Merge tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index e8ecdbf927ba5e7af79d3852a9a939c10052e45f..a54fe4401bd1a21c6bd133745ab8864882ca73d4 100644 (file)
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -29,7 +29,8 @@ 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 apache2, lighttpd, mongoose, plackup and webrick are supported.
+       Currently apache2, lighttpd, mongoose, plackup, python and
+       webrick are supported.
        (Default: lighttpd)
 
 -m::