Fixed tutorial topic order "bug". The issue of order and subcategorizatoin...

Fixed tutorial topic order "bug". The issue of order and subcategorizatoin while browsing help topics needs to be examined more closely. Also revised glossary, fixed alphabetization and links to Guides which changed.

lib/python/Products/ZopeTutorial/__init__.py

@@ -135,7 +135,7 @@ def initialize(context):
             # new topic
             if lines:
                 id = id + 1
-                topic_id = 'topic_%d' % id
+                topic_id = 'topic_%02d' % id
                 text=string.join(lines[1:], '')
                 text=term_pat.sub(glossaryTerm, text)
                 topic=TutorialTopic.TutorialTopic(topic_id, string.strip(lines[0]), text)

lib/python/Products/ZopeTutorial/glossary.stx

@@ -19,7 +19,7 @@ Glossary
   You can use DTML tags in a DTML document.
   
     For more information on DTML Documents see the <a
-    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.9.2.html"
+    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.7.2.html"
     target="_blank">Zope Content Manager's Guide</a>.
 
     <dtml-var "apiLink('OFSP'+'.DTMLDocument.DTMLDocument', REQUEST)">
@@ -28,21 +28,13 @@ Glossary
   be inserted into a web page. You can use DTML tags in a DTML Method.
   
     For more information on DTML Methods see the <a
-    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.9.1.html"
+    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.7.1.html"
     target="_blank">Zope Content Manager's Guide</a>.
 
     <dtml-var "apiLink('OFSP'+'.DTMLMethod.DTMLMethod', REQUEST)">
     
   [Delete] -- Remove an object from the current Folder. Unlike Cut, this
   does not place a copy of the object in the clipboard.
-
-  [Folder] -- A Zope object that contains other Zope objects. You can
-  move objects between Folders by cutting and pasting them. You can
-  add new objects to Folders with the product add list.
-
-    For more information on Folders see the <a
-    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.8.2.html"
-    target="_blank">Zope Content Manager's Guide</a>.
     
   [Cut] -- Remove a Zope object from its current location and place it
   in the clipboard.
@@ -60,49 +52,44 @@ Glossary
   action without inserting anything into a web page.
   
     For more information on &lt;dtml-call&gt; tag see the <a
-    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.11.html"
+    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.10.html"
     target="_blank">DTML Reference</a>.
   
   [<dtml-if>] -- A DTML tag that allows you to conditionally insert
   objects into a DTML Document or DTML Method.
 
     For more information on &lt;dtml-if&gt; tag see the <a
-    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.7.html"
+    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.6.html"
     target="_blank">DTML Reference</a>.  
 
   [<dtml-in>] -- A DTML tag that allows you to loop over a sequence
   of objects.
 
     For more information on &lt;dtml-in&gt; tag see the <a
-    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.8.html"
+    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.7.html"
     target="_blank">DTML Reference</a>.  
 
   [<dtml-var>] -- A DTML tag that allows you to insert objects
   into a DTML Document or DTML Method.
   
     For more information on &lt;dtml-var&gt; tag see the <a
-    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.6.html"
+    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.5.html"
     target="_blank">DTML Reference</a>.
     
   [<dtml-sendmail>] -- A DTML tag that sends email.
 
     For more information on &lt;dtml-sendmail&gt; tag see the <a
-    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.17.html"
+    href="http://www.zope.org/Documentation/Guides/DTML-HTML/DTML.16.html"
     target="_blank">DTML Reference</a>.
-
-  [Mail Host] -- A Zope object that allows you to send email.
-  Use the &lt;dtml-sendmail&gt; tag to send email.
-  
-  [Paste] -- Insert the objects from the clipboard into the current Folder.
-  
-  [Image] -- A Zope object for a picture.
-    
-    For more information on Images see the <a
-    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.8.4.html"
-    >Zope Content Manager's Guide</a>.
-    
-    <dtml-var "apiLink('OFSP'+'.Image.Image', REQUEST)">
     
+  [Folder] -- A Zope object that contains other Zope objects. You can
+  move objects between Folders by cutting and pasting them. You can
+  add new objects to Folders with the product add list.
+
+    For more information on Folders see the <a
+    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.6.2.html"
+    target="_blank">Zope Content Manager's Guide</a>.
+
   [HTTP Cookies] -- Cookies allow you to record information in a visitor's
   browser. This is commonly used to provide personalization for a web site. 
 
@@ -110,12 +97,27 @@ Glossary
   short string that contains letters and numbers, spaces, underscores, dashes,
   commas and tildes. Here are some example ids: 'index.html', 'My Page',
   'item-12'.
+
+  [Image] -- A Zope object for a picture.
+    
+    For more information on Images see the <a
+    href="http://www.zope.org/Documentation/Guides/ZCMG-HTML/ZCMG.6.4.html"
+    target="_blank">Zope Content Manager's Guide</a>.
     
+    <dtml-var "apiLink('OFSP'+'.Image.Image', REQUEST)"> 
+   
   [index_html] -- The name of the default Zope object in a Folder.
   When you view a Folder the index_html object will be displayed
   unless you specify otherwise. This is just like the 'index.html'
   or 'default.htm' default web page with a normal web server.
 
+  [Mail Host] -- A Zope object that allows you to send email.
+  Use the &lt;dtml-sendmail&gt; tag to send email.
+
+    <dtml-var "apiLink('MailHost'+'.MailHost.MailHost', REQUEST)">
+  
+  [Paste] -- Insert the objects from the clipboard into the current Folder.
+  
   [product add list] -- The list of addable objects. Select an object
   from the product add list to create a new object in the current
   Folder.
@@ -139,4 +141,7 @@ Glossary
   
     For more information on ZSQL Methods see the <a
     href="http://www.zope.org/Documentation/Guides/ZSQL-HTML/ZSQL.1.4.html"
-    target="_blank">SQL Method User's Guide</a>.  
\ No newline at end of file
+    target="_blank">SQL Method User's Guide</a>.  
+
+    <dtml-var "apiLink('ZSQLMethods'+'.ZSQLMethod.ZSQLMethod', REQUEST)">
+