[Zope-Checkins] CVS: Zope2 - AuthenticatedUser.py:1.4 DTMLDocument.py:1.9 DTMLMethod.py:1.9 DateTime.py:1.6 File.py:1.11 Image.py:1.9 ObjectManager.py:1.9 ObjectManagerItem.py:1.15 PropertySheet.py:1.10 PropertySheets.py:1.8 Request.py:1.7

Amos Latteier amos@digicool.com
Tue, 17 Apr 2001 19:29:57 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/Products/OFSP/help
In directory korak:/tmp/cvs-serv29065/OFSP/help

Modified Files:
	AuthenticatedUser.py DTMLDocument.py DTMLMethod.py DateTime.py 
	File.py Image.py ObjectManager.py ObjectManagerItem.py 
	PropertySheet.py PropertySheets.py Request.py 
Log Message:
Many small structured text fixes, typos fixes, and small wording and formatting corrections. Some of these were pointed out by Tom Deprez.



--- Updated File AuthenticatedUser.py in package Zope2 --
--- AuthenticatedUser.py	2000/06/13 17:54:52	1.3
+++ AuthenticatedUser.py	2001/04/17 23:29:25	1.4
@@ -95,7 +95,7 @@
 
         Return the name of a user
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -105,7 +105,7 @@
         Return a value that is true if the user has the given roles on
         the given object and return false otherwise.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -115,7 +115,7 @@
         Returns a list of the roles the user has on the given object
         (in the current context?)
 
-        Permission - Always available
+        Permission -- Always available
 
         """
 
@@ -125,7 +125,7 @@
         Get the ID of the user. The ID can be used, at least from
         Python, to get the user from the user's UserDatabase.
 
-        Permission - Python only
+        Permission -- Python only
 
         """
 
@@ -136,7 +136,7 @@
         facility can be used to get the user database from the path
         returned by this method.
 
-        Permission - Python only
+        Permission -- Python only
 
         """
 

--- Updated File DTMLDocument.py in package Zope2 --
--- DTMLDocument.py	2000/10/17 01:25:35	1.8
+++ DTMLDocument.py	2001/04/17 23:29:25	1.9
@@ -140,35 +140,39 @@
         Passing in a namespace to a DTML Document is often referred to
         as providing the Document with a *context*.
 
-        DTML Documents are called three ways:
+        DTML Documents can be called three ways.
 
-          From DTML -- A DTML Document can be called from another DTML
-            Method or Document::
+        From DTML
 
-              <dtml-var standard_html_header>
-                <dtml-var aDTMLDocument>
-              <dtml-var standard_html_footer>
-
-            In this example, the Document 'aDTMLDocument' is being called
-            from another DTML object by name.  The calling method
-            passes the value 'this' as the client argument and the
-            current DTML names pace as the REQUEST argument.  The above
-            is identical to this following usage in a DTML Python
-            expression::
-
-              <dtml-var standard_html_header>
-                <dtml-var "aDTMLDocument(_.None, _)">
-              <dtml-var standard_html_footer>
-
-          From Python -- Products, External Methods, and PythonMethods 
-            can call a DTML Document in the same way as calling a DTML
-            Document from a Python expression in DTML; as shown in the
-            previous example.
-
-          By the Publisher -- When the URL of a DTML Document is fetched 
-            from Zope, the DTML Document is called by the publisher.
-            The REQUEST object is passes as the second argument to the 
-            Document.  
+          A DTML Document can be called from another DTML
+          Method or Document::
+
+            <dtml-var standard_html_header>
+              <dtml-var aDTMLDocument>
+            <dtml-var standard_html_footer>
+
+          In this example, the Document 'aDTMLDocument' is being called
+          from another DTML object by name.  The calling method
+          passes the value 'this' as the client argument and the
+          current DTML namespace as the REQUEST argument.  The above
+          is identical to this following usage in a DTML Python
+          expression::
+
+            <dtml-var standard_html_header>
+              <dtml-var "aDTMLDocument(_.None, _)">
+            <dtml-var standard_html_footer>
+
+        From Python
+
+          Products, External Methods, and Scripts can call a DTML
+          Document in the same way as calling a DTML Document from a
+          Python expression in DTML; as shown in the previous example.
+
+        By the Publisher
+
+          When the URL of a DTML Document is fetched from Zope, the
+          DTML Document is called by the publisher.  The REQUEST
+          object is passed as the second argument to the Document.
           
         Permission -- 'View'
 

--- Updated File DTMLMethod.py in package Zope2 --
--- DTMLMethod.py	2000/10/17 01:25:35	1.8
+++ DTMLMethod.py	2001/04/17 23:29:25	1.9
@@ -141,35 +141,38 @@
         Passing in a namespace to a DTML Method is often referred to
         as providing the Method with a *context*.
 
-        DTML Methods are called three ways:
+        DTML Methods can be called three ways:
 
-          From DTML -- A DTML Method can be called from another DTML
-            Method or Document::
+        From DTML
 
-              <dtml-var standard_html_header>
-                <dtml-var aDTMLMethod>
-              <dtml-var standard_html_footer>
-
-            In this example, the Method 'aDTMLMethod' is being called
-            from another DTML object by name.  The calling method
-            passes the value 'this' as the client argument and the
-            current DTML names pace as the REQUEST argument.  The above
-            is identical to this following usage in a DTML Python
-            expression::
-
-              <dtml-var standard_html_header>
-                <dtml-var "aDTMLMethod(_.None, _)">
-              <dtml-var standard_html_footer>
-
-          From Python -- Products, External Methods, and PythonMethods 
-            can call a DTML Method in the same way as calling a DTML
-            Method from a Python expression in DTML; as shown in the
-            previous example.
-
-          By the Publisher -- When the URL of a DTML Method is fetched 
-            from Zope, the DTML Method is called by the publisher.
-            The REQUEST object is passes as the second argument to the 
-            Method.
+          A DTML Method can be called from another DTML Method or
+          Document::
+
+            <dtml-var standard_html_header>
+              <dtml-var aDTMLMethod>
+            <dtml-var standard_html_footer>
+
+          In this example, the Method 'aDTMLMethod' is being called
+          from another DTML object by name.  The calling method passes
+          the value 'this' as the client argument and the current DTML
+          namespace as the REQUEST argument.  The above is identical
+          to this following usage in a DTML Python expression::
+
+            <dtml-var standard_html_header>
+              <dtml-var "aDTMLMethod(_.None, _)">
+            <dtml-var standard_html_footer>
+
+        From Python
+
+          Products, External Methods, and Scripts can call a DTML
+          Method in the same way as calling a DTML Method from a
+          Python expression in DTML; as shown in the previous example.
+
+        By the Publisher
+
+          When the URL of a DTML Method is fetched from Zope, the DTML
+          Method is called by the publisher.  The REQUEST object is
+          passed as the second argument to the Method.
           
         Permission -- 'View'
         """

--- Updated File DateTime.py in package Zope2 --
--- DateTime.py	2000/10/17 19:36:29	1.5
+++ DateTime.py	2001/04/17 23:29:25	1.6
@@ -101,7 +101,8 @@
     to many major timezones, as well as the ability to create a
     DateTime object in the context of a given timezone.
 
-    DateTime objects provide partial numerical behavior:
+    DateTime objects provide partial
+    numerical behavior:
 
       - Two date-time objects can be subtracted to obtain a time,
         in days between the two.
@@ -132,8 +133,6 @@
     and numeric operations return a new DateTime object rather than
     modify the current object.
 
-    Return a new date-time object
-
     A DateTime object always maintains its value as an absolute 
     UTC time, and is represented in the context of some timezone
     based on the arguments used to create the object. A DateTime
@@ -141,9 +140,9 @@
 
     Note that in all cases the local machine timezone is used for
     representation if no timezone is specified.
-
-    DateTimes may be created with from zero to seven arguments.
 
+    DateTimes may be created with from zero to
+    seven arguments.
 
       - If the function is called with no arguments, then the 
         current date/time is returned, represented in the 
@@ -189,17 +188,17 @@
         values. The year value must be a one-, two-, or
         four-digit integer. If a one- or two-digit year is
         used, the year is assumed to be in the twentieth
-        century. The month may an integer, from 1 to 12, a
+        century. The month may be an integer, from 1 to 12, a
         month name, or a month abbreviation, where a period may
         optionally follow the abbreviation. The day must be an
         integer from 1 to the number of days in the month. The
         year, month, and day values may be separated by
-        periods, hyphens, forward, slashes, or spaces. Extra
+        periods, hyphens, forward slashes, or spaces. Extra
         spaces are permitted around the delimiters. Year,
         month, and day values may be given in any order as long
         as it is possible to distinguish the components. If all
         three components are numbers that are less than 13,
-        then a a month-day-year ordering is assumed.
+        then a month-day-year ordering is assumed.
 
         The time component consists of hour, minute, and second
         values separated by colons.  The hour value must be an
@@ -376,7 +375,7 @@
         Permission -- Always available
         """
 
-    def greaterThan(self,t):
+    def greaterThan(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the
@@ -388,7 +387,7 @@
         Permission -- Always available
         """
 
-    def greaterThanEqualTo(self,t):
+    def greaterThanEqualTo(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the
@@ -400,7 +399,7 @@
         Permission -- Always available
         """
 
-    def equalTo(self,t):
+    def equalTo(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the
@@ -412,7 +411,7 @@
         Permission -- Always available
         """
 
-    def notEqualTo(self,t):
+    def notEqualTo(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the
@@ -424,7 +423,7 @@
         Permission -- Always available
         """
 
-    def lessThan(self,t):
+    def lessThan(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the
@@ -436,7 +435,7 @@
         Permission -- Always available
         """
 
-    def lessThanEqualTo(self,t):
+    def lessThanEqualTo(t):
         """
         Compare this DateTime object to another DateTime object OR a
         floating point number such as that which is returned by the

--- Updated File File.py in package Zope2 --
--- File.py	2000/10/17 01:25:35	1.10
+++ File.py	2001/04/17 23:29:25	1.11
@@ -98,35 +98,33 @@
     A File is a Zope object that contains file content.  A File object
     can be used to upload or download file information with Zope.
 
-    Examples:
+    Using a File object in Zope is easy.  The most common usage is
+    to display the contents of a file object in a web page.  This is
+    done by simply referencing the object from DTML::
+
+      <dtml-var standard_html_header>
+        <dtml-var FileObject>
+      <dtml-var standard_html_footer>
+
+    A more complex example is presenting the File object for
+    download by the user.  The next example displays a link to every
+    File object in a folder for the user to download::
+
+      <dtml-var standard_html_header>
+      <ul>
+        <dtml-in "ObjectValues('File')">
+          <li><a href="<dtml-var absolute_url>"><dtml-var
+          id></a></li>
+        </dtml-in>
+      </ul>
+      <dtml-var standard_html_footer>
+
+    In this example, the 'absolute_url' method and 'id' are used to
+    create a list of HTML hyperlinks to all of the File objects in
+    the current Object Manager.
 
-      Using a File object in Zope is easy.  The most common usage is
-      to display the contents of a file object in a web page.  This is
-      done by simply referencing the object from DTML::
-
-        <dtml-var standard_html_header>
-          <dtml-var FileObject>
-        <dtml-var standard_html_footer>
-
-      A more complex example is presenting the File object for
-      download by the user.  The next example displays a link to every
-      File object in a folder for the user to download::
-
-        <dtml-var standard_html_header>
-        <ul>
-          <dtml-in "ObjectValues('File')">
-            <li><a href="<dtml-var absolute_url>"><dtml-var
-            id></a></li>
-          </dtml-in>
-        </ul>
-        <dtml-var standard_html_footer>
-
-      In this example, the 'absolute_url' method and 'id' are used to
-      create a list of HTML hyperlinks to all of the File objects in
-      the current Object Manager.
-      
-      Also see ObjectManager for details on the 'objectValues'
-      method.
+    Also see ObjectManager for details on the 'objectValues'
+    method.
     """
     
     __constructor__=manage_addFile
@@ -160,3 +158,5 @@
         
         Permission -- 'View'
         """
+
+

--- Updated File Image.py in package Zope2 --
--- Image.py	2000/10/17 01:25:35	1.8
+++ Image.py	2001/04/17 23:29:25	1.9
@@ -96,7 +96,7 @@
 
 class Image:
     """
-    A Image is a Zope object that contains image content.  A Image
+    An Image is a Zope object that contains image content.  An Image
     object can be used to upload or download image information with
     Zope.
 
@@ -105,29 +105,27 @@
     uploaded. For image types that Zope does not understand, these
     properties may be undefined.
 
-    Examples:
+    Using a Image object in Zope is easy.  The most common usage is
+    to display the contents of an image object in a web page.  This
+    is done by simply referencing the object from DTML::
+
+      <dtml-var standard_html_header>
+        <dtml-var ImageObject>
+      <dtml-var standard_html_footer>
+
+    This will generate an HTML IMG tag referencing the URL to the
+    Image. This is equivalent to::
+
+      <dtml-var standard_html_header>
+        <dtml-with ImageObject>
+          <img src="<dtml-var absolute_url>">
+        </dtml-with>
+      <dtml-var standard_html_footer>
 
-      Using a Image object in Zope is easy.  The most common usage is
-      to display the contents of an image object in a web page.  This
-      is done by simply referencing the object from DTML::
-
-        <dtml-var standard_html_header>
-          <dtml-var ImageObject>
-        <dtml-var standard_html_footer>
-
-      This will generate an HTML IMG tag referencing the URL to the
-      Image. This is equivalent to::
-
-        <dtml-var standard_html_header>
-          <dtml-with ImageObject>
-            <img src="<dtml-var absolute_url>">
-          </dtml-with>
-        <dtml-var standard_html_footer>
-        
-      You can control the image display more precisely with the 'tag'
-      method. For example::
-      
-        <dtml-var "ImageObject.tag(border=5, align=left)">
+    You can control the image display more precisely with the 'tag'
+    method. For example::
+
+      <dtml-var "ImageObject.tag(border=5, align=left)">
     
     """
 

--- Updated File ObjectManager.py in package Zope2 --
--- ObjectManager.py	2000/10/17 01:25:35	1.8
+++ ObjectManager.py	2001/04/17 23:29:25	1.9
@@ -88,27 +88,25 @@
     An ObjectManager contains other Zope objects. The contained
     objects are Object Manager Items.
 
-    Creating Objects in an ObjectManager
+    To create an object inside an object manager use 'manage_addProduct'::
 
-      To create an object inside an object manager use 'manage_addProduct'::
+      self.manage_addProduct['OFSP'].manage_addFolder(id, title)
 
-        self.manage_addProduct['OFSP'].manage_addFolder(id, title)
+    In DTML this would be::
 
-      In DTML this would be::
+        <dtml-call "manage_addProduct['OFSP'].manage_addFolder(id, title)">
 
-          <dtml-call "manage_addProduct['OFSP'].manage_addFolder(id, title)">
+    These examples create a new Folder inside the current
+    ObjectManager.
 
-      These examples create a new Folder inside the current
-      ObjectManager.
+    'manage_addProduct' is a mapping that provides access to product
+    constructor methods. It is indexed by product id.
 
-      'manage_addProduct' is a mapping that provides access to product
-      constructor methods. It is indexed by product id.
+    Constructor methods are registered during product initialization
+    and should be documented in the API docs for each addable
+    object.
+    """
 
-      Constructor methods are registered during product initialization
-      and should be documented in the API docs for each addable
-      object.
-      """
-
     def objectIds(type=None):
         """
         This method returns a list of the ids of the contained
@@ -137,13 +135,13 @@
         """
         This method returns a sequence of contained objects.
         
-        Like objectValues and objectIds, it accepts one argument,
+        Like objectItems and objectIds, it accepts one argument,
         either a string or a list to restrict the results to objects
         of a given meta_type or set of meta_types.
 
         Example::
 
-          <dtml-in "objectValues('Folder')">
+          <dtml-in expr="objectValues('Folder')">
             <dtml-var icon>
             This is the icon for the: <dtml-var id> Folder<br>.
           <dtml-else>
@@ -151,7 +149,7 @@
           </dtml-in>
 
         The results were restricted to Folders by passing a 
-        meta_type to 'objectItems' method.
+        meta_type to 'objectValues' method.
         
         Permission -- 'Access contents information'
         """
@@ -160,6 +158,10 @@
         """
         This method returns a sequence of (id, object) tuples.
         
+        Like objectValues and objectIds, it accepts one argument,
+        either a string or a list to restrict the results to objects
+        of a given meta_type or set of meta_types.
+
         Each tuple's first element is the id of an object contained in
         the Object Manager, and the second element is the object
         itself.

--- Updated File ObjectManagerItem.py in package Zope2 --
--- ObjectManagerItem.py	2001/01/13 15:33:12	1.14
+++ ObjectManagerItem.py	2001/04/17 23:29:25	1.15
@@ -89,7 +89,8 @@
     Almost all Zope objects that can be managed through the web are
     Object Manager Items.
 
-    Attributes
+    ObjectMangerItems have these instance
+    attributes:
          
       'title' -- The title of the object.
       

--- Updated File PropertySheet.py in package Zope2 --
--- PropertySheet.py	2000/10/17 01:25:35	1.9
+++ PropertySheet.py	2001/04/17 23:29:25	1.10
@@ -168,7 +168,7 @@
 
         Returns a tuple of mappings, giving meta-data for properties.
 
-        Perimssion -- Python only
+        Permssion -- Python only
 
         """
 
@@ -186,7 +186,8 @@
 
         Add a new property with the given 'id', 'value' and 'type'.
 
-        Property Types
+        These are the
+        property types:
 
           'boolean' -- 1 or 0. 
 
@@ -216,12 +217,11 @@
         cannot be converted, a ValueError will be raised.
 
         The value given for 'selection' and 'multiple selection'
-        properites must be a variable name.  The variable must also be
-        a sequence.
+        properites may be an attribute or method name.  The attribute
+        or method must return a sequence values.
 
-        *If the given 'type' is not recognized, the 'value' and 'type'
-        given are simply stored blindly by the object. This seems like
-        bad behavior - it should probably raise an exception instead.*
+        If the given 'type' is not recognized, the 'value' and 'type'
+        given are simply stored blindly by the object.
 
         If no value is passed in for 'REQUEST', the method will return
         'None'. If a value is provided for 'REQUEST' (as it will when
@@ -259,7 +259,7 @@
         This method may be called via the web, from DTML or from
         Python code.
 
-        Permission - 'Manage Properties'
+        Permission -- 'Manage Properties'
 
         """
 
@@ -275,19 +275,17 @@
 
         Some objects have "special" properties defined by product
         authors that cannot be deleted. If one of these properties is
-        named in 'ids', an HTML error message is returned (this is
-        lame and should be changed).
+        named in 'ids', an HTML error message is returned.
 
         If no value is passed in for 'REQUEST', the method will return
         None. If a value is provided for 'REQUEST' (as it will be when
-        
         called via the web), the property management form for the
         object will be rendered and returned.
 
         This method may be called via the web, from DTML or from
         Python code.
 
-        Permission - 'Manage Properties'
+        Permission -- 'Manage Properties'
 
         """
 

--- Updated File PropertySheets.py in package Zope2 --
--- PropertySheets.py	2000/10/17 01:25:35	1.7
+++ PropertySheets.py	2001/04/17 23:29:25	1.8
@@ -107,10 +107,10 @@
     def values():
         """
 
-        Return a sequence of all of the PropertySheet objects for
+        Return a sequence of all of the PropertySheet objects
         in the collection.
 
-        Permission - Python only
+        Permission -- Python only
         
         """
 
@@ -120,7 +120,7 @@
         Return a sequence containing an '(id, object)' tuple for
         each PropertySheet object in the collection.
 
-        Permission - Python only
+        Permission -- Python only
 
         """
 
@@ -130,7 +130,7 @@
         Return the PropertySheet identified by 'name', or the value
         given in 'default' if the named PropertySheet is not found.
 
-        Permission - Python only
+        Permission -- Python only
         
         """
 

--- Updated File Request.py in package Zope2 --
--- Request.py	2001/01/23 15:12:21	1.6
+++ Request.py	2001/04/17 23:29:25	1.7
@@ -123,53 +123,52 @@
     values will be looked up in the order: environment variables,
     other variables, form data, and then cookies.
 
-    Special Variables
+    These special variables are set in
+    the Request:
 
-      These special variables are set in the Request
+      'PARENTS' -- A list of the objects traversed to get to the
+      published object. So, 'PARENTS[0]' would be the ancestor of
+      the published object.
 
-        'PARENTS' -- A list of the objects traversed to get to the
-        published object. So, 'PARENTS[0]' would be the ancestor of
-        the published object.
+      'REQUEST' -- The Request object.
 
-        'REQUEST' -- The Request object.
+      'RESPONSE' -- The Response object.
 
-        'RESPONSE' -- The Response object.
+      'PUBLISHED' -- The actual object published as a result of
+      url traversal.
 
-        'PUBLISHED' -- The actual object published as a result of
-        url traversal.
+      'URL' -- The URL of the Request without query string.
 
-        'URL' -- The URL of the Request without query string.
+      *URLn* -- 'URL0' is the same as 'URL'. 'URL1' is the same as
+      'URL0' with the last path element removed. 'URL2' is the same
+      as 'URL1' with the last element removed. Etcetera.
 
-        *URLn* -- 'URL0' is the same as 'URL'. 'URL1' is the same as
-        'URL0' with the last path element removed. 'URL2' is the same
-        as 'URL1' with the last element removed. Etcetera.
+        For example if URL='http://localhost/foo/bar', then
+        URL1='http://localhost/foo' and URL2='http://localhost'.
 
-          For example if URL='http://localhost/foo/bar', then
-          URL1='http://localhost/foo' and URL2='http://localhost'.
+      *URLPATHn* -- 'URLPATH0' is the path portion of 'URL',
+      'URLPATH1' is the path portion of 'URL1', and so on.
 
-        *URLPATHn* -- 'URLPATH0' is the path portion of 'URL',
-        'URLPATH1' is the path portion of 'URL1', and so on.
+        For example if URL='http://localhost/foo/bar', then
+        URLPATH1='/foo' and URLPATH2='/'.
 
-          For example if URL='http://localhost/foo/bar', then
-          URLPATH1='/foo' and URLPATH2='/'.
+      *BASEn* -- 'BASE0' is the URL up to but not including the Zope
+      application object. 'BASE1' is the URL of the Zope application
+      object. 'BASE2' is the URL of the Zope application object with
+      an additional path element added in the path to the published
+      object. Etcetera.
 
-        *BASEn* -- 'BASE0' is the URL up to but not including the Zope
-        application object. 'BASE1' is the URL of the Zope application
-        object. 'BASE2' is the URL of the Zope application object with
-        an additional path element added in the path to the published
-        object. Etcetera.
+        For example if URL='http://localhost/Zope.cgi/foo/bar', then
+        BASE0='http://localhost', BASE1='http://localhost/Zope.cgi',
+        and BASE2='http://localhost/Zope.cgi/foo'.
 
-          For example if URL='http://localhost/Zope.cgi/foo/bar', then
-          BASE0='http://localhost', BASE1='http://localhost/Zope.cgi',
-          and BASE2='http://localhost/Zope.cgi/foo'.
-        
-        *BASEPATHn* -- 'BASEPATH0' is the path portion of 'BASE0',
-        'BASEPATH1' is the path portion of 'BASE1', and so on.
-        'BASEPATH1' is the externally visible path to the root Zope
-        folder, equivalent to CGI's 'SCRIPT_NAME', but virtual-host aware.
+      *BASEPATHn* -- 'BASEPATH0' is the path portion of 'BASE0',
+      'BASEPATH1' is the path portion of 'BASE1', and so on.
+      'BASEPATH1' is the externally visible path to the root Zope
+      folder, equivalent to CGI's 'SCRIPT_NAME', but virtual-host aware.
 
-          For example if URL='http://localhost/Zope.cgi/foo/bar', then
-          BASEPATH0='/', BASEPATH1='/Zope.cgi', and BASEPATH2='/Zope.cgi/foo'.
+        For example if URL='http://localhost/Zope.cgi/foo/bar', then
+        BASEPATH0='/', BASEPATH1='/Zope.cgi', and BASEPATH2='/Zope.cgi/foo'.
 
     """
 
@@ -180,7 +179,7 @@
         Create a new name in the REQUEST object and assign it a value.
         This name and value is stored in the 'Other' category.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -190,11 +189,12 @@
 
         Return the named HTTP header, or an optional default argument
         or None if the header is not found. Note that both original
-        and CGI-ified header names are recognized,
-        e.g. 'Content-Type', 'CONTENT_TYPE' and 'HTTP_CONTENT_TYPE'
-        should all return the Content-Type header, if available.
+        and CGI header names without the leading 'HTTP_' are
+        recognized, for example, 'Content-Type', 'CONTENT_TYPE' and
+        'HTTP_CONTENT_TYPE' should all return the Content-Type header,
+        if available.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -205,7 +205,7 @@
         Returns a true value if the REQUEST object contains key,
         returns a false value otherwise.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -215,7 +215,7 @@
 
         Returns a sorted sequence of all keys in the REQUEST object.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -225,7 +225,7 @@
         Returns a sequence of (key, value) tuples for all the keys in
         the REQUEST object.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -235,7 +235,7 @@
         Returns a sequence of values for all the keys in the REQUEST
         object.
 
-        Permission - Always available
+        Permission -- Always available
         
         """
 
@@ -247,7 +247,7 @@
 
         Provides virtual hosting support.
 
-        Permission - Always available
+        Permission -- Always available
 
         """
 
@@ -261,7 +261,7 @@
         Provides virtual hosting support.  Intended to be called from
         publishing traversal hooks.
 
-        Permission - Always available
+        Permission -- Always available
 
         """