Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 0354ac9861b83e020f8d4de57fe5bca2f9b32f69..be2ae53b90610d6c89fdf281634d06609562101b 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -102,7 +102,7 @@ For example, this configuration:
 will try to use konqueror first. But this may fail (for example if
 DISPLAY is not set) and in that case emacs' woman mode will be tried.
 
-If everythings fails the 'man' program will be tried anyway.
+If everything fails the 'man' program will be tried anyway.
 
 Note about git config --global
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~