Fix some typos, punctuation, missing words, minor markup.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 971fd9f16fba0bf07983a5aa9d016a20e059d7b6..d4a476e2ff9322348df099bfdfbba2832c8d47a4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -188,7 +188,7 @@ core.worktree::
        Set the path to the working tree.  The value will not be
        used in combination with repositories found automatically in
        a .git directory (i.e. $GIT_DIR is not set).
        Set the path to the working tree.  The value will not be
        used in combination with repositories found automatically in
        a .git directory (i.e. $GIT_DIR is not set).

-       This can be overriden by the GIT_WORK_TREE environment
+       This can be overridden by the GIT_WORK_TREE environment

        variable and the '--work-tree' command line option.
 
 core.logAllRefUpdates::
        variable and the '--work-tree' command line option.
 
 core.logAllRefUpdates::


@@ -607,7 +607,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.

-       Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+       Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.

 
 merge.<driver>.name::
        Defines a human readable name for a custom low-level
 
 merge.<driver>.name::
        Defines a human readable name for a custom low-level

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index db2eb46a191ecafac09492b95ec6f3a3233dbc6e..ce0f5024687056b696fe5e77362a6f01b18dd0bd 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -125,7 +125,7 @@ $ git diff topic...master  <3>
 +
 <1> Changes between the tips of the topic and the master branches.
 <2> Same as above.
 +
 <1> Changes between the tips of the topic and the master branches.
 <2> Same as above.

-<3> Changes that occured on the master branch since when the topic
+<3> Changes that occurred on the master branch since when the topic

 branch was started off it.
 
 Limiting the diff output::
 branch was started off it.
 
 Limiting the diff output::

diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index a8a7f6f04bf5b95a5b325dc2df0adf9d94532bc5..bf5c2bddf422c87768026ea8cae4146a136b3656 100644 (file)
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -43,7 +43,7 @@ OPTIONS
        a default name determined from the pack content.  If
        <pack-file> is not specified consider using --keep to
        prevent a race condition between this process and
        a default name determined from the pack content.  If
        <pack-file> is not specified consider using --keep to
        prevent a race condition between this process and

-       gitlink::git-repack[1] .
+       gitlink::git-repack[1].

 
 --fix-thin::
        It is possible for gitlink:git-pack-objects[1] to build
 
 --fix-thin::
        It is possible for gitlink:git-pack-objects[1] to build

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 17e9f10c659844e55e56b0d3a005e5f250f43c20..b726ddfe125f54986dad4c0f19c53d657de082b5 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it
 processes them in turn only stopping if merge returns a non-zero exit
 code.
 
 processes them in turn only stopping if merge returns a non-zero exit
 code.
 

-Typically this is run with the a script calling git's imitation of
+Typically this is run with a script calling git's imitation of

 the merge command from the RCS package.
 
 A sample script called "git-merge-one-file" is included in the
 the merge command from the RCS package.
 
 A sample script called "git-merge-one-file" is included in the

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 5723bb06f087f62e463b110686b850987103140d..c0147b99a2268d884a7c715dcb51571315e39e51 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -57,7 +57,7 @@ stash@{1}: On master: 9cc0589... Add git-stash
 
 show [<stash>]::
 
 
 show [<stash>]::
 

-       Show the changes recorded in the stash as a diff between the the
+       Show the changes recorded in the stash as a diff between the

        stashed state and its original parent. When no `<stash>` is given,
        shows the latest one. By default, the command shows the diffstat, but
        it will accept any format known to `git-diff` (e.g., `git-stash show
        stashed state and its original parent. When no `<stash>` is given,
        shows the latest one. By default, the command shows the diffstat, but
        it will accept any format known to `git-diff` (e.g., `git-stash show

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index e157c6ab501a574b929bd73c427313874c3a3e90..488e4b1caf8097de4ab53bf89a03f80173a2cf52 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -404,7 +404,7 @@ section because they affect the 'git-svn-id:' metadata line.
 BASIC EXAMPLES
 --------------
 
 BASIC EXAMPLES
 --------------
 

-Tracking and contributing to a the trunk of a Subversion-managed project:
+Tracking and contributing to the trunk of a Subversion-managed project:

 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 990ae4f948920477500b6a19a2350a61cbd7c3cd..22a23bf96f9d851546c296ad559f6ae4a23eedb1 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -112,7 +112,7 @@ You really want to call the new version "X" too, 'even though'
 others have already seen the old one. So just use "git tag -f"
 again, as if you hadn't already published the old one.
 
 others have already seen the old one. So just use "git tag -f"
 again, as if you hadn't already published the old one.
 

-However, Git does *not* (and it should not)change tags behind
+However, Git does *not* (and it should not) change tags behind

 users back. So if somebody already got the old tag, doing a "git
 pull" on your tree shouldn't just make them overwrite the old
 one.
 users back. So if somebody already got the old tag, doing a "git
 pull" on your tree shouldn't just make them overwrite the old
 one.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1c0ee078e64b20622727d223ae27c24d835b3d31..ce8f923a156ad0e33b15b5ef169887b49d5100ad 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -326,7 +326,7 @@ For a more complete list of ways to spell object names, see
 File/Directory Structure
 ------------------------
 
 File/Directory Structure
 ------------------------
 

-Please see link:repository-layout.html[repository layout] document.
+Please see the link:repository-layout.html[repository layout] document.

 
 Read link:hooks.html[hooks] for more details about each hook.
 
 
 Read link:hooks.html[hooks] for more details about each hook.
 


@@ -336,7 +336,7 @@ Higher level SCMs may provide and manage additional information in the
 
 Terminology
 -----------
 
 Terminology
 -----------

-Please see link:glossary.html[glossary] document.
+Please see the link:glossary.html[glossary] document.

 
 
 Environment Variables
 
 
 Environment Variables

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 3f7b1e42b502e1cc87305167ffcb99486132caca..d99fa199d65edb56838cfbd6944a2d681b45615b 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -52,8 +52,8 @@ GIT Glossary
 [[def_cherry-picking]]cherry-picking::
        In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
        changes out of a series of changes (typically commits) and record them
 [[def_cherry-picking]]cherry-picking::
        In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
        changes out of a series of changes (typically commits) and record them

-       as a new series of changes on top of different codebase. In GIT, this is
-       performed by "git cherry-pick" command to extract the change introduced
+       as a new series of changes on top of a different codebase. In GIT, this is
+       performed by the "git cherry-pick" command to extract the change introduced

        by an existing <<def_commit,commit>> and to record it based on the tip
        of the current <<def_branch,branch>> as a new commit.
 
        by an existing <<def_commit,commit>> and to record it based on the tip
        of the current <<def_branch,branch>> as a new commit.
 


@@ -347,7 +347,7 @@ This commit is referred to as a "merge commit", or sometimes just a
        it as my origin branch head". And `git push
        $URL refs/heads/master:refs/heads/to-upstream` means "publish my
        master branch head as to-upstream branch at $URL". See also
        it as my origin branch head". And `git push
        $URL refs/heads/master:refs/heads/to-upstream` means "publish my
        master branch head as to-upstream branch at $URL". See also

-       gitlink:git-push[1]
+       gitlink:git-push[1].

 
 [[def_repository]]repository::
        A collection of <<def_ref,refs>> together with an
 
 [[def_repository]]repository::
        A collection of <<def_ref,refs>> together with an

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 975dc96f9dd8c78b40c9e9d4eea925d06b566c12..b09dcc4152f6c4f975702bbeb4e372ace94eaef7 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1495,7 +1495,7 @@ Ensuring good performance
 -------------------------
 
 On large repositories, git depends on compression to keep the history
 -------------------------
 
 On large repositories, git depends on compression to keep the history

-information from taking up to much space on disk or in memory.
+information from taking up too much space on disk or in memory.

 
 This compression is not performed automatically.  Therefore you
 should occasionally run gitlink:git-gc[1]:
 
 This compression is not performed automatically.  Therefore you
 should occasionally run gitlink:git-gc[1]:


@@ -1920,7 +1920,7 @@ As with git-fetch, git-push will complain if this does not result in
 a <<fast-forwards,fast forward>>.  Normally this is a sign of
 something wrong.  However, if you are sure you know what you're
 doing, you may force git-push to perform the update anyway by
 a <<fast-forwards,fast forward>>.  Normally this is a sign of
 something wrong.  However, if you are sure you know what you're
 doing, you may force git-push to perform the update anyway by

-proceeding the branch name by a plus sign:
+preceding the branch name by a plus sign:

 
 -------------------------------------------------
 $ git push ssh://yourserver.com/~you/proj.git +master
 
 -------------------------------------------------
 $ git push ssh://yourserver.com/~you/proj.git +master


@@ -2040,7 +2040,7 @@ $ git branch --track test origin/master
 $ git branch --track release origin/master
 -------------------------------------------------
 
 $ git branch --track release origin/master
 -------------------------------------------------
 

-These can be easily kept up to date using gitlink:git-pull[1]
+These can be easily kept up to date using gitlink:git-pull[1].

 
 -------------------------------------------------
 $ git checkout test && git pull
 
 -------------------------------------------------
 $ git checkout test && git pull


@@ -2132,7 +2132,7 @@ changes are in a specific branch, use:
 $ git log linux..branchname | git-shortlog
 -------------------------------------------------
 
 $ git log linux..branchname | git-shortlog
 -------------------------------------------------
 

-To see whether it has already been merged into the test or release branches
+To see whether it has already been merged into the test or release branches,

 use:
 
 -------------------------------------------------
 use:
 
 -------------------------------------------------


@@ -2145,12 +2145,12 @@ or
 $ git log release..branchname
 -------------------------------------------------
 
 $ git log release..branchname
 -------------------------------------------------
 

-(If this branch has not yet been merged you will see some log entries.
+(If this branch has not yet been merged, you will see some log entries.

 If it has been merged, then there will be no output.)
 
 Once a patch completes the great cycle (moving from test to release,
 then pulled by Linus, and finally coming back into your local
 If it has been merged, then there will be no output.)
 
 Once a patch completes the great cycle (moving from test to release,
 then pulled by Linus, and finally coming back into your local

-"origin/master" branch) the branch for this change is no longer needed.
+"origin/master" branch), the branch for this change is no longer needed.

 You detect this when the output from:
 
 -------------------------------------------------
 You detect this when the output from:
 
 -------------------------------------------------


@@ -2479,7 +2479,7 @@ $ git checkout -b mywork-new origin
 $ gitk origin..mywork &
 -------------------------------------------------
 
 $ gitk origin..mywork &
 -------------------------------------------------
 

-And browse through the list of patches in the mywork branch using gitk,
+and browse through the list of patches in the mywork branch using gitk,

 applying them (possibly in a different order) to mywork-new using
 cherry-pick, and possibly modifying them as you go using commit --amend.
 The gitlink:git-gui[1] command may also help as it allows you to
 applying them (possibly in a different order) to mywork-new using
 cherry-pick, and possibly modifying them as you go using commit --amend.
 The gitlink:git-gui[1] command may also help as it allows you to


@@ -2739,7 +2739,7 @@ others:
 
 - Git can quickly determine whether two objects are identical or not,
   just by comparing names.
 
 - Git can quickly determine whether two objects are identical or not,
   just by comparing names.

-- Since object names are computed the same way in ever repository, the
+- Since object names are computed the same way in every repository, the

   same content stored in two repositories will always be stored under
   the same name.
 - Git can detect errors when it reads an object, by checking that the
   same content stored in two repositories will always be stored under
   the same name.
 - Git can detect errors when it reads an object, by checking that the


@@ -3425,9 +3425,10 @@ The Workflow
 ------------
 
 High-level operations such as gitlink:git-commit[1],
 ------------
 
 High-level operations such as gitlink:git-commit[1],

-gitlink:git-checkout[1] and git-reset[1] work by moving data between the
-working tree, the index, and the object database.  Git provides
-low-level operations which perform each of these steps individually.
+gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
+between the working tree, the index, and the object database.  Git
+provides low-level operations which perform each of these steps
+individually.

 
 Generally, all "git" operations work on the index file. Some operations
 work *purely* on the index file (showing the current state of the
 
 Generally, all "git" operations work on the index file. Some operations
 work *purely* on the index file (showing the current state of the


@@ -3704,7 +3705,7 @@ Merging multiple trees, continued
 ---------------------------------
 
 Sadly, many merges aren't trivial. If there are files that have
 ---------------------------------
 
 Sadly, many merges aren't trivial. If there are files that have

-been added.moved or removed, or if both branches have modified the
+been added, moved or removed, or if both branches have modified the

 same file, you will be left with an index tree that contains "merge
 entries" in it. Such an index tree can 'NOT' be written out to a tree
 object, and you will have to resolve any such merge clashes using
 same file, you will be left with an index tree that contains "merge
 entries" in it. Such an index tree can 'NOT' be written out to a tree
 object, and you will have to resolve any such merge clashes using


@@ -4061,7 +4062,7 @@ $ git branch new     # create branch "new" starting at current HEAD
 $ git branch -d new  # delete branch "new"
 -----------------------------------------------
 
 $ git branch -d new  # delete branch "new"
 -----------------------------------------------
 

-Instead of basing new branch on current HEAD (the default), use:
+Instead of basing a new branch on current HEAD (the default), use:

 
 -----------------------------------------------
 $ git branch new test    # branch named "test"
 
 -----------------------------------------------
 $ git branch new test    # branch named "test"