Fix some typos and improve wording

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index cc592579fedf54cc25673bc07d802d5fa85b319b..6167cd169e9668f2ea45cf7bf9f207989bb859e8 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -219,7 +219,7 @@ of development leading to that point.
 
 The best way to see how this works is using the linkgit:gitk[1]
 command; running gitk now on a Git repository and looking for merge
 
 The best way to see how this works is using the linkgit:gitk[1]
 command; running gitk now on a Git repository and looking for merge

-commits will help understand how the Git organizes history.
+commits will help understand how Git organizes history.

 
 In the following, we say that commit X is "reachable" from commit Y
 if commit X is an ancestor of commit Y.  Equivalently, you could say
 
 In the following, we say that commit X is "reachable" from commit Y
 if commit X is an ancestor of commit Y.  Equivalently, you could say


@@ -793,7 +793,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b
 -------------------------------------------------
 
 Or you could recall that the `...` operator selects all commits
 -------------------------------------------------
 
 Or you could recall that the `...` operator selects all commits

-contained reachable from either one reference or the other but not
+reachable from either one reference or the other but not

 both; so
 
 -------------------------------------------------
 both; so
 
 -------------------------------------------------


@@ -820,7 +820,7 @@ You could just visually inspect the commits since e05db0fd:
 $ gitk e05db0fd..
 -------------------------------------------------
 
 $ gitk e05db0fd..
 -------------------------------------------------
 

-Or you can use linkgit:git-name-rev[1], which will give the commit a
+or you can use linkgit:git-name-rev[1], which will give the commit a

 name based on any tag it finds pointing to one of the commit's
 descendants:
 
 name based on any tag it finds pointing to one of the commit's
 descendants:
 


@@ -864,8 +864,8 @@ because it outputs only commits that are not reachable from v1.5.0-rc1.
 
 As yet another alternative, the linkgit:git-show-branch[1] command lists
 the commits reachable from its arguments with a display on the left-hand
 
 As yet another alternative, the linkgit:git-show-branch[1] command lists
 the commits reachable from its arguments with a display on the left-hand

-side that indicates which arguments that commit is reachable from.  So,
-you can run something like
+side that indicates which arguments that commit is reachable from.
+So, if you run something like

 
 -------------------------------------------------
 $ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2
 
 -------------------------------------------------
 $ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2


@@ -877,15 +877,15 @@ available
 ...
 -------------------------------------------------
 
 ...
 -------------------------------------------------
 

-then search for a line that looks like
+then a line like

 
 -------------------------------------------------
 + ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
 available
 -------------------------------------------------
 
 
 -------------------------------------------------
 + ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
 available
 -------------------------------------------------
 

-Which shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and
-from v1.5.0-rc2, but not from v1.5.0-rc0.
+shows that e05db0fd is reachable from itself, from v1.5.0-rc1,
+and from v1.5.0-rc2, and not from v1.5.0-rc0.

 
 [[showing-commits-unique-to-a-branch]]
 Showing commits unique to a given branch
 
 [[showing-commits-unique-to-a-branch]]
 Showing commits unique to a given branch


@@ -3542,7 +3542,7 @@ with Git 1.5.2 can look up the submodule commits in the repository and
 manually check them out; earlier versions won't recognize the submodules at
 all.
 
 manually check them out; earlier versions won't recognize the submodules at
 all.
 

-To see how submodule support works, create (for example) four example
+To see how submodule support works, create four example

 repositories that can be used later as a submodule:
 
 -------------------------------------------------
 repositories that can be used later as a submodule:
 
 -------------------------------------------------


@@ -3914,7 +3914,7 @@ fact that such a commit brings together ("merges") two or more
 previous states represented by other commits.
 
 In other words, while a "tree" represents a particular directory state
 previous states represented by other commits.
 
 In other words, while a "tree" represents a particular directory state

-of a working directory, a "commit" represents that state in "time",
+of a working directory, a "commit" represents that state in time,

 and explains how we got there.
 
 You create a commit object by giving it the tree that describes the
 and explains how we got there.
 
 You create a commit object by giving it the tree that describes the