Merge branch 'jk/maint-cvsimport-pathname' into maint

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 22da21a54f625c434216945889127ec283d3d09f..0771f254436c9024b935ef745c3bcd384bc18465 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 and webrick are supported.
        (Default: lighttpd)
 
 -m::