Fix some manual typos.

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

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 36afad8d4e0d67a8d9dd33d3bc590789e9f6604d..7f7a45b2eaa3997cbf5a250fb78387e2a0959a11 100644 (file)
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -77,7 +77,7 @@ the URLs passed as arguments.
 Note about konqueror
 --------------------
 
 Note about konqueror
 --------------------
 

-When 'konqueror' is specified by the a command line option or a
+When 'konqueror' is specified by a command line option or a

 configuration variable, we launch 'kfmclient' to try to open the HTML
 man page on an already opened konqueror in a new tab if possible.
 
 configuration variable, we launch 'kfmclient' to try to open the HTML
 man page on an already opened konqueror in a new tab if possible.
 

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 49a167f241f0832e62fb905390715e45ef5be3c4..94e6752aa2e78e4bcf69334ca92bc41439b33028 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -311,7 +311,7 @@ patterns are available:
 
 - `bibtex` suitable for files with BibTeX coded references.
 
 
 - `bibtex` suitable for files with BibTeX coded references.
 

-- `java` suitable for source code in the Java lanugage.
+- `java` suitable for source code in the Java language.

 
 - `pascal` suitable for source code in the Pascal/Delphi language.
 
 
 - `pascal` suitable for source code in the Pascal/Delphi language.
 

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e061313974a4f8fdb9333608902c7ef653f..c735788b0f1c8efb0b250d4810be420be6c62f89 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,5 +1,5 @@
 merge.stat::
 merge.stat::

-       Whether to print the diffstat between ORIG_HEAD and merge result
+       Whether to print the diffstat between ORIG_HEAD and the merge result

        at the end of the merge.  True by default.
 
 merge.log::
        at the end of the merge.  True by default.
 
 merge.log::