Merge 1.5.5.4 in

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 92ef57456581d98f066cabd2e6be84e73b7ae063..f8d5fb11d1922e7469b325e237fa097f86a6a638 100644 (file)
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -78,7 +78,7 @@ When 'konqueror' is specified by the 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.
 
-For consistency, we also try such a trick if 'brower.konqueror.path' is
+For consistency, we also try such a trick if 'browser.konqueror.path' is
 set to something like 'A_PATH_TO/konqueror'. That means we will try to
 launch 'A_PATH_TO/kfmclient' instead.
 
@@ -118,4 +118,4 @@ git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite