diff -r c0729a7f6f8a -r 27fd8b7a6c51 mercurial/commands.py
--- a/mercurial/commands.py	Sun Apr 23 00:34:07 2006 +0200
+++ b/mercurial/commands.py	Tue Apr 25 00:43:40 2006 +0200
@@ -2566,7 +2566,8 @@
                 r = repo.addchangegroup(fin)
                 respond(str(r))
 
-    optlist = "name templates style address port ipv6 accesslog errorlog webdir_conf"
+    optlist = """name templates style address port
+                 ipv6 accesslog errorlog webdir_conf"""
     for o in optlist.split():
         if opts[o]:
             ui.setconfig("web", o, opts[o])
@@ -3127,7 +3128,8 @@
           ('a', 'address', '', _('address to use')),
           ('n', 'name', '',
            _('name to show in web pages (default: working dir)')),
-          ('D', 'webdir-conf', '', _('name of the webdir config file (serve more than one repo)')),
+          ('', 'webdir-conf', '', _('name of the webdir config file'
+                                    ' (serve more than one repo)')),
           ('', 'pid-file', '', _('name of file to write process ID to')),
           ('', 'stdio', None, _('for remote clients')),
           ('t', 'templates', '', _('web templates to use')),