Merge git://repo.or.cz/git-gui

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index ebaee4b3348ce9f7a4fcac6d9726a0251c51df72..05cbac56aced6ad27f36fe63f8f536e794794f9f 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,15 +8,15 @@ git-log - Show commit logs
 
 SYNOPSIS
 --------
-'git-log' <option>...
+'git log' <option>...
 
 DESCRIPTION
 -----------
 Shows the commit logs.
 
-The command takes options applicable to the linkgit:git-rev-list[1]
+The command takes options applicable to the 'git-rev-list'
 command to control what is shown and how, and options applicable to
-the linkgit:git-diff-tree[1] commands to control how the changes
+the 'git-diff-*' commands to control how the changes
 each commit introduces are shown.
 
 
@@ -58,7 +58,7 @@ include::diff-options.txt[]
        its size is not included.
 
 <paths>...::
-       Show only commits that affect the specified paths.
+       Show only commits that affect any of the specified paths.
 
 
 include::rev-list-options.txt[]
@@ -112,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite