Merge branch 'em/checkout-orphan'

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 22da21a54f625c434216945889127ec283d3d09f..2c3c4d299472a265bfc4486816933ca3dc69b44f 100644 (file)
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -29,7 +29,7 @@ OPTIONS
        The HTTP daemon command-line that will be executed.
        Command-line options may be specified here, and the
        configuration file will be added at the end of the command-line.
-       Currently lighttpd, apache2 and webrick are supported.
+       Currently apache2, lighttpd, mongoose, plackup and webrick are supported.
        (Default: lighttpd)
 
 -m::
@@ -44,7 +44,7 @@ OPTIONS
 -b::
 --browser::
        The web browser that should be used to view the gitweb
-       page. This will be passed to the 'git-web--browse' helper
+       page. This will be passed to the 'git web--browse' helper
        script along with the URL of the gitweb instance. See
        linkgit:git-web--browse[1] for more information about this. If
        the script fails, the URL will be printed to stdout.