aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-09-12 21:10:26 +0200
committerJunio C Hamano <gitster@pobox.com>2008-09-12 13:19:56 -0700
commitb66e00f12a4e0eef7c9f994db5386e066d726778 (patch)
treeda1913dd6ddae731ff99ea71612fbeda1d0be3c6 /Documentation
parent06e75d9ac7d03bb41bb9cd8e236d9dba635d44fd (diff)
downloadgit-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.gz
git-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.xz
Fix some manual typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-web--browse.txt2
-rw-r--r--Documentation/gitattributes.txt2
-rw-r--r--Documentation/merge-config.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 36afad8d4..7f7a45b2e 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 49a167f24..94e6752aa 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -311,7 +311,7 @@ patterns are available:
- `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.
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e061..c735788b0 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::