Fix typos in the documentation

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45df5ce3ef30e588555bbd5ab404c2b7397c..ba2006d892ec09d606f8846588c7727396b1ee28 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -157,7 +157,7 @@ Writing Documentation:
    --sort=<key>
    --abbrev[=<n>]
 
    --sort=<key>
    --abbrev[=<n>]
 

- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:

    <file>...
    (One or more of <file>.)
 
    <file>...
    (One or more of <file>.)
 

diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index b736d398cd9647212a4f2c9514e2d5a8fa3a51d7..375fea193567eda72b9511471b1a78f8f0b5c104 100644 (file)
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -8,12 +8,11 @@ Updates since v1.7.3
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 

- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or

    rename existing ones to a new name) were too loose and users were
    rename existing ones to a new name) were too loose and users were

-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves.  The name of a branch cannot begin with a dash
-   now.
+   allowed to give a branch a name that begins with a dash by creative
+   abuse of their command line options, which only led to burning
+   themselves.  The name of a branch cannot begin with a dash now.

 
  * System-wide fallback default attributes can be stored in
    /etc/gitattributes; core.attributesfile configuration variable can
 
  * System-wide fallback default attributes can be stored in
    /etc/gitattributes; core.attributesfile configuration variable can

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a8759cff804c98a7f4d13634ce8775edd2315a0d..ff7c225467b5da3263b6e8f8924adefeea404a8a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -892,7 +892,7 @@ diff.wordRegex::
 
 fetch.recurseSubmodules::
        A boolean value which changes the behavior for fetch and pull, the
 
 fetch.recurseSubmodules::
        A boolean value which changes the behavior for fetch and pull, the

-       default is to not recursively fetch populated sumodules unless
+       default is to not recursively fetch populated submodules unless

        configured otherwise.
 
 fetch.unpackLimit::
        configured otherwise.
 
 fetch.unpackLimit::


@@ -1811,7 +1811,7 @@ submodule.<name>.update::
 
 submodule.<name>.fetchRecurseSubmodules::
        This option can be used to enable/disable recursive fetching of this
 
 submodule.<name>.fetchRecurseSubmodules::
        This option can be used to enable/disable recursive fetching of this

-       submodule. It can be overriden by using the --[no-]recurse-submodules
+       submodule. It can be overridden by using the --[no-]recurse-submodules

        command line option to "git fetch" and "git pull".
        This setting will override that from in the linkgit:gitmodules[5]
        file.
        command line option to "git fetch" and "git pull".
        This setting will override that from in the linkgit:gitmodules[5]
        file.

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 54aaaeb41b969be4c79a2a8072bc6daca469ca8d..a03448f9231f78340fc492bffa009b96648ee6ac 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.
 There are also more complex operations that can be performed. But beware
 that because the patch is applied only to the index and not the working
 tree, the working tree will appear to "undo" the change in the index.
 There are also more complex operations that can be performed. But beware
 that because the patch is applied only to the index and not the working
 tree, the working tree will appear to "undo" the change in the index.

-For example, introducing a a new line into the index that is in neither
+For example, introducing a new line into the index that is in neither

 the HEAD nor the working tree will stage the new line for commit, but
 the line will appear to be reverted in the working tree.
 
 the HEAD nor the working tree will stage the new line for commit, but
 the line will appear to be reverted in the working tree.
 

diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 6266a3a6020db72c8629ad521dfedccc9d790a03..299007b206cb5d810d19eed9b7831c3ea6368043 100644 (file)
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -59,7 +59,7 @@ unbundle <file>::
 
 <git-rev-list-args>::
        A list of arguments, acceptable to 'git rev-parse' and
 
 <git-rev-list-args>::
        A list of arguments, acceptable to 'git rev-parse' and

-       'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES
+       'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES

        below), that specifies the specific objects and references
        to transport.  For example, `master{tilde}10..master` causes the
        current master reference to be packaged along with all objects
        below), that specifies the specific objects and references
        to transport.  For example, `master{tilde}10..master` causes the
        current master reference to be packaged along with all objects

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 40dba8c0a9f308064f67d8f38ce8a22b2a42a77c..75adf7a502e18aa11e7a8424acf217b4bf6be64c 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -57,7 +57,7 @@ merge.log::
        In addition to branch names, populate the log message with at
        most the specified number of one-line descriptions from the
        actual commits that are being merged.  Defaults to false, and
        In addition to branch names, populate the log message with at
        most the specified number of one-line descriptions from the
        actual commits that are being merged.  Defaults to false, and

-       true is a synoym for 20.
+       true is a synonym for 20.

 
 merge.summary::
        Synonym to `merge.log`; this is deprecated and will be removed in
 
 merge.summary::
        Synonym to `merge.log`; this is deprecated and will be removed in

diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index f4fbf672094ed11acb5ca551b5cc411a86f3f1ba..2d65cfefd5d2aeaafcbc0bb6e6705f8379b2f826 100644 (file)
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect
 to a remote git server.
 
 Data written to stdin of this specified 'program' is assumed
 to a remote git server.
 
 Data written to stdin of this specified 'program' is assumed

-to be sent to git:// server, git-upload-pack, git-receive-pack
+to be sent to a git:// server, git-upload-pack, git-receive-pack

 or git-upload-archive (depending on situation), and data read
 from stdout of this program is assumed to be received from
 the same service.
 
 or git-upload-archive (depending on situation), and data read
 from stdout of this program is assumed to be received from
 the same service.
 

-Command and arguments are separated by unescaped space.
+Command and arguments are separated by an unescaped space.

 
 The following sequences have a special meaning:
 
 
 The following sequences have a special meaning:
 


@@ -39,19 +39,19 @@ The following sequences have a special meaning:
        git-upload-pack, or git-upload-archive) of the service
        git wants to invoke.
 
        git-upload-pack, or git-upload-archive) of the service
        git wants to invoke.
 

-'%G' (must be first characters in argument)::
+'%G' (must be the first characters in an argument)::

        This argument will not be passed to 'program'. Instead, it
        This argument will not be passed to 'program'. Instead, it

-       will cause helper to start by sending git:// service request to
-       remote side with service field set to approiate value and
-       repository field set to rest of the argument. Default is not to send
-       such request.
+       will cause the helper to start by sending git:// service requests to
+       the remote side with the service field set to an appropriate value and
+       the repository field set to rest of the argument. Default is not to send
+       such a request.

 +
 This is useful if remote side is git:// server accessed over
 some tunnel.
 
 '%V' (must be first characters in argument)::
        This argument will not be passed to 'program'. Instead it sets
 +
 This is useful if remote side is git:// server accessed over
 some tunnel.
 
 '%V' (must be first characters in argument)::
        This argument will not be passed to 'program'. Instead it sets

-       the vhost field in git:// service request (to rest of the argument).
+       the vhost field in the git:// service request (to rest of the argument).

        Default is not to send vhost in such request (if sent).
 
 ENVIRONMENT VARIABLES:
        Default is not to send vhost in such request (if sent).
 
 ENVIRONMENT VARIABLES:

diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index abc49441be7a86e25a2b09d98f7de2ddcf0b0bb2..4aecd4d1878e0af6c3e6c87a63df1375606ff65a 100644 (file)
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -11,20 +11,20 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-This helper uses specified file descriptors to connect to remote git server.
+This helper uses specified file descriptors to connect to a remote git server.

 This is not meant for end users but for programs and scripts calling git
 fetch, push or archive.
 
 This is not meant for end users but for programs and scripts calling git
 fetch, push or archive.
 

-If only <infd> is given, it is assumed to be bidirectional socket connected
+If only <infd> is given, it is assumed to be a bidirectional socket connected

 to remote git server (git-upload-pack, git-receive-pack or
 git-upload-achive). If both <infd> and <outfd> are given, they are assumed
 to remote git server (git-upload-pack, git-receive-pack or
 git-upload-achive). If both <infd> and <outfd> are given, they are assumed

-to be pipes connected to remote git server (<infd> being the inbound pipe
+to be pipes connected to a remote git server (<infd> being the inbound pipe

 and <outfd> being the outbound pipe.
 
 It is assumed that any handshaking procedures have already been completed
 (such as sending service request for git://) before this helper is started.
 
 and <outfd> being the outbound pipe.
 
 It is assumed that any handshaking procedures have already been completed
 (such as sending service request for git://) before this helper is started.
 

-<anything> can be any string. It is ignored. It is meant for provoding
+<anything> can be any string. It is ignored. It is meant for providing

 information to user in the URL in case that URL is displayed in some
 context.
 
 information to user in the URL in case that URL is displayed in some
 context.
 

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 139d314ba54c4e7897ffcf257a1fd847eb7939fa..254d0441b391f2ce0c66651f9f4f69cd0121a98b 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug
 reports and archives.  If you plan to eventually migrate from SVN to git
 and are certain about dropping SVN history, consider
 linkgit:git-filter-branch[1] instead.  filter-branch also allows
 reports and archives.  If you plan to eventually migrate from SVN to git
 and are certain about dropping SVN history, consider
 linkgit:git-filter-branch[1] instead.  filter-branch also allows

-reformating of metadata for ease-of-reading and rewriting authorship
+reformatting of metadata for ease-of-reading and rewriting authorship

 info for non-"svn.authorsFile" users.
 
 svn.useSvmProps::
 info for non-"svn.authorsFile" users.
 
 svn.useSvmProps::

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 6c93202e735e7b7caad89120245050e0a06e5537..68977943e7bba092f5e55e6ad1b9ede83f4c2b67 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
        submodule. If this option is also present in the submodules entry in
        .git/config of the superproject, the setting there will override the
        one found in .gitmodules.
        submodule. If this option is also present in the submodules entry in
        .git/config of the superproject, the setting there will override the
        one found in .gitmodules.

-       Both settings can be overriden on the command line by using the
+       Both settings can be overridden on the command line by using the

        "--[no-]recurse-submodules" option to "git fetch" and "git pull"..
 
 submodule.<name>.ignore::
        "--[no-]recurse-submodules" option to "git fetch" and "git pull"..
 
 submodule.<name>.ignore::

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 92772e7c4eb8921d3b2763fe1b533c380bd2b92b..1e5c22c5e5c19dab5d5c35ec2401870237830a5d 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -10,7 +10,7 @@ merge.log::
        In addition to branch names, populate the log message with at
        most the specified number of one-line descriptions from the
        actual commits that are being merged.  Defaults to false, and
        In addition to branch names, populate the log message with at
        most the specified number of one-line descriptions from the
        actual commits that are being merged.  Defaults to false, and

-       true is a synoym for 20.
+       true is a synonym for 20.

 
 merge.renameLimit::
        The number of files to consider when performing rename detection
 
 merge.renameLimit::
        The number of files to consider when performing rename detection

diff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt
index 535cdff164f1f1cdf829f18fa192783efb9f0086..9e1189ef01dff889447c1bf92802c9792f267b9b 100644 (file)
--- a/Documentation/technical/api-sigchain.txt
+++ b/Documentation/technical/api-sigchain.txt
@@ -32,7 +32,7 @@ and installation code should look something like:
   }
 ------------------------------------------
 
   }
 ------------------------------------------
 

-Handlers are given the typdef of sigchain_fun. This is the same type
+Handlers are given the typedef of sigchain_fun. This is the same type

 that is given to signal() or sigaction(). It is perfectly reasonable to
 push SIG_DFL or SIG_IGN onto the stack.
 
 that is given to signal() or sigaction(). It is perfectly reasonable to
 push SIG_DFL or SIG_IGN onto the stack.