Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check

diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index e3bcdb50e30ea984cb8ae842df0cf1e561e32a62..d422ba4b59acf31151f149c8067c18e541e5bdb2 100644 (file)
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -191,7 +191,7 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/
 ----------------------------------------------------------------
 
 Lighttpd::
-       Ensure that `mod_cgi`, `mod_alias, `mod_auth`, `mod_setenv` are
+       Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are
        loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect
        all requests to the CGI:
 +
@@ -263,14 +263,6 @@ identifying information of the remote user who performed the push.
 All CGI environment variables are available to each of the hooks
 invoked by the 'git-receive-pack'.
 
-Author
-------
-Written by Shawn O. Pearce <spearce@spearce.org>.
-
-Documentation
---------------
-Documentation by Shawn O. Pearce <spearce@spearce.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite