doc: A few minor copy edits.

- (glossary) the quotes around the Wikipedia URL prevented its
linkification in frontends that support it; remove them

- (manual) newer version (SHA-1) == following, older == preceding, not
the other way around

- trivial typo and wording fixes

Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3ceefb8a1f3b17f4301d89f8eec1cc4bb103a24a..20f9228511e82ac9ced81889bcc66f41504710a3 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -181,7 +181,7 @@ final result verbatim.  When both sides made changes to the same area,
 however, git cannot randomly pick one side over the other, and asks you to
 resolve it by leaving what both sides did to that area.
 
 however, git cannot randomly pick one side over the other, and asks you to
 resolve it by leaving what both sides did to that area.
 

-By default, git uses the same style as that is used by "merge" program
+By default, git uses the same style as the one used by the "merge" program

 from the RCS suite to present such a conflicted hunk, like this:
 
 ------------
 from the RCS suite to present such a conflicted hunk, like this:
 
 ------------

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 147fa1a8e002daba2a465ed1f56c88838500cb53..feb51a6ea3e9cd3ddca3179b4cf542cf39f0efc1 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -273,7 +273,7 @@ which makes little sense.
        Pass the <strategy-option> through to the merge strategy.
        This implies `--merge` and, if no strategy has been
        specified, `-s recursive`.  Note the reversal of 'ours' and
        Pass the <strategy-option> through to the merge strategy.
        This implies `--merge` and, if no strategy has been
        specified, `-s recursive`.  Note the reversal of 'ours' and

-       'theirs' as noted in above for the `-m` option.
+       'theirs' as noted above for the `-m` option.

 
 -q::
 --quiet::
 
 -q::
 --quiet::

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 3595b586bc35d865a08ab538a1908cb2abe8e1a8..f928b57f90b0950e9297cff160741683754a454d 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -117,7 +117,7 @@ to point at the new commit.
 
 [[def_ent]]ent::
        Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
 
 [[def_ent]]ent::
        Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See

-       `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
+       http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth

        explanation. Avoid this term, not to confuse people.
 
 [[def_evil_merge]]evil merge::
        explanation. Avoid this term, not to confuse people.
 
 [[def_evil_merge]]evil merge::

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 84e34b1abaf23ef87fcccd21b0500fd21c5a1912..d9b2b5b2e07827ff0a8a276d2593f5e197e029b3 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -760,7 +760,7 @@ options may be given. See linkgit:git-diff-files[1] for more options.
 
 --cc::
 
 
 --cc::
 

-       This flag implies the '-c' options and further compresses the
+       This flag implies the '-c' option and further compresses the

        patch output by omitting uninteresting hunks whose contents in
        the parents have only two variants and the merge result picks
        one of them without modification.
        patch output by omitting uninteresting hunks whose contents in
        the parents have only two variants and the merge result picks
        one of them without modification.

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 02ed5668e151354d23991e7b272611c32741cb12..03d95dc290cecd2223116be90b591f75d40ced2b 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2870,7 +2870,7 @@ $ git fetch example
 You can also add a "+" to force the update each time:
 
 -------------------------------------------------
 You can also add a "+" to force the update each time:
 
 -------------------------------------------------

-$ git config remote.example.fetch +master:ref/remotes/example/master
+$ git config remote.example.fetch +master:refs/remotes/example/master

 -------------------------------------------------
 
 Don't do this unless you're sure you won't mind "git fetch" possibly
 -------------------------------------------------
 
 Don't do this unless you're sure you won't mind "git fetch" possibly


@@ -2966,7 +2966,7 @@ As you can see, a commit is defined by:
 
 - a tree: The SHA-1 name of a tree object (as defined below), representing
   the contents of a directory at a certain point in time.
 
 - a tree: The SHA-1 name of a tree object (as defined below), representing
   the contents of a directory at a certain point in time.

-- parent(s): The SHA-1 name of some number of commits which represent the
+- parent(s): The SHA-1 name(s) of some number of commits which represent the

   immediately previous step(s) in the history of the project.  The
   example above has one parent; merge commits may have more than
   one.  A commit with no parents is called a "root" commit, and
   immediately previous step(s) in the history of the project.  The
   example above has one parent; merge commits may have more than
   one.  A commit with no parents is called a "root" commit, and


@@ -3363,8 +3363,8 @@ Date:
 :100644 100644 oldsha... 4b9458b... M somedirectory/myfile
 ------------------------------------------------
 
 :100644 100644 oldsha... 4b9458b... M somedirectory/myfile
 ------------------------------------------------
 

-This tells you that the immediately preceding version of the file was
-"newsha", and that the immediately following version was "oldsha".
+This tells you that the immediately following version of the file was
+"newsha", and that the immediately preceding version was "oldsha".

 You also know the commit messages that went with the change from oldsha
 to 4b9458b and with the change from 4b9458b to newsha.
 
 You also know the commit messages that went with the change from oldsha
 to 4b9458b and with the change from 4b9458b to newsha.
 


@@ -4035,8 +4035,8 @@ $ git ls-files --unmerged
 Each line of the `git ls-files --unmerged` output begins with
 the blob mode bits, blob SHA-1, 'stage number', and the
 filename.  The 'stage number' is git's way to say which tree it
 Each line of the `git ls-files --unmerged` output begins with
 the blob mode bits, blob SHA-1, 'stage number', and the
 filename.  The 'stage number' is git's way to say which tree it

-came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD`
-tree, and stage3 `$target` tree.
+came from: stage 1 corresponds to the `$orig` tree, stage 2 to
+the `HEAD` tree, and stage 3 to the `$target` tree.

 
 Earlier we said that trivial merges are done inside
 `git read-tree -m`.  For example, if the file did not change
 
 Earlier we said that trivial merges are done inside
 `git read-tree -m`.  For example, if the file did not change