Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index b7dcf9ca102079d82e3108579aee3d62772041a5..7ee5ce386f851ee054991c5275d89bca4f226447 100644 (file)
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -95,7 +95,7 @@ $ git foo -oArg
 $ git foo -o Arg
 ----------------------------
 
-However, this is *NOT* allowed for switches with an optionnal value, where the
+However, this is *NOT* allowed for switches with an optional value, where the
 'sticked' form must be used:
 ----------------------------
 $ git describe --abbrev HEAD     # correct
@@ -110,4 +110,4 @@ Documentation by Pierre Habouzit.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite