Documentation: spelling and grammar fixes

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 24885444078b04cfe70cf9fd0b81c972f72b91bd..b44fd51f275b105b62a1f5c9d23ca616e2d87e7d 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -298,7 +298,7 @@ smaller project it is a good discipline to follow it.
 
 The sign-off is a simple line at the end of the explanation for
 the patch, which certifies that you wrote it or otherwise have
 
 The sign-off is a simple line at the end of the explanation for
 the patch, which certifies that you wrote it or otherwise have

-the right to pass it on as a open-source patch.  The rules are
+the right to pass it on as an open-source patch.  The rules are

 pretty simple: if you can certify the below D-C-O:
 
 [[dco]]
 pretty simple: if you can certify the below D-C-O:
 
 [[dco]]


@@ -403,7 +403,7 @@ don't demand).  +git log -p {litdd} _$area_you_are_modifying_+ would
 help you find out who they are.
 
 . You get comments and suggestions for improvements.  You may
 help you find out who they are.
 
 . You get comments and suggestions for improvements.  You may

-  even get them in a "on top of your change" patch form.
+  even get them in an "on top of your change" patch form.

 
 . Polish, refine, and re-send to the list and the people who
   spend their time to improve your patch.  Go back to step (2).
 
 . Polish, refine, and re-send to the list and the people who
   spend their time to improve your patch.  Go back to step (2).

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab641bf5a9984b7ab2dfea787a0db5704f79a448..98ffbd20875aac168c17c05e3dbbe594fb877e81 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -354,7 +354,7 @@ advice.*::
                Advice on what to do when you've accidentally added one
                git repo inside of another.
        ignoredHook::
                Advice on what to do when you've accidentally added one
                git repo inside of another.
        ignoredHook::

-               Advice shown if an hook is ignored because the hook is not
+               Advice shown if a hook is ignored because the hook is not

                set as executable.
        waitingForEditor::
                Print a message to the terminal whenever Git is waiting for
                set as executable.
        waitingForEditor::
                Print a message to the terminal whenever Git is waiting for

diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index 78479b003eb3a340da99c533aece8ee9fc19360c..0f9ef2f25e039e2a9ce72988962377439e84590c 100644 (file)
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -1103,7 +1103,7 @@ _____________
 Combining test suites, git bisect and other systems together
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Combining test suites, git bisect and other systems together
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

-We have seen that test suites an git bisect are very powerful when
+We have seen that test suites and git bisect are very powerful when

 used together. It can be even more powerful if you can combine them
 with other systems.
 
 used together. It can be even more powerful if you can combine them
 with other systems.
 

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 032613c420cf3cbcf75e82fc89abed6ec8d85355..7b157441eb3ee9e84e98f36f74a6083f071f36e1 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -68,8 +68,8 @@ imap.tunnel::
        to the server. Required when imap.host is not set.
 
 imap.host::
        to the server. Required when imap.host is not set.
 
 imap.host::

-       A URL identifying the server. Use a `imap://` prefix for non-secure
-       connections and a `imaps://` prefix for secure connections.
+       A URL identifying the server. Use an `imap://` prefix for non-secure
+       connections and an `imaps://` prefix for secure connections.

        Ignored when imap.tunnel is set, but required otherwise.
 
 imap.user::
        Ignored when imap.tunnel is set, but required otherwise.
 
 imap.user::

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index e8dec1b3c89a66dc2f9e78737fa7d243bee85d37..df2b64dbb618e3cf7c538798f5f18ebc41e7eff6 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -199,7 +199,7 @@ OPTIONS
        .git/NOTES_MERGE_REF symref is updated to the resulting commit.
 
 --abort::
        .git/NOTES_MERGE_REF symref is updated to the resulting commit.
 
 --abort::

-       Abort/reset a in-progress 'git notes merge', i.e. a notes merge
+       Abort/reset an in-progress 'git notes merge', i.e. a notes merge

        with conflicts. This simply removes all files related to the
        notes merge.
 
        with conflicts. This simply removes all files related to the
        notes merge.
 

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index c4467ffb98a95fa6bb5dc86a92dee3317be9c0ea..d9f422d5600af6b112eba692d5c5607cdb4169ef 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -106,7 +106,7 @@ It is optional: it defaults to 'traditional'.
 The possible options are:
 +
        - 'traditional' - Shows ignored files and directories, unless
 The possible options are:
 +
        - 'traditional' - Shows ignored files and directories, unless

-                         --untracked-files=all is specifed, in which case
+                         --untracked-files=all is specified, in which case

                          individual files in ignored directories are
                          displayed.
        - 'no'          - Show no ignored files.
                          individual files in ignored directories are
                          displayed.
        - 'no'          - Show no ignored files.

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 7ea24fc942c18c032048edc10dfe00b56bff991e..b99029520d9b17e76ab65b4333a79fe20ed22eff 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -452,7 +452,7 @@ Any other arguments are passed directly to 'git log'
 
 'commit-diff'::
        Commits the diff of two tree-ish arguments from the
 
 'commit-diff'::
        Commits the diff of two tree-ish arguments from the

-       command-line.  This command does not rely on being inside an `git svn
+       command-line.  This command does not rely on being inside a `git svn

        init`-ed repository.  This command takes three arguments, (a) the
        original tree to diff against, (b) the new tree result, (c) the
        URL of the target Subversion repository.  The final argument
        init`-ed repository.  This command takes three arguments, (a) the
        original tree to diff against, (b) the new tree result, (c) the
        URL of the target Subversion repository.  The final argument

diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 10c8ff93c0b9f55ff19a8b54cdeed2fdad93b92b..9f2528fc8c81622c237f7bc80289137d8f4f750b 100644 (file)
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -244,7 +244,7 @@ commands in addition to the ones needed by participants.
 
 This section can also be used by those who respond to `git
 request-pull` or pull-request on GitHub (www.github.com) to
 
 This section can also be used by those who respond to `git
 request-pull` or pull-request on GitHub (www.github.com) to

-integrate the work of others into their history. An sub-area
+integrate the work of others into their history. A sub-area

 lieutenant for a repository will act both as a participant and
 as an integrator.
 
 lieutenant for a repository will act both as a participant and
 as an integrator.
 

diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 3b9faabdbb9cbc45893dff67fd40b0ed7552f287..504c5f1a885dfb20c37a9f87bdbdbd452cd216bd 100644 (file)
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -194,7 +194,7 @@ In the above config only the submodule 'bar' and 'baz' are active,
 
 Note that (c) is a historical artefact and will be ignored if the
 (a) and (b) specify that the submodule is not active. In other words,
 
 Note that (c) is a historical artefact and will be ignored if the
 (a) and (b) specify that the submodule is not active. In other words,

-if we have an `submodule.<name>.active` set to `false` or if the
+if we have a `submodule.<name>.active` set to `false` or if the

 submodule's path is excluded in the pathspec in `submodule.active`, the
 url doesn't matter whether it is present or not. This is illustrated in
 the example that follows.
 submodule's path is excluded in the pathspec in `submodule.active`, the
 url doesn't matter whether it is present or not. This is illustrated in
 the example that follows.

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 6c2d23dc489474958d39d8053fc799b8616aafee..0d2aa48c63856aba78d559445186a9b9e6bddd7d 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -334,7 +334,7 @@ The optional colon that terminates the "magic signature" can be
 omitted if the pattern begins with a character that does not belong to
 "magic signature" symbol set and is not a colon.
 +
 omitted if the pattern begins with a character that does not belong to
 "magic signature" symbol set and is not a colon.
 +

-In the long form, the leading colon `:` is followed by a open
+In the long form, the leading colon `:` is followed by an open

 parenthesis `(`, a comma-separated list of zero or more "magic words",
 and a close parentheses `)`, and the remainder is the pattern to match
 against the path.
 parenthesis `(`, a comma-separated list of zero or more "magic words",
 and a close parentheses `)`, and the remainder is the pattern to match
 against the path.

diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt
index 4f44ca24f6457e6acf208d7068dfcd02039cf41b..5abb8e8b1fdb37f9948ea2e09bae6380cb11041b 100644 (file)
--- a/Documentation/technical/api-directory-listing.txt
+++ b/Documentation/technical/api-directory-listing.txt
@@ -54,7 +54,7 @@ The notable options are:
        this case, the contents are returned as individual entries.
 +
 If this is set, files and directories that explicitly match an ignore
        this case, the contents are returned as individual entries.
 +
 If this is set, files and directories that explicitly match an ignore

-pattern are reported. Implicity ignored directories (directories that
+pattern are reported. Implicitly ignored directories (directories that

 do not match an ignore pattern, but whose contents are all ignored)
 are not reported, instead all of the contents are reported.
 
 do not match an ignore pattern, but whose contents are all ignored)
 are not reported, instead all of the contents are reported.
 

diff --git a/Documentation/technical/api-gitattributes.txt b/Documentation/technical/api-gitattributes.txt
index e7cbb7c13adf2f7ea3b15279a17f1a06da859cbc..45f0df600fab616688154df39775cbbc0f91ebd3 100644 (file)
--- a/Documentation/technical/api-gitattributes.txt
+++ b/Documentation/technical/api-gitattributes.txt
@@ -146,7 +146,7 @@ To get the values of all attributes associated with a file:
 
 * Iterate over the `attr_check.items[]` array to examine
   the attribute names and values.  The name of the attribute
 
 * Iterate over the `attr_check.items[]` array to examine
   the attribute names and values.  The name of the attribute

-  described by a  `attr_check.items[]` object can be retrieved via
+  described by an `attr_check.items[]` object can be retrieved via

   `git_attr_name(check->items[i].attr)`.  (Please note that no items
   will be returned for unset attributes, so `ATTR_UNSET()` will return
   false for all returned `attr_check.items[]` objects.)
   `git_attr_name(check->items[i].attr)`.  (Please note that no items
   will be returned for unset attributes, so `ATTR_UNSET()` will return
   false for all returned `attr_check.items[]` objects.)

diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index ad6af8105cf68e9e607cf67032e445094e53daf9..2c965d594fed46a84d541e4159046ee9d629a076 100644 (file)
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -18,7 +18,7 @@ metadata, including:
   the graph file.
 
 These positional references are stored as unsigned 32-bit integers
   the graph file.
 
 These positional references are stored as unsigned 32-bit integers

-corresponding to the array position withing the list of commit OIDs. We
+corresponding to the array position within the list of commit OIDs. We

 use the most-significant bit for special purposes, so we can store at most
 (1 << 31) - 1 (around 2 billion) commits.
 
 use the most-significant bit for special purposes, so we can store at most
 (1 << 31) - 1 (around 2 billion) commits.