Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index 6403126a029bf43acaa219296353f7ab1f2040a0..9b9250600f651eac7d6e2fd6ca7ff320a64de67c 100644 (file)
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -8,6 +8,7 @@ git-shell - Restricted login shell for Git-only SSH access
 
 SYNOPSIS
 --------
+[verse]
 'git shell' [-c <command> <argument>]
 
 DESCRIPTION
@@ -28,14 +29,6 @@ read and execute permissions to the directory in order to execute the
 programs in it. The programs are executed with a cwd of $HOME, and
 <argument> is parsed as a command-line string.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite