~jan0sch/darcs-book
Showing details for patch b75a76f0649a622006f02dc74b7ead6fced735f2.
diff -rN -u old-darcs-book/en/01-introduction.md new-darcs-book/en/01-introduction.md --- old-darcs-book/en/01-introduction.md 2024-11-24 04:37:51.310772167 +0000 +++ new-darcs-book/en/01-introduction.md 2024-11-24 04:37:51.310772167 +0000 @@ -32,7 +32,7 @@ And if that wasn't confusing enough, you then end up in a situation where you want one part of an older revision in your final version. To make matters even -worse, at some point in time a friend of yours voulunteered to write some other +worse, at some point in time a friend of yours volunteered to write some other portion of that document and you start mailing full copies of your document back and forth while you are trying to stitch all of your work together. Needless to say that this isn't much fun but a rather frustrating task that makes working on @@ -84,7 +84,7 @@ to their copy. First, let's look at the snapshot based approach and we are using a tool called -`git` to illustrate this. If you don't fully understand what's happining here, +`git` to illustrate this. If you don't fully understand what's happening here, that's fine. It's not necessary to use `darcs` efficiently. gimbar pulls in jeanny's and then tauli's patches. gimbar now has the following