Typos in code comments, an error message, documentation

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 0b4011f76e008350c01c7328d949361279379afa..05ec3fed893b8c179bab2b41f35c34af5ce05b20 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1773,7 +1773,7 @@ submodule.<name>.ignore::
        Using "none" (the default when this option is not set) also shows
        submodules that have untracked files in their work tree as changed.
        This setting overrides any setting made in .gitmodules for this submodule,
        Using "none" (the default when this option is not set) also shows
        submodules that have untracked files in their work tree as changed.
        This setting overrides any setting made in .gitmodules for this submodule,

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

        "--ignore-submodules" option.
 
 tar.umask::
        "--ignore-submodules" option.
 
 tar.umask::

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 8ae107da250ff01b17b5215a474c781a0f0ae57a..bcffd95ada574a8fb3c6e62e539e736a17170414 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -56,7 +56,7 @@ submodule.<name>.ignore::
        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.
        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

        "--ignore-submodule" option.
 
 
        "--ignore-submodule" option.