Merge branch 'jc/git-log-doc'

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index cec60ee78075aa4411cd637aece93fc38080b0c5..735008c1ab172cda93e6f98b75b401c37f1cd22f 100644 (file)
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -27,7 +27,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 and apache2 are the only supported servers.
+       Currently lighttpd, apache2 and webrick are supported.
        (Default: lighttpd)
 
 -m|--module-path::