Merge branch 'maint'

diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt
index fcf2cdfd5468b8ac22082844b40b8ded3630c8d6..79217d8a56193c6ba4a3406ec6cbd04abf19fec3 100644 (file)
--- a/Documentation/git-sh-setup.txt
+++ b/Documentation/git-sh-setup.txt
@@ -3,7 +3,7 @@ git-sh-setup(1)
 
 NAME
 ----
-git-sh-setup - Common git shell script setup code.
+git-sh-setup - Common git shell script setup code
 
 SYNOPSIS
 --------
@@ -13,12 +13,13 @@ DESCRIPTION
 -----------
 
 Sets up the normal git environment variables and a few helper functions
-(currently just "die()"), and returns ok if it all looks like a git archive.
-So use it something like
+(currently just "die()"), and returns OK if it all looks like a git archive.
+So, to make the rest of the git scripts more careful and readable,
+use it as follows:
 
-       . git-sh-setup || die "Not a git archive"
-
-to make the rest of the git scripts more careful and readable.
+-------------------------------------------------
+. git-sh-setup || die "Not a git archive"
+-------------------------------------------------
 
 Author
 ------
@@ -30,5 +31,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite