[Zope-Checkins] SVN: Zope/trunk/ Merged 2.11 branch r87177:87178 into the trunk.

[Stefan H. Holek]

Log message for revision 87179:
  Merged 2.11 branch r87177:87178 into the trunk.
  
  Changed 'fast_listen' zope.conf option to 'fast-listen'.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZServer/component.xml
  U   Zope/trunk/skel/etc/zope.conf.in

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2008-06-06 08:34:21 UTC (rev 87178)
+++ Zope/trunk/doc/CHANGES.txt	2008-06-06 08:39:11 UTC (rev 87179)
@@ -198,6 +198,9 @@
 
     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.
 

Modified: Zope/trunk/lib/python/ZServer/component.xml
===================================================================
--- Zope/trunk/lib/python/ZServer/component.xml	2008-06-06 08:34:21 UTC (rev 87178)
+++ Zope/trunk/lib/python/ZServer/component.xml	2008-06-06 08:39:11 UTC (rev 87179)
@@ -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" />

Modified: Zope/trunk/skel/etc/zope.conf.in
===================================================================
--- Zope/trunk/skel/etc/zope.conf.in	2008-06-06 08:34:21 UTC (rev 87178)
+++ Zope/trunk/skel/etc/zope.conf.in	2008-06-06 08:39:11 UTC (rev 87179)
@@ -975,8 +975,7 @@
   #
   # To defer the opening of the HTTP socket until the end of the 
   # startup phase: 
-  # fast_listen false
-  #
+  # fast-listen off
 </http-server>
 
 # Examples: