Merged 2.11 branch r87177:87178 into the trunk.

Changed 'fast_listen' zope.conf option to 'fast-listen'.

doc/CHANGES.txt

@@ -198,6 +198,9 @@ Zope Changes
 
     Bugs Fixed
 
+      - Fixed against-the-rules zope.conf option 'fast_listen' to read
+        'fast-listen' (dash, not underscore).
+
       - Switch to branch of 'zope.testbrowser' external which suppresses
         over-the-wire tests.
 

lib/python/ZServer/component.xml

@@ -19,10 +19,10 @@
          receive WebDAV source responses to GET requests.
        </description>
      </key>
-     <key name="fast_listen" datatype="boolean" default="on">
+     <key name="fast-listen" datatype="boolean" default="on">
        <description>
-         Defines wether the http server should listen to requests immediately
-         or only after zope is ready to run
+         Defines whether the HTTP server should listen for requests
+         immediately or only after Zope is ready to run.
        </description>
      </key>
      <key name="use-wsgi" datatype="boolean" default="off" />

skel/etc/zope.conf.in

@@ -975,8 +975,7 @@ instancehome $INSTANCE
   #
   # To defer the opening of the HTTP socket until the end of the 
   # startup phase: 
-  # fast_listen false
-  #
+  # fast-listen off
 </http-server>
 
 # Examples: