[PATCH] Fix some manual typos.
From: Ralf Wildenhues <hidden>
Date: 2016-06-15 22:45:21
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Ralf Wildenhues <redacted> --- Thanks for git! Cheers, Ralf Documentation/git-web--browse.txt | 2 +- Documentation/gitattributes.txt | 2 +- Documentation/merge-config.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 36afad8..7f7a45b 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt@@ -77,7 +77,7 @@ the URLs passed as arguments. 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.
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 75124d2..6f3551d 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt@@ -313,7 +313,7 @@ patterns are available: - `html` suitable for HTML/XHTML documents. -- `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.
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e0..c735788 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt@@ -1,5 +1,5 @@ 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::
--
1.6.0.1.309.g48068