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

[Jim Fulton]

Log message for revision 41025:
  Merged from 3.2 branch:
  
  ------------------------------------------------------------------------
    r40923 | jim | 2005-12-20 17:39:56 -0500 (Tue, 20 Dec 2005) | 10 lines
  
  Unfortunately, the book machinery of apidoc depends on components
    registered by apidoc itself.  This means that the bookchapter
    directive can only be used in configuration files loaded after
    apidocs's.  It would be better, in the future, to restructure the way
    apidoc works to delay processing of book chapters until they are
    needed.
  
  For now, used the (crude) ordering mechanisms of zcml actions to delay
    book-chapter processing.
  

Changed:
  U   Zope3/trunk/src/zope/app/apidoc/bookmodule/metaconfigure.py
  U   Zope3/trunk/src/zope/app/onlinehelp/metaconfigure.py

-=-
Modified: Zope3/trunk/src/zope/app/apidoc/bookmodule/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/bookmodule/metaconfigure.py	2005-12-24 16:46:23 UTC (rev 41024)
+++ Zope3/trunk/src/zope/app/apidoc/bookmodule/metaconfigure.py	2005-12-24 16:47:19 UTC (rev 41025)
@@ -36,4 +36,5 @@
         discriminator = ('apidoc:bookchapter', parent, id),
         callable = book.registerHelpTopic,
         args = (parent, id, title, doc_path),
-        kw = {'resources': resources, 'class_': RESTOnlineHelpTopic})
+        kw = {'resources': resources, 'class_': RESTOnlineHelpTopic},
+        order=999999)

Modified: Zope3/trunk/src/zope/app/onlinehelp/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/onlinehelp/metaconfigure.py	2005-12-24 16:46:23 UTC (rev 41024)
+++ Zope3/trunk/src/zope/app/onlinehelp/metaconfigure.py	2005-12-24 16:47:19 UTC (rev 41025)
@@ -49,4 +49,5 @@
             discriminator=self._discriminator(),
             callable=globalhelp.registerHelpTopic,
             args=self._args(),
+            order=666666,
         )