[Zope3-checkins] SVN: Zope3/trunk/src/zope/ Merged from 3.2 branch:

[Jim Fulton]

Log message for revision 41026:
  Merged from 3.2 branch:
  
  ------------------------------------------------------------------------
    r40924 | jim | 2005-12-20 17:39:59 -0500 (Tue, 20 Dec 2005) | 8 lines
  
  Added a text file describing the new IResult mechanism and registered
    it with apidoc.
  
  I need someone to review this.
  
  This probably should be written as a test, but that requires too much
    effort for now.
  

Changed:
  U   Zope3/trunk/src/zope/app/publisher/configure.zcml
  A   Zope3/trunk/src/zope/publisher/httpresults.txt

-=-
Modified: Zope3/trunk/src/zope/app/publisher/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publisher/configure.zcml	2005-12-24 16:47:19 UTC (rev 41025)
+++ Zope3/trunk/src/zope/app/publisher/configure.zcml	2005-12-24 16:48:29 UTC (rev 41026)
@@ -1,10 +1,27 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure 
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:apidoc="http://namespaces.zope.org/apidoc"
+    >
+
   <include package=".browser" />
   <include package=".xmlrpc" />
   <include file="http.zcml" />
 
-  <interface
-     interface="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest"
-     />
+  <interface interface="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest" />
 
+  <configure 
+      xmlns:zcml="http://namespaces.zope.org/zcml"
+      zcml:condition="have apidoc" 
+      xmlns="http://namespaces.zope.org/apidoc"
+      >
+
+    <bookchapter
+        id="zopepublisherhttpresults.txt"
+        title="Creating HTTP Results"
+        doc_path="../../publisher/httpresults.txt"
+        />
+
+  </configure>
+
 </configure>
+

Copied: Zope3/trunk/src/zope/publisher/httpresults.txt (from rev 40924, Zope3/branches/3.2/src/zope/publisher/httpresults.txt)