diff -rN -u old-darcs-book/en/02-getting-started.md new-darcs-book/en/02-getting-started.md
--- old-darcs-book/en/02-getting-started.md	2024-11-24 04:30:23.585902679 +0000
+++ new-darcs-book/en/02-getting-started.md	2024-11-24 04:30:23.589902686 +0000
@@ -13,16 +13,17 @@
 Don't worry, it won't be much and I'll be introducing new terms as we are going
 along. But here are the basic terms you need to know.
 
-* Working Directory
+* Working Tree
 
-  This is where our project files reside, all work is done here.
+  This is the directory tree where our project files reside, all work is done
+  here.
 
 * Repository
 
   We already talked a bit about this but let's keep our most basic terms in one
   place. A repository is a place where we store information about our project
-  history. As our working directory changes through time we can record patches
-  that represent those changes and store them in our repository together with
+  history. As our working tree changes through time we can record patches that
+  represent those changes and store them in our repository together with
   additional information like, what changed, who did the changes and when.
 
 * Change
diff -rN -u old-darcs-book/en/03-working-locally.md new-darcs-book/en/03-working-locally.md
--- old-darcs-book/en/03-working-locally.md	2024-11-24 04:30:23.585902679 +0000
+++ new-darcs-book/en/03-working-locally.md	2024-11-24 04:30:23.589902686 +0000
@@ -53,28 +53,28 @@
 
 This creates a new file `Main.hs` with the content `main = putStrLn "Hello
 World"`, of course you can also use your favorite text editor to do this. By
-doing this we have changed our **working directory**.
+doing this we have changed our **working tree**.
 
-To find out what changes we have done to the working directory we can issue
-`darcs status`.
+To find out what changes we have done to the working tree we can issue `darcs
+status`.
 
 ```
 $ darcs status
 a ./Main.hs
 ```
 
-What `darcs` does here is that it compares the state of your working directory
+What `darcs` does here is that it compares the state of your working tree
 against the state of the repository (recall that the state of the repository is
 a set of changes). In our current repository there are no recorded changes so
-adding something to our working directory surely should constitute a change
-shouldn't it?
+adding something to our working tree surely should constitute a change shouldn't
+it?
 
 Let's take a closer look at the output of `darcs status`. What does the lower
 case `a` in front of `./Main.hs` mean? Well, it means that the file `Main.hs` is
 currently **unadded**. Let's try to `record` a patch and see what happens.
 
 When we want to `record` a new patch we can simply issue `darcs record` and
-`darcs` will compare our current working directory against the state of our
+`darcs` will compare our current working tree against the state of our
 repository and consider all changes for the patch we are about to `record`.
 
 ```
@@ -268,14 +268,14 @@
 Booooooooooring!!!
 ------------------
 
-Remember that **unadded** files are displayed with a lower case `a` in the `darcs
-status` output? This can be a bit annoying because there might be some files in
-our working directory that we would never consider for a patch. For files like
-this we have a list of files that we consider **boring**.
-
-Here's an example. We now have our `Hello.hs` file in our working directory and
-we want to compile that program. When we take a look at the our `status` we get
-a surprise.
+Remember that **unadded** files are displayed with a lower case `a` in the
+`darcs status` output? This can be a bit annoying because there might be some
+files in our working tree that we would never consider for a patch. For files
+like this we have a list of files that we consider **boring**.
+
+Here's an example. We now have our `Hello.hs` file in our working tree and we
+want to compile that program. When we take a look at the our `status` we get a
+surprise.
 
 ```
 $ darcs status
diff -rN -u old-darcs-book/en/04-happy-little-accidents.md new-darcs-book/en/04-happy-little-accidents.md
--- old-darcs-book/en/04-happy-little-accidents.md	2024-11-24 04:30:23.585902679 +0000
+++ new-darcs-book/en/04-happy-little-accidents.md	2024-11-24 04:30:23.589902686 +0000
@@ -22,8 +22,8 @@
 -----------------
 
 The most obvious thing that might go wrong in your development process is that
-you have a lot of changes in your working directory and you have decided that
-they don't make the cut. You want to get rid of them.
+you have a lot of changes in your working tree and you have decided that they
+don't make the cut. You want to get rid of them.
 
 Here's an example. Imagine you are writing a novel and some time light at night
 in some sleep depraved state you decide to rename the novel's protagonist from
@@ -38,8 +38,8 @@
 might have come across them, I certainly did, and they are no fun.
 
 In a situation like this `darcs revert` is exactly what you want. It allows you
-to restore the state of the working directory as if you didn't make any changes
-since the last record.
+to restore the state of the working tree as if you didn't make any changes since
+the last record.
 
 ```
 $ cat story.txt
@@ -94,10 +94,10 @@
 <Space>: accept the current default (which is capitalized)
 ```
 
-If you just want to get rid of everything in your working directory without
-being prompted interactively you can just issue `darcs revert --all` or the
-short hand `darcs revert -a` and `darcs` will `revert` all the unrecorded
-changes in your working directory.
+If you just want to get rid of everything in your working tree without being
+prompted interactively you can just issue `darcs revert --all` or the short hand
+`darcs revert -a` and `darcs` will `revert` all the unrecorded changes in your
+working tree.
 
 Unrevert
 --------