~jan0sch/darcs-book

Showing details for patch 3c48f7261269be9ac3418fff215c3c23fd1cf53b.
2018-08-11 (Sat), 12:55 PM - - 3c48f7261269be9ac3418fff215c3c23fd1cf53b

fix typos in chapter 3

Summary of changes
1 files modified with 13 lines added and 14 lines removed
  • en/03-working-locally.md with 13 added and 14 removed lines
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-23 18:16:40.491028380 +0000
+++ new-darcs-book/en/03-working-locally.md	2024-11-23 18:16:40.491028380 +0000
@@ -37,7 +37,7 @@
 Ch-Ch-Ch Changes!
 -----------------
 
-Okay, we now have a repository. Let's find what patches it holds. We can do
+Okay, we now have a repository. Let's find out what patches it holds. We can do
 this by issuing `darcs log`.
 
 ```
@@ -48,7 +48,7 @@
 since we have not recorded any yet.
 
 To warm up let's just create a simple "Hello World" program written in Haskell
-inside of our newly created project folder and add to our repository.
+inside of our newly created project folder and add that to our repository.
 
 ```
 $ echo 'main = putStrLn "Hello World!"' > Main.hs
@@ -138,14 +138,14 @@
 our email address in `~/.darcs` and won't bother us again.
 
 Now `darcs` asks us about the actual changes that we want to `record` for this
-patch. The first one is that we simply want to add the `Main.hs` file the we
+patch. The first one is that we simply want to add the `Main.hs` file that we
 created. The type of this change is `addfile`. The second change it asks us
 about adds the content to the file, this change type is what we call a `hunk`.
 This `hunk` just adds our single line program as line 1 to `Main.hs` (indicated
 by the `+` in front of the line). We will look at different types of changes
 later in this chapter.
 
-We have recorded our first path!
+We have recorded our first patch!
 
 Inspecting recorded patches
 ---------------------------
@@ -194,7 +194,7 @@
 specific files you can pass them as arguments to `record` and `darcs` will only
 ask you about recording changes in these files. So if I only wanted to record
 changes for this chapter of the book I would say `darcs record
-en/02-getting-started.md`.
+en/03-working-locally.md`.
 
 Recursively adding files
 ------------------------
@@ -356,11 +356,11 @@
 ```
 
 `darcs whatsnew` has detected a `hunk` change that has happened to line 1. What
-is does it that is removes the entire line 1 (indicated by the `-` at the
+it does is that it removes the entire line 1 (indicated by the `-` at the
 beginning of the line) and adds a new line (indicated by the `+`). So `darcs`
 has swapped out the entire line just because we have changed a single word as
-indicated by the `hunk` change. If we wanted to we can record a new patch based
-on this patch but let's look at another way to do something like this.
+indicated by the `hunk` change. If we wanted to we could record a new patch
+based on this patch but let's look at another way to do something like this.
 
 One thing I like to do when revisiting my unrecorded changes is to use `whatsnew
 -i` which puts the command into interactive mode. That way I can step through
@@ -428,8 +428,7 @@
 
 Here's an example. We now have our `Hello.hs` file in our working tree and we
 want to compile that program, when we do that our compiler will emit a new
-binary file `Hello`. Now, if we take a look at the our `status` we get a
-surprise.
+binary file `Hello`. Now, if we take a look at our `status` we get a surprise.
 
 ```
 $ darcs status
@@ -518,7 +517,7 @@
 
 * `changepref`
 
-  This kind of change is somewhat advanced and allow you to `record` preference
+  This kind of change is somewhat advanced and allows you to `record` preference
   changes of your repository and distribute them to others. To create such a
   change one utilizes the `setpref` command. These changes should be handled
   with extreme care since they also allow you to specify a shell command for the
@@ -577,7 +576,7 @@
 
 * `replace`
 
-  If we want to be a little bit more fine grained than a `hunk` when if comes to
+  If we want to be a little bit more fine grained than a `hunk` when it comes to
   text changes we can use `replace` changes. They play a lot better with other
   changes than the line-wise of a `hunk`.
 
@@ -620,9 +619,9 @@
 the useful utilities of `log` is the `-v` flag which is a short hand for
 `--verbose` and it displays the changes that a certain patch represents. That
 might be a little to much sometimes, think about adding a large new text file to
-your repository. You almost certainly don't want to see that entire file in you
+your repository. You almost certainly don't want to see that entire file in your
 `log` output. The `-s` flag which is a short hand for `--summary` allows you
-just to look at a summary of changes, similar to the `darcs status` output.
+to just look at a summary of changes, similar to the `darcs status` output.
 
 ```
 $ darcs log -s