Fix some documentation typos.

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8a0df5736e6025b2fffc21f3bd24588c8e78b0e5..ee0884545bff830972b8315e93e18d8143727e03 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -476,7 +476,7 @@ fetch.unpackLimit::
 
 format.numbered::
        A boolean which can enable sequence numbers in patch subjects.
-       Seting this option to "auto" will enable it only if there is
+       Setting this option to "auto" will enable it only if there is
        more than one patch.  See --numbered option in
        gitlink:git-format-patch[1].
 

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index da3f71850a902feba27e809440ebcfebe0a4e483..a8ffcbe78b09a3a78cb8d46b799713251dac1d87 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -21,7 +21,7 @@ printed on the standard output.
 
 If a git command is named, a manual page for that command is brought
 up. The 'man' program is used by default for this purpose, but this
-can be overriden by other options or configuration variables.
+can be overridden by other options or configuration variables.
 
 Note that 'git --help ...' is identical as 'git help ...' because the
 former is internally converted into the latter.
@@ -30,7 +30,7 @@ OPTIONS
 -------
 -a|--all::
        Prints all the available commands on the standard output. This
-       option superseeds any other option.
+       option supersedes any other option.
 
 -i|--info::
        Use the 'info' program to display the manual page, instead of
@@ -50,7 +50,7 @@ The web browser can be specified using the configuration variable
 these config variables is set, the 'git-help--browse' helper script
 (called by 'git-help') will pick a suitable default.
 +
-You can explicitly provide a full path to your prefered browser by
+You can explicitly provide a full path to your preferred browser by
 setting the configuration variable 'browser.<tool>.path'. For example,
 you can configure the absolute path to firefox by setting
 'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool
@@ -72,7 +72,7 @@ line option:
 * "web" or "html" correspond to '-w|--web',
 
 The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
-be checked if the 'web' format is choosen (either by command line
+be checked if the 'web' format is chosen (either by command line
 option or configuration variable). See '-w|--web' in the OPTIONS
 section above.
 

diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 07484a4fd065b639bbf33832cbf642eb8399757e..e51351dd537629962529f57ca3e25a39d4cccf73 100644 (file)
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -52,7 +52,7 @@ is given:
  - 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
    readable by all users.
 
-By default, the configuration flag receive.denyNonFastforward is enabled
+By default, the configuration flag receive.denyNonFastForwards is enabled
 in shared repositories, so that you cannot force a non fast-forwarding push
 into it.
 

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 989fbf3562977866d7d2558022587847f538ae4b..a03f9fe5fadc483f47c2fbd0199f72a9619b5fcd 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -274,7 +274,7 @@ limiting may be applied.
 --quiet::
 
        Don't print anything to standard output.  This form of
-       git-rev-list is primarly meant to allow the caller to
+       git-rev-list is primarily meant to allow the caller to
        test the exit status to see if a range of objects is fully
        connected (or not).  It is faster than redirecting stdout
        to /dev/null as the output does not have to be formatted.

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 659215ac7221d5c8b6aa78bef2fcadce24ada8c3..f0bd2851d8b118711ccf25fcd9c4205dd727b310 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -148,7 +148,7 @@ sendemail.identity::
        'sendemail.<identity>.<item>' will have higher precedence than
        'sendemail.<item>'. This is useful to declare multiple SMTP
        identities and to hoist sensitive authentication information
-       out of the repository and into the global configuation file.
+       out of the repository and into the global configuration file.
 
 sendemail.aliasesfile::
        To avoid typing long email addresses, point this to one or more

diff --git a/Documentation/git.txt b/Documentation/git.txt
index e0f9a4490cf29eae2294af0b5ff878208fea05db..37235b993da240ff0b91bcef1da318de3a03ff05 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -502,7 +502,7 @@ as tags and branch heads.
 
 The object database contains objects of three main types: blobs, which
 hold file data; trees, which point to blobs and other trees to build up
-directory heirarchies; and commits, which each reference a single tree
+directory hierarchies; and commits, which each reference a single tree
 and some number of parent commits.
 
 The commit, equivalent to what other systems call a "changeset" or
@@ -522,7 +522,7 @@ efficiency may later be compressed together into "pack files".
 Named pointers called refs mark interesting points in history.  A ref
 may contain the SHA1 name of an object or the name of another ref.  Refs
 with names beginning `ref/head/` contain the SHA1 name of the most
-recent commit (or "head") of a branch under developement.  SHA1 names of
+recent commit (or "head") of a branch under development.  SHA1 names of
 tags of interest are stored under `ref/tags/`.  A special ref named
 `HEAD` contains the name of the currently checked-out branch.