[MANUAL] English:

- structural fixes (no translations needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20763 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/en/module_specs/Zend_Acl-Advanced.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.acl.advanced">
-
     <title>Advanced Usage</title>
 
     <sect2 id="zend.acl.advanced.storing">
-
         <title>Storing ACL Data for Persistence</title>
 
         <para>
@@ -27,11 +25,9 @@
             stored anywhere the developer should desire, such as a file, database, or caching
             mechanism.
         </para>
-
     </sect2>
 
     <sect2 id="zend.acl.advanced.assertions">
-
         <title>Writing Conditional ACL Rules with Assertions</title>
 
         <para>
@@ -96,9 +92,7 @@ $acl->allow(null, null, null, new CleanIPAssertion());
             (i.e., <methodname>isAllowed()</methodname>) applies, in order to provide a context for
             the assertion class to determine its conditions where needed.
         </para>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Acl-Refining.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.acl.refining">
-
     <title>Refining Access Controls</title>
 
     <sect2 id="zend.acl.refining.precise">
-
         <title>Precise Access Controls</title>
 
         <para>
@@ -122,11 +120,9 @@ echo $acl->isAllowed('administrator', 'announcement', 'archive') ?
      "allowed" : "denied";
 // denied
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.acl.refining.removing">
-
         <title>Removing Access Controls</title>
 
         <para>
@@ -182,9 +178,7 @@ echo $acl->isAllowed('marketing', 'latest', 'anything') ?
      "allowed" : "denied";
 // allowed
 ]]></programlisting>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Acl.xml

@@ -21,6 +21,7 @@
                 to which access is controlled.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 a <emphasis>role</emphasis> is an object
@@ -43,6 +44,7 @@
 
     <sect2 id="zend.acl.introduction.resources">
         <title>Resources</title>
+
         <para>
             Creating a resource in <classname>Zend_Acl</classname> is very simple.
             <classname>Zend_Acl</classname> provides the resource,
@@ -53,6 +55,7 @@
             <classname>Zend_Acl_Resource</classname> is provided by <classname>Zend_Acl</classname>
             as a basic resource implementation for developers to extend as needed.
         </para>
+
         <para>
             <classname>Zend_Acl</classname> provides a tree structure to which multiple resources
             can be added. Since resources are stored in such a tree structure, they can be
@@ -66,6 +69,7 @@
             each building that requires such an exception. A resource may inherit from only one
             parent resource, though this parent resource can have its own parent resource, etc.
         </para>
+
         <para>
             <classname>Zend_Acl</classname> also supports privileges on resources (e.g., "create",
             "read", "update", "delete"), so the developer can assign rules that affect all
@@ -75,6 +79,7 @@
 
     <sect2 id="zend.acl.introduction.roles">
         <title>Roles</title>
+
         <para>
             As with resources, creating a role is also very simple. All roles must implement
             <classname>Zend_Acl_Role_Interface</classname>. This interface consists of a single
@@ -82,6 +87,7 @@
             <classname>Zend_Acl_Role</classname> is provided by <classname>Zend_Acl</classname> as
             a basic role implementation for developers to extend as needed.
         </para>
+
         <para>
             In <classname>Zend_Acl</classname>, a role may inherit from one or more roles. This is
             to support inheritance of rules among roles. For example, a user role, such as "sally",
@@ -89,13 +95,16 @@
             developer can assign rules to "editor" and "administrator" separately, and "sally"
             would inherit such rules from both, without having to assign rules directly to "sally".
         </para>
+
         <para>
             Though the ability to inherit from multiple roles is very useful, multiple inheritance
             also introduces some degree of complexity. The following example illustrates the
             ambiguity condition and how <classname>Zend_Acl</classname> solves it.
         </para>
+
         <example id="zend.acl.introduction.roles.example.multiple_inheritance">
             <title>Multiple Inheritance among Roles</title>
+
             <para>
                 The following code defines three base roles - "guest",
                 "member", and "admin" - from which other roles may
@@ -107,6 +116,7 @@
                 the queried role inherits (herein, "guest", "member", and
                 "admin"):
             </para>
+
             <programlisting language="php"><![CDATA[
 $acl = new Zend_Acl();
 
@@ -124,6 +134,7 @@ $acl->allow('member', 'someResource');
 
 echo $acl->isAllowed('someUser', 'someResource') ? 'allowed' : 'denied';
 ]]></programlisting>
+
             <para>
                 Since there is no rule specifically defined for the "someUser" role and
                 "someResource", <classname>Zend_Acl</classname> must search for rules that may be
@@ -132,6 +143,7 @@ echo $acl->isAllowed('someUser', 'someResource') ? 'allowed' : 'denied';
                 <classname>Zend_Acl</classname> finds that there is a rule specifying that "member"
                 is allowed access to "someResource".
             </para>
+
             <para>
                 If <classname>Zend_Acl</classname> were to continue examining the rules defined for
                 other parent roles, however, it would find that "guest" is denied access to
@@ -139,6 +151,7 @@ echo $acl->isAllowed('someUser', 'someResource') ? 'allowed' : 'denied';
                 "someUser" is both denied and allowed access to "someResource", by reason of having
                 inherited conflicting rules from different parent roles.
             </para>
+
             <para>
                 <classname>Zend_Acl</classname> resolves this ambiguity by completing a query when
                 it finds the first rule that is directly applicable to the query. In this case,
@@ -146,6 +159,7 @@ echo $acl->isAllowed('someUser', 'someResource') ? 'allowed' : 'denied';
                 print "allowed".
             </para>
         </example>
+
         <note>
             <para>
                 When specifying multiple parents for a role, keep in mind that the last parent
@@ -196,38 +210,42 @@ $acl = new Zend_Acl();
         </para>
 
         <table id="zend.acl.introduction.role_registry.table.example_cms_access_controls">
-          <title>Access Controls for an Example CMS</title>
-          <tgroup cols="3">
-            <thead>
-              <row>
-                <entry>Name</entry>
-                <entry>Unique Permissions</entry>
-                <entry>Inherit Permissions From</entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry>Guest</entry>
-                <entry>View</entry>
-                <entry>N/A</entry>
-              </row>
-              <row>
-                <entry>Staff</entry>
-                <entry>Edit, Submit, Revise</entry>
-                <entry>Guest</entry>
-              </row>
-              <row>
-                <entry>Editor</entry>
-                <entry>Publish, Archive, Delete</entry>
-                <entry>Staff</entry>
-              </row>
-              <row>
-                <entry>Administrator</entry>
-                <entry>(Granted all access)</entry>
-                <entry>N/A</entry>
-              </row>
-            </tbody>
-          </tgroup>
+            <title>Access Controls for an Example CMS</title>
+            <tgroup cols="3">
+                <thead>
+                    <row>
+                        <entry>Name</entry>
+                        <entry>Unique Permissions</entry>
+                        <entry>Inherit Permissions From</entry>
+                    </row>
+                </thead>
+
+                <tbody>
+                    <row>
+                        <entry>Guest</entry>
+                        <entry>View</entry>
+                        <entry>N/A</entry>
+                    </row>
+
+                    <row>
+                        <entry>Staff</entry>
+                        <entry>Edit, Submit, Revise</entry>
+                        <entry>Guest</entry>
+                    </row>
+
+                    <row>
+                        <entry>Editor</entry>
+                        <entry>Publish, Archive, Delete</entry>
+                        <entry>Staff</entry>
+                    </row>
+
+                    <row>
+                        <entry>Administrator</entry>
+                        <entry>(Granted all access)</entry>
+                        <entry>N/A</entry>
+                    </row>
+                </tbody>
+            </tgroup>
         </table>
 
         <para>
@@ -258,7 +276,6 @@ $acl->addRole(new Zend_Acl_Role('editor'), 'staff');
 // Administrator does not inherit access controls
 $acl->addRole(new Zend_Acl_Role('administrator'));
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.acl.introduction.defining">
@@ -319,7 +336,6 @@ $acl->allow('administrator');
             The <constant>NULL</constant> values in the above <methodname>allow()</methodname> calls
             are used to indicate that the allow rules apply to all resources.
         </para>
-
     </sect2>
 
     <sect2 id="zend.acl.introduction.querying">
@@ -365,7 +381,6 @@ echo $acl->isAllowed('administrator', null, 'update') ?
      "allowed" : "denied";
 // allowed because administrator is allowed all privileges
 ]]></programlisting>
-
     </sect2>
 </sect1>
 <!--

documentation/manual/en/module_specs/Zend_Amf-Server.xml

@@ -536,7 +536,6 @@ class Zend_Amf_Parse_Resource_MysqlResult
             Trying to return unknown resource type (i.e., one for which no handler plugin exists)
             will result in an exception.
         </para>
-
     </sect2>
 
     <sect2 id="zend.amf.server.flash">
@@ -685,7 +684,6 @@ private function onFault(fault:Object):void {
             should be used when your application receives a response from the server, and finally
             displayed the returned data to output via <methodname>trace()</methodname>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.amf.server.auth">
@@ -768,9 +766,7 @@ if($this->_acl->isAllowed($role, $class, $function)) {
     throw new Zend_Amf_Server_Exception("Access not allowed");
 }
 ]]></programlisting>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Db.xml

@@ -18,20 +18,26 @@
     </para>
 
     <itemizedlist>
-        <listitem><para>
-            <emphasis><property>adapter</property></emphasis>: <classname>Zend_Db</classname>
-            adapter type.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis><property>adapter</property></emphasis>: <classname>Zend_Db</classname>
+                adapter type.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis><property>params</property></emphasis>: associative array of configuration
-            parameters to use when retrieving the adapter instance.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis><property>params</property></emphasis>: associative array of configuration
+                parameters to use when retrieving the adapter instance.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis><property>isDefaultTableAdapter</property></emphasis>: whether or not to
-            establish this adapter as the default table adapter.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis><property>isDefaultTableAdapter</property></emphasis>: whether or not to
+                establish this adapter as the default table adapter.
+            </para>
+        </listitem>
     </itemizedlist>
 
     <example id="zend.application.available-resources.db.configExample">

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Frontcontroller.xml

@@ -24,53 +24,70 @@
     </para>
 
     <itemizedlist>
-        <listitem><para>
-            <emphasis><property>controllerDirectory</property></emphasis>: either a string value
-            specifying a single controller directory, or an array of
-            module to controller directory pairs.
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>moduleControllerDirectoryName</property></emphasis>: a string value
-            indicating the subdirectory under a module that contains
-            controllers.
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>moduleDirectory</property></emphasis>: directory under which
-            modules may be found.
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>defaultControllerName</property></emphasis>: base name of the
-            default controller (normally "index").
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>defaultAction</property></emphasis>: base name of the default
-            action (normally "index").
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>defaultModule</property></emphasis>: base name of the default
-            module (normally "default").
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>baseUrl</property></emphasis>: explicit base <acronym>URL</acronym>
-            to the application (normally auto-detected).
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>plugins</property></emphasis>: array of front controller plugin
-            class names. The resource will instantiate each class (with no constructor
-            arguments) and then register the instance with the front controller.
-        </para></listitem>
-
-        <listitem><para>
-            <emphasis><property>params</property></emphasis>: array of key to value pairs to
-            register with the front controller.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis><property>controllerDirectory</property></emphasis>: either a string value
+                specifying a single controller directory, or an array of
+                module to controller directory pairs.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>moduleControllerDirectoryName</property></emphasis>: a string
+                value indicating the subdirectory under a module that contains controllers.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>moduleDirectory</property></emphasis>: directory under which
+                modules may be found.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>defaultControllerName</property></emphasis>: base name of the
+                default controller (normally "index").
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>defaultAction</property></emphasis>: base name of the default
+                action (normally "index").
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>defaultModule</property></emphasis>: base name of the default
+                module (normally "default").
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>baseUrl</property></emphasis>: explicit base
+                <acronym>URL</acronym> to the application (normally auto-detected).
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>plugins</property></emphasis>: array of front controller plugin
+                class names. The resource will instantiate each class (with no constructor
+                arguments) and then register the instance with the front controller.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <emphasis><property>params</property></emphasis>: array of key to value pairs to
+                register with the front controller.
+            </para>
+        </listitem>
     </itemizedlist>
 
     <para>

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Modules.xml

@@ -68,6 +68,7 @@ $options = array(
 
     <example id="zend.application.available-resources.modules.configExample">
         <title>Configuring Modules</title>
+
         <para>
             You can specify module-specific configuration using the module name
             as a prefix or sub-section in your configuration file.

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Session.xml

@@ -16,23 +16,29 @@
     </para>
 
     <itemizedlist>
-        <listitem><para>
-            <type>String</type>: A string indicating a class implementing
-            <classname>Zend_Session_SaveHandler_Interface</classname> that should be
-            instantiated.
-        </para></listitem>
+        <listitem>
+            <para>
+                <type>String</type>: A string indicating a class implementing
+                <classname>Zend_Session_SaveHandler_Interface</classname> that should be
+                instantiated.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <type>Array</type>: An array with the keys "class" and, optionally,
-            "options", indicating a class implementing
-            <classname>Zend_Session_SaveHandler_Interface</classname> that should be
-            instantiated and an array of options to provide to its constructor.
-        </para></listitem>
+        <listitem>
+            <para>
+                <type>Array</type>: An array with the keys "class" and, optionally,
+                "options", indicating a class implementing
+                <classname>Zend_Session_SaveHandler_Interface</classname> that should be
+                instantiated and an array of options to provide to its constructor.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <classname>Zend_Session_SaveHandler_Interface</classname>: an object
-            implementing this interface.
-        </para></listitem>
+        <listitem>
+            <para>
+                <classname>Zend_Session_SaveHandler_Interface</classname>: an object
+                implementing this interface.
+            </para>
+        </listitem>
     </itemizedlist>
 
     <para>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Application.xml

@@ -19,6 +19,7 @@
 
     <table id="zend.application.core-functionality.application.api.options">
         <title>Zend_Application options</title>
+
         <tgroup cols="2">
             <thead>
                 <row>
@@ -26,38 +27,51 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry><emphasis><property>phpSettings</property></emphasis></entry>
-                    <entry><para>
-                        Array of <filename>php.ini</filename> settings to use. Keys should be the
-                        <filename>php.ini</filename> keys.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Array of <filename>php.ini</filename> settings to use. Keys should be
+                            the <filename>php.ini</filename> keys.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><emphasis><property>includePaths</property></emphasis></entry>
-                    <entry><para>
-                        Additional paths to prepend to the
-                        <emphasis>include_path</emphasis>. Should be an array of paths.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Additional paths to prepend to the <emphasis>include_path</emphasis>.
+                            Should be an array of paths.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><emphasis><property>autoloaderNamespaces</property></emphasis></entry>
-                    <entry><para>
-                        Array of additional namespaces to register with the
-                        <classname>Zend_Loader_Autoloader</classname> instance.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Array of additional namespaces to register with the
+                            <classname>Zend_Loader_Autoloader</classname> instance.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><emphasis><property>bootstrap</property></emphasis></entry>
-                    <entry><para>
-                        Either the string path to the bootstrap class, or an array
-                        with elements for the 'path' and 'class' for the application
-                        bootstrap.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Either the string path to the bootstrap class, or an array
+                            with elements for the 'path' and 'class' for the application
+                            bootstrap.
+                        </para>
+                    </entry>
                 </row>
             </tbody>
         </tgroup>
@@ -73,6 +87,7 @@
 
     <table id="zend.application.core-functionality.application.api.table">
         <title>Zend_Application Methods</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -82,243 +97,311 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry>
                         <methodname>__construct($environment, $options = null)</methodname>
                     </entry>
+
                     <entry><type>Void</type></entry>
-                    <entry><itemizedlist>
-                            <listitem><para>
-                                <varname>$environment</varname>: <emphasis>required</emphasis>,.
-                                String representing the current application
-                                environment. Typical strings might include
-                                "development", "testing", "qa", or
-                                "production", but will be defined by your
-                                organizational requirements.
-                            </para></listitem>
 
+                    <entry>
+                        <itemizedlist>
                             <listitem>
-                            <para>
-                                <varname>$options</varname>: <emphasis>optional</emphasis>.
-                                Argument may be one of the following values:
-                            </para>
-                            <itemizedlist>
-                                <listitem><para>
-                                    <emphasis><type>String</type></emphasis>: path to
-                                    a <classname>Zend_Config</classname> file to load
-                                    as configuration for your application.
-                                    <varname>$environment</varname> will be used
-                                    to determine what section of the
-                                    configuration to pull.
-                                </para></listitem>
-
-                                <listitem><para>
-                                    <emphasis><type>Array</type></emphasis>: associative
-                                    array of configuration data for your
-                                    application.
-                                </para></listitem>
-
-                                <listitem><para>
-                                    <emphasis><classname>Zend_Config</classname></emphasis>:
-                                    configuration object instance.
-                                </para></listitem>
-                            </itemizedlist>
-                        </listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Constructor. Arguments are as described, and will be
-                        used to set initial object state. An instance of
-                        <classname>Zend_Loader_Autoloader</classname> is registered
-                        during instantiation. Options passed to the
-                        constructor are passed to <methodname>setOptions()</methodname>.
-                    </para></entry>
+                                <para>
+                                    <varname>$environment</varname>: <emphasis>required</emphasis>,.
+                                    String representing the current application
+                                    environment. Typical strings might include
+                                    "development", "testing", "qa", or
+                                    "production", but will be defined by your
+                                    organizational requirements.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>optional</emphasis>.
+                                    Argument may be one of the following values:
+                                </para>
+
+                                <itemizedlist>
+                                    <listitem>
+                                        <para>
+                                            <emphasis><type>String</type></emphasis>: path to
+                                            a <classname>Zend_Config</classname> file to load
+                                            as configuration for your application.
+                                            <varname>$environment</varname> will be used
+                                            to determine what section of the
+                                            configuration to pull.
+                                        </para>
+                                    </listitem>
+
+                                    <listitem>
+                                        <para>
+                                            <emphasis><type>Array</type></emphasis>: associative
+                                            array of configuration data for your application.
+                                        </para>
+                                    </listitem>
+
+                                    <listitem>
+                                        <para>
+                                            <emphasis><classname>Zend_Config</classname></emphasis>:
+                                            configuration object instance.
+                                        </para>
+                                    </listitem>
+                                </itemizedlist>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Constructor. Arguments are as described, and will be
+                            used to set initial object state. An instance of
+                            <classname>Zend_Loader_Autoloader</classname> is registered
+                            during instantiation. Options passed to the
+                            constructor are passed to <methodname>setOptions()</methodname>.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getEnvironment()</methodname></entry>
                     <entry><type>String</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the environment string passed to the
-                        constructor.
-                    </para></entry>
+
+                    <entry>
+                        <para>Retrieve the environment string passed to the constructor.</para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getAutoloader()</methodname></entry>
                     <entry><classname>Zend_Loader_Autoloader</classname></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the <classname>Zend_Loader_Autoloader</classname>
-                        instance registered during instantiation.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the <classname>Zend_Loader_Autoloader</classname>
+                            instance registered during instantiation.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>required</emphasis>.
-                            An array of application options.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        All options are stored internally, and calling the
-                        method multiple times will merge options. Options
-                        matching the various setter methods will be passed
-                        to those methods. As an example, the option
-                        "phpSettings" will then be passed to
-                        <methodname>setPhpSettings()</methodname>. (Option names are
-                        case insensitive.)
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>required</emphasis>.
+                                    An array of application options.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            All options are stored internally, and calling the
+                            method multiple times will merge options. Options
+                            matching the various setter methods will be passed
+                            to those methods. As an example, the option
+                            "phpSettings" will then be passed to
+                            <methodname>setPhpSettings()</methodname>. (Option names are
+                            case insensitive.)
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getOptions()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve all options used to initialize the object;
-                        could be used to cache <classname>Zend_Config</classname>
-                        options to a serialized format between requests.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve all options used to initialize the object;
+                            could be used to cache <classname>Zend_Config</classname>
+                            options to a serialized format between requests.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>hasOption($key)</methodname></entry>
                     <entry><type>Boolean</type></entry>
                     <entry>
-                    <itemizedlist>
-                        <listitem><para>
-                            <varname>$key</varname>: String option key to lookup
-                        </para></listitem>
-                    </itemizedlist>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$key</varname>: String option key to lookup
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Determine whether or not an option with the
+                            specified key has been registered. Keys are case insensitive.
+                        </para>
                     </entry>
-                    <entry><para>
-                        Determine whether or not an option with the
-                        specified key has been registered. Keys are case
-                        insensitive.
-                    </para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getOption($key)</methodname></entry>
+                    <entry><type>Mixed</type></entry>
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para><varname>$key</varname>: String option key to lookup</para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
                     <entry>
-                        <type>Mixed</type>
+                        <para>
+                            Retrieve the option value of a given key. Returns
+                            <constant>NULL</constant> if the key does not exist.
+                        </para>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$key</varname>: String option key to lookup
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Retrieve the option value of a given key. Returns
-                        <constant>NULL</constant> if the key does not exist.
-                    </para></entry>
                 </row>
 
                 <row>
                     <entry>
                         <methodname>setPhpSettings(array $settings, $prefix = '')</methodname>
                     </entry>
+
                     <entry><classname>Zend_Application</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$settings</varname>: <emphasis>required</emphasis>.
-                            Associative array of <acronym>PHP</acronym> <acronym>INI</acronym>
-                            settings.
-                        </para></listitem>
-
-                        <listitem><para>
-                            <varname>$prefix</varname>: <emphasis>optional</emphasis>.
-                            String prefix with which to prepend option keys.
-                            Used internally to allow mapping nested arrays
-                            to dot-separated <filename>php.ini</filename> keys. In normal usage,
-                            this argument should never be passed by a user.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Set run-time <filename>php.ini</filename> settings. Dot-separated
-                        settings may be nested hierarchically (which may
-                        occur with <acronym>INI</acronym> <classname>Zend_Config</classname> files)
-                        via an array-of-arrays, and will still resolve correctly.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$settings</varname>: <emphasis>required</emphasis>.
+                                    Associative array of <acronym>PHP</acronym>
+                                    <acronym>INI</acronym> settings.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <varname>$prefix</varname>: <emphasis>optional</emphasis>.
+                                    String prefix with which to prepend option keys. Used
+                                    internally to allow mapping nested arrays to dot-separated
+                                    <filename>php.ini</filename> keys. In normal usage, this
+                                    argument should never be passed by a user.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Set run-time <filename>php.ini</filename> settings. Dot-separated
+                            settings may be nested hierarchically (which may occur
+                            with <acronym>INI</acronym> <classname>Zend_Config</classname> files)
+                            via an array-of-arrays, and will still resolve correctly.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry>
                         <methodname>setAutoloaderNamespaces(array $namespaces)</methodname>
                     </entry>
+
                     <entry><classname>Zend_Application</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$namespaces</varname>: <emphasis>required</emphasis>.
-                            Array of strings representing the namespaces to
-                            register with the <classname>Zend_Loader_Autoloader</classname>
-                            instance.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Register namespaces with the <classname>Zend_Loader_Autoloader</classname>
-                        instance.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$namespaces</varname>: <emphasis>required</emphasis>.
+                                    Array of strings representing the namespaces to
+                                    register with the <classname>Zend_Loader_Autoloader</classname>
+                                    instance.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Register namespaces with the
+                            <classname>Zend_Loader_Autoloader</classname> instance.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>setBootstrap($path, $class = null)</methodname></entry>
                     <entry><classname>Zend_Application</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$path</varname>: <emphasis>required</emphasis>. May be either a
-                            <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
-                            instance, a string path to the bootstrap class,
-                            an associative array of classname =&gt;
-                            filename, or an associative array with the keys
-                            'class' and 'path'.
-                        </para></listitem>
-
-                        <listitem><para>
-                            <varname>$class</varname>: <emphasis>optional</emphasis>.
-                            If <varname>$path</varname> is a string,
-                            <varname>$class</varname> may be specified, and should
-                            be a string class name of the class contained in
-                            the file represented by path.
-                        </para></listitem>
-                    </itemizedlist></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$path</varname>: <emphasis>required</emphasis>. May be
+                                    either a
+                                    <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
+                                    instance, a string path to the bootstrap class, an
+                                    associative array of classname =&gt; filename, or an associative
+                                    array with the keys 'class' and 'path'.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <varname>$class</varname>: <emphasis>optional</emphasis>.
+                                    If <varname>$path</varname> is a string,
+                                    <varname>$class</varname> may be specified, and should
+                                    be a string class name of the class contained in
+                                    the file represented by path.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getBootstrap()</methodname></entry>
+
                     <entry>
                         <constant>NULL</constant> |
                         <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                     </entry>
+
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the registered bootstrap instance.
-                    </para></entry>
+                    <entry><para>Retrieve the registered bootstrap instance.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>bootstrap()</methodname></entry>
                     <entry><type>Void</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Call the bootstrap's <methodname>bootstrap()</methodname>
-                        method to bootstrap the application.
-                    </para></entry>
+                    <entry>
+                        <para>
+                            Call the bootstrap's <methodname>bootstrap()</methodname>
+                            method to bootstrap the application.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>run()</methodname></entry>
                     <entry><type>Void</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Call the bootstrap's <methodname>run()</methodname>
-                        method to dispatch the application.
-                    </para></entry>
+                    <entry>
+                        <para>
+                            Call the bootstrap's <methodname>run()</methodname>
+                            method to dispatch the application.
+                        </para>
+                    </entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_BootstrapAbstract.xml

@@ -14,6 +14,7 @@
 
     <table id="zend.application.core-functionality.bootstrap-bootstrapabstract.api.table">
         <title>Zend_Application_Bootstrap_BootstrapAbstract Methods</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -23,51 +24,66 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry><methodname>__construct($application)</methodname></entry>
                     <entry><type>Void</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$application</varname>: <emphasis>required</emphasis>.
-                            Accepts either a <classname>Zend_Application</classname> or a
-                            <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
-                            object as the sole argument.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Constructor. Accepts a single argument, which should be a
-                        <classname>Zend_Application</classname> object, or another bootstrap
-                        object.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$application</varname>: <emphasis>required</emphasis>.
+                                    Accepts either a <classname>Zend_Application</classname> or a
+                                    <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
+                                    object as the sole argument.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Constructor. Accepts a single argument, which should be a
+                            <classname>Zend_Application</classname> object, or another bootstrap
+                            object.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>required</emphasis>.
-                            Array of options to set.
-                        </para></listitem>
-                    </itemizedlist></entry>
                     <entry>
-                    <para>
-                        Any option that has a matching setter will
-                        invoke that setter; otherwise, the option will simply be
-                        stored for later retrieval. As an example, if your
-                        extending class defined a <methodname>setFoo()</methodname> method,
-                        the option 'foo' would pass the value to that method.
-                    </para>
-                    <para>
-                        Two additional, special options keys may also be used.
-                        <property>pluginPaths</property> may be used to specify prefix
-                        paths to plugin resources; it should be an array of
-                        class prefix to filesystem path pairs.
-                        <property>resources</property> may be used to specify plugin
-                        resources to use, and should consist of plugin
-                        resource to instantiation options pairs.
-                    </para>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>required</emphasis>.
+                                    Array of options to set.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Any option that has a matching setter will
+                            invoke that setter; otherwise, the option will simply be
+                            stored for later retrieval. As an example, if your
+                            extending class defined a <methodname>setFoo()</methodname> method,
+                            the option 'foo' would pass the value to that method.
+                        </para>
+
+                        <para>
+                            Two additional, special options keys may also be used.
+                            <property>pluginPaths</property> may be used to specify prefix
+                            paths to plugin resources; it should be an array of
+                            class prefix to filesystem path pairs.
+                            <property>resources</property> may be used to specify plugin
+                            resources to use, and should consist of plugin
+                            resource to instantiation options pairs.
+                        </para>
                     </entry>
                 </row>
 
@@ -75,37 +91,52 @@
                     <entry><methodname>getOptions()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Returns all options registered via
-                        <methodname>setOptions()</methodname>.
-                    </para></entry>
+                    <entry>
+                        <para>
+                            Returns all options registered via
+                            <methodname>setOptions()</methodname>.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>hasOption($key)</methodname></entry>
                     <entry><type>Boolean</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$key</varname>: <emphasis>required</emphasis>.
-                            Option key to test.
-                        </para></listitem>
-                    </itemizedlist></entry>
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$key</varname>: <emphasis>required</emphasis>.
+                                    Option key to test.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
                     <entry><para>Determine if an option key is present.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getOption($key)</methodname></entry>
                     <entry><type>Mixed</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$key</varname>: <emphasis>required</emphasis>.
-                            Option key to retrieve.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Retrieve the value associated with an option key;
-                        returns <constant>NULL</constant> if no option is registered with that key.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$key</varname>: <emphasis>required</emphasis>.
+                                    Option key to retrieve.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the value associated with an option key; returns
+                            <constant>NULL</constant> if no option is registered with that key.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
@@ -113,142 +144,190 @@
                         <methodname>setApplication(Zend_Application |
                             Zend_Application_Bootstrap_Bootstrapper $application)</methodname>
                     </entry>
+
                     <entry>
                         <classname>Zend_Application_Bootstrap_BootstrapAbstract</classname>
                     </entry>
-                    <entry><itemizedlist>
-                            <listitem><para>
-                                <varname>$application</varname>: <emphasis>required</emphasis>.
-                            </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Register the parent application or bootstrap object.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$application</varname>: <emphasis>required</emphasis>.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry><para>Register the parent application or bootstrap object.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getApplication()</methodname></entry>
+
                     <entry>
                         <classname>Zend_Application</classname> |
                         <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                     </entry>
+
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the application or bootstrap object passed via the
-                        constructor.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the application or bootstrap object passed via the constructor.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getEnvironment()</methodname></entry>
                     <entry><type>String</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the environment string registered with the
-                        parent application or bootstrap object.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the environment string registered with the
+                            parent application or bootstrap object.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getClassResources()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve a list of available resource initializer names
-                        as defined in the class. This may be implementation
-                        specific.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve a list of available resource initializer names
+                            as defined in the class. This may be implementation
+                            specific.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getContainer()</methodname></entry>
                     <entry><type>Object</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieves the container that stores resources. If no
-                        container is currently registered, it registers a <link
-                            linkend="zend.registry">Zend_Registry</link>
-                        instance before returning it.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieves the container that stores resources. If no
+                            container is currently registered, it registers a <link
+                                linkend="zend.registry">Zend_Registry</link>
+                            instance before returning it.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>setContainer($container)</methodname></entry>
+
                     <entry>
                         <classname>Zend_Application_Bootstrap_BootstrapAbstract</classname>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$container</varname>, <emphasis>required</emphasis>.
-                            An object in which to store resources.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Provide a container in which to store resources. When a
-                        resource method or plugin returns a value, it will be
-                        stored in this container for later retrieval.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$container</varname>, <emphasis>required</emphasis>.
+                                    An object in which to store resources.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Provide a container in which to store resources. When a
+                            resource method or plugin returns a value, it will be
+                            stored in this container for later retrieval.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>hasResource($name)</methodname></entry>
                     <entry><type>Boolean</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$name</varname>, <emphasis>required</emphasis>.
-                            Name of a resource to check.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        When a resource method or plugin returns a value, it
-                        will be stored in the resource container (see
-                        <methodname>getContainer()</methodname> and
-                        <methodname>setContainer()</methodname>. This method will indicate
-                        whether or not a value for that resource has been set.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$name</varname>, <emphasis>required</emphasis>.
+                                    Name of a resource to check.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            When a resource method or plugin returns a value, it
+                            will be stored in the resource container (see
+                            <methodname>getContainer()</methodname> and
+                            <methodname>setContainer()</methodname>. This method will indicate
+                            whether or not a value for that resource has been set.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getResource($name)</methodname></entry>
                     <entry><type>Mixed</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$name</varname>, <emphasis>required</emphasis>.
-                            Name of a resource to fetch.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        When a resource method or plugin returns a value, it
-                        will be stored in the resource container (see
-                        <methodname>getContainer()</methodname> and
-                        <methodname>setContainer()</methodname>. This method will retrieve a
-                        resources from the container.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$name</varname>, <emphasis>required</emphasis>.
+                                    Name of a resource to fetch.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            When a resource method or plugin returns a value, it
+                            will be stored in the resource container (see
+                            <methodname>getContainer()</methodname> and
+                            <methodname>setContainer()</methodname>. This method will retrieve a
+                            resources from the container.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>bootstrap($resource = null)</methodname></entry>
                     <entry><type>Mixed</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>optional</emphasis>.
-                        </para></listitem>
-                    </itemizedlist></entry>
+
                     <entry>
-                    <para>
-                        If <varname>$resource</varname> is empty, execute all
-                        bootstrap resources. If a string, execute that single
-                        resource; if an array, execute each resource in the
-                        array.
-                    </para>
-
-                    <para>
-                        This method can be used to run individual bootstraps
-                        either defined in the class itself or via resource
-                        plugin classes. A resource defined in the class will be
-                        run in preference over a resource plugin in the case of
-                        naming conflicts.
-                    </para>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>optional</emphasis>.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            If <varname>$resource</varname> is empty, execute all
+                            bootstrap resources. If a string, execute that single
+                            resource; if an array, execute each resource in the array.
+                        </para>
+
+                        <para>
+                            This method can be used to run individual bootstraps
+                            either defined in the class itself or via resource
+                            plugin classes. A resource defined in the class will be
+                            run in preference over a resource plugin in the case of
+                            naming conflicts.
+                        </para>
                     </entry>
                 </row>
 
@@ -256,32 +335,42 @@
                     <entry><methodname>run()</methodname></entry>
                     <entry><type>Void</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Defines what application logic to run after
-                        bootstrapping.
-                    </para></entry>
+
+                    <entry>
+                        <para> Defines what application logic to run after bootstrapping.</para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>__call($method, $args)</methodname></entry>
                     <entry><type>Mixed</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$method</varname>: <emphasis>required</emphasis>.
-                            The method name to call.
-                        </para></listitem>
-
-                        <listitem><para>
-                            <varname>$args</varname>: <emphasis>required</emphasis>.
-                            Array of arguments to use in the method call.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Provides convenience to bootstrapping individual
-                        resources by allowing you to call
-                        'bootstrap&lt;ResourceName&gt;()' instead of using the
-                        <methodname>bootstrap()</methodname> method.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$method</varname>: <emphasis>required</emphasis>.
+                                    The method name to call.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <varname>$args</varname>: <emphasis>required</emphasis>.
+                                    Array of arguments to use in the method call.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Provides convenience to bootstrapping individual
+                            resources by allowing you to call
+                            'bootstrap&lt;ResourceName&gt;()' instead of using the
+                            <methodname>bootstrap()</methodname> method.
+                        </para>
+                    </entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_Bootstrapper.xml

@@ -16,6 +16,7 @@
 
     <table id="zend.application.core-functionality.bootstrap-bootstrapper.methods-table">
         <title>Zend_Application_Bootstrap_Bootstrapper Interface</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -25,101 +26,131 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry><methodname>__construct($application)</methodname></entry>
                     <entry><type>Void</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$application</varname>: <emphasis>required</emphasis>.
-                            Should accept a <classname>Zend_Application</classname> or a
-                            <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
-                            object as the sole argument.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Constructor. Accepts a single argument, which should be a
-                        <classname>Zend_Application</classname> object, or another bootstrap
-                        object.
-                    </para></entry>
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$application</varname>: <emphasis>required</emphasis>.
+                                    Should accept a <classname>Zend_Application</classname> or a
+                                    <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
+                                    object as the sole argument.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Constructor. Accepts a single argument, which should be a
+                            <classname>Zend_Application</classname> object, or another bootstrap
+                            object.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>required</emphasis>.
-                            Array of options to set.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Typically, any option that has a matching setter will
-                        invoke that setter; otherwise, the option will simply be
-                        stored for later retrieval.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>required</emphasis>.
+                                    Array of options to set.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Typically, any option that has a matching setter will
+                            invoke that setter; otherwise, the option will simply be
+                            stored for later retrieval.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getApplication()</methodname></entry>
+
                     <entry>
                         <classname>Zend_Application</classname> |
                         <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                     </entry>
+
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the application or bootstrap object passed via the
-                        constructor.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the application or bootstrap object passed via the
+                            constructor.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getEnvironment()</methodname></entry>
                     <entry><type>String</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the environment string registered with the
-                        parent application or bootstrap object.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve the environment string registered with the
+                            parent application or bootstrap object.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getClassResources()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve a list of available resource initializer names
-                        as defined in the class. This may be implementation
-                        specific.
-                    </para></entry>
+
+                    <entry>
+                        <para>
+                            Retrieve a list of available resource initializer names
+                            as defined in the class. This may be implementation specific.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>bootstrap($resource = null)</methodname></entry>
+                    <entry><type>Mixed</type></entry>
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>optional</emphasis>.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
                     <entry>
-                        <type>Mixed</type>
+                        <para>
+                            If <varname>$resource</varname> is empty, execute all
+                            bootstrap resources. If a string, execute that single
+                            resource; if an array, execute each resource in the array.
+                        </para>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>optional</emphasis>.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        If <varname>$resource</varname> is empty, execute all
-                        bootstrap resources. If a string, execute that single
-                        resource; if an array, execute each resource in the
-                        array.
-                    </para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>run()</methodname></entry>
                     <entry><type>Void</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Defines what application logic to run after
-                        bootstrapping.
-                    </para></entry>
+
+                    <entry>
+                        <para>Defines what application logic to run after bootstrapping.</para>
+                    </entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_ResourceBootstrapper.xml

@@ -20,6 +20,7 @@
 
     <table id="zend.application.core-functionality.bootstrap-resourcebootstrapper.methods-table">
         <title>Zend_Application_Bootstrap_ResourceBootstrapper Interface</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -29,86 +30,114 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry>
                         <methodname>registerPluginResource($resource, $options = null)</methodname>
                     </entry>
+
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>required</emphasis>.
-                            A resource name or
-                            <classname>Zend_Application_Resource_Resource</classname>
-                            object.
-                        </para></listitem>
-
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>optional</emphasis>.
-                            An array or <classname>Zend_Config</classname> object to pass
-                            to the resource on instantiation.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Register a resource with the class, providing optional
-                        configuration to pass to the resource.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>required</emphasis>.
+                                    A resource name or
+                                    <classname>Zend_Application_Resource_Resource</classname>
+                                    object.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>optional</emphasis>.
+                                    An array or <classname>Zend_Config</classname> object to pass
+                                    to the resource on instantiation.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Register a resource with the class, providing optional
+                            configuration to pass to the resource.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>unregisterPluginResource($resource)</methodname></entry>
+
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>required</emphasis>.
-                            Name of a resource to unregister from the class.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Remove a plugin resource from the class.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>required</emphasis>.
+                                    Name of a resource to unregister from the class.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry><para>Remove a plugin resource from the class.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>hasPluginResource($resource)</methodname></entry>
                     <entry><type>Boolean</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>required</emphasis>.
-                            Name of the resource.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Determine if a specific resource has been registered
-                        with the class.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>required</emphasis>.
+                                    Name of the resource.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Determine if a specific resource has been registered with the class.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getPluginResource($resource)</methodname></entry>
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$resource</varname>: <emphasis>required</emphasis>.
-                            Name of a resource to retrieve (string).
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Retrieve a plugin resource instance by name.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$resource</varname>: <emphasis>required</emphasis>.
+                                    Name of a resource to retrieve (string).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry><para>Retrieve a plugin resource instance by name.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getPluginResourceNames()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve a list of all registered plugin resource names.
-                    </para></entry>
+                    <entry>
+                        <para>Retrieve a list of all registered plugin resource names.</para>
+                    </entry>
                 </row>
 
                 <row>
@@ -116,29 +145,36 @@
                         <methodname>setPluginLoader(Zend_Loader_PluginLoader_Interface
                             $loader)</methodname>
                     </entry>
+
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$loader</varname>: <emphasis>required</emphasis>.
-                            Plugin loader instance to use when resolving plugin
-                            names to classes.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Register a plugin loader instance to use when resolving
-                        plugin class names.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$loader</varname>: <emphasis>required</emphasis>.
+                                    Plugin loader instance to use when resolving plugin
+                                    names to classes.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            Register a plugin loader instance to use when resolving plugin class
+                            names.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getPluginLoader()</methodname></entry>
                     <entry><classname>Zend_Loader_PluginLoader_Interface</classname></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the registered plugin loader.
-                    </para></entry>
+                    <entry><para>Retrieve the registered plugin loader.</para></entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_Resource.xml

@@ -13,6 +13,7 @@
 
     <table id="zend.application.core-functionality.resource-resource.api">
         <title>Zend_Application_Resource_Resource Interface</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -22,20 +23,29 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry><methodname>__construct($options = null)</methodname></entry>
                     <entry><type>Void</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>optional</emphasis>.
-                            Options with which to set resource state.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        The constructor should allow passing options with
-                        which to initialize state.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>optional</emphasis>.
+                                    Options with which to set resource state.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            The constructor should allow passing options with which to initialize
+                            state.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
@@ -43,57 +53,65 @@
                         <methodname>setBootstrap(Zend_Application_Bootstrap_Bootstrapper
                             $bootstrap)</methodname>
                     </entry>
+
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
-                    <entry><itemizedlist>
-                            <listitem><para>
-                                <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
-                                Parent bootstrap initializing this resource.
-                            </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Should allow registering the parent bootstrap object.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
+                                    Parent bootstrap initializing this resource.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>Should allow registering the parent bootstrap object.</para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getBootstrap()</methodname></entry>
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the registered bootstrap instance.
-                    </para></entry>
+                    <entry><para>Retrieve the registered bootstrap instance.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>required</emphasis>.
-                            Options with which to set state.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Set resource state.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>required</emphasis>.
+                                    Options with which to set state.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry><para>Set resource state.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getOptions()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve registered options.
-                    </para></entry>
+                    <entry><para>Retrieve registered options.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>init()</methodname></entry>
                     <entry><type>Mixed</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Strategy pattern: run initialization of the resource.
-                    </para></entry>
+
+                    <entry>
+                        <para>Strategy pattern: run initialization of the resource.</para>
+                    </entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_ResourceAbstract.xml

@@ -19,6 +19,7 @@
 
     <table id="zend.application.core-functionality.resource-resourceabstract.api">
         <title>Zend_Application_Resource_ResourceAbstract Methods</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -28,20 +29,28 @@
                     <entry>Description</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry><methodname>__construct($options = null)</methodname></entry>
                     <entry><type>Void</type></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>optional</emphasis>.
-                            Options with which to set resource state.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        The constructor should allow passing options with
-                        which to initialize state.
-                    </para></entry>
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>optional</emphasis>.
+                                    Options with which to set resource state.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>
+                            The constructor should allow passing options with which to initialize
+                            state.
+                        </para>
+                    </entry>
                 </row>
 
                 <row>
@@ -49,48 +58,55 @@
                         <methodname>setBootstrap(Zend_Application_Bootstrap_Bootstrapper
                             $bootstrap)</methodname>
                     </entry>
+
                     <entry><classname>Zend_Application_Resource_ResourceAbstract</classname></entry>
-                    <entry><itemizedlist>
-                            <listitem><para>
-                                <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
-                                Parent bootstrap initializing this resource.
-                            </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Should allow registering the parent bootstrap object.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
+                                    Parent bootstrap initializing this resource.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry>
+                        <para>Should allow registering the parent bootstrap object.</para>
+                    </entry>
                 </row>
 
                 <row>
                     <entry><methodname>getBootstrap()</methodname></entry>
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve the registered bootstrap instance.
-                    </para></entry>
+                    <entry><para>Retrieve the registered bootstrap instance.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application_Resource_ResourceAbstract</classname></entry>
-                    <entry><itemizedlist>
-                        <listitem><para>
-                            <varname>$options</varname>: <emphasis>required</emphasis>.
-                            Options with which to set state.
-                        </para></listitem>
-                    </itemizedlist></entry>
-                    <entry><para>
-                        Set resource state.
-                    </para></entry>
+
+                    <entry>
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    <varname>$options</varname>: <emphasis>required</emphasis>.
+                                    Options with which to set state.
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </entry>
+
+                    <entry><para>Set resource state.</para></entry>
                 </row>
 
                 <row>
                     <entry><methodname>getOptions()</methodname></entry>
                     <entry><type>Array</type></entry>
                     <entry>N/A</entry>
-                    <entry><para>
-                        Retrieve registered options.
-                    </para></entry>
+                    <entry><para>Retrieve registered options.</para></entry>
                 </row>
             </tbody>
         </tgroup>

documentation/manual/en/module_specs/Zend_Application-Examples.xml

@@ -93,11 +93,13 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
                 When instantiating the <classname>Zend_Application</classname> object
             </para>
         </listitem>
+
         <listitem>
             <para>
                 During initialization of the bootstrap object
             </para>
         </listitem>
+
         <listitem>
             <para>
                 By explicitly enabling them via method calls to the bootstrap

documentation/manual/en/module_specs/Zend_Application-QuickStart.xml

@@ -162,21 +162,27 @@ $application->bootstrap()
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                Create an <filename>application/Bootstrap.php</filename> file, with the
-                class <classname>Bootstrap</classname>.
-            </para></listitem>
-
-            <listitem><para>
-                Create an <filename>application/configs/application.ini</filename>
-                configuration file with the base configuration necessary for
-                <classname>Zend_Application</classname>.
-            </para></listitem>
-
-            <listitem><para>
-                Modify your <filename>public/index.php</filename> to utilize
-                <classname>Zend_Application</classname>.
-            </para></listitem>
+            <listitem>
+                <para>
+                    Create an <filename>application/Bootstrap.php</filename> file, with the
+                    class <classname>Bootstrap</classname>.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Create an <filename>application/configs/application.ini</filename>
+                    configuration file with the base configuration necessary for
+                    <classname>Zend_Application</classname>.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Modify your <filename>public/index.php</filename> to utilize
+                    <classname>Zend_Application</classname>.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>

documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml

@@ -36,6 +36,7 @@
                 the requested bootstrap class.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <classname>Zend_Application_Bootstrap</classname>: provides
@@ -46,6 +47,7 @@
                 bootstrap resources on demand.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <classname>Zend_Application_Resource</classname> provides an
@@ -70,6 +72,7 @@
                 The current environment
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Options for bootstrapping
@@ -88,36 +91,43 @@
                 Any extra include_paths to set
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Any additional autoloader namespaces to register
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Any <filename>php.ini</filename> settings to initialize
             </para>
         </listitem>
+
         <listitem>
             <para>
                 The class name for the bootstrap class (if not "Bootstrap")
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Resource prefix to path pairs to use
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Any resources to use (by class name or short name)
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Additional path to a configuration file to load
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Additional configuration options

documentation/manual/en/module_specs/Zend_Auth.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.auth.introduction">
-
     <title>Introduction</title>
 
     <para>
@@ -32,7 +31,6 @@
     </note>
 
     <sect2 id="zend.auth.introduction.adapters">
-
         <title>Adapters</title>
 
         <para>
@@ -97,11 +95,9 @@ class MyAuthAdapter implements Zend_Auth_Adapter_Interface
             throw an exception that derives from
             <classname>Zend_Auth_Adapter_Exception</classname>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.introduction.results">
-
         <title>Results</title>
 
         <para>
@@ -120,6 +116,7 @@ class MyAuthAdapter implements Zend_Auth_Adapter_Interface
                     only if the result represents a successful authentication attempt
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>getCode()</methodname> - returns a
@@ -134,12 +131,14 @@ class MyAuthAdapter implements Zend_Auth_Adapter_Interface
                     authentication failure message. For more information, see the notes below.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>getIdentity()</methodname> - returns the identity of the
                     authentication attempt
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>getMessages()</methodname> - returns an array of messages
@@ -192,11 +191,9 @@ switch ($result->getCode()) {
         break;
 }
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.auth.introduction.persistence">
-
         <title>Identity Persistence</title>
 
         <para>
@@ -212,7 +209,6 @@ switch ($result->getCode()) {
         </para>
 
         <sect3 id="zend.auth.introduction.persistence.default">
-
             <title>Default Persistence in the PHP Session</title>
 
             <para>
@@ -239,7 +235,6 @@ switch ($result->getCode()) {
             </note>
 
             <example id="zend.auth.introduction.persistence.default.example">
-
                 <title>Modifying the Session Namespace</title>
 
                 <para>
@@ -269,13 +264,10 @@ $auth->setStorage(new Zend_Auth_Storage_Session('someNamespace'));
 // success
 $result = $auth->authenticate($authAdapter);
 ]]></programlisting>
-
             </example>
-
         </sect3>
 
         <sect3 id="zend.auth.introduction.persistence.custom">
-
             <title>Implementing Customized Storage</title>
 
             <para>
@@ -287,7 +279,6 @@ $result = $auth->authenticate($authAdapter);
             </para>
 
             <example id="zend.auth.introduction.persistence.custom.example">
-
                 <title>Using a Custom Storage Class</title>
 
                 <para>
@@ -379,15 +370,11 @@ Zend_Auth::getInstance()->setStorage(new MyStorage());
 // success
 $result = Zend_Auth::getInstance()->authenticate($authAdapter);
 ]]></programlisting>
-
             </example>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.auth.introduction.using">
-
         <title>Usage</title>
 
         <para>
@@ -400,6 +387,7 @@ $result = Zend_Auth::getInstance()->authenticate($authAdapter);
                     indirectly, through <methodname>Zend_Auth::authenticate()</methodname>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     directly, through the adapter's <methodname>authenticate()</methodname> method
@@ -485,9 +473,7 @@ if (!$result->isValid()) {
     // $result->getIdentity() === $username
 }
 ]]></programlisting>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Auth_Adapter_DbTable.xml

@@ -2,8 +2,10 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.auth.adapter.dbtable">
     <title>Database Table Authentication</title>
+
     <sect2 id="zend.auth.adapter.dbtable.introduction">
         <title>Introduction</title>
+
         <para>
             <classname>Zend_Auth_Adapter_DbTable</classname> provides the ability to
             authenticate against credentials stored in a database table. Because
@@ -27,6 +29,7 @@
                     performed.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis><property>identityColumn</property></emphasis>: This is the name of
@@ -35,6 +38,7 @@
                     a username or e-mail address.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis><property>credentialColumn</property></emphasis>: This is the name
@@ -45,6 +49,7 @@
                     option.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis><property>credentialTreatment</property></emphasis>: In many cases,
@@ -64,6 +69,7 @@
 
         <example id="zend.auth.adapter.dbtable.introduction.example.basic_usage">
             <title>Basic Usage</title>
+
             <para>
                 As explained in the introduction, the
                 <classname>Zend_Auth_Adapter_DbTable</classname> constructor requires an
@@ -129,6 +135,7 @@ $authAdapter
     ->setCredentialColumn('password')
 ;
 ]]></programlisting>
+
             <para>
                 At this point, the authentication adapter instance is ready to
                 accept authentication queries. In order to formulate an
@@ -172,14 +179,17 @@ Array
     [real_name] => My Real Name
 )
 ]]></programlisting>
+
             <para>
                 Since the table row contains the credential value, it is
                 important to secure the values against unintended access.
             </para>
         </example>
     </sect2>
+
     <sect2 id="zend.auth.adapter.dbtable.advanced.storing_result_row">
         <title>Advanced Usage: Persisting a DbTable Result Object</title>
+
         <para>
             By default, <classname>Zend_Auth_Adapter_DbTable</classname> returns the
             identity supplied back to the auth object upon successful
@@ -190,6 +200,7 @@ Array
             <emphasis>stdClass</emphasis> object. The following code snippet illustrates
             its use:
         </para>
+
         <programlisting language="php"><![CDATA[
 // authenticate with Zend_Auth_Adapter_DbTable
 $result = $this->_auth->authenticate($adapter);
@@ -219,8 +230,10 @@ if ($result->isValid()) {
 }
 ]]></programlisting>
     </sect2>
+
     <sect2 id="zend.auth.adapter.dbtable.advanced.advanced_usage">
         <title>Advanced Usage By Example</title>
+
         <para>
             While the primary purpose of <classname>Zend_Auth</classname> (and consequently
             <classname>Zend_Auth_Adapter_DbTable</classname>) is primarily
@@ -231,11 +244,13 @@ if ($result->isValid()) {
              sometimes makes sense to solve what could look like an
              authorization problem within the authentication adapter.
         </para>
+
         <para>
             With that disclaimer out of the way, <classname>Zend_Auth_Adapter_DbTable</classname>
             has some built in mechanisms that can be leveraged for additional checks at
             authentication time to solve some common user problems.
         </para>
+
         <programlisting language="php"><![CDATA[
 // The status field value of an account is not equal to "compromised"
 $adapter = new Zend_Auth_Adapter_DbTable(
@@ -254,6 +269,7 @@ $adapter = new Zend_Auth_Adapter_DbTable(
     'password',
     'MD5(?) AND active = "TRUE"'
 ]]></programlisting>
+
         <para>
             Another scenario can be the implementation of a salting mechanism.
             Salting is a term referring to a technique which can highly improve
@@ -262,18 +278,22 @@ $adapter = new Zend_Auth_Adapter_DbTable(
             to accomplish a successful brute force attack on the database using
             pre-computed hash values from a dictionary.
         </para>
+
         <para>
             Therefore, we need to modify our table to store our salt string:
         </para>
+
         <programlisting language="php"><![CDATA[
 $sqlAlter = "ALTER TABLE [users] "
           . "ADD COLUMN [password_salt] "
           . "AFTER [password]";
 ]]></programlisting>
+
         <para>
             Here's a simple way to generate a salt string for every user at
             registration:
         </para>
+
         <programlisting language="php"><![CDATA[
 for ($i = 0; $i < 50; $i++) {
     $dynamicSalt .= chr(rand(33, 126));
@@ -292,6 +312,7 @@ $adapter = new Zend_Auth_Adapter_DbTable(
     . "', ?, password_salt))"
 );
 ]]></programlisting>
+
         <note>
             <para>
                 You can improve security even more by using a static salt value
@@ -300,6 +321,7 @@ $adapter = new Zend_Auth_Adapter_DbTable(
                 server is intact your data is still unusable for the attacker.
             </para>
         </note>
+
         <para>
             Another alternative is to use the <methodname>getDbSelect()</methodname> method
             of the <classname>Zend_Auth_Adapter_DbTable</classname> after the adapter has been
@@ -311,11 +333,13 @@ $adapter = new Zend_Auth_Adapter_DbTable(
             as those values are placed into the select object at
             <methodname>authenticate()</methodname> time.
         </para>
+
         <para>
             An example of a situation where one might want to use the
             <methodname>getDbSelect()</methodname> method would check the status of a user, in
             other words to see if that user's account is enabled.
         </para>
+
         <programlisting language="php"><![CDATA[
 // Continuing with the example from above
 $adapter = new Zend_Auth_Adapter_DbTable(

documentation/manual/en/module_specs/Zend_Auth_Adapter_Digest.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.auth.adapter.digest">
-
     <title>Digest Authentication</title>
 
     <sect2 id="zend.auth.adapter.digest.introduction">
-
         <title>Introduction</title>
 
         <para>
@@ -28,11 +26,13 @@
                     username, such as "<emphasis><filename>joe.user</filename></emphasis>"
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     realm, such as "<emphasis>Administrative Area</emphasis>"
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <acronym>MD5</acronym> hash of the username, realm, and password, separated
@@ -49,11 +49,9 @@
         <programlisting language="txt"><![CDATA[
 someUser:Some Realm:fde17b91c3a510ecbaf7dbd37f59d4f8
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.digest.specifics">
-
         <title>Specifics</title>
 
         <para>
@@ -67,16 +65,19 @@ someUser:Some Realm:fde17b91c3a510ecbaf7dbd37f59d4f8
                     filename - Filename against which authentication queries are performed
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     realm - Digest authentication realm
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     username - Digest authentication user
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     password - Password for the user of the realm
@@ -87,11 +88,9 @@ someUser:Some Realm:fde17b91c3a510ecbaf7dbd37f59d4f8
         <para>
             These parameters must be set prior to calling <methodname>authenticate()</methodname>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.digest.identity">
-
         <title>Identity</title>
 
         <para>
@@ -122,9 +121,7 @@ Array
 )
 */
 ]]></programlisting>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Auth_Adapter_Http.xml

@@ -28,17 +28,20 @@
                     Supports both Basic and Digest authentication.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Issues challenges in all supported schemes, so client can respond with any
                     scheme it supports.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Supports proxy authentication.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Includes support for authenticating against text files and provides an
@@ -59,22 +62,22 @@
                     attack protection.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Authentication with integrity checking, or "auth-int".
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Authentication-Info <acronym>HTTP</acronym> header.
                 </para>
             </listitem>
         </itemizedlist>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.design_overview">
-
         <title>Design Overview</title>
 
         <para>
@@ -86,11 +89,9 @@
             are then compared to the values submitted by the client to determine whether
             authentication is successful.
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.configuration_options">
-
         <title>Configuration Options</title>
 
         <para>
@@ -101,6 +102,7 @@
 
         <table id="zend.auth.adapter.configuration_options.table">
             <title>Configuration Options</title>
+
             <tgroup cols="3">
                 <thead>
                     <row>
@@ -109,50 +111,62 @@
                         <entry>Description</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry><emphasis><property>accept_schemes</property></emphasis></entry>
                         <entry>Yes</entry>
+
                         <entry>
                             Determines which authentication schemes the adapter will accept from
                             the client. Must be a space-separated list containing
                             <emphasis>'basic'</emphasis> and/or <emphasis>'digest'</emphasis>.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>realm</property></emphasis></entry>
                         <entry>Yes</entry>
+
                         <entry>
                             Sets the authentication realm; usernames should be unique within a
                             given realm.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>digest_domains</property></emphasis></entry>
+
                         <entry>
                             Yes, when <property>accept_schemes</property> contains
                             <emphasis>digest</emphasis>
                         </entry>
+
                         <entry>
                             Space-separated list of <acronym>URI</acronym>s for which the same
                             authentication information is valid. The <acronym>URI</acronym>s need
                             not all point to the same server.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>nonce_timeout</property></emphasis></entry>
+
                         <entry>
                             Yes, when <property>accept_schemes</property> contains
                             <emphasis>digest</emphasis>
                         </entry>
+
                         <entry>
                             Sets the number of seconds for which the nonce is valid. See notes
                             below.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>proxy_auth</property></emphasis></entry>
                         <entry>No</entry>
+
                         <entry>
                             Disabled by default. Enable to perform Proxy authentication, instead
                             of normal origin server authentication.
@@ -173,11 +187,9 @@
                 implemented.
             </para>
         </note>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.http.resolvers">
-
         <title>Resolvers</title>
 
         <para>
@@ -196,7 +208,6 @@
         </para>
 
         <sect3 id="zend.auth.adapter.http.resolvers.file">
-
             <title>File Resolver</title>
 
             <para>
@@ -242,13 +253,10 @@ $resolver->setFile($path);
             <para>
                 If the given path is empty or not readable, an exception is thrown.
             </para>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.http.basic_usage">
-
         <title>Basic Usage</title>
 
         <para>
@@ -313,9 +321,7 @@ if (!$result->isValid()) {
     // Bad userame/password, or canceled password prompt
 }
 ]]></programlisting>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.auth.adapter.ldap">
-
     <title>LDAP Authentication</title>
 
     <sect2 id="zend.auth.adapter.ldap.introduction">
-
         <title>Introduction</title>
 
         <para>
@@ -26,11 +24,9 @@
             information for troubleshooting authentication problems, and example options for both
             Active Directory and OpenLDAP servers.
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.ldap.usage">
-
         <title>Usage</title>
 
         <para>
@@ -135,11 +131,9 @@ ldap.server2.baseDn = "CN=Users,DC=w,DC=net"
             domain name used by Windows, we provide it here for name canonicalization purposes
             (described in the <emphasis>Username Canonicalization</emphasis> section below).
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.ldap.api">
-
         <title>The API</title>
 
         <para>
@@ -200,6 +194,7 @@ Array
 
         <note>
             <title>What is a Distinguished Name?</title>
+
             <para>
                 A DN or "distinguished name" is a string that represents the path to an object
                 within the <acronym>LDAP</acronym> directory. Each comma-separated component is an
@@ -230,6 +225,7 @@ Array
 
         <note>
             <title>The Gory Details: What Happens in the Authenticate Method?</title>
+
             <para>
                 When the <methodname>authenticate()</methodname> method is called, the adapter
                 iterates over each set of server options, sets them on the internal
@@ -263,11 +259,9 @@ Array
             <methodname>setUsername()</methodname> and <methodname>setPassword()</methodname>
             methods.
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.ldap.server-options">
-
         <title>Server Options</title>
 
         <para>
@@ -279,6 +273,7 @@ Array
 
         <table id="zend.auth.adapter.ldap.server-options.table">
             <title>Server Options</title>
+
             <tgroup cols="2">
                 <thead>
                     <row>
@@ -286,16 +281,20 @@ Array
                         <entry>Description</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry><emphasis><property>host</property></emphasis></entry>
+
                         <entry>
                             The hostname of <acronym>LDAP</acronym> server that these options
                             represent. This option is required.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>port</property></emphasis></entry>
+
                         <entry>
                             The port on which the <acronym>LDAP</acronym> server is listening. If
                             <emphasis>useSsl</emphasis> is <constant>TRUE</constant>, the default
@@ -304,8 +303,10 @@ Array
                             value is 389.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>useStartTls</property></emphasis></entry>
+
                         <entry>
                             Whether or not the <acronym>LDAP</acronym> client should use
                             <acronym>TLS</acronym> (aka <acronym>SSL</acronym>v2) encrypted
@@ -320,8 +321,10 @@ Array
                             mechanism.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>useSsl</property></emphasis></entry>
+
                         <entry>
                             Whether or not the <acronym>LDAP</acronym> client should use
                             <acronym>SSL</acronym> encrypted transport. The
@@ -333,8 +336,10 @@ Array
                             description above).
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>username</property></emphasis></entry>
+
                         <entry>
                             The DN of the account used to perform account DN lookups.
                             <acronym>LDAP</acronym> servers that require the username to be in DN
@@ -346,16 +351,20 @@ Array
                             based on the <emphasis>Principle of Least Privilege</emphasis>).
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>password</property></emphasis></entry>
+
                         <entry>
                             The password of the account used to perform account DN lookups. If this
                             option is not supplied, the <acronym>LDAP</acronym> client will attempt
                             an "anonymous bind" when performing account DN lookups.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>bindRequiresDn</property></emphasis></entry>
+
                         <entry>
                             Some <acronym>LDAP</acronym> servers require that the username used to
                             bind be in DN form like
@@ -376,8 +385,10 @@ Array
                             accounts. See the <property>accountFilterFormat</property> option.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>baseDn</property></emphasis></entry>
+
                         <entry>
                             The DN under which all accounts being authenticated are located. This
                             option is required. if you are uncertain about the correct
@@ -391,10 +402,12 @@ Array
                             however.
                         </entry>
                     </row>
+
                     <row>
                         <entry>
                             <emphasis><property>accountCanonicalForm</property></emphasis>
                         </entry>
+
                         <entry>
                             A value of 2, 3 or 4 indicating the form to which account names should
                             be canonicalized after successful authentication. Values are as
@@ -422,8 +435,10 @@ Array
                             may be awkward for the application's high-level logic).
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>accountDomainName</property></emphasis></entry>
+
                         <entry>
                             The <acronym>FQDN</acronym> domain name for which the target
                             <acronym>LDAP</acronym> server is an authority (e.g.,
@@ -440,10 +455,12 @@ Array
                             use-cases that require generating the principal name form.
                         </entry>
                     </row>
+
                     <row>
                         <entry>
                             <emphasis><property>accountDomainNameShort</property></emphasis>
                         </entry>
+
                         <entry>
                             The 'short' domain for which the target <acronym>LDAP</acronym> server
                             is an authority (e.g., <acronym>FOO</acronym>). Note that there is a
@@ -457,8 +474,10 @@ Array
                             <filename>FOO\alice</filename>) are not supported.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>accountFilterFormat</property></emphasis></entry>
+
                         <entry>
                             The <acronym>LDAP</acronym> search filter used to search for accounts.
                             This string is a <ulink
@@ -475,8 +494,10 @@ Array
                                 '(&amp;(objectClass=user)(sAMAccountName=%s))</emphasis>'.
                         </entry>
                     </row>
+
                     <row>
                         <entry><emphasis><property>optReferrals</property></emphasis></entry>
+
                         <entry>
                             If set to <constant>TRUE</constant>, this option indicates to the
                             <acronym>LDAP</acronym> client that referrals should be followed. The
@@ -502,11 +523,9 @@ Array
                 that the OpenLDAP client can validate the server's identity.
             </para>
         </note>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.ldap.debugging">
-
         <title>Collecting Debugging Messages</title>
 
         <para>
@@ -518,6 +537,7 @@ Array
 
         <table id="zend.auth.adapter.ldap.debugging.table">
             <title>Debugging Messages</title>
+
             <tgroup cols="2">
                 <thead>
                     <row>
@@ -525,28 +545,31 @@ Array
                         <entry>Description</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry>Index 0</entry>
+
                         <entry>
                             A generic, user-friendly message that is suitable for displaying to
                             users (e.g., "Invalid credentials"). If the authentication is
                             successful, this string is empty.
                         </entry>
                     </row>
+
                     <row>
                         <entry>Index 1</entry>
+
                         <entry>
                             A more detailed error message that is not suitable to be displayed to
                             users but should be logged for the benefit of server operators. If the
                             authentication is successful, this string is empty.
                         </entry>
                     </row>
+
                     <row>
                         <entry>Indexes 2 and higher</entry>
-                        <entry>
-                            All log messages in order starting at index 2.
-                        </entry>
+                        <entry>All log messages in order starting at index 2.</entry>
                     </row>
                 </tbody>
             </tgroup>
@@ -558,15 +581,12 @@ Array
             indexes 2 and higher could be logged as well (although the final message always includes
             the string from index 1).
         </para>
-
     </sect2>
 
     <sect2 id="zend.auth.adapter.ldap.options-common-server-specific">
-
         <title>Common Options for Specific Servers</title>
 
         <sect3 id="zend.auth.adapter.ldap.options-common-server-specific.active-directory">
-
             <title>Options for Active Directory</title>
 
             <para>
@@ -576,6 +596,7 @@ Array
             <table
                 id="zend.auth.adapter.ldap.options-common-server-specific.active-directory.table">
                 <title>Options for Active Directory</title>
+
                 <tgroup cols="2">
                     <thead>
                         <row>
@@ -583,29 +604,34 @@ Array
                             <entry>Additional Notes</entry>
                         </row>
                     </thead>
+
                     <tbody>
                         <row>
                             <entry><emphasis><property>host</property></emphasis></entry>
-                            <entry>
-                                As with all servers, this option is required.
-                            </entry>
+                            <entry>As with all servers, this option is required.</entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>useStartTls</property></emphasis></entry>
+
                             <entry>
                                 For the sake of security, this should be <constant>TRUE</constant>
                                 if the server has the necessary certificate installed.
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>useSsl</property></emphasis></entry>
+
                             <entry>
                                 Possibly used as an alternative to <emphasis>useStartTls</emphasis>
                                 (see above).
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>baseDn</property></emphasis></entry>
+
                             <entry>
                                 As with all servers, this option is required. By default AD places
                                 all user accounts under the <emphasis>Users</emphasis> container
@@ -615,10 +641,12 @@ Array
                                 would be.
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountCanonicalForm</property></emphasis>
                             </entry>
+
                             <entry>
                                 You almost certainly want this to be 3 for backslash style names
                                 (e.g., <filename>FOO\alice</filename>), which are most familiar to
@@ -630,20 +658,24 @@ Array
                                 (See also note below.)
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountDomainName</property></emphasis>
                             </entry>
+
                             <entry>
                                 This is required with AD unless
                                 <property>accountCanonicalForm</property> 2 is used, which, again,
                                 is discouraged.
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountDomainNameShort</property></emphasis>
                             </entry>
+
                             <entry>
                                 The NetBIOS name of the domain that users are in and for which the
                                 AD server is an authority. This is required if the backslash style
@@ -664,11 +696,9 @@ Array
                     be the source of security issues, so always try to use qualified account names.
                 </para>
             </note>
-
         </sect3>
 
         <sect3 id="zend.auth.adapter.ldap.options-common-server-specific.openldap">
-
             <title>Options for OpenLDAP</title>
 
             <para>
@@ -678,6 +708,7 @@ Array
 
             <table id="zend.auth.adapter.ldap.options-common-server-specific.openldap.table">
                 <title>Options for OpenLDAP</title>
+
                 <tgroup cols="2">
                     <thead>
                         <row>
@@ -685,61 +716,74 @@ Array
                             <entry>Additional Notes</entry>
                         </row>
                     </thead>
+
                     <tbody>
                         <row>
                             <entry><emphasis><property>host</property></emphasis></entry>
-                            <entry>
-                                As with all servers, this option is required.
-                            </entry>
+                            <entry>As with all servers, this option is required.</entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>useStartTls</property></emphasis></entry>
+
                             <entry>
                                 For the sake of security, this should be <constant>TRUE</constant>
                                 if the server has the necessary certificate installed.
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>useSsl</property></emphasis></entry>
+
                             <entry>
                                 Possibly used as an alternative to <property>useStartTls</property>
                                 (see above).
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>username</property></emphasis></entry>
+
                             <entry>
                                 Required and must be a DN, as OpenLDAP requires that usernames be
                                 in DN form when performing a bind. Try to use an unprivileged
                                 account.
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>password</property></emphasis></entry>
+
                             <entry>
                                 The password corresponding to the username above, but this may be
                                 omitted if the <acronym>LDAP</acronym> server permits an anonymous
                                 binding to query user accounts.
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>bindRequiresDn</property></emphasis></entry>
+
                             <entry>
                                 Required and must be <constant>TRUE</constant>, as OpenLDAP
                                 requires that usernames be in DN form when performing a bind.
                             </entry>
                         </row>
+
                         <row>
                             <entry><emphasis><property>baseDn</property></emphasis></entry>
+
                             <entry>
                                 As with all servers, this option is required and indicates the DN
                                 under which all accounts being authenticated are located.
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountCanonicalForm</property></emphasis>
                             </entry>
+
                             <entry>
                                 Optional, but the default value is 4 (principal style names like
                                 <filename>alice@foo.net</filename>), which may not be ideal if your
@@ -748,20 +792,24 @@ Array
                                 value 3.
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountDomainName</property></emphasis>
                             </entry>
+
                             <entry>
                                 Required unless you're using
                                 <property>accountCanonicalForm</property> 2, which is not
                                 recommended.
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <emphasis><property>accountDomainNameShort</property></emphasis>
                             </entry>
+
                             <entry>
                                 If AD is not also being used, this value is not required.
                                 Otherwise, if <property>accountCanonicalForm</property> 3 is used,
@@ -772,7 +820,7 @@ Array
                                 <property>accountDomainNameShort</property> value might be
                                 <acronym>FOO</acronym>).
                             </entry>
-                      </row>
+                        </row>
                     </tbody>
                 </tgroup>
             </table>

documentation/manual/en/module_specs/Zend_Auth_Adapter_OpenId.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.auth.adapter.openid">
-
     <title>Open ID Authentication</title>
 
     <sect2 id="zend.auth.adapter.openid.introduction">
-
         <title>Introduction</title>
+
         <para>
             The <classname>Zend_Auth_Adapter_OpenId</classname> adapter can be used to authenticate
             users using remote OpenID servers. This authentication method assumes that the user
@@ -15,6 +14,7 @@
             using a password or some other method. This password is never provided to
             the web application.
         </para>
+
         <para>
             The OpenID identity is just a <acronym>URI</acronym> that points to a web site
             with information about a user, along with special tags that
@@ -22,6 +22,7 @@
             You can read more about OpenID at the
             <ulink url="http://www.openid.net/">OpenID official site</ulink>.
         </para>
+
         <para>
             The <classname>Zend_Auth_Adapter_OpenId</classname> class wraps
             the <classname>Zend_OpenId_Consumer</classname> component, which implements the
@@ -40,6 +41,7 @@
 
     <sect2 id="zend.auth.adapter.openid.specifics">
         <title>Specifics</title>
+
         <para>
             As is the case for all <classname>Zend_Auth</classname> adapters, the
             <classname>Zend_Auth_Adapter_OpenId</classname> class implements
@@ -129,7 +131,6 @@ if ((isset($_POST['openid_action']) &&
             in more detail in the <classname>Zend_OpenId_Consumer</classname>
             chapter.
         </para>
-
     </sect2>
 </sect1>
 <!--

documentation/manual/en/module_specs/Zend_Translate-Additional.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.translate.additional">
-
     <title>Additional features for translation</title>
 
     <para>
@@ -10,7 +9,6 @@
     </para>
 
     <sect2 id="zend.translate.additional.options">
-
         <title>Options for adapters</title>
 
         <para>
@@ -30,6 +28,7 @@
 
         <example id="zend.translate..additional.options.example">
             <title>Using translation options</title>
+
             <programlisting language="php"><![CDATA[
 // define ':' as separator for the translation source files
 $options = array('delimiter' => ':');
@@ -63,30 +62,38 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
                         <entry>Default value</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry>clear</entry>
                         <entry>all</entry>
+
                         <entry>
                             If set to <constant>TRUE</constant>, the already read translations will
                             be cleared. This can be used instead of creating a new instance when
                             reading new translation data
                         </entry>
+
                         <entry><emphasis><constant>FALSE</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>disableNotices</entry>
                         <entry>all</entry>
+
                         <entry>
                             If set to <constant>TRUE</constant>, all notices regarding not available
                             translations will be disabled. You should set this option to
                             <constant>TRUE</constant> in production environment
                         </entry>
+
                         <entry><emphasis><constant>FALSE</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>ignore</entry>
                         <entry>all</entry>
+
                         <entry>
                             All directories and files beginning with this prefix will be ignored
                             when searching for files. This value defaults to
@@ -96,27 +103,32 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
                             <code>'tmpFiles'</code> would be ignored as well as all subsequent
                             directories
                         </entry>
+
                         <entry><emphasis>.</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>log</entry>
                         <entry>all</entry>
+
                         <entry>
                             An instance of <classname>Zend_Log</classname> where untranslated
                             messages and notices will be written to
                         </entry>
+
                         <entry><emphasis><constant>NULL</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>logMessage</entry>
                         <entry>all</entry>
-                        <entry>
-                            The message which will be written into the log
-                        </entry>
+                        <entry>The message which will be written into the log</entry>
+
                         <entry>
                             <emphasis>Untranslated message within '%locale%': %message%</emphasis>
                         </entry>
                     </row>
+
                     <row>
                         <entry>logUntranslated</entry>
                         <entry>all</entry>
@@ -128,6 +140,7 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
 
                         <entry><emphasis><constant>FALSE</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>reload</entry>
                         <entry>all</entry>
@@ -141,6 +154,7 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
 
                         <entry><emphasis><constant>FALSE</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>scan</entry>
                         <entry>all</entry>
@@ -157,32 +171,42 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
 
                         <entry><emphasis><constant>NULL</constant></emphasis></entry>
                     </row>
+
                     <row>
                         <entry>delimiter</entry>
                         <entry>Csv</entry>
+
                         <entry>
                             Defines which sign is used as delimiter for separating source and
                             translation
                         </entry>
+
                         <entry><emphasis>;</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>enclosure</entry>
                         <entry>Csv</entry>
+
                         <entry>
                             Defines the enclosure character to be used. Defaults to a doublequote
                         </entry>
+
                         <entry><emphasis>"</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>length</entry>
                         <entry>Csv</entry>
+
                         <entry>
                             Defines the maximum length of a csv line. When set to 0 it will be
                             detected automatically
                         </entry>
+
                         <entry><emphasis>0</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>useId</entry>
                         <entry>Xliff</entry>
@@ -202,23 +226,22 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
 
         <para>
             When you want to have self defined options, you are also able to use them within all
-            adapters. The <methodname>setOptions()</methodname> method can be used to define your option.
-            <methodname>setOptions()</methodname> needs an array with the options you want to set. If an given
-            option exists it will be signed over. You can define as much options as needed as they
-            will not be checked by the adapter. Just make sure not to overwrite any existing option
-            which is used by an adapter.
+            adapters. The <methodname>setOptions()</methodname> method can be used to define your
+            option. <methodname>setOptions()</methodname> needs an array with the options you want
+            to set. If an given option exists it will be signed over. You can define as much options
+            as needed as they will not be checked by the adapter. Just make sure not to overwrite
+            any existing option which is used by an adapter.
         </para>
 
         <para>
             To return the option you can use the <methodname>getOptions()</methodname> method. When
-            <methodname>getOptions()</methodname> is called without a parameter it will return all options set.
-            When the optional parameter is given you will only get the specified option.
+            <methodname>getOptions()</methodname> is called without a parameter it will return all
+            options set. When the optional parameter is given you will only get the specified
+            option.
         </para>
-
     </sect2>
 
     <sect2 id="zend.translate.additional.languages">
-
         <title>Handling languages</title>
 
         <para>
@@ -226,33 +249,35 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
         </para>
 
         <para>
-            The <methodname>getLocale()</methodname> method can be used to get the currently set language. It
-            can either hold an instance of <classname>Zend_Locale</classname> or the identifier of
-            a locale.
+            The <methodname>getLocale()</methodname> method can be used to get the currently set
+            language. It can either hold an instance of <classname>Zend_Locale</classname> or the
+            identifier of a locale.
         </para>
 
         <para>
-            The <methodname>setLocale()</methodname> method sets a new standard language for translation. This
-            prevents the need of setting the optional language parameter more than once to the
-            <methodname>translate()</methodname> method. If the given language does not exist, or no
-            translation data is available for the language, <methodname>setLocale()</methodname> tries to
-            downgrade to the language without the region if any was given. A language of
-            <code>en_US</code> would be downgraded to <code>en</code>. When even the downgraded
-            language can not be found an exception will be thrown.
+            The <methodname>setLocale()</methodname> method sets a new standard language for
+            translation. This prevents the need of setting the optional language parameter more than
+            once to the <methodname>translate()</methodname> method. If the given language does not
+            exist, or no translation data is available for the language,
+            <methodname>setLocale()</methodname> tries to downgrade to the language without the
+            region if any was given. A language of <code>en_US</code> would be downgraded to
+            <code>en</code>. When even the downgraded language can not be found an exception will be
+            thrown.
         </para>
 
         <para>
-            The <methodname>isAvailable()</methodname> method checks if a given language is already available.
-            It returns <constant>TRUE</constant> if data for the given language exist.
+            The <methodname>isAvailable()</methodname> method checks if a given language is already
+            available. It returns <constant>TRUE</constant> if data for the given language exist.
         </para>
 
         <para>
-            And finally the <methodname>getList()</methodname> method can be used to get all currently set
-            languages for an adapter returned as array.
+            And finally the <methodname>getList()</methodname> method can be used to get all
+            currently set languages for an adapter returned as array.
         </para>
 
         <example id="zend.translate.additional.languages.example">
             <title>Handling languages with adapters</title>
+
             <programlisting language="php"><![CDATA[
 // returns the currently set language
 $actual = $translate->getLocale();
@@ -275,16 +300,16 @@ if ($translate->isAvailable("fr")) {
         </example>
 
         <sect3 id="zend.translate.additional.languages.automatic">
-
             <title>Automatical handling of languages</title>
 
             <para>
                 Note that as long as you only add new translation sources with the
-                <methodname>addTranslation()</methodname> method <classname>Zend_Translate</classname> will
-                automatically set the best fitting language for your environment when you use one
-                of the automatic locales which are '<code>auto</code>' or '<code>browser</code>'.
-                So normally you will not need to call <methodname>setLocale()</methodname>. This should only be
-                used in conjunction with automatic source detection.
+                <methodname>addTranslation()</methodname> method
+                <classname>Zend_Translate</classname> will automatically set the best fitting
+                language for your environment when you use one of the automatic locales which are
+                '<code>auto</code>' or '<code>browser</code>'. So normally you will not need to call
+                <methodname>setLocale()</methodname>. This should only be used in conjunction with
+                automatic source detection.
             </para>
 
             <para>
@@ -294,6 +319,7 @@ if ($translate->isAvailable("fr")) {
 
             <example id="zend.translate.additional.languages.automatic.example">
                 <title>Automatically language detection</title>
+
                 <programlisting language="php"><![CDATA[
 // Let's expect the browser returns these language settings:
 // HTTP_ACCEPT_LANGUAGE = "de_AT=1;fr=1;en_US=0.8";
@@ -336,14 +362,14 @@ $translate->setLocale('it_IT');
             </example>
 
             <para>
-                After setting a language manually with the <methodname>setLocale()</methodname> method the
-                automatic detection will be switched off and overridden.
+                After setting a language manually with the <methodname>setLocale()</methodname>
+                method the automatic detection will be switched off and overridden.
             </para>
 
             <para>
                 If you want to use it again, you can set the language
-                <emphasis>auto</emphasis> with <methodname>setLocale()</methodname> which will reactivate
-                the automatic detection for <classname>Zend_Translate</classname>.
+                <emphasis>auto</emphasis> with <methodname>setLocale()</methodname> which will
+                reactivate the automatic detection for <classname>Zend_Translate</classname>.
             </para>
 
             <para>
@@ -372,13 +398,10 @@ if (!$translate->isAvailable($locale->getLanguage())) {
 
 $translate->getLocale();
 ]]></programlisting>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.translate.additional.detection">
-
         <title>Automatic source detection</title>
 
         <para>
@@ -401,6 +424,7 @@ $translate->getLocale();
 
         <example id="zend.translate.additional.languages.directory.example">
             <title>Scanning a directory structure for sources</title>
+
             <programlisting language="php"><![CDATA[
 // assuming we have the following structure
 //  /language/
@@ -438,7 +462,6 @@ $translate = new Zend_Translate('tmx', '/language');
         </para>
 
         <sect3 id="zend.translate.additional.detection.directory">
-
             <title>Language through naming directories</title>
 
             <para>
@@ -455,6 +478,7 @@ $translate = new Zend_Translate('tmx', '/language');
 
             <example id="zend.translate.additional.detection.directory.example">
                 <title>Directory scanning for languages</title>
+
                 <programlisting language="php"><![CDATA[
 // assuming we have the following structure
 //  /language/
@@ -490,11 +514,9 @@ $translate = new Zend_Translate(
                     undefined and it is recommended to use file detection in such situations.
                 </para>
             </note>
-
         </sect3>
 
         <sect3 id="zend.translate.additional.detection.filename">
-
             <title>Language through filenames</title>
 
             <para>
@@ -507,6 +529,7 @@ $translate = new Zend_Translate(
 
             <example id="zend.translate.additional.detection.filename.example">
                 <title>Filename scanning for languages</title>
+
                 <programlisting language="php"><![CDATA[
 // assuming we have the following structure
 //  /language/
@@ -524,7 +547,6 @@ $translate = new Zend_Translate(
             </example>
 
             <sect4 id="zend.translate.additional.detection.filename.complete">
-
                 <title>Complete filename</title>
 
                 <para>
@@ -538,11 +560,9 @@ $translate = new Zend_Translate(
 /languages/de.mo
 /languages/es.mo
 ]]></programlisting>
-
             </sect4>
 
             <sect4 id="zend.translate.additional.detection.filename.extension">
-
                 <title>Extension of the file</title>
 
                 <para>
@@ -557,11 +577,9 @@ $translate = new Zend_Translate(
 /languages/view.de
 /languages/view.es
 ]]></programlisting>
-
             </sect4>
 
             <sect4 id="zend.translate.additional.detection.filename.token">
-
                 <title>Filename tokens</title>
 
                 <para>
@@ -602,36 +620,33 @@ $translate = new Zend_Translate(
 /languages/view-en_it.mo -> detects italian because '_' will be used before '-'
 /languages/view_en.it.mo -> detects italian because '.' will be used before '_'
 ]]></programlisting>
-
             </sect4>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.translate.additional.istranslated">
-
         <title>Checking for translations</title>
 
         <para>
             Normally text will be translated without any computation. But sometimes it is necessary
-            to know if a text is translated or not, therefor the <methodname>isTranslated()</methodname>
-            method can be used.
+            to know if a text is translated or not, therefor the
+            <methodname>isTranslated()</methodname> method can be used.
         </para>
 
         <para>
-            <methodname>isTranslated($messageId, $original = false, $locale = null)</methodname> takes
-            the text you want to check as its first parameter, and as optional third parameter the
-            locale for which you want to do the check. The optional second parameter declares
+            <methodname>isTranslated($messageId, $original = false, $locale = null)</methodname>
+            takes the text you want to check as its first parameter, and as optional third parameter
+            the locale for which you want to do the check. The optional second parameter declares
             whether translation is fixed to the declared language or a lower set of translations
             can be used. If you have a text which can be returned for 'en' but not for 'en_US' you
-            will normally get the translation returned, but by setting <varname>$original</varname> to
-            <constant>TRUE</constant>, <methodname>isTranslated()</methodname> will return
+            will normally get the translation returned, but by setting <varname>$original</varname>
+            to <constant>TRUE</constant>, <methodname>isTranslated()</methodname> will return
             <constant>FALSE</constant>.
         </para>
 
         <example id="zend.translate.additional.istranslated.example">
             <title>Checking if a text is translatable</title>
+
             <programlisting language="php"><![CDATA[
 $english = array(
     'message1' => 'Nachricht 1',
@@ -654,11 +669,9 @@ if ($translate->isTranslated('message1', false, 'de')) {
 }
 ]]></programlisting>
         </example>
-
     </sect2>
 
     <sect2 id="zend.translate.additional.logging">
-
         <title>How to log not found translations</title>
 
         <para>
@@ -675,6 +688,7 @@ if ($translate->isTranslated('message1', false, 'de')) {
 
         <example id="zend.translate.additional.logging.example">
             <title>Log translations</title>
+
             <programlisting language="php"><![CDATA[
 $translate = new Zend_Translate('gettext', $path, 'de');
 
@@ -721,6 +735,7 @@ $translate->translate('unknown string');
 
         <example id="zend.translate.additional.logging.example2">
             <title>Self defined log messages</title>
+
             <programlisting language="php"><![CDATA[
 $translate = new Zend_Translate('gettext', $path, 'de');
 
@@ -737,11 +752,9 @@ $translate->setOptions(array(
 $translate->translate('unknown string');
 ]]></programlisting>
         </example>
-
     </sect2>
 
     <sect2 id="zend.translate.additional.sourcedata">
-
         <title>Accessing source data</title>
 
         <para>
@@ -750,27 +763,28 @@ $translate->translate('unknown string');
         </para>
 
         <para>
-            The <methodname>getMessageIds($locale = null)</methodname> method returns all known message IDs as
-            array.
+            The <methodname>getMessageIds($locale = null)</methodname> method returns all known
+            message IDs as array.
         </para>
 
         <para>
-            The <methodname>getMessages($locale = null)</methodname> method returns the complete translation
-            source as an array. The message ID is used as key and the translation data as value.
+            The <methodname>getMessages($locale = null)</methodname> method returns the complete
+            translation source as an array. The message ID is used as key and the translation data
+            as value.
         </para>
 
         <para>
-            Both methods accept an optional parameter <varname>$locale</varname> which, if set, returns
-            the translation data for the specified language. If this parameter is not given, the
-            actual set language will be used. Keep in mind that normally all translations should be
-            available in all languages. Which means that in a normal situation you will not have to
-            set this parameter.
+            Both methods accept an optional parameter <varname>$locale</varname> which, if set,
+            returns the translation data for the specified language. If this parameter is not given,
+            the actual set language will be used. Keep in mind that normally all translations should
+            be available in all languages. Which means that in a normal situation you will not have
+            to set this parameter.
         </para>
 
         <para>
-            Additionally the <methodname>getMessages()</methodname> method can be used to return the complete
-            translation dictionary using the pseudo-locale 'all'. This will return all available
-            translation data for each added locale.
+            Additionally the <methodname>getMessages()</methodname> method can be used to return the
+            complete translation dictionary using the pseudo-locale 'all'. This will return all
+            available translation data for each added locale.
         </para>
 
         <note>
@@ -782,6 +796,7 @@ $translate->translate('unknown string');
 
         <example id="zend.translate.additional.sourcedata.example">
             <title>Handling languages with adapters</title>
+
             <programlisting language="php"><![CDATA[
 // returns all known message IDs
 $messageIds = $translate->getMessageIds();
@@ -796,9 +811,7 @@ $source = $translate->getMessages();
 print_r($source);
 ]]></programlisting>
         </example>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_Translate-Introduction.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.translate.introduction">
-
     <title>Introduction</title>
 
     <para>
@@ -24,6 +23,7 @@
                 The usage of gettext for example is very complicated.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>PHP supports only gettext and native array:</emphasis>
@@ -32,6 +32,7 @@
                 because there is no native support.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>No detection of the default language:</emphasis>
@@ -40,6 +41,7 @@
                 the different web browsers.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>Gettext is not thread-safe:</emphasis>
@@ -53,8 +55,8 @@
 
     <para>
         <classname>Zend_Translate</classname> does not have the above problems. This is why we
-        recommend using <classname>Zend_Translate</classname> instead of <acronym>PHP</acronym>'s native functions.
-        The benefits of <classname>Zend_Translate</classname> are:
+        recommend using <classname>Zend_Translate</classname> instead of <acronym>PHP</acronym>'s
+        native functions. The benefits of <classname>Zend_Translate</classname> are:
     </para>
 
     <itemizedlist>
@@ -66,6 +68,7 @@
                 and CSV files.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>Thread-safe gettext:</emphasis>
@@ -73,11 +76,12 @@
                 There are no problems using it in multi-threaded environments.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>Easy and generic <acronym>API</acronym>:</emphasis>
-                The <acronym>API</acronym> of <classname>Zend_Translate</classname> is very simple and requires only a
-                handful of functions.
+                The <acronym>API</acronym> of <classname>Zend_Translate</classname> is very simple
+                and requires only a handful of functions.
                 So it's easy to learn and easy to maintain.
                 All source formats are handled the same way, so if the format
                 of your source files change from Gettext to TMX,
@@ -85,6 +89,7 @@
                 storage adapter.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>Detection of the user's standard language:</emphasis>
@@ -92,17 +97,18 @@
                 detected and used by <classname>Zend_Translate</classname>.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <emphasis>Automatic source detection:</emphasis>
-                <classname>Zend_Translate</classname> is capable of detecting and integrating multiple source files
-                and additionally detect the locale to be used depending on directory or filenames.
+                <classname>Zend_Translate</classname> is capable of detecting and integrating
+                multiple source files and additionally detect the locale to be used depending on
+                directory or filenames.
             </para>
         </listitem>
     </itemizedlist>
 
     <sect2 id="zend.translate.introduction.adapters">
-
         <title>Starting multi-lingual</title>
 
         <para>
@@ -121,16 +127,19 @@
                     Decide which adapter you want to use;
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Create your view and integrate <classname>Zend_Translate</classname> in your code;
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Create the source file from your code;
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Translate your source file to the desired language.
@@ -143,9 +152,7 @@
             Read through the next few pages to create your own
             multi-lingual web application.
         </para>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/module_specs/Zend_XmlRpc_Server.xml

@@ -114,6 +114,7 @@ echo $server->handle();
 
     <sect2 id="zend.xmlrpc.server.conventions">
         <title>Conventions</title>
+
         <para>
             <classname>Zend_XmlRpc_Server</classname> allows the developer to attach functions and
             class method calls as dispatchable <acronym>XML-RPC</acronym> methods. Via
@@ -454,9 +455,10 @@ $server->setClass('Services_PricingService',
 ]]></programlisting>
 
             <para>
-                The arguments passed at <methodname>setClass()</methodname> at server construction time are
-                injected into the method call <command>pricing.calculate()</command> on remote invokation.
-                In the example above, only the argument <code>$purchaseId</code> is expected from the client.
+                The arguments passed at <methodname>setClass()</methodname> at server construction
+                time are injected into the method call <command>pricing.calculate()</command> on
+                remote invokation. In the example above, only the argument <code>$purchaseId</code>
+                is expected from the client.
             </para>
         </example>
 
@@ -648,8 +650,7 @@ echo $server->handle($request);
             <title>Cache server definitions between requests</title>
 
             <para>
-                The example below illustrates caching server definitions
-                between requests.
+                The example below illustrates caching server definitions between requests.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -689,7 +690,6 @@ echo $server->handle($request);
         </note>
 
         <example id="zend.xmlrpc.server.performance.xmlgen">
-
             <title>Optimizing XML generation</title>
 
             <para>