Просмотр исходного кода

[MANUAL] English:

- structural fixes (no translations needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20799 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 лет назад
Родитель
Сommit
0b6f13cdd2
27 измененных файлов с 766 добавлено и 591 удалено
  1. 22 0
      documentation/manual/en/module_specs/Zend_Text_Table.xml
  2. 113 87
      documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml
  3. 43 31
      documentation/manual/en/module_specs/Zend_Tool_Framework-Introduction.xml
  4. 0 1
      documentation/manual/en/module_specs/Zend_Tool_Framework-SystemProviders.xml
  5. 13 12
      documentation/manual/en/module_specs/Zend_Tool_Framework-WritingProviders.xml
  6. 6 13
      documentation/manual/en/module_specs/Zend_Tool_Project-CreateProject.xml
  7. 4 1
      documentation/manual/en/module_specs/Zend_Tool_Project-Internals.xml
  8. 1 1
      documentation/manual/en/module_specs/Zend_Tool_Project.xml
  9. 83 57
      documentation/manual/en/module_specs/Zend_Translate-Adapters.xml
  10. 1 0
      documentation/manual/en/module_specs/Zend_Translate-Additional.xml
  11. 2 1
      documentation/manual/en/module_specs/Zend_Translate-Introduction.xml
  12. 11 22
      documentation/manual/en/module_specs/Zend_Translate-Plurals.xml
  13. 22 29
      documentation/manual/en/module_specs/Zend_Translate-SourceCreation.xml
  14. 7 5
      documentation/manual/en/module_specs/Zend_Translate-Using.xml
  15. 2 2
      documentation/manual/en/module_specs/Zend_Uri.xml
  16. 2 2
      documentation/manual/en/module_specs/Zend_Validate-Barcode.xml
  17. 1 0
      documentation/manual/en/module_specs/Zend_Validate-CreditCard.xml
  18. 54 34
      documentation/manual/en/module_specs/Zend_Validate-Set.xml
  19. 0 2
      documentation/manual/en/module_specs/Zend_Validate-ValidatorChains.xml
  20. 42 54
      documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml
  21. 0 13
      documentation/manual/en/module_specs/Zend_Validate.xml
  22. 0 5
      documentation/manual/en/module_specs/Zend_View-Controllers.xml
  23. 73 0
      documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml
  24. 219 173
      documentation/manual/en/module_specs/Zend_View-Helpers.xml
  25. 38 35
      documentation/manual/en/module_specs/Zend_View-Introduction.xml
  26. 0 4
      documentation/manual/en/module_specs/Zend_View-Scripts.xml
  27. 7 7
      documentation/manual/en/module_specs/Zend_Wildfire.xml

+ 22 - 0
documentation/manual/en/module_specs/Zend_Text_Table.xml

@@ -2,6 +2,7 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.text.table.introduction">
     <title>Zend_Text_Table</title>
+
     <para>
         <classname>Zend_Text_Table</classname> is a component to create text based tables
         on the fly with different decorators. This can be helpful, if you either
@@ -10,8 +11,10 @@
         <classname>Zend_Text_Table</classname> supports multi-line columns, colspan and
         align as well.
     </para>
+
     <note>
         <title>Encoding</title>
+
         <para>
             <classname>Zend_Text_Table</classname> expects your strings to be UTF-8 encoded
             by default. If this is not the case, you can either supply the character
@@ -24,6 +27,7 @@
             this with <methodname>Zend_Text_Table::setOutputCharset($charset)</methodname>.
         </para>
     </note>
+
     <para>
         A <classname>Zend_Text_Table</classname> object consists of rows, which contain
         columns, represented by <classname>Zend_Text_Table_Row</classname> and
@@ -37,6 +41,7 @@
                     all columns width their widths in characters.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>decorator</code>: The decorator to use for the
@@ -45,12 +50,14 @@
                     of a custom decorator object.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>padding</code>: The left and right padding withing
                     the columns in characters. The default padding is zero.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>AutoSeparate</code>: The way how the rows are
@@ -58,26 +65,32 @@
                     separation between all rows. This is defined as a bitmask
                     containing one ore more of the following constants of
                     <classname>Zend_Text_Table</classname>:
+
                     <itemizedlist>
                         <listitem>
                             <para><constant>Zend_Text_Table::AUTO_SEPARATE_NONE</constant></para>
                         </listitem>
+
                         <listitem>
                             <para><constant>Zend_Text_Table::AUTO_SEPARATE_HEADER</constant></para>
                         </listitem>
+
                         <listitem>
                             <para><constant>Zend_Text_Table::AUTO_SEPARATE_FOOTER</constant></para>
                         </listitem>
+
                         <listitem>
                             <para><constant>Zend_Text_Table::AUTO_SEPARATE_ALL</constant></para>
                         </listitem>
                     </itemizedlist>
+
                     Where header is always the first row, and the footer is
                     always the last row.
                 </para>
             </listitem>
         </itemizedlist>
     </para>
+
     <para>
         Rows are simply added to the table by creating a new instance of
         <classname>Zend_Text_Table_Row</classname>, and appending it to the table via the
@@ -86,6 +99,7 @@
         will automatically converted to a row object, containing multiple column
         objects.
     </para>
+
     <para>
         The same way you can add columns to the rows. Create a new instance of
         <classname>Zend_Text_Table_Column</classname> and then either set the column
@@ -102,11 +116,13 @@
                     <constant>ALIGN_LEFT</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>ALIGN_CENTER</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>ALIGN_RIGHT</constant>
@@ -122,17 +138,21 @@
         with the column object as parameter. Alternatively you can directly
         give a string to the <code>appendColumn</code> method.
     </para>
+
     <para>
         To finally render the table, you can either use the <code>render</code>
         method of the table, or use the magic method <code>__toString</code>
         by doing <code>echo $table;</code> or <code>$tableString = (string) $table</code>.
     </para>
+
     <example id="zend.text.table.example.using">
         <title>Using Zend_Text_Table</title>
+
         <para>
             This example illustrates the basic use of <classname>Zend_Text_Table</classname>
             to create a simple table:
         </para>
+
         <programlisting language="php"><![CDATA[
 $table = new Zend_Text_Table(array('columnWidths' => array(10, 20)));
 
@@ -149,9 +169,11 @@ $table->appendRow($row);
 
 echo $table;
 ]]></programlisting>
+
         <para>
             This will result in the following output:
         </para>
+
         <programlisting language="text"><![CDATA[
 ┌──────────┬────────────────────┐
 │Zend      │Framework           │

+ 113 - 87
documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml

@@ -27,14 +27,11 @@
             <para>
                 First download Zend Framework.  This can be done by going to framework.zend.com
                 and downloading the latest release.  After you've downloaded the package and placed
-                it on your system.  The next step is to make the zf command available to your system.
-                The easiest way to do this, is to copy the proper files from the bin/ directory
-                of the download, and place these files within the <emphasis>same</emphasis> directory
-                as the location of the php cli binary.
+                it on your system.  The next step is to make the zf command available to your
+                system. The easiest way to do this, is to copy the proper files from the bin/
+                directory of the download, and place these files within the
+                <emphasis>same</emphasis> directory as the location of the php cli binary.
             </para>
-
-
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.installation.pear">
@@ -43,10 +40,10 @@
             <para>
                 To install via PEAR, you must use the 3rd party zfcampus.org site to retrieve the
                 latest Zend Framework PEAR package.  These packages are typically built within a day
-                of an official Zend Framework release.  The benefit of installing via the PEAR package
-                manager is that during the install process, the ZF library will end up on the
-                include_path, and the zf.php and zf scripts will end up in a place on your system
-                that will allow you to run them without any additional setup.
+                of an official Zend Framework release.  The benefit of installing via the PEAR
+                package manager is that during the install process, the ZF library will end up on
+                the include_path, and the zf.php and zf scripts will end up in a place on your
+                system that will allow you to run them without any additional setup.
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -59,7 +56,6 @@ pear install zfcampus/zf
                 running the zf command.  Go good way to check to see if it't there is to run
                 zf --help
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.installation.install-by-hand">
@@ -73,8 +69,8 @@ pear install zfcampus/zf
             </para>
 
             <para>
-                If you are on a *nix or mac system, you can also create a link from somewhere in your
-                path to the zf.sh file.  If you do this, you do not need to worry about having
+                If you are on a *nix or mac system, you can also create a link from somewhere in
+                your path to the zf.sh file.  If you do this, you do not need to worry about having
                 Zend Framework's library on your include_path, as the zf.php and zf.sh files will
                 be able to access the library relative to where they are (meaning the ./bin/ files
                 are ../library/ relative to the Zend Framework library).
@@ -82,14 +78,12 @@ pear install zfcampus/zf
 
             <para>
                 There are a number of other options available for setting up the zf.php and library
-                on your system.  These options revolve around setting specific environment variables.
-                These are described in the later section on "customizing the CLI environement".  The
-                environment variables for setting the zf.php include_path, ZF_INCLUDE_PATH and
-                ZF_INCLUDE_PATH_PREPEND, are the ones of most interest.
+                on your system.  These options revolve around setting specific environment
+                variables. These are described in the later section on "customizing the CLI
+                environement".  The environment variables for setting the zf.php include_path,
+                ZF_INCLUDE_PATH and ZF_INCLUDE_PATH_PREPEND, are the ones of most interest.
             </para>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.tool.usage.cli.general-purpose-commands">
@@ -99,24 +93,24 @@ pear install zfcampus/zf
             <title>Version</title>
 
             <para>
-                This will show the current version number of the copy of Zend Framework the zf.php tool is using.
+                This will show the current version number of the copy of Zend Framework the zf.php
+                tool is using.
             </para>
 
             <programlisting language="text"><![CDATA[
 zf show version
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.built-in-help">
             <title>Built-in Help</title>
 
             <para>
-                The built-in help system is the primary place where you can get up-to-date information
-                on what your system is capable of doing.  The help system is dynamic in that as providers
-                are added to your system, they are automatically dispatchable, and as such, the parameters
-                required to run them will be in the help screen.  The easiest way to retrieve the help
-                screen is the following:
+                The built-in help system is the primary place where you can get up-to-date
+                information on what your system is capable of doing.  The help system is dynamic in
+                that as providers are added to your system, they are automatically dispatchable, and
+                as such, the parameters required to run them will be in the help screen.  The
+                easiest way to retrieve the help screen is the following:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -124,11 +118,12 @@ zf --help
 ]]></programlisting>
 
             <para>
-                This will give you an overview of the various capabilities of the system.  Sometimes, there
-                are more finite commands than can be run, and to gain more information about these, you might
-                have to run a more specialized help command.  For specialized help, simply replace any of the
-                elements of the command with a "?". This will tell the help system that you want more
-                information about what commands can go in place of the question mark. For example:
+                This will give you an overview of the various capabilities of the system.
+                Sometimes, there are more finite commands than can be run, and to gain more
+                information about these, you might have to run a more specialized help command.
+                For specialized help, simply replace any of the elements of the command with a "?".
+                This will tell the help system that you want more information about what commands
+                can go in place of the question mark. For example:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -136,7 +131,8 @@ zf ? controller
 ]]></programlisting>
 
             <para>
-                The above means "show me all 'actions' for the provider 'controller'"; while the following:
+                The above means "show me all 'actions' for the provider 'controller'"; while the
+                following:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -144,29 +140,27 @@ zf show ?
 ]]></programlisting>
 
             <para>
-                means "show me all providers that support the 'show' action". This works for drilling down
-                into options as well as you can see in the following examples:
+                means "show me all providers that support the 'show' action". This works for
+                drilling down into options as well as you can see in the following examples:
             </para>
 
             <programlisting language="text"><![CDATA[
 zf show version.? (show any specialties)
 zf show version ? (show any options)
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.general-purpose-commands.manifest">
             <title>Manifest</title>
 
             <para>
-                This will show what information is in the tooling systems manifest. This is more important
-                for provider developers than casual users of the tooling system.
+                This will show what information is in the tooling systems manifest. This is more
+                important for provider developers than casual users of the tooling system.
             </para>
 
             <programlisting language="text"><![CDATA[
 zf show manifest
 ]]></programlisting>
-
         </sect3>
 
         <!--
@@ -177,7 +171,6 @@ zf show manifest
 
         </sect3>
         -->
-
     </sect2>
 
     <sect2 id="zend.tool.usage.cli.project-specific-commands">
@@ -187,9 +180,9 @@ zf show manifest
             <title>Project</title>
 
             <para>
-                The project provider is the first command you might want to run. This will setup the basic
-                structure of your application. This is required before any of the other providers can
-                be executed.
+                The project provider is the first command you might want to run. This will setup the
+                basic structure of your application. This is required before any of the other
+                providers can be executed.
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -197,24 +190,22 @@ zf create project MyProjectName
 ]]></programlisting>
 
             <para>
-                This will create a project in a directory called ./MyProjectName.  From this point on,
-                it is important to note that any subsequent commands on the command line must be issued
-                from within the project directory you had just created.  So, after creation, changing into
-                that directory is required.
+                This will create a project in a directory called ./MyProjectName. From this point
+                on, it is important to note that any subsequent commands on the command line must be
+                issued from within the project directory you had just created. So, after creation,
+                changing into that directory is required.
             </para>
-
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.module">
             <title>Project</title>
 
             <para>
-                The module provider allows for the easy creation of a Zend Framework module.  A module
-                follows the hMVC pattern loosely.  When creating modules, it will take the same structure
-                used at the application/ level, and duplicate it inside of the chosen name for your module,
-                inside of the "modules" directory of the application/ directory without duplicating the
-                modules directory itself.  For example:
+                The module provider allows for the easy creation of a Zend Framework module. A
+                module follows the hMVC pattern loosely. When creating modules, it will take the
+                same structure used at the application/ level, and duplicate it inside of the chosen
+                name for your module, inside of the "modules" directory of the application/
+                directory without duplicating the modules directory itself. For example:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -222,20 +213,18 @@ zf create module Blog
 ]]></programlisting>
 
             <para>
-                This will create a module named Blog at application/modules/Blog, and all of the artifacts
-                that a module will need.
+                This will create a module named Blog at application/modules/Blog, and all of the
+                artifacts that a module will need.
             </para>
-
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.controller">
             <title>Controller</title>
 
             <para>
-                The controller provider is responsible for creating (mostly) empty controllers as well
-                as their corresponding view script directories and files.  To utilize it to create
-                an 'Auth' controlller, for example, execute:
+                The controller provider is responsible for creating (mostly) empty controllers as
+                well as their corresponding view script directories and files.  To utilize it to
+                create an 'Auth' controlller, for example, execute:
             </para>
 
             <programlisting language="text"><![CDATA[
@@ -257,7 +246,6 @@ zf create controller Post --module=Blog
             <para>
                 Note: In the first command, 1 is the value for the "includeIndexAction" flag.
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.action">
@@ -272,7 +260,6 @@ zf create action login Auth
 zf create action login -c Auth
 zf create action login --controller-name=Auth
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.view">
@@ -291,7 +278,6 @@ zf create view -c Auth -a my-script-name
             <para>
                 This will create a view script in the controller folder of Auth.
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.model">
@@ -317,7 +303,6 @@ zf create model Post -m Blog
             <para>
                 The above will create a 'Post' model inside of the 'Blog' module.
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.form">
@@ -354,19 +339,21 @@ zf create form Comment -m Blog
             </para>
 
             <para>
-
                 For example, to enter the following information:
 
                 <itemizedlist>
                     <listitem>
                         <para>adapter: Pdo_Mysql</para>
                     </listitem>
+
                     <listitem>
                         <para>username: test</para>
                     </listitem>
+
                     <listitem>
                         <para>password: test</para>
                     </listitem>
+
                     <listitem>
                         <para>dbname: test </para>
                     </listitem>
@@ -391,7 +378,6 @@ zf configure dbadapter "adapter=Pdo_Mysql&username=test&password=test&dbname=tes
 zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" development
 zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" -s development
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.db-table">
@@ -432,7 +418,6 @@ zf create dbtable.from-database
             <programlisting language="text"><![CDATA[
 zf -p create dbtable.from-database
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.project-specific-commands.layout">
@@ -447,9 +432,7 @@ zf -p create dbtable.from-database
             <programlisting language="text"><![CDATA[
 zf enable layout
 ]]></programlisting>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.tool.usage.cli.environment-customization">
@@ -467,7 +450,6 @@ zf enable layout
             <programlisting language="text"><![CDATA[
 zf --setup storage-directory
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.environment-customization.configuration-file">
@@ -483,7 +465,6 @@ zf --setup storage-directory
             <programlisting language="text"><![CDATA[
 zf --setup config-file
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.usage.cli.environment-customization.environment-locations">
@@ -497,11 +478,17 @@ zf --setup config-file
             <itemizedlist>
                 <listitem>
                     <para>ZF_HOME</para>
+
                     <itemizedlist>
-                        <listitem><para>the directory this tool will look for a home directory</para></listitem>
+                        <listitem>
+                            <para>the directory this tool will look for a home directory</para>
+                        </listitem>
+
                         <listitem><para>directory must exist</para></listitem>
+
                         <listitem>
                             <para>search order:</para>
+
                             <itemizedlist>
                                 <listitem><para>ZF_HOME environment variable</para></listitem>
                                 <listitem><para>HOME environment variable</para></listitem>
@@ -510,58 +497,97 @@ zf --setup config-file
                         </listitem>
                     </itemizedlist>
                 </listitem>
+
                 <listitem>
                     <para>ZF_STORAGE_DIRECTORY</para>
+
                     <itemizedlist>
-                        <listitem><para>where this tool will look for a storage directory</para></listitem>
+                        <listitem>
+                            <para>where this tool will look for a storage directory</para>
+                        </listitem>
+
                         <listitem><para>directory must exist</para></listitem>
+
                         <listitem>
                             <para>search order:</para>
+
                             <itemizedlist>
-                                <listitem><para>ZF_STORAGE_DIRECTORY environment variable</para></listitem>
+                                <listitem>
+                                    <para>ZF_STORAGE_DIRECTORY environment variable</para>
+                                </listitem>
+
                                 <listitem><para>$homeDirectory/.zf/ directory</para></listitem>
                             </itemizedlist>
                         </listitem>
                     </itemizedlist>
                 </listitem>
+
                 <listitem>
                     <para>ZF_CONFIG_FILE</para>
+
                     <itemizedlist>
-                        <listitem><para>where this tool will look for a configuration file</para></listitem>
+                        <listitem>
+                            <para>where this tool will look for a configuration file</para>
+                        </listitem>
+
                         <listitem>
                             <para>search order:</para>
+
                             <itemizedlist>
-                                <listitem><para>ZF_CONFIG_FILE environment variable</para></listitem>
-                                <listitem><para>$homeDirectory/.zf.ini file if it exists</para></listitem>
-                                <listitem><para>$storageDirectory/zf.ini file if it exists</para></listitem>
+                                <listitem>
+                                    <para>ZF_CONFIG_FILE environment variable</para>
+                                </listitem>
+
+                                <listitem>
+                                    <para>$homeDirectory/.zf.ini file if it exists</para>
+                                </listitem>
+
+                                <listitem>
+                                    <para>$storageDirectory/zf.ini file if it exists</para>
+                                </listitem>
                             </itemizedlist>
                         </listitem>
                     </itemizedlist>
                 </listitem>
+
                 <listitem>
                     <para>ZF_INCLUDE_PATH</para>
+
                     <itemizedlist>
-                        <listitem><para>set the include_path for this tool to use this value</para></listitem>
+                        <listitem>
+                            <para>set the include_path for this tool to use this value</para>
+                        </listitem>
+
                         <listitem>
                             <para>original behavior:</para>
+
                             <itemizedlist>
                                 <listitem><para>use php's include_path to find ZF</para></listitem>
-                                <listitem><para>use the ZF_INCLUDE_PATH environment variable</para></listitem>
-                                <listitem><para>use the path ../library (relative to zf.php) to find ZF</para></listitem>
+
+                                <listitem>
+                                    <para>use the ZF_INCLUDE_PATH environment variable</para>
+                                </listitem>
+
+                                <listitem>
+                                    <para>
+                                        use the path ../library (relative to zf.php) to find ZF
+                                    </para>
+                                </listitem>
                             </itemizedlist>
                         </listitem>
                     </itemizedlist>
                 </listitem>
+
                 <listitem>
                     <para>ZF_INCLUDE_PATH_PREPEND</para>
+
                     <itemizedlist>
-                        <listitem><para>prepend the current php.ini include_path with this value</para></listitem>
+                        <listitem>
+                            <para>prepend the current php.ini include_path with this value</para>
+                        </listitem>
                     </itemizedlist>
                 </listitem>
             </itemizedlist>
-
         </sect3>
-
     </sect2>
-
-</sect1>
+</sect1>

+ 43 - 31
documentation/manual/en/module_specs/Zend_Tool_Framework-Introduction.xml

@@ -72,42 +72,54 @@
     </para>
 
     <itemizedlist>
-        <listitem><para>
-            <classname>Zend_Tool_Framework</classname> - The framework which exposes
-            tooling capabilities.
-        </para></listitem>
+        <listitem>
+            <para>
+                <classname>Zend_Tool_Framework</classname> - The framework which exposes
+                tooling capabilities.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis>Tooling Client</emphasis> - A developer tool that connects
-            to and consumes <classname>Zend_Tool_Framework</classname>.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>Tooling Client</emphasis> - A developer tool that connects
+                to and consumes <classname>Zend_Tool_Framework</classname>.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis>Client</emphasis> - The subsystem of
-            <classname>Zend_Tool_Framework</classname> that exposes an interface such that
-            tooling clients can connect, query and execute commands.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>Client</emphasis> - The subsystem of
+                <classname>Zend_Tool_Framework</classname> that exposes an interface such that
+                tooling clients can connect, query and execute commands.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis>Console Client / Command Line Interface /
-            <filename>zf.php</filename></emphasis> - The tooling client for the command line.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>Console Client / Command Line Interface /
+                <filename>zf.php</filename></emphasis> - The tooling client for the command line.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis>Provider</emphasis> - A subsystem and a collection of
-            built-in functionality that the framework exports.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>Provider</emphasis> - A subsystem and a collection of
+                built-in functionality that the framework exports.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <emphasis>Manifest</emphasis> - A subsystem for defining,
-            organizing, and disseminating provider requirement data.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>Manifest</emphasis> - A subsystem for defining,
+                organizing, and disseminating provider requirement data.
+            </para>
+        </listitem>
 
-        <listitem><para>
-            <classname>Zend_Tool_Project</classname> Provider - A set of providers
-            specifically for creating and maintaining Zend Framework-based
-            projects.
-        </para></listitem>
+        <listitem>
+            <para>
+                <classname>Zend_Tool_Project</classname> Provider - A set of providers
+                specifically for creating and maintaining Zend Framework-based projects.
+            </para>
+        </listitem>
     </itemizedlist>
 </sect1>
-

+ 0 - 1
documentation/manual/en/module_specs/Zend_Tool_Framework-SystemProviders.xml

@@ -25,7 +25,6 @@
         <para>
             Through the command line, simply run <command>zf show version</command>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.tool.framework.system-providers.manifest">

+ 13 - 12
documentation/manual/en/module_specs/Zend_Tool_Framework-WritingProviders.xml

@@ -41,6 +41,7 @@
                     provider being accessible by the name "hello".
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     If your provider has a method <methodname>getName()</methodname>
@@ -48,6 +49,7 @@
                     the name.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     If your provider has "Provider" as prefix, e.g. it is called
@@ -58,9 +60,11 @@
         </itemizedlist>
 
         <note>
-            <para>The IncludePathLoader does not follow symlinks, that means
-            you cannot link provider functionality into your include paths,
-            they have to be physically present in the include paths.</para>
+            <para>
+                The IncludePathLoader does not follow symlinks, that means
+                you cannot link provider functionality into your include paths,
+                they have to be physically present in the include paths.
+            </para>
         </note>
 
         <example id="zend.tool.framework.writing-providers.loading.example">
@@ -89,7 +93,6 @@ class My_Component_Manifest
     }
 }
 ]]></programlisting>
-
         </example>
     </sect2>
 
@@ -155,8 +158,9 @@ class My_Component_HelloProvider
 ]]></programlisting>
 
         <para>
-            As you can see one has to extend the <classname>Zend_Tool_Framework_Provider_Abstract</classname>
-            to gain access to the Registry which holds the <classname>Zend_Tool_Framework_Client_Response</classname>
+            As you can see one has to extend the
+            <classname>Zend_Tool_Framework_Provider_Abstract</classname> to gain access to the
+            Registry which holds the <classname>Zend_Tool_Framework_Client_Response</classname>
             instance.
         </para>
     </sect2>
@@ -204,7 +208,6 @@ class My_Component_HelloProvider
                 line, so that <command>zf say hello</command> will still work, and default
                 to the name "Ralph".
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.framework.writing-providers.advanced.prompt">
@@ -285,7 +288,6 @@ class My_Component_HelloProvider
 % zf --pretend say hello Ralph
 I would say hello Ralph.
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.tool.framework.writing-providers.advanced.verbosedebug">
@@ -350,9 +352,9 @@ class My_Component_HelloProvider
             </para>
 
             <para>
-                The storage allows to save arbitrary data for later reference. This can be useful for batch
-                processing tasks or for re-runs of your tasks. You can access the storage in a similar way
-                like the configuration:
+                The storage allows to save arbitrary data for later reference. This can be useful
+                for batch processing tasks or for re-runs of your tasks. You can access the storage
+                in a similar way like the configuration:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -393,6 +395,5 @@ class Zend_Tool_Framework_Client_Storage
                 </para>
             </important>
         </sect3>
-
     </sect2>
 </sect1>

+ 6 - 13
documentation/manual/en/module_specs/Zend_Tool_Project-CreateProject.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.tool.project.create-a-project">
-
     <title>Create A Project</title>
 
     <note>
@@ -46,6 +45,7 @@
 
     <table id="zend.tool.project.project-provider-table">
         <title>Project Provider Options</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -55,20 +55,13 @@
                     <entry><acronym>CLI</acronym> Usage</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
-                    <entry>
-                        Project
-                    </entry>
-                    <entry>
-                        Create / Show
-                    </entry>
-                    <entry>
-                        create - [path=null, profile='default']
-                    </entry>
-                    <entry>
-                        <command>zf create project some/path</command>
-                    </entry>
+                    <entry>Project</entry>
+                    <entry>Create / Show</entry>
+                    <entry>create - [path=null, profile='default']</entry>
+                    <entry><command>zf create project some/path</command></entry>
                 </row>
             </tbody>
         </tgroup>

+ 4 - 1
documentation/manual/en/module_specs/Zend_Tool_Project-Internals.xml

@@ -2,15 +2,18 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.tool.project.internals">
     <title>Zend_Tool_Project Internals</title>
+
     <sect2 id="zend.tool.project.internals.xml-structure">
         <title>Zend_Tool_Project Internal Xml Structure</title>
+
         <para></para>
         <!-- @todo -->
     </sect2>
 
     <sect2 id="zend.tool.project.internals.extending">
         <title>Zend_Tool_Project Internal Extending</title>
+
         <para></para>
         <!-- @todo -->
     </sect2>
-</sect1>
+</sect1>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Tool_Project.xml

@@ -35,4 +35,4 @@
         resources are part of a project at any given time, but also <emphasis>where</emphasis> they
         are in relation to one another.
     </para>
-</sect1>
+</sect1>

+ 83 - 57
documentation/manual/en/module_specs/Zend_Translate-Adapters.xml

@@ -13,6 +13,7 @@
 
     <table id="zend.translate.adapter.table">
         <title>Adapters for Zend_Translate</title>
+
         <tgroup cols="3">
             <thead>
                 <row>
@@ -21,52 +22,88 @@
                     <entry>Usage</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
                     <entry>Array</entry>
                     <entry>Use <acronym>PHP</acronym> arrays</entry>
                     <entry>Small pages; simplest usage; only for programmers</entry>
                 </row>
+
                 <row>
                     <entry>Csv</entry>
                     <entry>Use comma separated (*.csv/*.txt) files</entry>
-                    <entry>Simple text file format; fast; possible problems with unicode characters</entry>
+
+                    <entry>
+                        Simple text file format; fast; possible problems with unicode characters
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Gettext</entry>
                     <entry>Use binary gettext (*.mo) files</entry>
                     <entry>GNU standard for linux; thread-safe; needs tools for translation</entry>
                 </row>
+
                 <row>
                     <entry>Ini</entry>
                     <entry>Use simple ini (*.ini) files</entry>
-                    <entry>Simple text file format; fast; possible problems with unicode characters</entry>
+
+                    <entry>
+                        Simple text file format; fast; possible problems with unicode characters
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Tbx</entry>
                     <entry>Use termbase exchange (*.tbx/*.xml) files</entry>
-                    <entry>Industry standard for inter application terminology strings; <acronym>XML</acronym> format</entry>
+
+                    <entry>
+                        Industry standard for inter application terminology strings;
+                        <acronym>XML</acronym> format
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Tmx</entry>
                     <entry>Use tmx (*.tmx/*.xml) files</entry>
-                    <entry>Industry standard for inter application translation; <acronym>XML</acronym> format; human readable</entry>
+
+                    <entry>
+                        Industry standard for inter application translation; <acronym>XML</acronym>
+                        format; human readable
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Qt</entry>
                     <entry>Use qt linguist (*.ts) files</entry>
-                    <entry>Cross platform application framework; <acronym>XML</acronym> format; human readable</entry>
+
+                    <entry>
+                        Cross platform application framework; <acronym>XML</acronym> format; human
+                        readable
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Xliff</entry>
                     <entry>Use xliff (*.xliff/*.xml) files</entry>
-                    <entry>A simpler format as <constant>TMX</constant> but related to it; <acronym>XML</acronym> format; human readable</entry>
+
+                    <entry>
+                        A simpler format as <constant>TMX</constant> but related to it;
+                        <acronym>XML</acronym> format; human readable
+                    </entry>
                 </row>
+
                 <row>
                     <entry>XmlTm</entry>
                     <entry>Use xmltm (*.xml) files</entry>
-                    <entry>Industry standard for <acronym>XML</acronym> document translation memory; <acronym>XML</acronym> format; human readable</entry>
+
+                    <entry>
+                        Industry standard for <acronym>XML</acronym> document translation memory;
+                        <acronym>XML</acronym> format; human readable
+                    </entry>
                 </row>
+
                 <row>
                     <entry>Others</entry>
                     <entry>*.sql</entry>
@@ -77,13 +114,12 @@
     </table>
 
     <sect2 id="zend.translate.adapter.decision">
-
         <title>How to decide which translation adapter to use</title>
 
         <para>
-            You should decide which Adapter you want to use for <classname>Zend_Translate</classname>.
-            Frequently, external criteria such as a project requirement or
-            a customer requirement determines this for you, but if you are in
+            You should decide which Adapter you want to use for
+            <classname>Zend_Translate</classname>. Frequently, external criteria such as a project
+            requirement or a customer requirement determines this for you, but if you are in
             the position to do this yourself, the following hints may simplify
             your decision.
         </para>
@@ -110,7 +146,6 @@
         </note>
 
         <sect3 id="zend.translate.adapter.array">
-
             <title>Zend_Translate_Adapter_Array</title>
 
             <para>
@@ -130,7 +165,6 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.csv">
-
             <title>Zend_Translate_Adapter_Csv</title>
 
             <para>
@@ -147,16 +181,17 @@
 
             <note>
                 <para>
-                    Beware that the Csv Adapter has problems when your Csv files are encoded differently than
-                    the locale setting of your environment. This is due to a Bug of <acronym>PHP</acronym> itself which will not
-                    be fixed before <acronym>PHP</acronym> 6.0 (http://bugs.php.net/bug.php?id=38471). So you should be aware
-                    that the Csv Adapter due to <acronym>PHP</acronym> restrictions is not locale aware.
+                    Beware that the Csv Adapter has problems when your Csv files are encoded
+                    differently than the locale setting of your environment. This is due to a Bug of
+                    <acronym>PHP</acronym> itself which will not be fixed before
+                    <acronym>PHP</acronym> 6.0 (http://bugs.php.net/bug.php?id=38471). So you should
+                    be aware that the Csv Adapter due to <acronym>PHP</acronym> restrictions is not
+                    locale aware.
                 </para>
             </note>
         </sect3>
 
         <sect3 id="zend.translate.adapter.gettext">
-
             <title>Zend_Translate_Adapter_Gettext</title>
 
             <para>
@@ -164,9 +199,9 @@
                 frequently. Gettext is a translation source format which was
                 introduced by GNU, and is now used worldwide.
                 It is not human readable, but there are several freeware tools
-                (for instance, <ulink url="http://sourceforge.net/projects/poedit/">POEdit</ulink>), which are very helpful.
-                The <classname>Zend_Translate</classname> Gettext Adapter is not implemented using
-                <acronym>PHP</acronym>'s gettext extension.
+                (for instance, <ulink url="http://sourceforge.net/projects/poedit/">POEdit</ulink>),
+                which are very helpful. The <classname>Zend_Translate</classname> Gettext Adapter is
+                not implemented using <acronym>PHP</acronym>'s gettext extension.
                 You can use the Gettext Adapter even if you do not have
                 the <acronym>PHP</acronym> gettext extension installed.
                 Also the Adapter is thread-safe and the <acronym>PHP</acronym> gettext extension
@@ -182,7 +217,6 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.ini">
-
             <title>Zend_Translate_Adapter_Ini</title>
 
             <para>
@@ -203,17 +237,17 @@
                 <para>
                     Prior to <acronym>PHP</acronym> 5.3, <methodname>parse_ini_file()</methodname>
                     and <methodname>parse_ini_string()</methodname> handled non-ASCII characters
-                    within <acronym>INI</acronym> option keys worked without an issue. However, starting with <acronym>PHP</acronym> 5.3,
-                    any such keys will now be silently dropped in the returned array from either
-                    function. If you had keys utilizing UTF-8 or Latin-1 characters, you may find
-                    your translations no longer work when using the <acronym>INI</acronym> adapter. If this is the
-                    case, we recommend utilizing a different adapter.
+                    within <acronym>INI</acronym> option keys worked without an issue. However,
+                    starting with <acronym>PHP</acronym> 5.3, any such keys will now be silently
+                    dropped in the returned array from either function. If you had keys utilizing
+                    UTF-8 or Latin-1 characters, you may find your translations no longer work when
+                    using the <acronym>INI</acronym> adapter. If this is the case, we recommend
+                    utilizing a different adapter.
                 </para>
             </warning>
         </sect3>
 
         <sect3 id="zend.translate.adapter.tbx">
-
             <title>Zend_Translate_Adapter_Tbx</title>
 
             <para>
@@ -236,7 +270,6 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.tmx">
-
             <title>Zend_Translate_Adapter_Tmx</title>
 
             <para>
@@ -257,7 +290,6 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.qt">
-
             <title>Zend_Translate_Adapter_Qt</title>
 
             <para>
@@ -275,13 +307,11 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.xliff">
-
             <title>Zend_Translate_Adapter_Xliff</title>
 
             <para>
-                The Xliff Adapter is the Adapter which will be used by most
-                customers which want to have <acronym>XML</acronym> files but do not have tools
-                for TMX.
+                The Xliff Adapter is the Adapter which will be used by most customers which
+                want to have <acronym>XML</acronym> files but do not have tools for TMX.
                 XLIFF is a <acronym>XML</acronym> file based format, which is related to TMX but
                 simpler as it does not support all possibilities of it.
                 <acronym>XML</acronym> files are human-readable, but the parsing is not as fast
@@ -295,7 +325,6 @@
         </sect3>
 
         <sect3 id="zend.translate.adapter.xmltm">
-
             <title>Zend_Translate_Adapter_XmlTm</title>
 
             <para>
@@ -312,30 +341,29 @@
                 The files are human readable and system-independent.
             </para>
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.translate.adapter.selfwritten">
-
         <title>Integrate self written Adapters</title>
 
         <para>
-            <classname>Zend_Translate</classname> allows you to integrate and use self written Adapter
-            classes. They can be used like the standard Adapter classes which
+            <classname>Zend_Translate</classname> allows you to integrate and use self written
+            Adapter classes. They can be used like the standard Adapter classes which
             are already included within <classname>Zend_Translate</classname>.
         </para>
 
         <para>
-            Any adapter class you want to use with <classname>Zend_Translate</classname> must be a subclass
-            of <classname>Zend_Translate_Adapter</classname>. <classname>Zend_Translate_Adapter</classname> is an abstract class
-            which already defines all what is needed for translation. What has to be
-            done by you, is the definition of the reader for translation datas.
+            Any adapter class you want to use with <classname>Zend_Translate</classname> must be a
+            subclass of <classname>Zend_Translate_Adapter</classname>.
+            <classname>Zend_Translate_Adapter</classname> is an abstract class which already defines
+            all what is needed for translation. What has to be done by you, is the definition of the
+            reader for translation datas.
         </para>
 
         <para>
             The usage of the prefix "Zend" should be limited to Zend Framework.
-            If you extend <classname>Zend_Translate</classname> with your own adapter, you should name it
-            like "Company_Translate_Adapter_MyFormat". The following code shows an
+            If you extend <classname>Zend_Translate</classname> with your own adapter, you should
+            name it like "Company_Translate_Adapter_MyFormat". The following code shows an
             example of how a self written adapter class could be implemented:
         </para>
 
@@ -350,25 +378,25 @@ try {
     // General failure
 }
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.translate.adapter.caching">
-
         <title>Speedup all Adapters</title>
 
         <para>
-            <classname>Zend_Translate</classname> allows you use internally <classname>Zend_Cache</classname> to
-            fasten the loading of translation sources. This comes very handy if you use many
-            translation sources or extensive source formats like <acronym>XML</acronym> based files.
+            <classname>Zend_Translate</classname> allows you use internally
+            <classname>Zend_Cache</classname> to fasten the loading of translation sources. This
+            comes very handy if you use many translation sources or extensive source formats like
+            <acronym>XML</acronym> based files.
         </para>
 
         <para>
             To use caching you will just have to give a cache object to the
             <methodname>Zend_Translate::setCache()</methodname> method. It takes a instance of
-            <classname>Zend_Cache</classname> as only parameter. Also if you use any adapter direct you
-            can use the <methodname>setCache()</methodname> method. For convenience there are also the static methods
-            <methodname>getCache()</methodname>, <methodname>hasCache()</methodname>, <methodname>clearCache()</methodname> and
+            <classname>Zend_Cache</classname> as only parameter. Also if you use any adapter direct
+            you can use the <methodname>setCache()</methodname> method. For convenience there are
+            also the static methods <methodname>getCache()</methodname>,
+            <methodname>hasCache()</methodname>, <methodname>clearCache()</methodname> and
             <methodname>removeCache()</methodname>.
         </para>
 
@@ -386,14 +414,12 @@ $translate = new Zend_Translate('gettext',
         <note>
             <para>
                 You must set the cache <emphasis>before</emphasis> you use or initiate
-                any adapter or instance of <classname>Zend_Translate</classname>. Otherwise your translation
-                source will not be cached until you add a new source with the
+                any adapter or instance of <classname>Zend_Translate</classname>. Otherwise your
+                translation source will not be cached until you add a new source with the
                 <methodname>addTranslation()</methodname> method.
             </para>
         </note>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

+ 1 - 0
documentation/manual/en/module_specs/Zend_Translate-Additional.xml

@@ -53,6 +53,7 @@ $translate->addTranslation('/path/to/new.csv', 'fr', $options);
 
         <table id="zend.translate.additional.options.alloptions">
             <title>Options for translation adapters</title>
+
             <tgroup cols="4">
                 <thead>
                     <row>

+ 2 - 1
documentation/manual/en/module_specs/Zend_Translate-Introduction.xml

@@ -130,7 +130,8 @@
 
             <listitem>
                 <para>
-                    Create your view and integrate <classname>Zend_Translate</classname> in your code;
+                    Create your view and integrate <classname>Zend_Translate</classname> in your
+                    code;
                 </para>
             </listitem>
 

+ 11 - 22
documentation/manual/en/module_specs/Zend_Translate-Plurals.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.translate.plurals">
-
     <title>Plural notations for Translation</title>
 
     <para>
@@ -32,7 +31,6 @@
     </para>
 
     <sect2 id="zend.translate.plurals.traditional">
-
         <title>Traditional plural translations</title>
 
         <para>
@@ -42,7 +40,6 @@
         </para>
 
         <example id="zend.translate.plurals.traditional.example1">
-
             <title>Example of traditional plural translations</title>
 
             <para>
@@ -61,13 +58,10 @@
 $translate = new Zend_Translate('gettext', '/path/to/german.mo', 'de');
 $translate->plural('Car', 'Cars', $number);
 ]]></programlisting>
-
         </example>
-
     </sect2>
 
     <sect2 id="zend.translate.plurals.modern">
-
         <title>Modern plural translations</title>
 
         <para>
@@ -84,7 +78,6 @@ $translate->plural('Car', 'Cars', $number);
         </para>
 
         <example id="zend.translate.plurals.modern.example1">
-
             <title>Example of modern plural translations</title>
 
             <para>
@@ -96,7 +89,6 @@ $translate->plural('Car', 'Cars', $number);
 $translate = new Zend_Translate('gettext', '/path/to/german.mo', 'de');
 $translate->translate(array('Car', 'Cars', $number));
 ]]></programlisting>
-
         </example>
 
         <para>
@@ -105,7 +97,6 @@ $translate->translate(array('Car', 'Cars', $number));
         </para>
 
         <example id="zend.translate.plurals.modern.example2">
-
             <title>Example of modern plural translations using a different source language</title>
 
             <para>
@@ -121,7 +112,6 @@ $translate->translate(array('Car',
                             $number,
                             'ru'));
 ]]></programlisting>
-
         </example>
 
         <para>
@@ -134,11 +124,9 @@ $translate->translate(array('Car',
             When you omit the plural language then english will be used per default and any
             additional plural definition will be ignored.
         </para>
-
     </sect2>
 
     <sect2 id="zend.translate.plurals.source">
-
         <title>Plural source files</title>
 
         <para>
@@ -147,6 +135,7 @@ $translate->translate(array('Car',
 
         <table id="zend.translate.plurals.source.supportedadapters">
             <title>Plural support</title>
+
             <tgroup cols="4">
                 <thead>
                     <row>
@@ -154,39 +143,48 @@ $translate->translate(array('Car',
                         <entry>Plurals supported</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry>Array</entry>
                         <entry><emphasis>yes</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Csv</entry>
                         <entry><emphasis>yes</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Gettext</entry>
                         <entry><emphasis>yes</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Ini</entry>
                         <entry><emphasis>no</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Qt</entry>
                         <entry><emphasis>no</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Tbx</entry>
                         <entry><emphasis>no</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Tmx</entry>
                         <entry><emphasis>no</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>Xliff</entry>
                         <entry><emphasis>no</emphasis></entry>
                     </row>
+
                     <row>
                         <entry>XmlTm</entry>
                         <entry><emphasis>no</emphasis></entry>
@@ -200,7 +198,6 @@ $translate->translate(array('Car',
         </para>
 
         <sect3 id="zend.translate.plurals.source.array">
-
             <title>Array source with plural definitions</title>
 
             <para>
@@ -241,11 +238,9 @@ array(
                 the array below the first plural form. When your source language suppors more
                 plural forms, than simply add a new empty translation.
             </para>
-
         </sect3>
 
         <sect3 id="zend.translate.plurals.source.csv">
-
             <title>Csv source with plural definitions</title>
 
             <para>
@@ -263,11 +258,9 @@ array(
                 below but without translation. Note that you must add a delimiter to empty
                 source plurals.
             </para>
-
         </sect3>
 
         <sect3 id="zend.translate.plurals.source.gettext">
-
             <title>Gettext source with plural definitions</title>
 
             <para>
@@ -276,18 +269,14 @@ array(
             </para>
 
             <note>
-
                 <para>
                     Note that gettext does not support the usage of source languages which are not
                     using english plural forms. When you plan to use a source language which
                     supports other plural forms like russian for example, then you can not use
                     gettext sources.
                 </para>
-
             </note>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.translate.plurals.customrules">
@@ -363,4 +352,4 @@ Zend_Translate_Plural::setPlural('MyPlural', 'zh');
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

+ 22 - 29
documentation/manual/en/module_specs/Zend_Translate-SourceCreation.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.translate.sourcecreation">
-
     <title>Creating source files</title>
 
     <para>
@@ -19,7 +18,6 @@
     </note>
 
     <sect2 id="zend.translate.sourcecreation.array">
-
         <title>Creating Array source files</title>
 
         <para>
@@ -47,8 +45,8 @@ $translate->addTranslation($deutsch, 'de');
 
         <para>
             Since release 1.5 it is also supported to have arrays included within an external file.
-            You just have to provide the filename and <classname>Zend_Translate</classname> will automatically
-            include it and look for the array. See the following example for details:
+            You just have to provide the filename and <classname>Zend_Translate</classname> will
+            automatically include it and look for the array. See the following example for details:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -67,13 +65,10 @@ $translate = new Zend_Translate('array', '/path/to/myarray.php', 'de');
                 Files which do not return an array will fail to be included.
                 Also any output within this file will be ignored and suppressed.
             </para>
-
         </note>
-
     </sect2>
 
     <sect2 id="zend.translate.sourcecreation.gettext">
-
         <title>Creating Gettext source files</title>
 
         <para>
@@ -96,8 +91,8 @@ $translate->addTranslation('/path/to/german.mo', 'de');
         <para>
             As you can see the adapters are used exactly the same way,
             with one small difference:
-            change <emphasis>array</emphasis> to <emphasis>gettext</emphasis>. All other usages are exactly
-            the same as with all other adapters.
+            change <emphasis>array</emphasis> to <emphasis>gettext</emphasis>. All other usages are
+            exactly the same as with all other adapters.
             With the gettext adapter you no longer have to be aware of
             gettext's standard directory structure,
             bindtextdomain and textdomain.
@@ -114,6 +109,7 @@ $translate->addTranslation('/path/to/german.mo', 'de');
                  You can set only one encoding for your source file,
                  so one of your languages probably will not display correctly.
             </para>
+
             <para>
                  UTF-8 is a portable format which supports all languages.
                  When using UTF-8 for all languages, you will eliminate
@@ -135,11 +131,9 @@ $translate->addTranslation('/path/to/german.mo', 'de');
 $translate = new Zend_Translate('gettext', '/path/to/english.mo', 'en');
 print_r($translate->getAdapterInfo());
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.translate.sourcecreation.tmx">
-
         <title>Creating TMX source files</title>
 
         <para>
@@ -153,6 +147,7 @@ print_r($translate->getAdapterInfo());
 
         <example id="zend.translate.sourcecreation.tmx.example">
             <title>Example TMX file</title>
+
             <programlisting language="xml"><![CDATA[
 <?xml version="1.0" ?>
 <!DOCTYPE tmx SYSTEM "tmx14.dtd">
@@ -193,7 +188,6 @@ $translate = new Zend_Translate('tmx', 'path/to/mytranslation.tmx', 'en');
     </sect2>
 
     <sect2 id="zend.translate.sourcecreation.csv">
-
         <title>Creating CSV source files</title>
 
         <para>
@@ -204,6 +198,7 @@ $translate = new Zend_Translate('tmx', 'path/to/mytranslation.tmx', 'en');
 
         <example id="zend.translate.sourcecreation.csv.example">
             <title>Example CSV file</title>
+
             <programlisting language="txt"><![CDATA[
 #Example csv file
 message1;Nachricht1
@@ -242,6 +237,7 @@ $translate->addTranslation('path/to/other.csv', 'fr');
 
         <example id="zend.translate.sourcecreation.csv.example2">
             <title>Second CSV file example</title>
+
             <programlisting language="txt"><![CDATA[
 # Example CSV file
 "message,1",Nachricht1
@@ -261,29 +257,26 @@ $translate->addTranslation('/path/to/other.csv', 'fr');
         </example>
 
         <note>
-
             <para>
                 When you are using non-ASCII characters within your CSV file, like umlauts or UTF-8
                 chars, then you should always use enclosure. Omitting the enclosure can lead to
                 missing characters in your translation.
             </para>
-
         </note>
-
     </sect2>
 
     <sect2 id="zend.translate.sourcecreation.ini">
-
         <title>Creating INI source files</title>
 
         <para>
-            <acronym>INI</acronym> source files are human readable but normally not very small as they also
-            include other data beside translations. If you have data which shall be
+            <acronym>INI</acronym> source files are human readable but normally not very small as
+            they also include other data beside translations. If you have data which shall be
             editable by your customers you can use the <acronym>INI</acronym> adapter.
         </para>
 
         <example id="zend.translate.sourcecreation.ini.example">
             <title>Example INI file</title>
+
             <programlisting language="txt"><![CDATA[
 [Test]
 ;TestPage Comment
@@ -299,19 +292,19 @@ $translate->addTranslation('/path/to/other.ini', 'it');
         </example>
 
         <para>
-            <acronym>INI</acronym> files have several restrictions. If a value in the ini file contains any
-            non-alphanumeric characters it needs to be enclosed in double-quotes (<code>"</code>).
-            There are also reserved words which must not be used as keys for ini files.
-            These include: <constant>NULL</constant>, <code>yes</code>, <code>no</code>, <constant>TRUE</constant>,
-            and <constant>FALSE</constant>. Values <constant>NULL</constant>, <code>no</code> and <constant>FALSE</constant> results
-            in <code>""</code>, <code>yes</code> and <constant>TRUE</constant> results in <code>1</code>. Characters <code>{}|&amp;~![()"</code> must not be used anywhere
-            in the key and have a special meaning in the value. Do not use them as it will
-            produce unexpected behaviour.
+            <acronym>INI</acronym> files have several restrictions. If a value in the ini file
+            contains any non-alphanumeric characters it needs to be enclosed in double-quotes
+            (<code>"</code>). There are also reserved words which must not be used as keys for ini
+            files. These include: <constant>NULL</constant>, <code>yes</code>, <code>no</code>,
+            <constant>TRUE</constant>, and <constant>FALSE</constant>. Values
+            <constant>NULL</constant>, <code>no</code> and <constant>FALSE</constant> results in
+            <code>""</code>, <code>yes</code> and <constant>TRUE</constant> results in
+            <code>1</code>. Characters <code>{}|&amp;~![()"</code> must not be used anywhere in the
+            key and have a special meaning in the value. Do not use them as it will produce
+            unexpected behaviour.
         </para>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

+ 7 - 5
documentation/manual/en/module_specs/Zend_Translate-Using.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.translate.using">
-
     <title>Using Translation Adapters</title>
 
     <para>
@@ -35,6 +34,7 @@ print "Here is line two\n";
 
     <example id="zend.translate.using.example2">
         <title>Example of multi-lingual PHP code</title>
+
         <programlisting language="php"><![CDATA[
 $translate = new Zend_Translate('gettext', '/my/path/source-de.mo', 'de');
 $translate->addTranslation('/path/to/translation/fr-source.mo', 'fr');
@@ -143,7 +143,6 @@ print $translate->_(2) . "\n";
     </para>
 
     <sect2 id="zend.translate.using.structure">
-
         <title>Translation Source Structures</title>
 
         <para>
@@ -178,6 +177,7 @@ print $translate->_(2) . "\n";
                     in one directory. No splitting of related files.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Language structured source
@@ -201,6 +201,7 @@ print $translate->_(2) . "\n";
                     only one directory. Also the usage of multiple files is transparent.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Application structured source
@@ -226,6 +227,7 @@ print $translate->_(2) . "\n";
                     problematic.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Gettext structured source
@@ -255,6 +257,7 @@ print $translate->_(2) . "\n";
                     for people who have not used gettext before.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                    File structured source
@@ -272,6 +275,7 @@ print $translate->_(2) . "\n";
 /application/controllers/MyController.en
 /library/
 ]]></programlisting>
+
                 <para>
                     Positive: translation files are localted near their source.
                 </para>
@@ -293,10 +297,8 @@ print $translate->_(2) . "\n";
             So now, that we know which structure we want to have,
             we should create our translation source files.
         </para>
-
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:
--->
+-->

+ 2 - 2
documentation/manual/en/module_specs/Zend_Uri.xml

@@ -63,8 +63,8 @@ $uri = Zend_Uri::factory('http');
         <title>Manipulating an Existing URI</title>
 
         <para>
-            To manipulate an existing <acronym>URI</acronym>, pass the entire <acronym>URI</acronym> to
-            <methodname>Zend_Uri::factory()</methodname>.
+            To manipulate an existing <acronym>URI</acronym>, pass the entire <acronym>URI</acronym>
+            to <methodname>Zend_Uri::factory()</methodname>.
         </para>
 
         <example id="zend.uri.manipulation.example-1">

+ 2 - 2
documentation/manual/en/module_specs/Zend_Validate-Barcode.xml

@@ -170,8 +170,8 @@
 
             <para>
                 This barcode must have a length of 18 characters. It support only digits. The last
-                digit is always a checksum digit which is calculated with modulo 10. This code is often
-                used for the identification of shipping containers.
+                digit is always a checksum digit which is calculated with modulo 10. This code is
+                often used for the identification of shipping containers.
             </para>
         </listitem>
 

+ 1 - 0
documentation/manual/en/module_specs/Zend_Validate-CreditCard.xml

@@ -172,6 +172,7 @@ $valid = new Zend_Validate_CreditCard(array(
 
         <table id="zend.validate.set.creditcard.institute.table">
             <title>Constants for credit card institutes</title>
+
             <tgroup cols="5">
                 <thead>
                     <row>

+ 54 - 34
documentation/manual/en/module_specs/Zend_Validate-Set.xml

@@ -10,27 +10,30 @@
 
     <sect2 id="zend.validate.set.alnum">
         <title>Alnum</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only alphabetic
-            and digit characters. This validator includes an option to also consider white space
-            characters as valid.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only
+            alphabetic and digit characters. This validator includes an option to also consider
+            white space characters as valid.
         </para>
 
         <note>
             <para>
                 The alphabetic characters mean characters that makes up words in each language.
                 However, the English alphabet is treated as the alphabetic characters in following
-                languages: Chinese, Japanese, Korean. The language is specified by <classname>Zend_Locale</classname>.
+                languages: Chinese, Japanese, Korean. The language is specified by
+                <classname>Zend_Locale</classname>.
             </para>
         </note>
     </sect2>
 
     <sect2 id="zend.validate.set.alpha">
         <title>Alpha</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only alphabetic
-            characters. This validator includes an option to also consider white space characters
-            as valid.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only
+            alphabetic characters. This validator includes an option to also consider white space
+            characters as valid.
         </para>
     </sect2>
 
@@ -38,12 +41,13 @@
 
     <sect2 id="zend.validate.set.between">
         <title>Between</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is between the minimum and
-            maximum boundary values. The comparison is inclusive by default (<varname>$value</varname> may
-            equal a boundary value), though this may be overridden in order to do a strict
-            comparison, where <varname>$value</varname> must be strictly greater than the minimum and
-            strictly less than the maximum.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is between
+            the minimum and maximum boundary values. The comparison is inclusive by default
+            (<varname>$value</varname> may equal a boundary value), though this may be overridden in
+            order to do a strict comparison, where <varname>$value</varname> must be strictly
+            greater than the minimum and strictly less than the maximum.
         </para>
     </sect2>
 
@@ -52,10 +56,12 @@
 
     <sect2 id="zend.validate.set.ccnum">
         <title>Ccnum</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> follows the Luhn algorithm
-            (mod-10 checksum) for credit card numbers.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> follows the
+            Luhn algorithm (mod-10 checksum) for credit card numbers.
         </para>
+
         <note>
             <para>
                 The <classname>Ccnum</classname> validator has been deprecated in favor of the
@@ -67,6 +73,7 @@
 
     <sect2 id="zend.validate.set.date">
         <title>Date</title>
+
         <para>
             Returns <constant>TRUE</constant> if <varname>$value</varname> is a valid date of the
             format 'YYYY-MM-DD'. If the optional <property>locale</property> option is set then the
@@ -81,9 +88,10 @@
 
     <sect2 id="zend.validate.set.digits">
         <title>Digits</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> only contains digit
-            characters.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> only contains
+            digit characters.
         </para>
     </sect2>
 
@@ -91,28 +99,31 @@
 
     <sect2 id="zend.validate.set.float">
         <title>Float</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a floating-point value.
-            Since Zend Framework 1.8 this validator takes into account the actual locale from
-            browser, environment or application wide set locale. You can of course use the
-            get/setLocale accessors to change the used locale or give it while creating a instance
-            of this validator.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a
+            floating-point value. Since Zend Framework 1.8 this validator takes into account the
+            actual locale from browser, environment or application wide set locale. You can of
+            course use the get/setLocale accessors to change the used locale or give it while
+            creating a instance of this validator.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.greater_than">
         <title>GreaterThan</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is greater than the minimum
-            boundary.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is greater
+            than the minimum boundary.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.hex">
         <title>Hex</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only hexadecimal
-            digit characters.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only
+            hexadecimal digit characters.
         </para>
     </sect2>
 
@@ -120,15 +131,18 @@
 
     <sect2 id="zend.validate.set.iban">
         <title>Iban</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains a valid IBAN
-            (International Bank Account Number). IBAN numbers are validated against the country
-            where they are used and by a checksum.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains a
+            valid IBAN (International Bank Account Number). IBAN numbers are validated against the
+            country where they are used and by a checksum.
         </para>
+
         <para>
             There are two ways to validate IBAN numbers. As first way you can give a locale which
             represents a country. Any given IBAN number will then be validated against this country.
         </para>
+
         <programlisting language="php"><![CDATA[
 $validator = new Zend_Validate_Iban('de_AT');
 $iban = 'AT611904300234573201';
@@ -141,10 +155,12 @@ if ($validator->isValid($iban)) {
     }
 }
 ]]></programlisting>
+
         <para>
             This should be done when you want to validate IBAN numbers for a single countries. The
             simpler way of validation is not to give a locale like shown in the next example.
         </para>
+
         <programlisting language="php"><![CDATA[
 $validator = new Zend_Validate_Iban();
 $iban = 'AT611904300234573201';
@@ -154,6 +170,7 @@ if ($validator->isValid($iban)) {
     // IBAN is invalid
 }
 ]]></programlisting>
+
         <para>
             But this shows one big problem: When you have to accept only IBAN numbers from one
             single country, for example france, then IBAN numbers from other countries would also be
@@ -168,12 +185,13 @@ if ($validator->isValid($iban)) {
 
     <sect2 id="zend.validate.set.int">
         <title>Int</title>
+
         <para>
-            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a valid integer. Since
-            Zend Framework 1.8 this validator takes into account the actual locale from browser,
-            environment or application wide set locale. You can of course use the get/setLocale
-            accessors to change the used locale or give it while creating a instance of this
-            validator.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a valid
+            integer. Since Zend Framework 1.8 this validator takes into account the actual locale
+            from browser, environment or application wide set locale. You can of course use the
+            get/setLocale accessors to change the used locale or give it while creating a instance
+            of this validator.
         </para>
     </sect2>
 
@@ -182,6 +200,7 @@ if ($validator->isValid($iban)) {
 
     <sect2 id="zend.validate.set.less_than">
         <title>LessThan</title>
+
         <para>
             Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is less than
             the maximum boundary.
@@ -193,6 +212,7 @@ if ($validator->isValid($iban)) {
 
     <sect2 id="zend.validate.set.regex">
         <title>Regex</title>
+
         <para>
             Returns <constant>TRUE</constant> if and only if <varname>$value</varname> matches
             against a regular expression pattern.
@@ -203,6 +223,7 @@ if ($validator->isValid($iban)) {
 
     <sect2 id="zend.validate.set.string_length">
         <title>StringLength</title>
+
         <para>
             Returns <constant>TRUE</constant> if and only if the string length of
             <varname>$value</varname> is at least a minimum and no greater than a maximum (when the
@@ -216,7 +237,6 @@ if ($validator->isValid($iban)) {
             and setEncoding.
         </para>
     </sect2>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

+ 0 - 2
documentation/manual/en/module_specs/Zend_Validate-ValidatorChains.xml

@@ -54,14 +54,12 @@ $validatorChain->addValidator(
                     true)
                ->addValidator(new Zend_Validate_Alnum());
 ]]></programlisting>
-
     </para>
 
     <para>
         Any object that implements <classname>Zend_Validate_Interface</classname> may be used in a
         validator chain.
     </para>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

+ 42 - 54
documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.validate.writing_validators">
-
     <title>Writing Validators</title>
 
     <para>
-        <classname>Zend_Validate</classname> supplies a set of commonly needed validators, but inevitably, developers will
-        wish to write custom validators for their particular needs. The task of writing a custom
-        validator is described in this section.
+        <classname>Zend_Validate</classname> supplies a set of commonly needed validators, but
+        inevitably, developers will wish to write custom validators for their particular needs. The
+        task of writing a custom validator is described in this section.
     </para>
 
     <para>
@@ -15,8 +14,8 @@
         <methodname>isValid()</methodname> and <methodname>getMessages()</methodname>, that may
         be implemented by user classes in order to create custom validation objects. An object that
         implements <classname>Zend_Validate_Interface</classname> interface may be added to a
-        validator chain with <methodname>Zend_Validate::addValidator()</methodname>. Such objects may
-        also be used with <link
+        validator chain with <methodname>Zend_Validate::addValidator()</methodname>. Such objects
+        may also be used with <link
             linkend="zend.filter.input"><classname>Zend_Filter_Input</classname></link>.
     </para>
 
@@ -33,23 +32,24 @@
         Basic validation failure message functionality is implemented in
         <classname>Zend_Validate_Abstract</classname>. To include this functionality when creating a
         validation class, simply extend <classname>Zend_Validate_Abstract</classname>. In the
-        extending class you would implement the <methodname>isValid()</methodname> method logic and define the
-        message variables and message templates that correspond to the types of validation failures
-        that can occur. If a value fails your validation tests, then <methodname>isValid()</methodname> should
-        return <constant>FALSE</constant>. If the value passes your validation tests, then
-        <methodname>isValid()</methodname> should return <constant>TRUE</constant>.
+        extending class you would implement the <methodname>isValid()</methodname> method logic and
+        define the message variables and message templates that correspond to the types of
+        validation failures that can occur. If a value fails your validation tests, then
+        <methodname>isValid()</methodname> should return <constant>FALSE</constant>. If the value
+        passes your validation tests, then <methodname>isValid()</methodname> should return
+        <constant>TRUE</constant>.
     </para>
 
     <para>
-        In general, the <methodname>isValid()</methodname> method should not throw any exceptions, except where
-        it is impossible to determine whether or not the input value is valid. A few examples of
-        reasonable cases for throwing an exception might be if a file cannot be opened, an <acronym>LDAP</acronym>
-        server could not be contacted, or a database connection is unavailable, where such a thing
-        may be required for validation success or failure to be determined.
+        In general, the <methodname>isValid()</methodname> method should not throw any exceptions,
+        except where it is impossible to determine whether or not the input value is valid. A few
+        examples of reasonable cases for throwing an exception might be if a file cannot be opened,
+        an <acronym>LDAP</acronym> server could not be contacted, or a database connection is
+        unavailable, where such a thing may be required for validation success or failure to be
+        determined.
     </para>
 
     <example id="zend.validate.writing_validators.example.simple">
-
         <title>Creating a Simple Validation Class</title>
 
         <para>
@@ -90,11 +90,9 @@ class MyValid_Float extends Zend_Validate_Abstract
             class only defines one failure message, it is not necessary to provide
             <methodname>_error()</methodname> with the name of the failure message template.
         </para>
-
     </example>
 
     <example id="zend.validate.writing_validators.example.conditions.dependent">
-
         <title>Writing a Validation Class having Dependent Conditions</title>
 
         <para>
@@ -108,9 +106,11 @@ class MyValid_Float extends Zend_Validate_Abstract
             <listitem>
                 <para>The input value is not numeric.</para>
             </listitem>
+
             <listitem>
                 <para>The input value is less than the minimum allowed value.</para>
             </listitem>
+
             <listitem>
                 <para>The input value is more than the maximum allowed value.</para>
             </listitem>
@@ -166,28 +166,26 @@ class MyValid_NumericBetween extends Zend_Validate_Abstract
 ]]></programlisting>
 
         <para>
-            The public properties <varname>$minimum</varname> and <varname>$maximum</varname> have been
-            established to provide the minimum and maximum boundaries, respectively, for a value to
-            successfully validate. The class also defines two message variables that correspond to
-            the public properties and allow <property>min</property> and <property>max</property> to
-            be used in message templates as magic parameters, just as with
-            <property>value</property>.
+            The public properties <varname>$minimum</varname> and <varname>$maximum</varname> have
+            been established to provide the minimum and maximum boundaries, respectively, for a
+            value to successfully validate. The class also defines two message variables that
+            correspond to the public properties and allow <property>min</property> and
+            <property>max</property> to be used in message templates as magic parameters, just as
+            with <property>value</property>.
         </para>
 
         <para>
-            Note that if any one of the validation checks in <methodname>isValid()</methodname> fails, an
-            appropriate failure message is prepared, and the method immediately returns
-            <constant>FALSE</constant>. These validation rules are therefore sequentially dependent. That
-            is, if one test should fail, there is no need to test any subsequent validation rules.
-            This need not be the case, however. The following example illustrates how to write a
-            class having independent validation rules, where the validation object may return
-            multiple reasons why a particular validation attempt failed.
+            Note that if any one of the validation checks in <methodname>isValid()</methodname>
+            fails, an appropriate failure message is prepared, and the method immediately returns
+            <constant>FALSE</constant>. These validation rules are therefore sequentially dependent.
+            That is, if one test should fail, there is no need to test any subsequent validation
+            rules. This need not be the case, however. The following example illustrates how to
+            write a class having independent validation rules, where the validation object may
+            return multiple reasons why a particular validation attempt failed.
         </para>
-
     </example>
 
     <example id="zend.validate.writing_validators.example.conditions.independent">
-
         <title>Validation with Independent Conditions, Multiple Reasons for Failure</title>
 
         <para>
@@ -197,18 +195,10 @@ class MyValid_NumericBetween extends Zend_Validate_Abstract
         </para>
 
         <itemizedlist>
-            <listitem>
-                <para>is at least 8 characters in length,</para>
-            </listitem>
-            <listitem>
-                <para>contains at least one uppercase letter,</para>
-            </listitem>
-            <listitem>
-                <para>contains at least one lowercase letter,</para>
-            </listitem>
-            <listitem>
-                <para>and contains at least one digit character.</para>
-            </listitem>
+            <listitem><para>is at least 8 characters in length,</para></listitem>
+            <listitem><para>contains at least one uppercase letter,</para></listitem>
+            <listitem><para>contains at least one lowercase letter,</para></listitem>
+            <listitem><para>and contains at least one digit character.</para></listitem>
         </itemizedlist>
 
         <para>
@@ -262,16 +252,14 @@ class MyValid_PasswordStrength extends Zend_Validate_Abstract
 ]]></programlisting>
 
         <para>
-            Note that the four criteria tests in <methodname>isValid()</methodname> do not immediately return
-            <constant>FALSE</constant>. This allows the validation class to provide <emphasis>all</emphasis>
-            of the reasons that the input password failed to meet the validation requirements. if,
-            for example, a user were to input the string "#$%" as a password,
-            <methodname>isValid()</methodname> would cause all four validation failure messages to be returned
-            by a subsequent call to <methodname>getMessages()</methodname>.
+            Note that the four criteria tests in <methodname>isValid()</methodname> do not
+            immediately return <constant>FALSE</constant>. This allows the validation class to
+            provide <emphasis>all</emphasis> of the reasons that the input password failed to meet
+            the validation requirements. if, for example, a user were to input the string "#$%" as a
+            password, <methodname>isValid()</methodname> would cause all four validation failure
+            messages to be returned by a subsequent call to <methodname>getMessages()</methodname>.
         </para>
-
     </example>
-
 </sect1>
 <!--
 vim:se ts=4 sw=4 et:

+ 0 - 13
documentation/manual/en/module_specs/Zend_Validate.xml

@@ -29,11 +29,9 @@
             meet one or both of the requirements, it would be useful to know
             which of the requirements the username fails to meet.
         </para>
-
     </sect2>
 
     <sect2 id="zend.validate.introduction.using">
-
         <title>Basic usage of validators</title>
 
         <para>
@@ -85,13 +83,10 @@ if ($validator->isValid($email)) {
     }
 }
 ]]></programlisting>
-
         </para>
-
     </sect2>
 
     <sect2 id="zend.validate.introduction.messages">
-
         <title>Customizing messages</title>
 
         <para>
@@ -153,7 +148,6 @@ $validator->setMessages( array(
         'The string \'%value%\' is too long'
 ));
 ]]></programlisting>
-
         </para>
 
         <para>
@@ -179,11 +173,9 @@ if (!validator->isValid('word')) {
 }
 ]]></programlisting>
         </para>
-
     </sect2>
 
     <sect2 id="zend.validate.introduction.static">
-
         <title>Using the static is() method</title>
 
         <para>
@@ -203,7 +195,6 @@ if (Zend_Validate::is($email, 'EmailAddress')) {
     // Yes, email appears to be valid
 }
 ]]></programlisting>
-
         </para>
 
         <para>
@@ -215,7 +206,6 @@ if (Zend_Validate::is($value, 'Between', array('min' => 1, 'max' => 12))) {
     // Yes, $value is between 1 and 12
 }
 ]]></programlisting>
-
         </para>
 
         <para>
@@ -241,7 +231,6 @@ if (Zend_Validate::is($value, 'Between', array('min' => 1, 'max' => 12))) {
         </para>
 
         <sect3 id="zend.validate.introduction.static.namespaces">
-
             <title>Namespaces</title>
 
             <para>
@@ -316,7 +305,6 @@ if (Zend_Validate::is($value, 'OtherValidator', array('min' => 1, 'max' => 12))
     </sect2>
 
     <sect2 id="zend.validate.introduction.translation">
-
         <title>Translating messages</title>
 
         <para>
@@ -380,7 +368,6 @@ if (!$validator->isTranslatorDisabled()) {
             <methodname>setMessage()</methodname>. But doing so, you should keep in mind, that the
             translator works also on messages you set your own.
         </para>
-
     </sect2>
 </sect1>
 <!--

+ 0 - 5
documentation/manual/en/module_specs/Zend_View-Controllers.xml

@@ -10,7 +10,6 @@
     </para>
 
     <sect2 id="zend.view.controllers.assign">
-
         <title>Assigning Variables</title>
 
         <para>
@@ -72,11 +71,9 @@ $view->assign('a', "Hay");
 $view->assign('b', "Bee");
 $view->assign('c', "Sea");
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.view.controllers.render">
-
         <title>Rendering a View Script</title>
 
         <para>
@@ -94,11 +91,9 @@ $view->b = "Bee";
 $view->c = "Sea";
 echo $view->render('someView.php');
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.view.controllers.script-paths">
-
         <title>View Script Paths</title>
 
         <para>

+ 73 - 0
documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -330,11 +330,13 @@ $this->navigation()->addPage(array(
                     The domain for the site is <code>www.example.com</code>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Interesting page properties are marked with a comment.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Unless otherwise is stated in other examples, the user
@@ -344,6 +346,7 @@ $this->navigation()->addPage(array(
                     under <code>Foo Server</code>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     The assumed <acronym>ACL</acronym> and router setup is shown below the
@@ -610,6 +613,7 @@ Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole('member');
                    <code>' &amp;gt; '</code>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}LinkLast()</code> gets/sets whether the
@@ -617,6 +621,7 @@ Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole('member');
                    Default is <constant>FALSE</constant>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}Partial()</code> gets/sets a partial view
@@ -634,12 +639,14 @@ Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole('member');
                    script is found.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <methodname>renderStraight()</methodname> is the default render
                    method.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <methodname>renderPartial()</methodname> is used for rendering
@@ -821,6 +828,7 @@ Products, Foo Server, FAQ
                     relation: the first page in the container.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRelNext()</methodname>, forward 'next'
@@ -828,6 +836,7 @@ Products, Foo Server, FAQ
                     the page after the active page.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRelPrev()</methodname>, forward 'prev'
@@ -835,6 +844,7 @@ Products, Foo Server, FAQ
                     the active page.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRelChapter()</methodname>, forward 'chapter'
@@ -842,6 +852,7 @@ Products, Foo Server, FAQ
                     relation or the active page if it's on level 0.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRelSection()</methodname>, forward 'section'
@@ -849,6 +860,7 @@ Products, Foo Server, FAQ
                     the active page is on level 0 (a 'chapter').
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRelSubsection()</methodname>, forward 'subsection'
@@ -856,6 +868,7 @@ Products, Foo Server, FAQ
                     the active pages is on level 1 (a 'section').
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRevSection()</methodname>, reverse 'section'
@@ -863,6 +876,7 @@ Products, Foo Server, FAQ
                     active page is on level 1 (a 'section').
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>searchRevSubsection()</methodname>, reverse 'subsection'
@@ -913,6 +927,7 @@ Products, Foo Server, FAQ
             helper's render constants to determine if the relation that belongs
             to the render constant should be rendered.
         </para>
+
         <para>
             See the
             <link linkend="zend.view.helpers.initial.navigation.links.example3">example
@@ -925,81 +940,97 @@ Products, Foo Server, FAQ
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_ALTERNATE</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_STYLESHEET</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_START</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_NEXT</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_PREV</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_CONTENTS</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_INDEX</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_GLOSSARY</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_COPYRIGHT</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_CHAPTER</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_SECTION</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_SUBSECTION</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_APPENDIX</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_HELP</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_BOOKMARK</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_CUSTOM</constant>
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <constant>Zend_View_Helper_Navigation_Link::RENDER_ALL</constant>
@@ -1027,18 +1058,21 @@ Products, Foo Server, FAQ
                     below on how to set the render flag.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>findAllRelations()</methodname> finds all relations of
                     all types for a given page.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>findRelation()</methodname> finds all relations of a given
                     type from a given page.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>searchRel{Start|Next|Prev|Chapter|Section|Subsection}()</code>
@@ -1047,6 +1081,7 @@ Products, Foo Server, FAQ
                     chapters, sections, and subsections.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>searchRev{Section|Subsection}()</code> traverses
@@ -1054,6 +1089,7 @@ Products, Foo Server, FAQ
                     subsections.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>renderLink()</methodname> renders a single <code>link</code>
@@ -1209,6 +1245,7 @@ Output:
                     used in <methodname>renderMenu()</methodname>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>{get|set}OnlyActiveBranch()</code> gets/sets a flag
@@ -1216,6 +1253,7 @@ Output:
                     should be rendered.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>{get|set}RenderParents()</code> gets/sets a flag
@@ -1225,6 +1263,7 @@ Output:
                     rendered.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>{get|set}Partial()</code> gets/sets a partial view
@@ -1242,6 +1281,7 @@ Output:
                     script is found.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>htmlify()</methodname> overrides the method from the
@@ -1249,22 +1289,26 @@ Output:
                     if the page has no <code>href</code>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>renderMenu($container = null, $options = array())</methodname>
                     is the default render method, and will render a container as
                     a HTML <code>UL</code> list.
                 </para>
+
                 <para>
                     If <varname>$container</varname> is not given, the container
                     registered in the helper will be rendered.
                 </para>
+
                 <para>
                     <varname>$options</varname> is used for overriding options
                     specified temporarily without rsetting the values in the
                     helper instance. It is an associative array where each key
                     corresponds to an option in the helper.
                 </para>
+
                 <para>
                     Recognized options:
                 </para>
@@ -1277,6 +1321,7 @@ Output:
                             value.
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <code>minDepth</code>; minimum depth. Expcects
@@ -1284,6 +1329,7 @@ Output:
                             minimum depth).
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <code>maxDepth</code>; maximum depth. Expcects
@@ -1291,6 +1337,7 @@ Output:
                             maximum depth).
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <code>ulClass</code>; <acronym>CSS</acronym> class for
@@ -1298,6 +1345,7 @@ Output:
                             <type>String</type>.
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <code>onlyActiveBranch</code>; whether only
@@ -1305,6 +1353,7 @@ Output:
                             a <type>Boolean</type> value.
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <code>renderParents</code>; whether parents
@@ -1319,12 +1368,14 @@ Output:
                     will be used.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>renderPartial()</methodname> is used for rendering the menu
                     using a partial view script.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <methodname>renderSubMenu()</methodname> renders the deepest menu level
@@ -1816,6 +1867,7 @@ foreach ($this->container as $page) {
 
         <table id="zend.view.helpers.initial.navigation.sitemap.elements">
             <title>Sitemap XML elements</title>
+
             <tgroup cols="2">
                 <thead>
                     <row>
@@ -1823,16 +1875,20 @@ foreach ($this->container as $page) {
                         <entry>Description</entry>
                     </row>
                 </thead>
+
                 <tbody>
                     <row>
                         <entry><code>loc</code></entry>
+
                         <entry>
                             Absolute <acronym>URL</acronym> to page. An absolute
                             <acronym>URL</acronym> will be generated by the helper.
                         </entry>
                     </row>
+
                     <row>
                         <entry><code>lastmod</code></entry>
+
                         <entry>
                             <para>
                                 The date of last modification of the file, in <ulink
@@ -1840,6 +1896,7 @@ foreach ($this->container as $page) {
                                 format. This time portion can be omitted if desired, and only use
                                 YYYY-MM-DD.
                             </para>
+
                             <para>
                                 The helper will try to retrieve the
                                 <code>lastmod</code> value from the page's
@@ -1849,8 +1906,10 @@ foreach ($this->container as $page) {
                             </para>
                         </entry>
                     </row>
+
                     <row>
                         <entry><code>changefreq</code></entry>
+
                         <entry>
                             <para>
                                 How frequently the page is likely to change.
@@ -1879,14 +1938,17 @@ foreach ($this->container as $page) {
                             </para>
                         </entry>
                     </row>
+
                     <row>
                         <entry><code>priority</code></entry>
+
                         <entry>
                             <para>
                                 The priority of this <acronym>URL</acronym> relative to other
                                 <acronym>URL</acronym>s on your site. Valid values range from
                                 0.0 to 1.0.
                             </para>
+
                             <para>
                                 The helper will try to retrieve the
                                 <code>priority</code> value from the page's
@@ -1916,6 +1978,7 @@ foreach ($this->container as $page) {
                     Default is <constant>FALSE</constant>.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <code>{get|set}UseXmlDeclaration()</code> gets/sets a
@@ -1923,6 +1986,7 @@ foreach ($this->container as $page) {
                     included when rendering. Default is <constant>TRUE</constant>.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <code>{get|set}UseSitemapValidators()</code> gets/sets a
@@ -1931,6 +1995,7 @@ foreach ($this->container as $page) {
                     <constant>TRUE</constant>.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <code>{get|set}UseSchemaValidation()</code> gets/sets a
@@ -1939,6 +2004,7 @@ foreach ($this->container as $page) {
                     <constant>FALSE</constant>. If <constant>TRUE</constant>.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <code>{get|set}ServerUrl()</code> gets/sets server <acronym>URL</acronym>
@@ -1947,12 +2013,14 @@ foreach ($this->container as $page) {
                     specified, it will be determined by the helper.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <methodname>url()</methodname> is used to generate absolute
                     <acronym>URL</acronym>s to pages.
                 </para>
            </listitem>
+
            <listitem>
                 <para>
                     <methodname>getDomSitemap()</methodname> generates a DOMDocument
@@ -2226,6 +2294,7 @@ echo $this->navigation()
                    container, <acronym>ACL</acronym>/role and translator.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}InjectContainer()</code> gets/sets a flag
@@ -2233,6 +2302,7 @@ echo $this->navigation()
                    proxied helpers. Default is <constant>TRUE</constant>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}InjectAcl()</code> gets/sets a flag
@@ -2240,6 +2310,7 @@ echo $this->navigation()
                    proxied helpers. Default is <constant>TRUE</constant>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}InjectTranslator()</code> gets/sets a flag
@@ -2247,12 +2318,14 @@ echo $this->navigation()
                    proxied helpers. Default is <constant>TRUE</constant>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <code>{get|set}DefaultProxy()</code> gets/sets the default
                    proxy. Default is <code>'menu'</code>.
                </para>
            </listitem>
+
            <listitem>
                <para>
                    <methodname>render()</methodname> proxies to the render method of

+ 219 - 173
documentation/manual/en/module_specs/Zend_View-Helpers.xml

@@ -65,45 +65,51 @@
         </para>
 
         <itemizedlist>
+            <listitem>
+                <para>
+                    <methodname>declareVars()</methodname>: Primarily for use when using
+                    <methodname>strictVars()</methodname>, this helper can be used to declare
+                    template variables that may or may not already be set in the
+                    view object, as well as to set default values. Arrays passed as
+                    arguments to the method will be used to set default values;
+                    otherwise, if the variable does not exist, it is set to an empty string.
+                </para>
+            </listitem>
 
-            <listitem><para>
-                <methodname>declareVars()</methodname>: Primarily for use when using
-                <methodname>strictVars()</methodname>, this helper can be used to declare
-                template variables that may or may not already be set in the
-                view object, as well as to set default values. Arrays passed as
-                arguments to the method will be used to set default values;
-                otherwise, if the variable does not exist, it is set to an empty
-                string.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>fieldset($name, $content, $attribs)</methodname>: Creates an
-                <acronym>XHTML</acronym> fieldset. If <varname>$attribs</varname> contains a
-                'legend' key, that value will be used for the fieldset legend. The
-                fieldset will surround the <varname>$content</varname> as provided to
-                the helper.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>form($name, $attribs, $content)</methodname>: Generates an
-                <acronym>XHTML</acronym> form. All <varname>$attribs</varname> are escaped and
-                rendered as <acronym>XHTML</acronym> attributes of the form tag. If
-                <varname>$content</varname> is present and not a boolean <constant>FALSE</constant>,
-                then that content is rendered within the start and close form tags; if
-                <varname>$content</varname> is a boolean <constant>FALSE</constant> (the default),
-                only the opening form tag is generated.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formButton($name, $value, $attribs)</methodname>: Creates an
-                &lt;button /&gt; element.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>fieldset($name, $content, $attribs)</methodname>: Creates an
+                    <acronym>XHTML</acronym> fieldset. If <varname>$attribs</varname> contains a
+                    'legend' key, that value will be used for the fieldset legend. The
+                    fieldset will surround the <varname>$content</varname> as provided to
+                    the helper.
+                </para>
+            </listitem>
 
             <listitem>
                 <para>
-                    <methodname>formCheckbox($name, $value, $attribs,
-                        $options)</methodname>: Creates an &lt;input type="checkbox"
-                    /&gt; element.
+                    <methodname>form($name, $attribs, $content)</methodname>: Generates an
+                    <acronym>XHTML</acronym> form. All <varname>$attribs</varname> are escaped and
+                    rendered as <acronym>XHTML</acronym> attributes of the form tag. If
+                    <varname>$content</varname> is present and not a boolean
+                    <constant>FALSE</constant>, then that content is rendered within the start and
+                    close form tags; if <varname>$content</varname> is a boolean
+                    <constant>FALSE</constant> (the default), only the opening form tag is
+                    generated.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formButton($name, $value, $attribs)</methodname>: Creates an
+                    &lt;button /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formCheckbox($name, $value, $attribs, $options)</methodname>:
+                    Creates an &lt;input type="checkbox" /&gt; element.
                 </para>
 
                 <para>
@@ -193,114 +199,145 @@ echo $this->formCheckbox('foo',
                 </para>
 
                 <itemizedlist>
-                    <listitem><para>
+                    <listitem>
+                        <para>
                             <methodname>setElementStart($string)</methodname>; default is
                             '&lt;ul class="errors"%s"&gt;&lt;li&gt;', where %s
                             is replaced with the attributes as specified in
                             <varname>$options</varname>.
-                    </para></listitem>
+                        </para>
+                    </listitem>
 
-                    <listitem><para>
+                    <listitem>
+                        <para>
                             <methodname>setElementSeparator($string)</methodname>; default
                             is '&lt;/li&gt;&lt;li&gt;'.
-                    </para></listitem>
+                        </para>
+                    </listitem>
 
-                    <listitem><para>
+                    <listitem>
+                        <para>
                             <methodname>setElementEnd($string)</methodname>; default is
                             '&lt;/li&gt;&lt;/ul&gt;'.
-                    </para></listitem>
+                        </para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
-            <listitem><para>
-                <methodname>formFile($name, $attribs)</methodname>: Creates an
-                &lt;input type="file" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formHidden($name, $value, $attribs)</methodname>: Creates an
-                &lt;input type="hidden" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formLabel($name, $value, $attribs)</methodname>: Creates a
-                &lt;label&gt; element, setting the <property>for</property> attribute to
-                <varname>$name</varname>, and the actual label text to
-                <varname>$value</varname>. If <emphasis>disable</emphasis> is passed in
-                <property>attribs</property>, nothing will be returned.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formMultiCheckbox($name, $value, $attribs, $options,
-                    $listsep)</methodname>: Creates a list of checkboxes.
-                <varname>$options</varname> should be an associative array, and may be
-                arbitrarily deep. <varname>$value</varname> may be a single value or
-                an array of selected values that match the keys in the
-                <varname>$options</varname> array. <varname>$listsep</varname> is an HTML
-                break ("&lt;br /&gt;") by default. By default, this element is
-                treated as an array; all checkboxes share the same name, and are
-                submitted as an array.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formPassword($name, $value, $attribs)</methodname>: Creates an
-                &lt;input type="password" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formRadio($name, $value, $attribs, $options)</methodname>:
-                Creates a series of &lt;input type="radio" /&gt; elements, one
-                for each of the $options elements. In the $options array, the
-                element key is the radio value, and the element value is the
-                radio label. The $value radio will be preselected for you.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formReset($name, $value, $attribs)</methodname>: Creates an
-                &lt;input type="reset" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formSelect($name, $value, $attribs, $options)</methodname>:
-                Creates a &lt;select&gt;...&lt;/select&gt; block, with one
-                &lt;option&gt;one for each of the $options elements. In the
-                $options array, the element key is the option value, and the
-                element value is the option label. The $value option(s) will be
-                preselected for you.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formSubmit($name, $value, $attribs)</methodname>: Creates an
-                &lt;input type="submit" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formText($name, $value, $attribs)</methodname>: Creates an
-                &lt;input type="text" /&gt; element.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>formTextarea($name, $value, $attribs)</methodname>: Creates a
-                &lt;textarea&gt;...&lt;/textarea&gt; block.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>url($urlOptions, $name, $reset)</methodname>: Creates a
-                <acronym>URL</acronym> string based on a named route.
-                <varname>$urlOptions</varname> should be an associative array of key/value pairs
-                used by the particular route.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>htmlList($items, $ordered, $attribs, $escape)</methodname>: generates
-                unordered and ordered lists based on the <varname>$items</varname>
-                passed to it. If <varname>$items</varname> is a multidimensional
-                array, a nested list will be built. If the <varname>$escape</varname>
-                flag is <constant>TRUE</constant> (default), individual items will be escaped using
-                the view objects registered escaping mechanisms; pass a <constant>FALSE</constant>
-                value if you want to allow markup in your lists.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>formFile($name, $attribs)</methodname>: Creates an
+                    &lt;input type="file" /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formHidden($name, $value, $attribs)</methodname>: Creates an
+                    &lt;input type="hidden" /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formLabel($name, $value, $attribs)</methodname>: Creates a
+                    &lt;label&gt; element, setting the <property>for</property> attribute to
+                    <varname>$name</varname>, and the actual label text to
+                    <varname>$value</varname>. If <emphasis>disable</emphasis> is passed in
+                    <property>attribs</property>, nothing will be returned.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formMultiCheckbox($name, $value, $attribs, $options,
+                        $listsep)</methodname>: Creates a list of checkboxes.
+                    <varname>$options</varname> should be an associative array, and may be
+                    arbitrarily deep. <varname>$value</varname> may be a single value or
+                    an array of selected values that match the keys in the
+                    <varname>$options</varname> array. <varname>$listsep</varname> is an HTML
+                    break ("&lt;br /&gt;") by default. By default, this element is
+                    treated as an array; all checkboxes share the same name, and are
+                    submitted as an array.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formPassword($name, $value, $attribs)</methodname>: Creates an
+                    &lt;input type="password" /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formRadio($name, $value, $attribs, $options)</methodname>:
+                    Creates a series of &lt;input type="radio" /&gt; elements, one
+                    for each of the $options elements. In the $options array, the
+                    element key is the radio value, and the element value is the
+                    radio label. The $value radio will be preselected for you.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formReset($name, $value, $attribs)</methodname>: Creates an
+                    &lt;input type="reset" /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formSelect($name, $value, $attribs, $options)</methodname>:
+                    Creates a &lt;select&gt;...&lt;/select&gt; block, with one
+                    &lt;option&gt;one for each of the $options elements. In the
+                    $options array, the element key is the option value, and the
+                    element value is the option label. The $value option(s) will be
+                    preselected for you.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formSubmit($name, $value, $attribs)</methodname>: Creates an
+                    &lt;input type="submit" /&gt; element.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>formText($name, $value, $attribs)</methodname>: Creates an
+                    &lt;input type="text" /&gt; element.
+                </para>
+            </listitem>
 
+            <listitem>
+                <para>
+                    <methodname>formTextarea($name, $value, $attribs)</methodname>: Creates a
+                    &lt;textarea&gt;...&lt;/textarea&gt; block.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>url($urlOptions, $name, $reset)</methodname>: Creates a
+                    <acronym>URL</acronym> string based on a named route.
+                    <varname>$urlOptions</varname> should be an associative array of key/value pairs
+                    used by the particular route.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>htmlList($items, $ordered, $attribs, $escape)</methodname>:
+                    generates unordered and ordered lists based on the <varname>$items</varname>
+                    passed to it. If <varname>$items</varname> is a multidimensional
+                    array, a nested list will be built. If the <varname>$escape</varname>
+                    flag is <constant>TRUE</constant> (default), individual items will be escaped
+                    using the view objects registered escaping mechanisms; pass a
+                    <constant>FALSE</constant> value if you want to allow markup in your lists.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>
@@ -417,7 +454,6 @@ $view->addHelperPath('/other/path/to/helpers', 'Your_View_Helper');
 // "Zend/View/Helper/HelperName.php" using class name
 // "Zend_View_Helper_HelperName".
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.view.helpers.custom">
@@ -428,50 +464,59 @@ $view->addHelperPath('/other/path/to/helpers', 'Your_View_Helper');
         </para>
 
         <itemizedlist>
+            <listitem>
+                <para>
+                    While not strictly necessary, we recommend either implementing
+                    <classname>Zend_View_Helper_Interface</classname> or extending
+                    <classname>Zend_View_Helper_Abstract</classname> when creating your
+                    helpers. Introduced in 1.6.0, these simply define a
+                    <methodname>setView()</methodname> method; however, in upcoming releases, we
+                    plan to implement a strategy pattern that will simplify much of
+                    the naming schema detailed below. Building off these now will
+                    help you future-proof your code.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    The class name must, at the very minimum, end with the helper
+                    name itself, using MixedCaps. E.g., if you were writing a
+                    helper called "specialPurpose", the class name would minimally
+                    need to be "SpecialPurpose". You may, and should, give the class
+                    name a prefix, and it is recommended that you use 'View_Helper'
+                    as part of that prefix: "My_View_Helper_SpecialPurpose". (You
+                    will need to pass in the prefix, with or without the trailing
+                    underscore, to <methodname>addHelperPath()</methodname> or
+                    <methodname>setHelperPath()</methodname>).
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    The class must have a public method that matches the
+                    helper name; this is the method that will be called when
+                    your template calls "$this->specialPurpose()". In our
+                    "specialPurpose" helper example, the required method
+                    declaration would be "public function specialPurpose()".
+                </para>
+            </listitem>
 
-            <listitem><para>
-                While not strictly necessary, we recommend either implementing
-                <classname>Zend_View_Helper_Interface</classname> or extending
-                <classname>Zend_View_Helper_Abstract</classname> when creating your
-                helpers. Introduced in 1.6.0, these simply define a
-                <methodname>setView()</methodname> method; however, in upcoming releases, we
-                plan to implement a strategy pattern that will simplify much of
-                the naming schema detailed below. Building off these now will
-                help you future-proof your code.
-            </para></listitem>
-
-            <listitem><para>
-                The class name must, at the very minimum, end with the helper
-                name itself, using MixedCaps. E.g., if you were writing a
-                helper called "specialPurpose", the class name would minimally
-                need to be "SpecialPurpose". You may, and should, give the class
-                name a prefix, and it is recommended that you use 'View_Helper'
-                as part of that prefix: "My_View_Helper_SpecialPurpose". (You
-                will need to pass in the prefix, with or without the trailing
-                underscore, to <methodname>addHelperPath()</methodname> or
-                <methodname>setHelperPath()</methodname>).
-            </para></listitem>
-
-            <listitem><para>
-                The class must have a public method that matches the
-                helper name; this is the method that will be called when
-                your template calls "$this->specialPurpose()". In our
-                "specialPurpose" helper example, the required method
-                declaration would be "public function specialPurpose()".
-            </para></listitem>
-
-            <listitem><para>
-                In general, the class should not echo or print or otherwise
-                generate output. Instead, it should return values to be
-                printed or echoed. The returned values should be escaped
-                appropriately.
-            </para></listitem>
-
-            <listitem><para>
-                The class must be in a file named after the helper class. Again
-                using our "specialPurpose" helper example, the file has to be
-                named "SpecialPurpose.php".
-            </para></listitem>
+            <listitem>
+                <para>
+                    In general, the class should not echo or print or otherwise
+                    generate output. Instead, it should return values to be
+                    printed or echoed. The returned values should be escaped
+                    appropriately.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    The class must be in a file named after the helper class. Again
+                    using our "specialPurpose" helper example, the file has to be
+                    named "SpecialPurpose.php".
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>
@@ -514,6 +559,7 @@ echo $this->specialPurpose();
         <para>
             The output would look something like this:
         </para>
+
         <programlisting language="php"><![CDATA[
 I have seen 'The Jerk' 1 time(s).
 I have seen 'The Jerk' 2 time(s).

+ 38 - 35
documentation/manual/en/module_specs/Zend_View-Introduction.xml

@@ -20,10 +20,8 @@
 
     <para>
         Essentially, using <classname>Zend_View</classname> happens in two major steps:
-
         1. Your controller script creates an instance of
         <classname>Zend_View</classname> and assigns variables to that instance.
-
         2. The controller tells the <classname>Zend_View</classname> to render a particular
         view, thereby handing control over the view script, which
         generates the view output.
@@ -63,11 +61,9 @@ $view->books = $data;
 // and render a view script called "booklist.php"
 echo $view->render('booklist.php');
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.view.introduction.view">
-
         <title>View Script</title>
 
         <para>
@@ -111,7 +107,6 @@ echo $view->render('booklist.php');
             Note how we use the "escape()" method to apply output
             escaping to variables.
         </para>
-
     </sect2>
 
     <sect2 id="zend.view.introduction.options">
@@ -144,36 +139,44 @@ base/path/
                 </para>
             </listitem>
 
-            <listitem><para>
-                <property>encoding</property>: indicate the character encoding to use
-                with <methodname>htmlentities()</methodname>,
-                <methodname>htmlspecialchars()</methodname>, and other operations. Defaults
-                to ISO-8859-1 (latin1). May be set via
-                <methodname>setEncoding()</methodname> or the <property>encoding</property> option
-                to the constructor.
-            </para></listitem>
-
-            <listitem><para>
-                <property>escape</property>: indicate a callback to be used by
-                <methodname>escape()</methodname>. May be set via
-                <methodname>setEscape()</methodname> or the <property>escape</property> option to
-                the constructor.
-            </para></listitem>
-
-            <listitem><para>
-                <property>filter</property>: indicate a filter to use after rendering
-                a view script. May be set via <methodname>setFilter()</methodname>,
-                <methodname>addFilter()</methodname>, or the <property>filter</property> option to
-                the constructor.
-            </para></listitem>
-
-            <listitem><para>
-                <property>strictVars</property>: force <classname>Zend_View</classname> to emit
-                notices and warnings when uninitialized view variables are
-                accessed. This may be set by calling
-                <methodname>strictVars(true)</methodname> or passing the
-                <property>strictVars</property> option to the constructor.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <property>encoding</property>: indicate the character encoding to use
+                    with <methodname>htmlentities()</methodname>,
+                    <methodname>htmlspecialchars()</methodname>, and other operations. Defaults
+                    to ISO-8859-1 (latin1). May be set via
+                    <methodname>setEncoding()</methodname> or the <property>encoding</property>
+                    option to the constructor.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <property>escape</property>: indicate a callback to be used by
+                    <methodname>escape()</methodname>. May be set via
+                    <methodname>setEscape()</methodname> or the <property>escape</property> option
+                    to the constructor.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <property>filter</property>: indicate a filter to use after rendering
+                    a view script. May be set via <methodname>setFilter()</methodname>,
+                    <methodname>addFilter()</methodname>, or the <property>filter</property> option
+                    to the constructor.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <property>strictVars</property>: force <classname>Zend_View</classname> to emit
+                    notices and warnings when uninitialized view variables are
+                    accessed. This may be set by calling
+                    <methodname>strictVars(true)</methodname> or passing the
+                    <property>strictVars</property> option to the constructor.
+                </para>
+            </listitem>
         </itemizedlist>
     </sect2>
 

+ 0 - 4
documentation/manual/en/module_specs/Zend_View-Scripts.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.view.scripts">
-
     <title>View Scripts</title>
 
     <para>
@@ -53,7 +52,6 @@
 ]]></programlisting>
 
     <sect2 id="zend.view.scripts.escaping">
-
         <title>Escaping Output</title>
 
         <para>
@@ -109,7 +107,6 @@ echo $view->render(...);
             escaped as its first parameter, and all other parameters should
             be optional.
         </para>
-
     </sect2>
 
     <sect2 id="zend.view.scripts.templates">
@@ -179,7 +176,6 @@ if ($this->books) {
 <!-- nobooks.tpl -->
 <p>There are no books to display.</p>
 ]]></programlisting>
-
         </sect3>
 
         <sect3 id="zend.view.scripts.templates.interface">

+ 7 - 7
documentation/manual/en/module_specs/Zend_Wildfire.xml

@@ -15,17 +15,17 @@
         this time, the primary focus is to provide a system that allows server-side
         <acronym>PHP</acronym> code to inject logging messages into the
         <ulink url="http://www.getfirebug.com/">Firebug Console</ulink>.
-  </para>
+    </para>
 
     <para>
         The <link
             linkend="zend.log.writers.firebug"><classname>Zend_Log_Writer_Firebug</classname></link>
-        component is provided for the purpose of logging to Firebug, and a communication protocol has
-        been developed that uses <acronym>HTTP</acronym> request and response headers to send data
-        between the server and client components. It is great for logging intelligence data to the
-        browser that is generated during script execution, without interfering with the page content.
-        With this approach, it is possible to debug <acronym>AJAX</acronym> requests that require clean
-        <acronym>JSON</acronym> and <acronym>XML</acronym> responses.
+        component is provided for the purpose of logging to Firebug, and a communication protocol
+        has been developed that uses <acronym>HTTP</acronym> request and response headers to send
+        data between the server and client components. It is great for logging intelligence data to
+        the browser that is generated during script execution, without interfering with the page
+        content. With this approach, it is possible to debug <acronym>AJAX</acronym> requests that
+        require clean <acronym>JSON</acronym> and <acronym>XML</acronym> responses.
     </para>
 
     <para>