[MANUAL] English:

- structural fixes (no translations needed)

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

documentation/manual/en/ref/coding_standard.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <appendix id="coding-standard">
-  <title>Zend Framework Coding Standard for PHP</title>
+    <title>Zend Framework Coding Standard for PHP</title>
+
     <sect1 id="coding-standard.overview">
         <title>Overview</title>
 
@@ -1135,7 +1136,6 @@ switch ($numPeople) {
             </sect3>
         </sect2>
     </sect1>
-
 </appendix>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/ref/copyrights.xml

@@ -11,8 +11,7 @@
         Copyright &#169; 2005-<?dbtimestamp format="Y"?> Zend Technologies Inc.
         (<ulink url="http://www.zend.com" />)
     </para>
-
 </appendix>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/documentation-standard.xml

@@ -76,7 +76,6 @@
             <title>Indentation</title>
 
             <para>Indentation should consist of 4 spaces. Tabs are not allowed.</para>
-
             <para>Tags which are at the same level must have the same indentation.</para>
 
             <programlisting language="xml"><![CDATA[

documentation/manual/en/ref/installation.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <chapter id="introduction.installation">
-
     <title>Installation</title>
 
     <para>
@@ -25,6 +24,7 @@
                 good choice for those who are new to Zend Framework.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <ulink url="http://framework.zend.com/download/snapshot">Download the latest
@@ -35,6 +35,7 @@
                 developments, consider using a Subversion (<acronym>SVN</acronym>) client.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 Using a <ulink url="http://subversion.tigris.org">Subversion</ulink>
@@ -45,11 +46,13 @@
                 contribute back to the framework, or need to upgrade your framework version
                 more often than releases occur.
             </para>
+
             <para>
                 <ulink url="http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.export.html">
                 Exporting</ulink> is useful if you want to get a particular framework revision
                 without the <filename>.svn</filename> directories as created in a working copy.
             </para>
+
             <para>
                 <ulink url="http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.checkout.html">
                 Check out a working copy</ulink> if you want contribute to Zend Framework, a
@@ -60,12 +63,14 @@
                 <ulink url="http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.commit.html">
                 svn commit</ulink> command.
             </para>
+
             <para>
                 An
                 <ulink url="http://svnbook.red-bean.com/nightly/en/svn.advanced.externals.html">
                 externals definition</ulink> is quite convenient for developers already using
                 <acronym>SVN</acronym> to manage their application's working copies.
             </para>
+
             <para>
                 The <acronym>URL</acronym> for the trunk of Zend Framework's <acronym>SVN</acronym>
                 repository is: <ulink
@@ -96,5 +101,4 @@
         combination of them in your own applications. The following chapters provide a
         comprehensive reference to Zend Framework on a component-by-component basis.
     </para>
-
 </chapter>

documentation/manual/en/ref/language-snippets.xml

@@ -51,4 +51,3 @@
 <!ENTITY requirements.all.components            'All Components'>
 <!ENTITY requirements.virtually.all.components  'Virtually all components'>
 <!ENTITY requirements.all.pdo.adapters          'All <acronym>PDO</acronym> database adapters'>
-

documentation/manual/en/ref/migration-06.xml

@@ -75,6 +75,7 @@ $ctrl->dispatch();
                             Set <methodname>throwExceptions()</methodname> in the front
                             controller:
                         </para>
+
                         <programlisting language="php"><![CDATA[
 $front->throwExceptions(true);
 ]]></programlisting>
@@ -85,6 +86,7 @@ $front->throwExceptions(true);
                             Set <methodname>renderExceptions()</methodname> in the response
                             object:
                         </para>
+
                         <programlisting language="php"><![CDATA[
 $response->renderExceptions(true);
 $front->setResponse($response);
@@ -256,4 +258,4 @@ public function __call($method, $args)
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-08.xml

@@ -98,4 +98,4 @@ final protected function _forward($action,
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-09.xml

@@ -27,12 +27,14 @@
                     <methodname>Zend_Controller_Action_Helper_Redirector::setCode()</methodname>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>setRedirectPrependBase()</methodname>; use
                     <methodname>Zend_Controller_Action_Helper_Redirector::setPrependBase()</methodname>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>setRedirectExit()</methodname>; use
@@ -53,4 +55,4 @@
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-10.xml

@@ -70,15 +70,10 @@ $front->setParam('noViewRenderer', true);
         </para>
 
         <itemizedlist>
-            <listitem>
-                <para>Calls to <command>$this->render();</command></para>
-            </listitem>
-            <listitem>
-                <para>Calls to <command>$this->_forward();</command></para>
-            </listitem>
-            <listitem>
-                <para>Calls to <command>$this->_redirect();</command></para>
-            </listitem>
+            <listitem><para>Calls to <command>$this->render();</command></para></listitem>
+            <listitem><para>Calls to <command>$this->_forward();</command></para></listitem>
+            <listitem><para>Calls to <command>$this->_redirect();</command></para></listitem>
+
             <listitem>
                 <para>Calls to the <classname>Redirector</classname> action helper</para>
             </listitem>
@@ -122,12 +117,14 @@ public function preDispatch()
                     action, you don't need to change a thing.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     If you're simply calling <methodname>render()</methodname> with no
                     arguments, you can remove such lines.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     If you're calling <methodname>render()</methodname> with arguments, and
@@ -224,12 +221,14 @@ $currency = new Zend_Currency($currency, $locale);
                     Replacement for the old 'rules' parameter.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>script</emphasis>:
                     Replacement for the old 'script' parameter.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>format</emphasis>:
@@ -237,18 +236,21 @@ $currency = new Zend_Currency($currency, $locale);
                     set new currencies but only the number format.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>display</emphasis>:
                     Replacement for the old 'rules' parameter.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>precision</emphasis>:
                     New parameter.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>name</emphasis>:
@@ -256,12 +258,14 @@ $currency = new Zend_Currency($currency, $locale);
                     currencies name.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>currency</emphasis>:
                     New parameter.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>symbol</emphasis>:
@@ -296,4 +300,4 @@ $currency->toCurrency($value, array $options);
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-110.xml

@@ -145,6 +145,7 @@ $authors = $feed->getAuthors()->getValues();
 
             <table id="migration.110.zend.file.transfer.count.table">
                 <title>Changed Validation Messages</title>
+
                 <tgroup cols="4">
                     <thead>
                         <row>
@@ -158,6 +159,7 @@ $authors = $feed->getAuthors()->getValues();
                         <row>
                             <entry><constant>TOO_MUCH</constant></entry>
                             <entry><constant>TOO_MANY</constant></entry>
+
                             <entry>
                                 Too many files, maximum '%max%' are allowed but '%count%' are given
                             </entry>
@@ -166,6 +168,7 @@ $authors = $feed->getAuthors()->getValues();
                         <row>
                             <entry><constant>TOO_LESS</constant></entry>
                             <entry><constant>TOO_FEW</constant></entry>
+
                             <entry>
                                 Too few files, minimum '%min%' are expected but '%count%' are given
                             </entry>
@@ -322,6 +325,7 @@ My_Validator extends Zend_Validate_Abstract
 
             <table id="migration.110.zend.validate.barcodevalidator.table">
                 <title>Available Validation Messages</title>
+
                 <tgroup cols="3">
                     <thead>
                         <row>

documentation/manual/en/ref/migration-15.xml

@@ -135,4 +135,4 @@ $front->setParam('useCaseSensitiveActions', true);
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-16.xml

@@ -25,26 +25,33 @@
             </para>
 
             <itemizedlist>
-                <listitem><para>
-                    <methodname>getDefaultModule()</methodname>: should return the name of
-                    the default module.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getDefaultControllerName()</methodname>: should return the
-                    name of the default controller.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getDefaultAction()</methodname>: should return the
-                    name of the default action.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <methodname>getDefaultModule()</methodname>: should return the name of
+                        the default module.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getDefaultControllerName()</methodname>: should return the
+                        name of the default controller.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getDefaultAction()</methodname>: should return the
+                        name of the default action.
+                    </para>
+                </listitem>
             </itemizedlist>
         </sect3>
     </sect2>
 
     <sect2 id="migration.16.zend.file.transfer">
         <title>Zend_File_Transfer</title>
+
         <sect3 id="migration.16.zend.file.transfer.validators">
             <title>Changes when using validators</title>
 
@@ -62,15 +69,19 @@
             </para>
 
             <itemizedlist>
-                <listitem><para>
-                    Old method <acronym>API</acronym>: <methodname>addValidator($validator,
-                    $options, $files)</methodname>.
-                </para></listitem>
-
-                <listitem><para>
-                    New method <acronym>API</acronym>: <methodname>addValidator($validator,
-                    $breakChainOnFailure, $options, $files)</methodname>.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        Old method <acronym>API</acronym>: <methodname>addValidator($validator,
+                            $options, $files)</methodname>.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        New method <acronym>API</acronym>: <methodname>addValidator($validator,
+                            $breakChainOnFailure, $options, $files)</methodname>.
+                    </para>
+                </listitem>
             </itemizedlist>
 
             <para>
@@ -97,4 +108,4 @@ $upload->addValidator('FilesSize', false, array('1B', '100kB'));
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-17.xml

@@ -64,20 +64,24 @@
                 <title>Filter: Rename</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Filter_File_Rename($oldfile, $newfile,
-                            $overwrite)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Filter_File_Rename($options)</methodname>
-                        where <varname>$options</varname> accepts the following array keys:
-                        <emphasis>source</emphasis> equals to <varname>$oldfile</varname>,
-                        <emphasis>target</emphasis> equals to <varname>$newfile</varname>,
-                        <emphasis>overwrite</emphasis> equals to <varname>$overwrite</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Filter_File_Rename($oldfile, $newfile,
+                                $overwrite)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Filter_File_Rename($options)</methodname>
+                            where <varname>$options</varname> accepts the following array keys:
+                            <emphasis>source</emphasis> equals to <varname>$oldfile</varname>,
+                            <emphasis>target</emphasis> equals to <varname>$newfile</varname>,
+                            <emphasis>overwrite</emphasis> equals to <varname>$overwrite</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.rename.example">
@@ -103,18 +107,22 @@ $upload->addFilter('Rename',
                 <title>Validator: Count</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Count($min, $max)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Count($options)</methodname>
-                        where <varname>$options</varname> accepts the following array keys:
-                        <emphasis>min</emphasis> equals to <varname>$min</varname>,
-                        <emphasis>max</emphasis> equals to <varname>$max</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Count($min, $max)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Count($options)</methodname>
+                            where <varname>$options</varname> accepts the following array keys:
+                            <emphasis>min</emphasis> equals to <varname>$min</varname>,
+                            <emphasis>max</emphasis> equals to <varname>$max</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.count.example">
@@ -140,18 +148,23 @@ $upload->addValidator('Count',
                 <title>Validator:Extension</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Extension($extension, $case)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Extension($options)</methodname> where
-                        <varname>$options</varname> accepts the following array keys:
-                        <emphasis>*</emphasis> equals to <varname>$extension</varname> and can have
-                        any other key, <emphasis>case</emphasis> equals to <varname>$case</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Extension($extension, $case)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Extension($options)</methodname> where
+                            <varname>$options</varname> accepts the following array keys:
+                            <emphasis>*</emphasis> equals to <varname>$extension</varname> and can
+                            have any other key, <emphasis>case</emphasis> equals to
+                            <varname>$case</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.extension.example">
@@ -177,20 +190,25 @@ $upload->addValidator('Extension',
                 <title>Validator: FilesSize</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_FilesSize($min, $max,
-                            $bytestring)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_FilesSize($options)</methodname> where
-                        <varname>$options</varname> accepts the following array keys:
-                        <emphasis>min</emphasis> equals to <varname>$min</varname>,
-                        <emphasis>max</emphasis> equals to <varname>$max</varname>,
-                        <emphasis>bytestring</emphasis> equals to <varname>$bytestring</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_FilesSize($min, $max,
+                                $bytestring)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_FilesSize($options)</methodname> where
+                            <varname>$options</varname> accepts the following array keys:
+                            <emphasis>min</emphasis> equals to <varname>$min</varname>,
+                            <emphasis>max</emphasis> equals to <varname>$max</varname>,
+                            <emphasis>bytestring</emphasis> equals to
+                            <varname>$bytestring</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <para>
@@ -231,19 +249,23 @@ $upload->setUseByteSting(true); // set flag
                 <title>Validator: Hash</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Hash($hash, $algorithm)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Hash($options)</methodname>
-                        where <varname>$options</varname> accepts the following array keys:
-                        <emphasis>*</emphasis> equals to <varname>$hash</varname> and can have any
-                        other key, <emphasis>algorithm</emphasis> equals to
-                        <varname>$algorithm</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Hash($hash, $algorithm)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Hash($options)</methodname>
+                            where <varname>$options</varname> accepts the following array keys:
+                            <emphasis>*</emphasis> equals to <varname>$hash</varname> and can have
+                            any other key, <emphasis>algorithm</emphasis> equals to
+                            <varname>$algorithm</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.hash.example">
@@ -269,21 +291,25 @@ $upload->addValidator('Hash',
                 <title>Validator: ImageSize</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_ImageSize($minwidth, $minheight, $maxwidth,
-                            $maxheight)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_FilesSize($options)</methodname> where
-                        <varname>$options</varname> accepts the following array keys:
-                        <emphasis>minwidth</emphasis> equals to <varname>$minwidth</varname>,
-                        <emphasis>maxwidth</emphasis> equals to <varname>$maxwidth</varname>,
-                        <emphasis>minheight</emphasis> equals to <varname>$minheight</varname>,
-                        <emphasis>maxheight</emphasis> equals to <varname>$maxheight</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_ImageSize($minwidth, $minheight,
+                                $maxwidth, $maxheight)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_FilesSize($options)</methodname> where
+                            <varname>$options</varname> accepts the following array keys:
+                            <emphasis>minwidth</emphasis> equals to <varname>$minwidth</varname>,
+                            <emphasis>maxwidth</emphasis> equals to <varname>$maxwidth</varname>,
+                            <emphasis>minheight</emphasis> equals to <varname>$minheight</varname>,
+                            <emphasis>maxheight</emphasis> equals to <varname>$maxheight</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.imagesize.example">
@@ -311,19 +337,25 @@ $upload->addValidator('ImageSize',
                 <title>Validator: Size</title>
 
                 <itemizedlist>
-                    <listitem><para>
-                        Old method <acronym>API</acronym>: <methodname>Zend_Validate_File_Size($min,
-                            $max, $bytestring)</methodname>
-                    </para></listitem>
-
-                    <listitem><para>
-                        New method <acronym>API</acronym>:
-                        <methodname>Zend_Validate_File_Size($options)</methodname>
-                        where <varname>$options</varname> accepts the following array keys:
-                        <emphasis>min</emphasis> equals to <varname>$min</varname>,
-                        <emphasis>max</emphasis> equals to <varname>$max</varname>,
-                        <emphasis>bytestring</emphasis> equals to <varname>$bytestring</varname>.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            Old method <acronym>API</acronym>:
+                                <methodname>Zend_Validate_File_Size($min, $max,
+                                $bytestring)</methodname>
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            New method <acronym>API</acronym>:
+                            <methodname>Zend_Validate_File_Size($options)</methodname>
+                            where <varname>$options</varname> accepts the following array keys:
+                            <emphasis>min</emphasis> equals to <varname>$min</varname>,
+                            <emphasis>max</emphasis> equals to <varname>$max</varname>,
+                            <emphasis>bytestring</emphasis> equals to
+                            <varname>$bytestring</varname>.
+                        </para>
+                    </listitem>
                 </itemizedlist>
 
                 <example id="migration.17.zend.file.transfer.validators.size.example">
@@ -413,7 +445,6 @@ if (Zend_Locale::isLocale($locale, false)) {
     // original string is no locale but can be rerouted
 }
 ]]></programlisting>
-
             </example>
         </sect3>
 
@@ -524,7 +555,6 @@ $language = new Zend_Translate('gettext',
                                'auto',
                                array('disableNotices' => true));
 ]]></programlisting>
-
             </example>
         </sect3>
     </sect2>
@@ -584,4 +614,4 @@ $view->setLfiProtection(false);
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-18.xml

@@ -56,4 +56,4 @@ Zend_Locale::disableCache(true);
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/migration-19.xml

@@ -181,67 +181,83 @@ $client->setFileUpload('file2.txt',
                             <entry>New call</entry>
                         </row>
                     </thead>
+
                     <tbody>
                         <row>
                             <entry>
                                 <methodname>getLanguageTranslationList($locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslationList('language', $locale)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getScriptTranslationList($locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslationList('script', $locale)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getCountryTranslationList($locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslationList('territory', $locale, 2)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getTerritoryTranslationList($locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslationList('territory', $locale, 1)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getLanguageTranslation($value, $locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslation($value, 'language', $locale)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getScriptTranslation($value, $locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslation($value, 'script', $locale)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getCountryTranslation($value, $locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslation($value, 'country', $locale)</methodname>
                             </entry>
                         </row>
+
                         <row>
                             <entry>
                                 <methodname>getTerritoryTranslation($value, $locale)</methodname>
                             </entry>
+
                             <entry>
                                 <methodname>getTranslation($value, 'territory',
                                     $locale)</methodname>

documentation/manual/en/ref/migration-introduction.xml

@@ -30,4 +30,4 @@
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

documentation/manual/en/ref/overview.xml

@@ -11,6 +11,7 @@
         with few dependencies on other components. This loosely coupled architecture allows
         developers to use components individually. We often call this a "use-at-will" design.
     </para>
+
     <para>
         While they can be used separately, Zend Framework components in the standard library form a
         powerful and extensible web application framework when combined. Zend Framework offers a
@@ -24,6 +25,7 @@
         Whatever your application needs are, you're likely to find a Zend Framework component that
         can be used to dramatically reduce development time with a thoroughly tested foundation.
     </para>
+
     <para>
         The principal sponsor of the project 'Zend Framework' is <ulink url="http://www.zend.com">
         Zend Technologies</ulink>, but many companies have contributed components or significant
@@ -31,6 +33,7 @@
         partnered with Zend to provide interfaces to web services and other technologies that they
         wish to make available to Zend Framework developers.
     </para>
+
     <para>
         Zend Framework could not deliver and support all of these features without the help of the
         vibrant Zend Framework community. Community members, including contributors, make

documentation/manual/en/ref/performance-classloading.xml

@@ -124,25 +124,25 @@ set_include_path(implode(PATH_SEPARATOR, $paths);
                 safely pushed to the last item in the list.
             </para>
 
-        <example id="performance.classloading.includepath.example">
-            <title>Example: Optimized include_path</title>
-
-            <para>
-                Let's put all of these suggestions together. Our assumption will
-                be that you are using one or more <acronym>PEAR</acronym> libraries in conjunction
-                with Zend Framework -- perhaps the PHPUnit and <classname>Archive_Tar</classname>
-                libraries -- and that you occasionally need to include
-                files relative to the current file.
-            </para>
-
-            <para>
-                First, we'll create a library directory in our project. Inside
-                that directory, we'll symlink our Zend Framework's <filename>library/Zend</filename>
-                directory, as well as the necessary directories from our <acronym>PEAR</acronym>
-                installation:
-            </para>
-
-            <programlisting language="php"><![CDATA[
+            <example id="performance.classloading.includepath.example">
+                <title>Example: Optimized include_path</title>
+
+                <para>
+                    Let's put all of these suggestions together. Our assumption will be that you
+                    are using one or more <acronym>PEAR</acronym> libraries in conjunction with
+                    Zend Framework -- perhaps the PHPUnit and <classname>Archive_Tar</classname>
+                    libraries -- and that you occasionally need to include
+                    files relative to the current file.
+                </para>
+
+                <para>
+                    First, we'll create a library directory in our project. Inside that
+                    directory, we'll symlink our Zend Framework's <filename>library/Zend</filename>
+                    directory, as well as the necessary directories from our <acronym>PEAR</acronym>
+                    installation:
+                </para>
+
+                <programlisting language="php"><![CDATA[
 library
     Archive/
     PEAR/
@@ -150,35 +150,35 @@ library
     Zend/
 ]]></programlisting>
 
-            <para>
-                This allows us to add our own library code if necessary, while
-                keeping shared libraries intact.
-            </para>
-
-            <para>
-                Next, we'll opt to create our include_path programmatically
-                within our <filename>public/index.php</filename> file. This allows us to move our
-                code around on the file system, without needing to edit the
-                include_path every time.
-            </para>
-
-            <para>
-                We'll borrow ideas from each of the suggestions above: we'll use
-                absolute paths, as determined using <methodname>realpath()</methodname>;
-                we'll include Zend Framework's include path early; we've
-                already consolidated include_paths; and we'll put the current
-                directory as the last path. In fact, we're doing really well
-                here -- we're going to end up with only two paths.
-            </para>
-
-            <programlisting language="php"><![CDATA[
+                <para>
+                    This allows us to add our own library code if necessary, while
+                    keeping shared libraries intact.
+                </para>
+
+                <para>
+                    Next, we'll opt to create our include_path programmatically
+                    within our <filename>public/index.php</filename> file. This allows us to move
+                    our code around on the file system, without needing to edit the
+                    include_path every time.
+                </para>
+
+                <para>
+                    We'll borrow ideas from each of the suggestions above: we'll use
+                    absolute paths, as determined using <methodname>realpath()</methodname>;
+                    we'll include Zend Framework's include path early; we've
+                    already consolidated include_paths; and we'll put the current
+                    directory as the last path. In fact, we're doing really well
+                    here -- we're going to end up with only two paths.
+                </para>
+
+                <programlisting language="php"><![CDATA[
 $paths = array(
     realpath(dirname(__FILE__) . '/../library'),
     '.'
 );
 set_include_path(implode(PATH_SEPARATOR, $paths));
 ]]></programlisting>
-        </example>
+            </example>
         </sect3>
     </sect2>
 
@@ -276,39 +276,55 @@ Zend_Loader_Autoloader::getInstance();
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <classname>Zend_Controller_Action_HelperBroker</classname>: helpers
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_Dojo</classname>: view helpers, form elements and decorators
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_File_Transfer</classname>: adapters
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_Filter_Inflector</classname>: filters (used by the
-                ViewRenderer action helper and <classname>Zend_Layout</classname>)
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_Filter_Input</classname>: filters and validators
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_Form</classname>: elements, validators, filters,
-                decorators, captcha and file transfer adapters
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_Paginator</classname>: adapters
-            </para></listitem>
-
-            <listitem><para>
-                <classname>Zend_View</classname>: helpers, filters
-            </para></listitem>
+            <listitem>
+                <para>
+                    <classname>Zend_Controller_Action_HelperBroker</classname>: helpers
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_Dojo</classname>: view helpers, form elements and decorators
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_File_Transfer</classname>: adapters
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_Filter_Inflector</classname>: filters (used by the
+                    ViewRenderer action helper and <classname>Zend_Layout</classname>)
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_Filter_Input</classname>: filters and validators
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_Form</classname>: elements, validators, filters,
+                    decorators, captcha and file transfer adapters
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_Paginator</classname>: adapters
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <classname>Zend_View</classname>: helpers, filters
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>

documentation/manual/en/ref/performance-database.xml

@@ -61,8 +61,9 @@
     </sect2>
 
     <sect2 id="performance.database.select">
-        <title>SQL generated with Zend_Db_Select s not hitting my indexes; how
-            can I make it better?</title>
+        <title>
+            SQL generated with Zend_Db_Select s not hitting my indexes; how can I make it better?
+        </title>
 
         <para>
             <classname>Zend_Db_Select</classname> is relatively good at its job. However,
@@ -79,6 +80,7 @@
                 <classname>Zend_Db_Select</classname>, so providing your own, tuned
                 <acronym>SQL</acronym> select statements is a perfectly legitimate approach,
             </para>
+
             <para>
                 Run <constant>EXPLAIN</constant> on your queries, and test a variety of
                 approaches until you can reliably hit your indices in the most

documentation/manual/en/ref/performance-localization.xml

@@ -34,34 +34,42 @@
             </para>
 
             <itemizedlist>
-                <listitem><para>
-                    <emphasis>Array</emphasis>: this is the fastest, as it is,
-                    by definition, parsed into a native <acronym>PHP</acronym> format immediately
-                    on inclusion.
-                </para></listitem>
-
-                <listitem><para>
-                    <emphasis><acronym>CSV</acronym></emphasis>: uses
-                    <methodname>fgetcsv()</methodname> to parse a <acronym>CSV</acronym> file and
-                    transform it into a native <acronym>PHP</acronym> format.
-                </para></listitem>
-
-                <listitem><para>
-                    <emphasis><acronym>INI</acronym></emphasis>: uses
-                    <methodname>parse_ini_file()</methodname> to parse an <acronym>INI</acronym>
-                    file and transform it into a native <acronym>PHP</acronym> format. This and the
-                    <acronym>CSV</acronym> adapter are roughly equivalent performance-wise.
-                </para></listitem>
-
-                <listitem><para>
-                    <emphasis>Gettext</emphasis>: The gettext adapter from Zend Framework
-                    does <emphasis>not</emphasis> use the gettext
-                    extension as it is not thread safe and does not allow
-                    specifying more than one locale per server. As a result, it
-                    is slower than using the gettext extension directly, but,
-                    because the gettext format is binary, it's faster to parse
-                    than <acronym>XML</acronym>.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <emphasis>Array</emphasis>: this is the fastest, as it is, by
+                        definition, parsed into a native <acronym>PHP</acronym> format immediately
+                        on inclusion.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <emphasis><acronym>CSV</acronym></emphasis>: uses
+                        <methodname>fgetcsv()</methodname> to parse a <acronym>CSV</acronym> file
+                        and transform it into a native <acronym>PHP</acronym> format.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <emphasis><acronym>INI</acronym></emphasis>: uses
+                        <methodname>parse_ini_file()</methodname> to parse an <acronym>INI</acronym>
+                        file and transform it into a native <acronym>PHP</acronym> format. This and
+                        the <acronym>CSV</acronym> adapter are roughly equivalent performance-wise.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <emphasis>Gettext</emphasis>: The gettext adapter from Zend Framework
+                        does <emphasis>not</emphasis> use the gettext
+                        extension as it is not thread safe and does not allow
+                        specifying more than one locale per server. As a result, it
+                        is slower than using the gettext extension directly, but,
+                        because the gettext format is binary, it's faster to parse
+                        than <acronym>XML</acronym>.
+                    </para>
+                </listitem>
             </itemizedlist>
 
             <para>
@@ -101,15 +109,16 @@
             <itemizedlist>
                 <listitem>
                     <para>
-                        <link linkend="zend.translate.adapter.caching"><classname>
-                        Zend_Translate</classname> adapter caching</link>
+                        <link
+                            linkend="zend.translate.adapter.caching"><classname>Zend_Translate</classname>
+                            adapter caching</link>
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
                         <link linkend="zend.locale.cache"><classname>Zend_Locale</classname>
-                        caching</link>
+                            caching</link>
                     </para>
                 </listitem>
             </itemizedlist>

documentation/manual/en/ref/performance-view.xml

@@ -144,21 +144,27 @@ class My_View extends Zend_View
             </para>
 
             <itemizedlist>
-                <listitem><para>
-                    <varname>$name</varname>: the name of the view script to render
-                </para></listitem>
-
-                <listitem><para>
-                    <varname>$module</varname>: the name of the module in which the
-                    view script resides; or, if no third argument is provided
-                    and this is an array or object, it will be the
-                    <varname>$model</varname> argument.
-                </para></listitem>
-
-                <listitem><para>
-                    <varname>$model</varname>: an array or object to pass to the
-                    partial representing the clean data to assign to the view.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <varname>$name</varname>: the name of the view script to render
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <varname>$module</varname>: the name of the module in which the
+                        view script resides; or, if no third argument is provided
+                        and this is an array or object, it will be the
+                        <varname>$model</varname> argument.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <varname>$model</varname>: an array or object to pass to the
+                        partial representing the clean data to assign to the view.
+                    </para>
+                </listitem>
             </itemizedlist>
 
             <para>

documentation/manual/en/ref/requirements.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <appendix id="requirements" xmlns:xi="http://www.w3.org/2001/XInclude">
-
     <title>Zend Framework Requirements</title>
 
     <sect1 id="requirements.introduction">
-
         <title>Introduction</title>
 
         <para>
@@ -24,7 +22,6 @@
         </para>
 
         <sect2 id="requirements.version">
-
             <title>PHP Version</title>
 
             <para>
@@ -37,11 +34,9 @@
                 Zend Framework has an extensive collection of unit tests, which you can run using
                 PHPUnit 3.3.0 or later.
             </para>
-
         </sect2>
 
         <sect2 id="requirements.extensions">
-
             <title>PHP Extensions</title>
 
             <para>
@@ -66,7 +61,6 @@
         </sect2>
 
         <sect2 id="requirements.zendcomponents">
-
             <title>Zend Framework Components</title>
 
             <para>
@@ -91,7 +85,6 @@
         </sect2>
 
         <sect2 id="requirements.dependencies">
-
             <title>Zend Framework Dependencies</title>
 
             <para>
@@ -123,9 +116,7 @@
 
             <xi:include href="requirements-dependencies-table.xml" />
         </sect2>
-
     </sect1>
-
 </appendix>
 <!--
 vim:se ts=4 sw=4 et:

documentation/manual/en/tutorials/form-decorators-composite.xml

@@ -183,11 +183,11 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
 ]]></programlisting>
 
         <para>
-            This class gives some nice flexibility -- we can set default values from our database, and
-            be certain that the value will be stored and represented correctly.  Additionally, we can
-            allow for the value to be set from an array passed via form input. Finally, we have discrete
-            accessors for each date segment, which we can now use in a decorator to create a composite
-            element.
+            This class gives some nice flexibility -- we can set default values from our database,
+            and be certain that the value will be stored and represented correctly.  Additionally,
+            we can allow for the value to be set from an array passed via form input. Finally, we
+            have discrete accessors for each date segment, which we can now use in a decorator to
+            create a composite element.
         </para>
     </sect2>
 

documentation/manual/en/tutorials/form-decorators-individual.xml

@@ -276,8 +276,8 @@ foreach ($form->getElements() as $element) {
 
     <para>
         By this point in the tutorial, you should be getting fairly comfortable with the markup
-        possibilities using <classname>Zend_Form</classname>'s decorators. In the next section, we'll
-        revisit the date element from above, and demonstrate how to create a custom element
+        possibilities using <classname>Zend_Form</classname>'s decorators. In the next section,
+        we'll revisit the date element from above, and demonstrate how to create a custom element
         and decorator for composite elements.
     </para>
 </sect1>

documentation/manual/en/tutorials/multiuser-authentication.xml

@@ -24,7 +24,6 @@
             information: fingerprint, eye retinal scan, passphrase, or any other obscure personal
             information.
         </para>
-
     </sect2>
 
     <sect2 id="learning.multiuser.authentication.basic-usage">
@@ -180,4 +179,3 @@ echo $this->form;
         </para>
     </sect2>
 </sect1>
-

documentation/manual/en/tutorials/multiuser-authorization.xml

@@ -40,7 +40,6 @@
             building a tree of roles, resources and privileges to manage and query authorization
             requests against.
         </para>
-
     </sect2>
 
     <sect2 id="learning.multiuser.authorization.basic-usage">
@@ -242,4 +241,4 @@ $acl->allow('publisher', 'blogPost', 'publish');
             owner passed in.
         </para>
     </sect2>
-</sect1>
+</sect1>

documentation/manual/en/tutorials/multiuser-intro.xml

@@ -61,7 +61,6 @@
                 people, as well as other consuming applications, should all be treated in same with
                 regard to the concerns outlined above.
             </para>
-
         </note>
 
         <para>
@@ -72,4 +71,4 @@
             extension points each have that will cater to a more customized solution.
         </para>
     </sect2>
-</sect1>
+</sect1>

documentation/manual/en/tutorials/multiuser-sessions.xml

@@ -17,18 +17,17 @@
         <para>
             The act of interacting with a web application is typically defined by the sum
             of all requests sent to a web server.  Since there can be many consumers being served
-            simultaneously, the application must decide which requests belong to which consumer.  These
-            requests are typically known as a "session".
+            simultaneously, the application must decide which requests belong to which consumer.
+            These requests are typically known as a "session".
         </para>
 
         <para>
             In PHP, the session problem is solved by the session extension which utilizes some state
             tracking, typically cookies, and some form of local storage which is exposed via the
-            $_SESSION superglobal.  In Zend Framework, the component Zend_Session adds value to the php
-            session extension making it easier to use and depend on inside object-oriented
+            $_SESSION superglobal.  In Zend Framework, the component Zend_Session adds value to the
+            php session extension making it easier to use and depend on inside object-oriented
             applications.
         </para>
-
     </sect2>
 
     <sect2 id="learning.multiuser.sessions.basic-usage">
@@ -79,8 +78,8 @@ resources.session.remember_me_seconds = 864000
             into the Zend_Session managed $_SESSION superglobal.  The reason it is called
             Zend_Session_Namespace is that it effectively namespaces the data inside $_SESSION, thus
             allowing multiple components and objects to safely store and retrieve data.  In the
-            following code, we'll explore how to build a simple session incrementing counter, starting
-            at 1000 and resetting itself after 1999.
+            following code, we'll explore how to build a simple session incrementing counter,
+            starting at 1000 and resetting itself after 1999.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -100,10 +99,11 @@ if ($mysession->counter > 1999) {
         <para>
             As you can see above, the session namespace object uses the magic __get, __set,
             __isset, and __unset to allow you to seemlessly and fluently interact with the session.
-            The information stored in the above example is stored at $_SESSION['mysession']['counter'].
+            The information stored in the above example is stored at
+            $_SESSION['mysession']['counter'].
         </para>
-
     </sect2>
+
     <sect2 id="learning.multiuser.sessions.advanced-usage">
         <title>Advanced Usage of Zend_Session</title>
 
@@ -125,9 +125,5 @@ resources.session.saveHandler.options.modifiedColumn = "modified"
 resources.session.saveHandler.options.dataColumn = "session_data"
 resources.session.saveHandler.options.lifetimeColumn = "lifetime"
 ]]></programlisting>
-
-
     </sect2>
-
-
-</sect1>
+</sect1>

documentation/manual/en/tutorials/paginator-control.xml

@@ -5,19 +5,21 @@
 
     <para>
         Rendering the items for a page on the screen has been a good start. In the code
-        snippets in previous section we have also seen the <methodname>setCurrentPageNumber()</methodname>
-        method to set the active page number. The next step is to navigate through your pages.
-        To do this, Paginator provides you with two important tools: the ability to render the Paginator
-        with help of a View Partial, and support for so-called ScrollingStyles.
+        snippets in previous section we have also seen the
+        <methodname>setCurrentPageNumber()</methodname> method to set the active page number. The
+        next step is to navigate through your pages. To do this, Paginator provides you with two
+        important tools: the ability to render the Paginator with help of a View Partial, and
+        support for so-called ScrollingStyles.
     </para>
 
     <para>
-        The View Partial is a small view script that renders the Pagination controls, such as buttons to go
-        to the next or previous page. Which pagination controls are rendered depends on the contents of
-        the view partial. Working with the view partial requires that you have set up Zend_View.
-        To get started with the pagination control, create a new view script somewhere in
-        your view scripts path. You can name it anything you want, but we'll call it "controls.phtml" in this text.
-        The reference manual contains various examples of what might go in the view script. Here is one example.
+        The View Partial is a small view script that renders the Pagination controls, such as
+        buttons to go to the next or previous page. Which pagination controls are rendered depends
+        on the contents of the view partial. Working with the view partial requires that you have
+        set up Zend_View. To get started with the pagination control, create a new view script
+        somewhere in your view scripts path. You can name it anything you want, but we'll call it
+        "controls.phtml" in this text. The reference manual contains various examples of what might
+        go in the view script. Here is one example.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -73,11 +75,11 @@ Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
 
     <para>
         The last step is probably the easiest. Make sure you have assigned your Paginator object
-        to the a script (NOT the 'controls.phtml' script!). The only thing left to do is echo the Paginator in the view script.
-        This will automatically render the Paginator using the PaginationControl view helper.
-        In this next example, the Paginator object has been assigned to the 'paginator' view variable.
-        Don't worry if you don't fully get how it all works yet. The next section will feature
-        a complete example.
+        to the a script (NOT the 'controls.phtml' script!). The only thing left to do is echo the
+        Paginator in the view script. This will automatically render the Paginator using the
+        PaginationControl view helper. In this next example, the Paginator object has been assigned
+        to the 'paginator' view variable. Don't worry if you don't fully get how it all works yet.
+        The next section will feature a complete example.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -85,14 +87,15 @@ Zend_View_Helper_PaginationControl::setDefaultViewPartial('controls.phtml');
 ]]></programlisting>
 
     <para>
-        <classname>Zend_Paginator</classname>, together with the 'controls.phtml' view script you wrote,
-        makes sure your Paginator navigation is rendered properly. In order to decide
+        <classname>Zend_Paginator</classname>, together with the 'controls.phtml' view script you
+        wrote, makes sure your Paginator navigation is rendered properly. In order to decide
         which page numbers need to be displayed on screen, Paginator uses so-called ScrollingStyles.
         The default style is called "Sliding", which is similar to the way Yahoo's search result
         navigation works. To mimick Google's ScrollingStyle, use the Elastic style.
-        You can set a default ScrollingStyle with the static <methodname>setDefaultScrollingStyle()</methodname> method,
-        or you can specify a ScrollingStyle dynamically when rendering the Paginator in your view script. This
-        requires manual invocation of the view helper in your view script.
+        You can set a default ScrollingStyle with the static
+        <methodname>setDefaultScrollingStyle()</methodname> method, or you can specify a
+        ScrollingStyle dynamically when rendering the Paginator in your view script. This requires
+        manual invocation of the view helper in your view script.
     </para>
 
     <programlisting language="php"><![CDATA[

documentation/manual/en/tutorials/paginator-simple.xml

@@ -121,5 +121,4 @@ foreach ($paginator as $item) {
         is being executed efficiently, see the <classname>Zend_Paginator</classname> chapter in the
         reference manual on the DbSelect and DbTableSelect adapters.
     </para>
-
 </sect1>

documentation/manual/en/tutorials/paginator-together.xml

@@ -4,21 +4,22 @@
     <title>Putting it all Together</title>
 
     <para>
-        You have seen how to create a Paginator object, how to render the items on the current page, and
-        how to render a navigation element to browse through your pages. In this section you will
-        see how Paginator fits in with the rest of your MVC application.
+        You have seen how to create a Paginator object, how to render the items on the current page,
+        and how to render a navigation element to browse through your pages. In this section you
+        will see how Paginator fits in with the rest of your MVC application.
     </para>
 
     <para>
-        In the following examples we will ignore the best practice implementation of using a Service Layer to keep
-        the example simple and easier to understand. Once you get familiar with using Service Layers, it should be easy to see
-        how Paginator can fit in with the best practice approach.
+        In the following examples we will ignore the best practice implementation of using a Service
+        Layer to keep the example simple and easier to understand. Once you get familiar with using
+        Service Layers, it should be easy to see how Paginator can fit in with the best practice
+        approach.
     </para>
 
     <para>
-        Lets start with the controller. The sample application is simple, and we'll just put everything
-        in the IndexController and the IndexAction. Again, this is for demonstration purposes only. A real application
-        should not use controllers in this manner.
+        Lets start with the controller. The sample application is simple, and we'll just put
+        everything in the IndexController and the IndexAction. Again, this is for demonstration
+        purposes only. A real application should not use controllers in this manner.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -49,8 +50,9 @@ class IndexController extends Zend_Controller_Action
 ]]></programlisting>
 
     <para>
-        The following view script is the index.phtml view script for the IndexController's indexAction.
-        The view script can be kept simple. We're assuming the use of the default ScrollingStyle.
+        The following view script is the index.phtml view script for the IndexController's
+        indexAction. The view script can be kept simple. We're assuming the use of the default
+        ScrollingStyle.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -66,9 +68,9 @@ foreach ($this->paginator as $item) {
 ]]></programlisting>
 
     <para>
-        Now navigate to your project's index and see Paginator in action. What we have discussed in this
-        tutorial is just the tip of the iceberg. The reference manual and API documentation can tell
-        you more about what you can do with Zend_Paginator.
+        Now navigate to your project's index and see Paginator in action. What we have discussed
+        in this tutorial is just the tip of the iceberg. The reference manual and API documentation
+        can tell you more about what you can do with Zend_Paginator.
     </para>
 
 </sect1>

documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -48,12 +48,11 @@
 
     <programlisting language="shell"><![CDATA[
 % zf enable layout
-Layouts have been enabled, and a default layout created at 
+Layouts have been enabled, and a default layout created at
 application/layouts/scripts/layout.phtml
 A layout entry has been added to the application config file.
 ]]></programlisting>
 
-
     <para>
         As noted by the command,
         <filename>application/configs/application.ini</filename> is updated, and

documentation/manual/en/tutorials/quickstart-create-model.xml

@@ -16,8 +16,8 @@
         mini-applications.  Modules mimic the directory structure that the <command>zf</command>
         tool sets up under <filename>application/</filename>, and all classes inside them are
         assumed to begin with a common prefix, the module name.  <filename>application/</filename>
-        is itself a module -- the "default" or "application" module. As such, we'll want to setup autoloading for resources
-        within this directory.
+        is itself a module -- the "default" or "application" module. As such, we'll want to setup
+        autoloading for resources within this directory.
     </para>
 
     <para>
@@ -445,7 +445,7 @@ class Application_Model_GuestbookMapper
 Creating a model at application/models/GuestbookMapper.php
 Updating project profile '.zfproject.xml'
 ]]></programlisting>
-        
+
     <para>
         Now, edit the class <classname>Application_Model_GuestbookMapper</classname> found in
         <filename>application/models/GuestbookMapper.php</filename> to read as follows:
@@ -535,7 +535,7 @@ class Application_Model_GuestbookMapper
 Creating a model at application/models/Guestbook.php
 Updating project profile '.zfproject.xml'
 ]]></programlisting>
-    
+
     <para>
         We'll modify this empty PHP class to make it easy to populate the model by passing an array
         of data either to the constructor or a <methodname>setOptions()</methodname> method. The
@@ -647,12 +647,12 @@ class Application_Model_Guestbook
 
     <programlisting language="shell"><![CDATA[
 % zf create controller Guestbook
-Creating a controller at 
+Creating a controller at
     application/controllers/GuestbookController.php
 Creating an index action method in controller Guestbook
-Creating a view script for the index action method at 
+Creating a view script for the index action method at
     application/views/scripts/guestbook/index.phtml
-Creating a controller test file at 
+Creating a controller test file at
     tests/application/controllers/GuestbookControllerTest.php
 Updating project profile '.zfproject.xml'
 ]]></programlisting>