Merge branch 'master' of git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt
index 918ca55f5332e09ec3b54e715a3193766a0d4747..11b1f4d2e2b278eeb51cec2c2de0c2dbce452272 100644 (file)
--- a/Documentation/git-parse-remote.txt
+++ b/Documentation/git-parse-remote.txt
@@ -3,7 +3,7 @@ git-parse-remote(1)
 
 NAME
 ----
-git-parse-remote - Routines to help parsing $GIT_DIR/remotes/
+git-parse-remote - Routines to help parsing remote repository access parameters
 
 
 SYNOPSIS