Merge branch 'jc/index-extended-flags'

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 379571eef0e3f7ee79f7b99c8e85845f5248e79e..3647dd6c8f9c74a688f7a143119386ba89a8f13d 100644 (file)
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -3,12 +3,12 @@ git-var(1)
 
 NAME
 ----
-git-var - Print the git users identity
+git-var - Show a git logical variable
 
 
 SYNOPSIS
 --------
-'git-var' [ -l | <variable> ]
+'git var' [ -l | <variable> ]
 
 DESCRIPTION
 -----------
@@ -19,11 +19,12 @@ OPTIONS
 -l::
        Cause the logical variables to be listed. In addition, all the
        variables of the git configuration file .git/config are listed
-       as well.
+       as well. (However, the configuration variables listing functionality
+       is deprecated in favor of 'git-config -l'.)
 
 EXAMPLE
 --------
-       $ git-var GIT_AUTHOR_IDENT
+       $ git var GIT_AUTHOR_IDENT
        Eric W. Biederman <ebiederm@lnxi.com> 1121223278 -0600
 
 
@@ -44,11 +45,11 @@ Your parents must have hated you!::
 Your sysadmin must hate you!::
     The password(5) name field is longer than a giant static buffer.
 
-See Also
+SEE ALSO
 --------
-gitlink:git-commit-tree[1]
-gitlink:git-tag[1]
-gitlink:git-repo-config[1]
+linkgit:git-commit-tree[1]
+linkgit:git-tag[1]
+linkgit:git-config[1]
 
 Author
 ------
@@ -60,5 +61,4 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite