Переглянути джерело

[MANUAL] English:

- structural fixes (no translations needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20807 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 роки тому
батько
коміт
36236e4a0d
20 змінених файлів з 896 додано та 771 видалено
  1. 69 68
      documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml
  2. 45 37
      documentation/manual/en/module_specs/Zend_Session-Introduction.xml
  3. 3 0
      documentation/manual/en/module_specs/Zend_Tag-Introduction.xml
  4. 13 9
      documentation/manual/en/module_specs/Zend_Tag_Cloud.xml
  5. 232 157
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Assertions.xml
  6. 23 19
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Bootstrapping.xml
  7. 2 2
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Adapter.xml
  8. 11 9
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Quickstart.xml
  9. 12 10
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Testing.xml
  10. 54 39
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Examples.xml
  11. 5 5
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Testing.xml
  12. 13 9
      documentation/manual/en/module_specs/Zend_Test-PHPUnit.xml
  13. 19 2
      documentation/manual/en/module_specs/Zend_Text_Figlet.xml
  14. 50 54
      documentation/manual/en/module_specs/Zend_TimeSync-Working.xml
  15. 67 61
      documentation/manual/en/module_specs/Zend_TimeSync.xml
  16. 160 144
      documentation/manual/en/module_specs/Zend_Tool-Extending.xml
  17. 0 2
      documentation/manual/en/module_specs/Zend_Tool_Framework-Architecture.xml
  18. 2 4
      documentation/manual/en/module_specs/Zend_Tool_Framework-CliTool.xml
  19. 84 76
      documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml
  20. 32 64
      documentation/manual/en/module_specs/Zend_Tool_Project-Providers.xml

+ 69 - 68
documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml

@@ -4,26 +4,27 @@
     <title>Zend_Service_StrikeIron: Advanced Uses</title>
 
     <para>
-      This section describes the more advanced uses of <classname>Zend_Service_StrikeIron</classname>.
+        This section describes the more advanced uses of
+        <classname>Zend_Service_StrikeIron</classname>.
     </para>
 
     <sect2 id="zend.service.strikeiron.advanced-uses.services-by-wsdl">
-      <title>Using Services by WSDL</title>
-
-      <para>
-        Some StrikeIron services may have a <acronym>PHP</acronym> wrapper class available,
-        such as those described in
-        <link linkend="zend.service.strikeiron.bundled-services">Bundled Services</link>.
-        However, StrikeIron offers hundreds of services and many of these
-        may be usable even without creating a special wrapper class.
-      </para>
-
-      <para>
-        To try a StrikeIron service that does not have a wrapper class available,
-        give the <code>wsdl</code> option to <methodname>getService()</methodname>
-        instead of the <code>class</code> option:
-
-        <programlisting language="php"><![CDATA[
+        <title>Using Services by WSDL</title>
+
+        <para>
+            Some StrikeIron services may have a <acronym>PHP</acronym> wrapper class available,
+            such as those described in
+            <link linkend="zend.service.strikeiron.bundled-services">Bundled Services</link>.
+            However, StrikeIron offers hundreds of services and many of these
+            may be usable even without creating a special wrapper class.
+        </para>
+
+        <para>
+            To try a StrikeIron service that does not have a wrapper class available,
+            give the <code>wsdl</code> option to <methodname>getService()</methodname>
+            instead of the <code>class</code> option:
+
+            <programlisting language="php"><![CDATA[
 $strikeIron = new Zend_Service_StrikeIron(array('username' => 'your-username',
                                                 'password' => 'your-password'));
 
@@ -37,58 +38,59 @@ echo $result->listingName;
 
 // Zend Technologies USA Inc
 ]]></programlisting>
-      </para>
-
-      <para>
-        Using StrikeIron services from the WSDL will require at least some understanding
-        of the WSDL files. StrikeIron has many resources on its site to help with this.
-        Also,
-        <ulink url="http://janschneider.de">Jan Schneider</ulink> from the
-        <ulink url="http://horde.org">Horde project</ulink> has written a
-        <ulink url="http://janschneider.de/news/25/268">small <acronym>PHP</acronym> routine</ulink> that
-        will format a WSDL file into more readable HTML.
-      </para>
-
-      <para>
-        Please note that only the services
-        described in the <link linkend="zend.service.strikeiron.bundled-services">Bundled Services</link>
-        section are officially supported.
-      </para>
-
+        </para>
+
+        <para>
+            Using StrikeIron services from the WSDL will require at least some understanding
+            of the WSDL files. StrikeIron has many resources on its site to help with this. Also,
+            <ulink url="http://janschneider.de">Jan Schneider</ulink> from the <ulink
+                url="http://horde.org">Horde project</ulink> has written a <ulink
+                url="http://janschneider.de/news/25/268">small <acronym>PHP</acronym>
+                routine</ulink> that will format a WSDL file into more readable HTML.
+        </para>
+
+        <para>
+            Please note that only the services described in the <link
+                linkend="zend.service.strikeiron.bundled-services">Bundled Services</link>
+            section are officially supported.
+        </para>
     </sect2>
 
     <sect2 id="zend.service.strikeiron.viewing-soap-transactions">
-      <title>Viewing SOAP Transactions</title>
-
-      <para>
-        All communication with StrikeIron is done using the <acronym>SOAP</acronym> extension. It
-        is sometimes useful to view the <acronym>XML</acronym> exchanged with StrikeIron for debug
-        purposes.
-      </para>
-
-      <para>
-        Every StrikeIron client (subclass of <classname>Zend_Service_StrikeIron_Base</classname>)
-        contains a <methodname>getSoapClient()</methodname> method to return the underlying instance of
-        <code>SOAPClient</code> used to communicate with StrikeIron.
-      </para>
-
-      <para>
-        <acronym>PHP</acronym>'s
-        <ulink url="http://www.php.net/manual/en/function.soap-soapclient-construct.php">SOAPClient</ulink>
-        has a <code>trace</code> option that causes it to remember the <acronym>XML</acronym> exchanged during the last transaction.
-        <classname>Zend_Service_StrikeIron</classname> does not enable the <code>trace</code> option by default but this
-        can easily by changed by specifying the options that will be passed to the <code>SOAPClient</code> constructor.
-      </para>
-
-      <para>
-        To view a SOAP transaction, call the <methodname>getSoapClient()</methodname> method
-        to get the <code>SOAPClient</code> instance and then call the appropriate
-        methods like
-        <ulink url="http://www.php.net/manual/en/function.soap-soapclient-getlastrequest.php"><methodname>__getLastRequest()</methodname></ulink>
-        and
-        <ulink url="http://www.php.net/manual/en/function.soap-soapclient-getlastresponse.php"><methodname>__getLastRequest()</methodname></ulink>:
-
-        <programlisting language="php"><![CDATA[
+        <title>Viewing SOAP Transactions</title>
+
+        <para>
+            All communication with StrikeIron is done using the <acronym>SOAP</acronym> extension.
+            It is sometimes useful to view the <acronym>XML</acronym> exchanged with StrikeIron for
+            debug purposes.
+        </para>
+
+        <para>
+            Every StrikeIron client (subclass of
+            <classname>Zend_Service_StrikeIron_Base</classname>) contains a
+            <methodname>getSoapClient()</methodname> method to return the underlying instance of
+            <code>SOAPClient</code> used to communicate with StrikeIron.
+        </para>
+
+        <para>
+            <acronym>PHP</acronym>' <ulink
+                url="http://www.php.net/manual/en/function.soap-soapclient-construct.php">SOAPClient</ulink>
+            has a <code>trace</code> option that causes it to remember the <acronym>XML</acronym>
+            exchanged during the last transaction. <classname>Zend_Service_StrikeIron</classname>
+            does not enable the <code>trace</code> option by default but this can easily by changed
+            by specifying the options that will be passed to the <code>SOAPClient</code>
+            constructor.
+        </para>
+
+        <para>
+            To view a SOAP transaction, call the <methodname>getSoapClient()</methodname> method
+            to get the <code>SOAPClient</code> instance and then call the appropriate methods like
+            <ulink
+                url="http://www.php.net/manual/en/function.soap-soapclient-getlastrequest.php"><methodname>__getLastRequest()</methodname></ulink>
+            and <ulink
+                url="http://www.php.net/manual/en/function.soap-soapclient-getlastresponse.php"><methodname>__getLastRequest()</methodname></ulink>:
+
+            <programlisting language="php"><![CDATA[
 $strikeIron =
     new Zend_Service_StrikeIron(array('username' => 'your-username',
                                       'password' => 'your-password',
@@ -105,7 +107,6 @@ $soapClient = $taxBasic->getSoapClient();
 echo $soapClient->__getLastRequest();
 echo $soapClient->__getLastResponse();
 ]]></programlisting>
-      </para>
-
+        </para>
     </sect2>
 </sect1>

+ 45 - 37
documentation/manual/en/module_specs/Zend_Session-Introduction.xml

@@ -1,55 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.session.introduction">
-
     <title>Introduction</title>
 
     <para>
-        The Zend Framework Auth team greatly appreciates your feedback and contributions on our email list:
-        <ulink url="mailto:fw-auth@lists.zend.com">fw-auth@lists.zend.com</ulink>
+        The Zend Framework Auth team greatly appreciates your feedback and contributions on our
+        email list: <ulink url="mailto:fw-auth@lists.zend.com">fw-auth@lists.zend.com</ulink>
     </para>
 
     <para>
-        With web applications written using <acronym>PHP</acronym>, a <emphasis>session</emphasis> represents a logical,
-        one-to-one connection between server-side, persistent state data and a particular user agent client (e.g., web
-        browser). <classname>Zend_Session</classname> helps manage and preserve session data, a logical complement of cookie
-        data, across multiple page requests by the same client. Unlike cookie data, session data are not stored on the
-        client side and are only shared with the client when server-side source code voluntarily makes the data
-        available in response to a client request. For the purposes of this component and documentation, the term
-        "session data" refers to the server-side data stored in
-        <ulink url="http://www.php.net/manual/en/reserved.variables.php#reserved.variables.session"><varname>$_SESSION</varname></ulink>,
-        managed by <classname>Zend_Session</classname>, and individually manipulated by <classname>Zend_Session_Namespace</classname>
-        accessor objects. <emphasis>Session namespaces</emphasis> provide access to session data using
-        classic <ulink url="http://en.wikipedia.org/wiki/Namespace_%28computer_science%29">namespaces</ulink>
-        implemented logically as named groups of associative arrays, keyed by strings (similar to normal <acronym>PHP</acronym> arrays).
+        With web applications written using <acronym>PHP</acronym>, a <emphasis>session</emphasis>
+        represents a logical, one-to-one connection between server-side, persistent state data and a
+        particular user agent client (e.g., web browser). <classname>Zend_Session</classname> helps
+        manage and preserve session data, a logical complement of cookie data, across multiple page
+        requests by the same client. Unlike cookie data, session data are not stored on the client
+        side and are only shared with the client when server-side source code voluntarily makes the
+        data available in response to a client request. For the purposes of this component and
+        documentation, the term "session data" refers to the server-side data stored in <ulink
+            url="http://www.php.net/manual/en/reserved.variables.php#reserved.variables.session"><varname>$_SESSION</varname></ulink>,
+        managed by <classname>Zend_Session</classname>, and individually manipulated by
+        <classname>Zend_Session_Namespace</classname> accessor objects.
+        <emphasis>Session namespaces</emphasis> provide access to session data using classic <ulink
+            url="http://en.wikipedia.org/wiki/Namespace_%28computer_science%29">namespaces</ulink>
+        implemented logically as named groups of associative arrays, keyed by strings (similar to
+        normal <acronym>PHP</acronym> arrays).
     </para>
 
     <para>
-        <classname>Zend_Session_Namespace</classname> instances are accessor objects for namespaced slices of
-        <varname>$_SESSION</varname>. The <classname>Zend_Session</classname> component wraps the existing <acronym>PHP</acronym> ext/session with an
-        administration and management interface, as well as providing an <acronym>API</acronym> for <classname>Zend_Session_Namespace</classname> to
-        persist session namespaces. <classname>Zend_Session_Namespace</classname> provides a standardized, object-oriented
-        interface for working with namespaces persisted inside <acronym>PHP</acronym>'s standard session mechanism. Support exists for
-        both anonymous and authenticated (e.g., "login") session namespaces. <classname>Zend_Auth</classname>, the authentication
-        component of Zend Framework, uses <classname>Zend_Session_Namespace</classname> to store some information associated
-        with authenticated users. Since <classname>Zend_Session</classname> uses the normal <acronym>PHP</acronym> ext/session functions internally,
-        all the familiar configuration options and settings apply (see
-        <ulink url="http://www.php.net/session">http://www.php.net/session</ulink>), with such bonuses as the
-        convenience of an object-oriented interface and default behavior that provides both best practices and smooth
-        integration with Zend Framework. Thus, a standard <acronym>PHP</acronym> session identifier, whether conveyed by cookie or
-        within <acronym>URL</acronym>s, maintains the association between a client and session state data.
+        <classname>Zend_Session_Namespace</classname> instances are accessor objects for namespaced
+        slices of <varname>$_SESSION</varname>. The <classname>Zend_Session</classname> component
+        wraps the existing <acronym>PHP</acronym> ext/session with an administration and management
+        interface, as well as providing an <acronym>API</acronym> for
+        <classname>Zend_Session_Namespace</classname> to persist session namespaces.
+        <classname>Zend_Session_Namespace</classname> provides a standardized, object-oriented
+        interface for working with namespaces persisted inside <acronym>PHP</acronym>'s standard
+        session mechanism. Support exists for both anonymous and authenticated (e.g., "login")
+        session namespaces. <classname>Zend_Auth</classname>, the authentication component of Zend
+        Framework, uses <classname>Zend_Session_Namespace</classname> to store some information
+        associated with authenticated users. Since <classname>Zend_Session</classname> uses the
+        normal <acronym>PHP</acronym> ext/session functions internally, all the familiar
+        configuration options and settings apply (see <ulink
+            url="http://www.php.net/session">http://www.php.net/session</ulink>), with such bonuses
+        as the convenience of an object-oriented interface and default behavior that provides both
+        best practices and smooth integration with Zend Framework. Thus, a standard
+        <acronym>PHP</acronym> session identifier, whether conveyed by cookie or within
+        <acronym>URL</acronym>s, maintains the association between a client and session state data.
     </para>
 
     <para>
         The default
-        <ulink url="http://www.php.net/manual/en/function.session-set-save-handler.php">ext/session save
-        handler</ulink> does not maintain this association for server clusters under certain conditions because session
-        data are stored to the filesystem of the server that responded to the request. If a request may be processed by
-        a different server than the one where the session data are located, then the responding server has no access to
-        the session data (if they are not available from a networked filesystem). A list of additional, appropriate
-        save handlers will be provided, when available. Community members are encouraged to suggest and submit save
-        handlers to the <ulink url="mailto:fw-auth@lists.zend.com">fw-auth@lists.zend.com</ulink> list. A <classname>Zend_Db</classname>
-        compatible save handler has been posted to the list.
+        <ulink url="http://www.php.net/manual/en/function.session-set-save-handler.php">ext/session
+        save handler</ulink> does not maintain this association for server clusters under certain
+        conditions because session data are stored to the filesystem of the server that responded to
+        the request. If a request may be processed by a different server than the one where the
+        session data are located, then the responding server has no access to the session data (if
+        they are not available from a networked filesystem). A list of additional, appropriate save
+        handlers will be provided, when available. Community members are encouraged to suggest and
+        submit save handlers to the <ulink
+            url="mailto:fw-auth@lists.zend.com">fw-auth@lists.zend.com</ulink> list. A
+        <classname>Zend_Db</classname> compatible save handler has been posted to the list.
     </para>
-
 </sect1>

+ 3 - 0
documentation/manual/en/module_specs/Zend_Tag-Introduction.xml

@@ -31,10 +31,12 @@
 
     <example id="zend.tag.example.using">
         <title>Using Zend_Tag</title>
+
         <para>
             This example illustrates how to create a list of tags and spread
             absolute weight values on them.
         </para>
+
         <programlisting language="php"><![CDATA[
 // Create the item list
 $list = new Zend_Tag_ItemList();
@@ -52,6 +54,7 @@ foreach ($list as $item) {
     printf("%s: %d\n", $item->getTitle(), $item->getParam('weightValue'));
 }
 ]]></programlisting>
+
         <para>
             This will output the three items Code, Zend Framework and <acronym>PHP</acronym> with
             the absolute values 10, 1 and 2.

+ 13 - 9
documentation/manual/en/module_specs/Zend_Tag_Cloud.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.tag.cloud">
-
     <title>Zend_Tag_Cloud</title>
 
     <para>
@@ -30,6 +29,7 @@
                 decorators constructor.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <code>tagDecorator</code>: defines the decorator for individual
@@ -41,6 +41,7 @@
                 decorators constructor.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <code>pluginLoader</code>: a different plugin loader to use.
@@ -48,6 +49,7 @@
                 <classname>Zend_Loader_PluginLoader_Interface</classname>.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <code>prefixPath</code>: prefix paths to add to the plugin
@@ -56,12 +58,14 @@
                 elements will be skipped.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <code>itemList</code>: a different item list to use. Must be an
                 instance of <classname>Zend_Tag_ItemList</classname>.
             </para>
         </listitem>
+
         <listitem>
             <para>
                 <code>tags</code>: a list of tags to assign to the cloud. Each
@@ -73,7 +77,6 @@
     </itemizedlist>
 
     <example id="zend.tag.cloud.example.using">
-
         <title>Using Zend_Tag_Cloud</title>
 
         <para>
@@ -96,6 +99,7 @@ $cloud = new Zend_Tag_Cloud(array(
 // Render the cloud
 echo $cloud;
 ]]></programlisting>
+
         <para>
             This will output the tag cloud with the three tags, spread with
             the default font-sizes.
@@ -103,7 +107,6 @@ echo $cloud;
     </example>
 
     <sect2 id="zend.tag.cloud.decorators">
-
         <title>Decorators</title>
 
         <para>
@@ -117,7 +120,6 @@ echo $cloud;
         </para>
 
         <sect3 id="zend.tag.cloud.decorators.htmltag">
-
             <title>HTML Tag decorator</title>
 
             <para>
@@ -128,6 +130,7 @@ echo $cloud;
 
             <note>
                 <title>URL parameter</title>
+
                 <para>
                     As the HTML tag decorator always surounds the tag title with
                     an anchor, you should define an <acronym>URL</acronym> parameter for every
@@ -151,24 +154,28 @@ echo $cloud;
                         em, ex, px, in, cm, mm, pt, pc and &#37;.
                     </para>
                 </listitem>
+
                 <listitem>
                     <para>
                         <code>minFontSize</code>: the minimum font-size
                         distributed through the tags (must be an integer).
                     </para>
                 </listitem>
+
                 <listitem>
                     <para>
                         <code>maxFontSize</code>: the maximum font-size
                         distributed through the tags (must be an integer).
                     </para>
                 </listitem>
+
                 <listitem>
                     <para>
                         <code>classList</code>: an arry of classes distributed
                         through the tags.
                     </para>
                 </listitem>
+
                 <listitem>
                     <para>
                         <code>htmlTags</code>: an array of HTML tags surounding
@@ -183,7 +190,6 @@ echo $cloud;
         </sect3>
 
         <sect3 id="zend.tag.cloud.decorators.htmlcloud">
-
             <title>HTML Cloud decorator</title>
 
             <para>
@@ -200,19 +206,17 @@ echo $cloud;
                         is placed between all tags.
                     </para>
                 </listitem>
+
                 <listitem>
                     <para>
                         <code>htmlTags</code>: an array of HTML tags surounding
                         all tags. Each element can either be a string, which
                         is used as element type then, or an array containing
                         an attribute list for the element, defined as key/value
-                        pair. In this case, the array key is used as element
-                        type.
+                        pair. In this case, the array key is used as element type.
                     </para>
                 </listitem>
             </itemizedlist>
         </sect3>
-
     </sect2>
-
 </sect1>

+ 232 - 157
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Assertions.xml

@@ -34,60 +34,72 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <methodname>assertQuery($path, $message = '')</methodname>: assert that
-                one or more DOM elements matching the given <acronym>CSS</acronym> selector are
-                present. If a <varname>$message</varname> is present, it will be
-                prepended to any failed assertion message.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertQueryContentContains($path, $match, $message =
-                    '')</code>: assert that one or more DOM elements matching
-                the given <acronym>CSS</acronym> selector are present, and that at least one
-                contains the content provided in <varname>$match</varname>. If a
-                <varname>$message</varname> is present, it will be prepended to any
-                failed assertion message.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertQueryContentRegex($path, $pattern, $message =
-                    '')</code>: assert that one or more DOM elements matching
-                the given <acronym>CSS</acronym> selector are present, and that at least one
-                matches the regular expression provided in
-                <varname>$pattern</varname>. If a <varname>$message</varname> is present,
-                it will be prepended to any failed assertion message.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertQueryCount($path, $count, $message =
-                    '')</code>: assert that there are exactly
-                <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                selector present. If a <varname>$message</varname> is present, it
-                will be prepended to any failed assertion message.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertQueryCountMin($path, $count, $message =
-                    '')</code>: assert that there are at least
-                <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                selector present. If a <varname>$message</varname> is present, it
-                will be prepended to any failed assertion message.
-                <emphasis>Note:</emphasis> specifying a value of 1 for
-                <varname>$count</varname> is the same as simply using
-                <methodname>assertQuery()</methodname>.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertQueryCountMax($path, $count, $message =
-                    '')</code>: assert that there are no more than
-                <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                selector present. If a <varname>$message</varname> is present, it
-                will be prepended to any failed assertion message.
-                <emphasis>Note:</emphasis> specifying a value of 1 for
-                <varname>$count</varname> is the same as simply using
-                <methodname>assertQuery()</methodname>.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>assertQuery($path, $message = '')</methodname>: assert that
+                    one or more DOM elements matching the given <acronym>CSS</acronym> selector are
+                    present. If a <varname>$message</varname> is present, it will be
+                    prepended to any failed assertion message.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertQueryContentContains($path, $match, $message =
+                        '')</code>: assert that one or more DOM elements matching
+                    the given <acronym>CSS</acronym> selector are present, and that at least one
+                    contains the content provided in <varname>$match</varname>. If a
+                    <varname>$message</varname> is present, it will be prepended to any
+                    failed assertion message.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertQueryContentRegex($path, $pattern, $message =
+                        '')</code>: assert that one or more DOM elements matching
+                    the given <acronym>CSS</acronym> selector are present, and that at least one
+                    matches the regular expression provided in
+                    <varname>$pattern</varname>. If a <varname>$message</varname> is present,
+                    it will be prepended to any failed assertion message.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertQueryCount($path, $count, $message =
+                        '')</code>: assert that there are exactly
+                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
+                    selector present. If a <varname>$message</varname> is present, it
+                    will be prepended to any failed assertion message.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertQueryCountMin($path, $count, $message =
+                        '')</code>: assert that there are at least
+                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
+                    selector present. If a <varname>$message</varname> is present, it
+                    will be prepended to any failed assertion message.
+                    <emphasis>Note:</emphasis> specifying a value of 1 for
+                    <varname>$count</varname> is the same as simply using
+                    <methodname>assertQuery()</methodname>.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertQueryCountMax($path, $count, $message =
+                        '')</code>: assert that there are no more than
+                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
+                    selector present. If a <varname>$message</varname> is present, it
+                    will be prepended to any failed assertion message.
+                    <emphasis>Note:</emphasis> specifying a value of 1 for
+                    <varname>$count</varname> is the same as simply using
+                    <methodname>assertQuery()</methodname>.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>
@@ -112,36 +124,68 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <methodname>assertXpath($path, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertNotXpath($path, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertXpathContentContains($path, $match, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertNotXpathContentContains($path, $match, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertXpathContentRegex($path, $pattern, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertNotXpathContentRegex($path, $pattern, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertXpathCount($path, $count, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertNotXpathCount($path, $count, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertXpathCountMin($path, $count, $message = '')</methodname>
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertNotXpathCountMax($path, $count, $message = '')</methodname>
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>assertXpath($path, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotXpath($path, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertXpathContentContains($path, $match, $message =
+                        '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotXpathContentContains($path, $match, $message =
+                        '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertXpathContentRegex($path, $pattern, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotXpathContentRegex($path, $pattern, $message =
+                        '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertXpathCount($path, $count, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotXpathCount($path, $count, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertXpathCountMin($path, $count, $message = '')</methodname>
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotXpathCountMax($path, $count, $message = '')</methodname>
+                </para>
+            </listitem>
         </itemizedlist>
     </sect3>
 
@@ -155,41 +199,53 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <methodname>assertRedirect($message = '')</methodname>: assert simply that
-                a redirect has occurred.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertNotRedirect($message = '')</methodname>: assert that no
-                redirect has occurred.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertRedirectTo($url, $message = '')</methodname>: assert that
-                a redirect has occurred, and that the value of the Location
-                header is the <varname>$url</varname> provided.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertNotRedirectTo($url, $message = '')</methodname>: assert that
-                a redirect has either NOT occurred, or that the value of the Location
-                header is NOT the <varname>$url</varname> provided.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertRedirectRegex($pattern, $message = '')</methodname>:
-                assert that a redirect has occurred, and that the value of the
-                Location header matches the regular expression provided by
-                <varname>$pattern</varname>.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertNotRedirectRegex($pattern, $message = '')</methodname>:
-                assert that a redirect has either NOT occurred, or that the value of the
-                Location header does NOT match the regular expression provided by
-                <varname>$pattern</varname>.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>assertRedirect($message = '')</methodname>: assert simply that
+                    a redirect has occurred.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotRedirect($message = '')</methodname>: assert that no
+                    redirect has occurred.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertRedirectTo($url, $message = '')</methodname>: assert that
+                    a redirect has occurred, and that the value of the Location
+                    header is the <varname>$url</varname> provided.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotRedirectTo($url, $message = '')</methodname>: assert that
+                    a redirect has either NOT occurred, or that the value of the Location
+                    header is NOT the <varname>$url</varname> provided.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertRedirectRegex($pattern, $message = '')</methodname>:
+                    assert that a redirect has occurred, and that the value of the
+                    Location header matches the regular expression provided by
+                    <varname>$pattern</varname>.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertNotRedirectRegex($pattern, $message = '')</methodname>:
+                    assert that a redirect has either NOT occurred, or that the value of the
+                    Location header does NOT match the regular expression provided by
+                    <varname>$pattern</varname>.
+                </para>
+            </listitem>
         </itemizedlist>
     </sect3>
 
@@ -205,27 +261,35 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <methodname>assertResponseCode($code, $message = '')</methodname>: assert
-                that the response resulted in the given <acronym>HTTP</acronym> response code.
-            </para></listitem>
-
-            <listitem><para>
-                <methodname>assertHeader($header, $message = '')</methodname>: assert
-                that the response contains the given header.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertHeaderContains($header, $match, $message =
-                '')</code>: assert that the response contains the given header
-                and that its content contains the given string.
-            </para></listitem>
-
-            <listitem><para>
-                <code>assertHeaderRegex($header, $pattern, $message =
-                '')</code>: assert that the response contains the given header
-            and that its content matches the given regex.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>assertResponseCode($code, $message = '')</methodname>: assert
+                    that the response resulted in the given <acronym>HTTP</acronym> response code.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertHeader($header, $message = '')</methodname>: assert
+                    that the response contains the given header.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertHeaderContains($header, $match, $message = '')</code>: assert that
+                    the response contains the given header and that its content contains the given
+                    string.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>assertHeaderRegex($header, $pattern, $message = '')</code>: assert that
+                    the response contains the given header and that its content matches the given
+                    regex.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>
@@ -245,23 +309,34 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                <methodname>assertModule($module, $message = '')</methodname>: Assert that
-                the given module was used in the last dispatched action.
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertController($controller, $message = '')</methodname>:
-                Assert that the given controller was selected in the last
-                dispatched action.
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertAction($action, $message = '')</methodname>: Assert that
-                the given action was last dispatched.
-            </para></listitem>
-            <listitem><para>
-                <methodname>assertRoute($route, $message = '')</methodname>: Assert that
-                the given named route was matched by the router.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <methodname>assertModule($module, $message = '')</methodname>: Assert that
+                    the given module was used in the last dispatched action.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertController($controller, $message = '')</methodname>:
+                    Assert that the given controller was selected in the last
+                    dispatched action.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertAction($action, $message = '')</methodname>: Assert that
+                    the given action was last dispatched.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>assertRoute($route, $message = '')</methodname>: Assert that
+                    the given named route was matched by the router.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>

+ 23 - 19
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Bootstrapping.xml

@@ -117,25 +117,29 @@ class UserControllerTest extends Zend_Test_PHPUnit_ControllerTestCase
     </para>
 
     <itemizedlist>
-        <listitem><para>
-            Do not provide alternate implementations of the Request and
-            Response objects; they will not be used.
-            <classname>Zend_Test_PHPUnit_ControllerTestCase</classname> uses custom
-            request and response objects,
-            <classname>Zend_Controller_Request_HttpTestCase</classname> and
-            <classname>Zend_Controller_Response_HttpTestCase</classname>, respectively.
-            These objects provide methods for setting up the request
-            environment in targeted ways, and pulling response artifacts in
-            specific ways.
-        </para></listitem>
-
-        <listitem><para>
-            Do not expect to test server specifics. In other words, the tests
-            are not a guarantee that the code will run on a specific server
-            configuration, but merely that the application should run as
-            expected should the router be able to route the given request. To
-            this end, do not set server-specific headers in the request object.
-        </para></listitem>
+        <listitem>
+            <para>
+                Do not provide alternate implementations of the Request and
+                Response objects; they will not be used.
+                <classname>Zend_Test_PHPUnit_ControllerTestCase</classname> uses custom
+                request and response objects,
+                <classname>Zend_Controller_Request_HttpTestCase</classname> and
+                <classname>Zend_Controller_Response_HttpTestCase</classname>, respectively.
+                These objects provide methods for setting up the request
+                environment in targeted ways, and pulling response artifacts in
+                specific ways.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                Do not expect to test server specifics. In other words, the tests
+                are not a guarantee that the code will run on a specific server
+                configuration, but merely that the application should run as
+                expected should the router be able to route the given request. To
+                this end, do not set server-specific headers in the request object.
+            </para>
+        </listitem>
     </itemizedlist>
 
     <para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Adapter.xml

@@ -62,8 +62,8 @@ $adapter->appendStatementToStack(
 ]]></programlisting>
 
     <para>
-        By default the query profiler is enabled, so that you can retrieve the executed SQL statements
-        and their bound parameters to check for the correctness of the execution.
+        By default the query profiler is enabled, so that you can retrieve the executed SQL
+        statements and their bound parameters to check for the correctness of the execution.
     </para>
 
     <programlisting language="php"><![CDATA[

+ 11 - 9
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Quickstart.xml

@@ -95,10 +95,10 @@ class BugsTest extends Zend_Test_PHPUnit_DatabaseTestCase
                 <para>
                     DataSets have to implement the interface
                     <classname>PHPUnit_Extensions_Database_DataSet_IDataSet</classname>.
-                    There is a wide range of <acronym>XML</acronym> and YAML configuration file types included in
-                    PHPUnit which allows to specifiy how the tables and datasets should look
-                    like and you should look into the PHPUnit documentation to get the latest
-                    information on these dataset specifications.
+                    There is a wide range of <acronym>XML</acronym> and YAML configuration file
+                    types included in PHPUnit which allows to specifiy how the tables and datasets
+                    should look like and you should look into the PHPUnit documentation to get the
+                    latest information on these dataset specifications.
                 </para>
             </listitem>
         </itemizedlist>
@@ -109,7 +109,8 @@ class BugsTest extends Zend_Test_PHPUnit_DatabaseTestCase
 
         <para>
             In the previous setup for the database testcase we have specified a seed file for the
-            database fixture. We now create this file specified in the Flat <acronym>XML</acronym> format:
+            database fixture. We now create this file specified in the Flat <acronym>XML</acronym>
+            format:
         </para>
 
         <programlisting language="xml"><![CDATA[
@@ -202,10 +203,11 @@ class BugsTest extends Zend_Test_PHPUnit_DatabaseTestCase
             given data. For this we create a
             <classname>Zend_Test_PHPUnit_Db_DataSet_QueryDataSet</classname> instance and give
             it a database connection. We will then tell this dataset that it contains a table
-            "zfbugs" which is given by an <acronym>SQL</acronym> statement. This current/actual state of the
-            database is compared to the expected database state which is contained in another
-            <acronym>XML</acronym> file "bugsInsertIntoAssertions.xml". This <acronym>XML</acronym> file is a slight deviation from
-            the one given above and contains another row with the expected data:
+            "zfbugs" which is given by an <acronym>SQL</acronym> statement. This current/actual
+            state of the database is compared to the expected database state which is contained in
+            another <acronym>XML</acronym> file "bugsInsertIntoAssertions.xml". This
+            <acronym>XML</acronym> file is a slight deviation from the one given above and contains
+            another row with the expected data:
         </para>
 
         <programlisting language="xml"><![CDATA[

+ 12 - 10
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Testing.xml

@@ -5,9 +5,9 @@
 
     <para>
         The Quickstart already gave a good introduction on how database testing can be done using
-        PHPUnit and the Zend Framework. This section gives an overview over the <acronym>API</acronym> that the
-        <classname>Zend_Test_PHPUnit_Db</classname> component comes with and how it works
-        internally.
+        PHPUnit and the Zend Framework. This section gives an overview over the
+        <acronym>API</acronym> that the <classname>Zend_Test_PHPUnit_Db</classname> component comes
+        with and how it works internally.
     </para>
 
     <note>
@@ -130,7 +130,8 @@
                             Create a PHPUnit Database Extension compatible Connection instance from
                             a <classname>Zend_Db_Adapter_Abstract</classname> instance. This method
                             should be used in for testcase setup when implementing the abstract
-                            <methodname>getConnection()</methodname> method of the database testcase.
+                            <methodname>getConnection()</methodname> method of the database
+                            testcase.
                         </entry>
                     </row>
 
@@ -179,8 +180,8 @@
                         </entry>
 
                         <entry>
-                            Create a DataSet containing the given <varname>$tables</varname>, an array of
-                            <classname>Zend_Db_Table_Abstract</classname> instances.
+                            Create a DataSet containing the given <varname>$tables</varname>, an
+                            array of <classname>Zend_Db_Table_Abstract</classname> instances.
                         </entry>
                     </row>
                 </tbody>
@@ -192,8 +193,8 @@
         <title>Integrating Database Testing with the ControllerTestCase</title>
 
         <para>
-            Because <acronym>PHP</acronym> does not support multiple inheritance it is not possible to use the
-            Controller and Database testcases in conjunction. However you can use the
+            Because <acronym>PHP</acronym> does not support multiple inheritance it is not possible
+            to use the Controller and Database testcases in conjunction. However you can use the
             <classname>Zend_Test_PHPUnit_Db_SimpleTester</classname> database tester in your
             controller test-case to setup a database enviroment fixture for each new controller
             test. The Database TestCase in general is only a set of convenience functions which can
@@ -237,8 +238,9 @@ class UserControllerTest extends Zend_Test_PHPUnit_ControllerTestCase
 ]]></programlisting>
 
             <para>
-                Now the Flat <acronym>XML</acronym> dataset "initialUserFixture.xml" is used to set the database into
-                an initial state before each test, exactly as the DatabaseTestCase works internally.
+                Now the Flat <acronym>XML</acronym> dataset "initialUserFixture.xml" is used to set
+                the database into an initial state before each test, exactly as the DatabaseTestCase
+                works internally.
             </para>
         </example>
     </sect3>

+ 54 - 39
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Examples.xml

@@ -13,48 +13,63 @@
         <title>Testing a UserController</title>
 
         <para>
-            Let's consider a standard task for a website: authenticating and registering users. In our example, we'll define a UserController for handling this, and have the following requirements:
+            Let's consider a standard task for a website: authenticating and registering users. In
+            our example, we'll define a UserController for handling this, and have the following
+            requirements:
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                If a user is not authenticated, they will always be redirected
-                to the login page of the controller, regardless of the action
-                specified.
-            </para></listitem>
-
-            <listitem><para>
-                The login form page will show both the login form and the
-                registration form.
-            </para></listitem>
-
-            <listitem><para>
-                Providing invalid credentials should result in returning to the
-                login form.
-            </para></listitem>
-
-            <listitem><para>
-                Valid credentials should result in redirecting to the user
-                profile page.
-            </para></listitem>
-
-            <listitem><para>
-                The profile page should be customized to contain the user's
-                username.
-            </para></listitem>
-
-            <listitem><para>
-                Authenticated users who visit the login page should be
-                redirected to their profile page.
-            </para></listitem>
-
-            <listitem><para>
-                On logout, a user should be redirected to the login page.
-            </para></listitem>
-
-            <listitem><para>
-                With invalid data, registration should fail.
-            </para></listitem>
+            <listitem>
+                <para>
+                    If a user is not authenticated, they will always be redirected
+                    to the login page of the controller, regardless of the action
+                    specified.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    The login form page will show both the login form and the
+                    registration form.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Providing invalid credentials should result in returning to the login form.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Valid credentials should result in redirecting to the user profile page.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    The profile page should be customized to contain the user's username.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Authenticated users who visit the login page should be
+                    redirected to their profile page.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    On logout, a user should be redirected to the login page.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    With invalid data, registration should fail.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Testing.xml

@@ -75,8 +75,7 @@ class FooControllerTest extends Zend_Test_PHPUnit_ControllerTestCase
 ]]></programlisting>
 
     <para>
-        Now that the request is made, it's time to start making assertions
-        against it.
+        Now that the request is made, it's time to start making assertions against it.
     </para>
 
     <sect3 id="zend.test.phpunit.testing.redirector">
@@ -120,9 +119,10 @@ class MyController extends Zend_Controller_Action
 
         <important>
             <para>
-                Depending on your application this is not enough as additional action, <methodname>preDispatch()</methodname> or
-                <methodname>postDispatch()</methodname> logic might be executed. This cannot be handled in a good way with
-                Zend Test currently.
+                Depending on your application this is not enough as additional action,
+                <methodname>preDispatch()</methodname> or <methodname>postDispatch()</methodname>
+                logic might be executed. This cannot be handled in a good way with Zend Test
+                currently.
             </para>
         </important>
     </sect3>

+ 13 - 9
documentation/manual/en/module_specs/Zend_Test-PHPUnit.xml

@@ -4,8 +4,8 @@
     <title>Zend_Test_PHPUnit</title>
 
     <para>
-        <classname>Zend_Test_PHPUnit</classname> provides a TestCase for <acronym>MVC</acronym> applications
-        that contains assertions for testing against a variety of
+        <classname>Zend_Test_PHPUnit</classname> provides a TestCase for <acronym>MVC</acronym>
+        applications that contains assertions for testing against a variety of
         responsibilities. Probably the easiest way to understand what it can do
         is to see an example.
     </para>
@@ -19,14 +19,18 @@
         </para>
 
         <itemizedlist>
-            <listitem><para>
-                The login form should be displayed to non-authenticated users.
-            </para></listitem>
+            <listitem>
+                <para>
+                    The login form should be displayed to non-authenticated users.
+                </para>
+            </listitem>
 
-            <listitem><para>
-                When a user logs in, they should be redirected to their profile
-                page, and that profile page should show relevant information.
-            </para></listitem>
+            <listitem>
+                <para>
+                    When a user logs in, they should be redirected to their profile
+                    page, and that profile page should show relevant information.
+                </para>
+            </listitem>
         </itemizedlist>
 
         <para>

+ 19 - 2
documentation/manual/en/module_specs/Zend_Text_Figlet.xml

@@ -2,6 +2,7 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.text.figlet">
     <title>Zend_Text_Figlet</title>
+
     <para>
         <classname>Zend_Text_Figlet</classname> is a component which enables developers to
         create a so called FIGlet text. A FIGlet text is a string, which is
@@ -10,8 +11,10 @@
         <classname>Zend_Text_Figlet</classname>, but you can download additional fonts at
         <ulink url="http://www.figlet.org/fontdb.cgi">http://www.figlet.org</ulink>.
     </para>
+
     <note>
         <title>Compressed fonts</title>
+
         <para>
             <classname>Zend_Text_Figlet</classname> supports gzipped fonts. This means that
             you can take an <code>.flf</code> file and gzip it. To allow
@@ -20,14 +23,17 @@
             gzipped fonts, you have to have enabled the GZIP extension of <acronym>PHP</acronym>.
         </para>
     </note>
+
     <note>
         <title>Encoding</title>
+
         <para>
             <classname>Zend_Text_Figlet</classname> expects your strings to be UTF-8 encoded
             by default. If this is not the case, you can supply the character
             encoding as second parameter to the <methodname>render()</methodname> method.
         </para>
     </note>
+
     <para>
         You can define multiple options for a FIGlet. When instantiating
         <classname>Zend_Text_Figlet</classname>, you can supply an array or an instance of
@@ -41,6 +47,7 @@
                     used.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>outputWidth</code> - Defines the maximum width of the
@@ -49,6 +56,7 @@
                     in an undefined behaviour. The default value is 80.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>handleParagraphs</code> - A boolean which indicates,
@@ -58,15 +66,18 @@
                     <constant>FALSE</constant>.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>justification</code> - May be one of the values of
                     <classname>Zend_Text_Figlet::JUSTIFICATION_*</classname>. There is
-                    <constant>JUSTIFICATION_LEFT</constant>, <constant>JUSTIFICATION_CENTER</constant>
-                    and <constant>JUSTIFICATION_RIGHT</constant> The default justification
+                    <constant>JUSTIFICATION_LEFT</constant>,
+                    <constant>JUSTIFICATION_CENTER</constant> and
+                    <constant>JUSTIFICATION_RIGHT</constant> The default justification
                     is defined by the <code>rightToLeft</code> value.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>rightToLeft</code> - Defines in which direction the
@@ -78,6 +89,7 @@
                     automatically right-aligned.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <code>smushMode</code> - An integer bitfield which defines,
@@ -96,19 +108,24 @@
             </listitem>
         </itemizedlist>
     </para>
+
     <example id="zend.text.figlet.example.using">
         <title>Using Zend_Text_Figlet</title>
+
         <para>
             This example illustrates the basic use of <classname>Zend_Text_Figlet</classname>
             to create a simple FIGlet text:
         </para>
+
         <programlisting language="php"><![CDATA[
 $figlet = new Zend_Text_Figlet();
 echo $figlet->render('Zend');
 ]]></programlisting>
+
         <para>
             Assuming you are using a monospace font, this would look as follows:
         </para>
+
         <programlisting language="text"><![CDATA[
   ______    ______    _  __   ______
  |__  //   |  ___||  | \| || |  __ \\

+ 50 - 54
documentation/manual/en/module_specs/Zend_TimeSync-Working.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.timesync.working">
-
     <title>Working with Zend_TimeSync</title>
 
     <para>
@@ -12,14 +11,14 @@
 
     <note>
         <para>
-            All examples in this chapter use a public, generic time server: <emphasis>0.europe.pool.ntp.org</emphasis>. You should use a public, generic time server which is close to your application server.
-            See <ulink url="http://www.pool.ntp.org">http://www.pool.ntp.org</ulink> for
-            information.
+            All examples in this chapter use a public, generic time server:
+            <emphasis>0.europe.pool.ntp.org</emphasis>. You should use a public, generic time server
+            which is close to your application server. See <ulink
+                url="http://www.pool.ntp.org">http://www.pool.ntp.org</ulink> for information.
         </para>
     </note>
 
     <sect2 id="zend.timesync.working.generic">
-
         <title>Generic Time Server Request</title>
 
         <para>
@@ -45,26 +44,27 @@ print $server->getDate()->getIso();
         </para>
 
         <para>
-            For details about <classname>Zend_Date</classname> and its methods see the
-            <link linkend="zend.date.introduction"><classname>Zend_Date</classname> documentation</link>.
+            For details about <classname>Zend_Date</classname> and its methods see the <link
+                linkend="zend.date.introduction"><classname>Zend_Date</classname>
+                documentation</link>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.multiple">
-
         <title>Multiple Time Servers</title>
 
         <para>
-            Not all time servers are always available to return their time. Servers may be unavailable during maintenance, for example.
-            When the time cannot be requested from the time server, you will get an exception.
+            Not all time servers are always available to return their time. Servers may be
+            unavailable during maintenance, for example. When the time cannot be requested from the
+            time server, you will get an exception.
         </para>
 
         <para>
-            <classname>Zend_TimeSync</classname> is a simple solution that can handle multiple time servers and supports an
-            automatic fallback mechanism. There are two supported ways; you can either specify an array
-            of time servers when creating the instance, or you can add additional time servers to the instance
-            using the <methodname>addServer()</methodname> method.
+            <classname>Zend_TimeSync</classname> is a simple solution that can handle multiple time
+            servers and supports an automatic fallback mechanism. There are two supported ways; you
+            can either specify an array of time servers when creating the instance, or you can add
+            additional time servers to the instance using the <methodname>addServer()</methodname>
+            method.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -78,13 +78,15 @@ print $server->getDate()->getIso();
 
         <para>
             There is no limit to the number of time servers you can add. When a time server can not
-            be reached, <classname>Zend_TimeSync</classname> will fallback and try to connect to the next time server.
+            be reached, <classname>Zend_TimeSync</classname> will fallback and try to connect to the
+            next time server.
         </para>
 
         <para>
-            When you supply more than one time server- which is considered a best practice for <classname>Zend_TimeSync</classname>- you should name
-            each server. You can name your servers with array keys, with the second
-            parameter at instantiation, or with the second parameter when adding another time server.
+            When you supply more than one time server- which is considered a best practice for
+            <classname>Zend_TimeSync</classname>- you should name each server. You can name your
+            servers with array keys, with the second parameter at instantiation, or with the second
+            parameter when adding another time server.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -100,11 +102,9 @@ print $server->getDate()->getIso();
             Naming the time servers allows you to request a specific time server as we will see
             later in this chapter.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.protocol">
-
         <title>Protocols of Time Servers</title>
 
         <para>
@@ -115,9 +115,10 @@ print $server->getDate()->getIso();
 
         <para>
             You set the proper protocol in the address of the time server. There are two
-            protocols which are supported by <classname>Zend_TimeSync</classname>: <emphasis>NTP</emphasis> and <emphasis>SNTP</emphasis>. The default protocol is
-            <emphasis>NTP</emphasis>. If you are using <emphasis>NTP</emphasis>, you can omit the protocol
-            in the address as demonstrated in the previous examples.
+            protocols which are supported by <classname>Zend_TimeSync</classname>:
+            <emphasis>NTP</emphasis> and <emphasis>SNTP</emphasis>. The default protocol is
+            <emphasis>NTP</emphasis>. If you are using <emphasis>NTP</emphasis>, you can omit the
+            protocol in the address as demonstrated in the previous examples.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -130,14 +131,12 @@ print $server->getDate()->getIso();
 ]]></programlisting>
 
         <para>
-            <classname>Zend_TimeSync</classname> can handle mixed time servers. So you are not restricted to
-            only one protocol; you can add any server independently from its protocol.
+            <classname>Zend_TimeSync</classname> can handle mixed time servers. So you are not
+            restricted to only one protocol; you can add any server independently from its protocol.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.ports">
-
         <title>Using Ports for Time Servers</title>
 
         <para>
@@ -147,9 +146,10 @@ print $server->getDate()->getIso();
         </para>
 
         <para>
-            But sometimes the port that the protocols use differs from the standard one. You can define the port which
-            has to be used for each server within the address. Just add the number of the port after the
-            address. If no port is defined, then <classname>Zend_TimeSync</classname> will use the standard port.
+            But sometimes the port that the protocols use differs from the standard one. You can
+            define the port which has to be used for each server within the address. Just add the
+            number of the port after the address. If no port is defined, then
+            <classname>Zend_TimeSync</classname> will use the standard port.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -159,31 +159,32 @@ $server->addServer('sntp:\\internal.myserver.com:399', 'additional');
 
 print $server->getDate()->getIso();
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.options">
-
         <title>Time Servers Options</title>
 
         <para>
-            There is only one option within <classname>Zend_TimeSync</classname> which will be used internally: <emphasis>timeout</emphasis>.
-            You can set any self-defined option you are in need of and request it, however.
+            There is only one option within <classname>Zend_TimeSync</classname> which will be used
+            internally: <emphasis>timeout</emphasis>. You can set any self-defined option you are in
+            need of and request it, however.
         </para>
 
         <para>
             The option <emphasis>timeout</emphasis> defines the number of seconds after which
             a connection is detected as broken when there was no response. The default value is
             <emphasis>1</emphasis>, which means that <classname>Zend_TimeSync</classname> will
-            fallback to the next time server if the requested time server does not respond in one second.
+            fallback to the next time server if the requested time server does not respond in one
+            second.
         </para>
 
         <para>
-            With the <methodname>setOptions()</methodname> method, you can set any option. This function accepts an array where the
-            key is the option to set and the value is the value of that option. Any previously set option will
-            be overwritten by the new value. If you want to know which options are set, use the
-            <methodname>getOptions()</methodname> method. It accepts either a key which returns the given option if specified,
-            or, if no key is set, it will return all set options.
+            With the <methodname>setOptions()</methodname> method, you can set any option. This
+            function accepts an array where the key is the option to set and the value is the value
+            of that option. Any previously set option will be overwritten by the new value. If you
+            want to know which options are set, use the <methodname>getOptions()</methodname>
+            method. It accepts either a key which returns the given option if specified, or, if no
+            key is set, it will return all set options.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -201,21 +202,20 @@ print "Timeout = " . Zend_TimeSync::getOptions('timeout');
             As you can see, the options for <classname>Zend_TimeSync</classname> are static. Each
             instance of <classname>Zend_TimeSync</classname> will use the same options.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.different">
-
         <title>Using Different Time Servers</title>
 
         <para>
-            <classname>Zend_TimeSync</classname>'s default behavior for requesting a time is to request it from the first given server.
-            But sometimes it is useful to set a different time server from which to request the time.
-            This can be done with the <methodname>setServer()</methodname> method. To define the used time server
-            set the alias as a parameter within the method. To get the actual used time server
-            call the <methodname>getServer()</methodname> method. It accepts an alias as a parameter which
-            defines the time server to be returned. If no parameter is given, the current time server will
-            be returned.
+            <classname>Zend_TimeSync</classname>'s default behavior for requesting a time is to
+            request it from the first given server. But sometimes it is useful to set a different
+            time server from which to request the time. This can be done with the
+            <methodname>setServer()</methodname> method. To define the used time server set the
+            alias as a parameter within the method. To get the actual used time server call the
+            <methodname>getServer()</methodname> method. It accepts an alias as a parameter which
+            defines the time server to be returned. If no parameter is given, the current time
+            server will be returned.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -226,11 +226,9 @@ $server->addServer('sntp:\\internal.myserver.com', 'additional');
 $actual = $server->getServer();
 $server = $server->setServer('additional');
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.informations">
-
         <title>Information from Time Servers</title>
 
         <para>
@@ -249,11 +247,9 @@ print_r ($server->getInfo());
             The returned information differs with the protocol used and can also differ with the
             server used.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.working.exceptions">
-
         <title>Handling Exceptions</title>
 
         <para>

+ 67 - 61
documentation/manual/en/module_specs/Zend_TimeSync.xml

@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect1 id="zend.timesync.introduction">
-
     <title>Introduction</title>
 
     <para>
-        <classname>Zend_TimeSync</classname> is able to receive internet or network time from a time server using
-        the <emphasis>NTP</emphasis> or <emphasis>SNTP</emphasis> protocol.
-        With <classname>Zend_TimeSync</classname>, Zend Framework is able to act independently from the
-        time settings of the server where it is running.
+        <classname>Zend_TimeSync</classname> is able to receive internet or network time from a time
+        server using the <emphasis>NTP</emphasis> or <emphasis>SNTP</emphasis> protocol.
+        With <classname>Zend_TimeSync</classname>, Zend Framework is able to act independently from
+        the time settings of the server where it is running.
     </para>
 
     <para>
         To be independent from the actual time of the server, <classname>Zend_TimeSync</classname>
-        works with the difference of the real time which is sent through NTP or SNTP and the internal
-        server's time.
+        works with the difference of the real time which is sent through NTP or SNTP and the
+        internal server's time.
     </para>
 
     <note>
-
         <title>Background</title>
 
         <para>
-            <classname>Zend_TimeSync</classname> is not able to change the server's time, but it will return a
-            <link linkend="zend.date.introduction">Zend_Date</link> instance from which the difference
-            from the server's time can be worked with.
+            <classname>Zend_TimeSync</classname> is not able to change the server's time, but it
+            will return a <link linkend="zend.date.introduction">Zend_Date</link> instance from
+            which the difference from the server's time can be worked with.
         </para>
-
     </note>
 
     <sect2 id="zend.timesync.introduction.why">
-
         <title>Why Zend_TimeSync ?</title>
 
         <para>
@@ -38,14 +34,15 @@
         </para>
 
         <para>
-            Normally every server within a multi-server farm will have a service running which synchronizes
-            its own time with a time server. So within a standard environment it should not be necessary to
-            use <classname>Zend_TimeSync</classname>. But it can become handy if there is no service available and if
-            you don't have the right to install such a service.
+            Normally every server within a multi-server farm will have a service running which
+            synchronizes its own time with a time server. So within a standard environment it should
+            not be necessary to use <classname>Zend_TimeSync</classname>. But it can become handy if
+            there is no service available and if you don't have the right to install such a service.
         </para>
 
         <para>
-            Here are some example use cases, for which <classname>Zend_TimeSync</classname> is perfect suited:
+            Here are some example use cases, for which <classname>Zend_TimeSync</classname> is
+            perfect suited:
         </para>
 
         <itemizedlist mark='opencircle'>
@@ -53,35 +50,45 @@
                 <para>
                     <emphasis>Server without time service</emphasis>
                 </para>
+
                 <para>
-                    If your application is running on a server and this server does not have any time service
-                    running, it may make sense to use <classname>Zend_TimeSync</classname> in your application.
+                    If your application is running on a server and this server does not have any
+                    time service running, it may make sense to use
+                    <classname>Zend_TimeSync</classname> in your application.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>Separate database server</emphasis>
                 </para>
+
                 <para>
-                    If your database is running on a different server and this server is not connected
-                    with <emphasis>NTP</emphasis> or <emphasis>SNTP</emphasis>
-                    to the application server, you might have problems using storing and using time stamp data.
+                    If your database is running on a different server and this server is not
+                    connected with <emphasis>NTP</emphasis> or <emphasis>SNTP</emphasis>
+                    to the application server, you might have problems using storing and using time
+                    stamp data.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>Multiple servers</emphasis>
                 </para>
+
                 <para>
-                    If your application is running on more than one server and these servers' time bases
-                    are not syncronized, you can expect problems within your application when part of
-                    the application is coming from one server and another part from another server.
+                    If your application is running on more than one server and these servers' time
+                    bases are not syncronized, you can expect problems within your application when
+                    part of the application is coming from one server and another part from another
+                    server.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <emphasis>Batch processing</emphasis>
                 </para>
+
                 <para>
                     If you want to work with a time service within a batch file or within a
                     command line application, <classname>Zend_TimeSync</classname> may be of use.
@@ -90,57 +97,51 @@
         </itemizedlist>
 
         <para>
-            <classname>Zend_TimeSync</classname> may provide a good solution in all of these cases and can be used if you are
-            unable to run any services on your server.
+            <classname>Zend_TimeSync</classname> may provide a good solution in all of these cases
+            and can be used if you are unable to run any services on your server.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.introduction.ntp">
-
         <title>What is NTP ?</title>
 
         <para>
             The Network Time Protocol (<emphasis>NTP</emphasis>) is a protocol
             for synchronizing multiple systems' clocks over packet-switched, variable-latency data
-            networks. NTP uses UDP port 123 as its transport layer. See the
-            <ulink url="http://en.wikipedia.org/wiki/Network_Time_Protocol">wikipedia article</ulink>
+            networks. NTP uses UDP port 123 as its transport layer. See the <ulink
+                url="http://en.wikipedia.org/wiki/Network_Time_Protocol">wikipedia article</ulink>
             for details about this protocol.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.introduction.sntp">
-
         <title>What is SNTP?</title>
 
         <para>
             The Simple Network Time Protocol (<emphasis>SNTP</emphasis>) is a
             protocol synchronizing multiple systems' clocks over packet-switched, variable-latency
-            data networks. SNTP uses UDP port 37 as its transport layer. It is closely related to the
-            Network Time Protocol, but simpler.
+            data networks. SNTP uses UDP port 37 as its transport layer. It is closely related to
+            the Network Time Protocol, but simpler.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.introduction.problematic">
-
         <title>Problematic usage</title>
 
         <para>
-            Be warned that when you are using <classname>Zend_TimeSync</classname> you will have to think about some
-            details related to the structure of time sync and the internet itself. Correct usage
-            and best practices will be described here. Read carefully before you begin using <classname>Zend_TimeSync</classname>.
+            Be warned that when you are using <classname>Zend_TimeSync</classname> you will have to
+            think about some details related to the structure of time sync and the internet itself.
+            Correct usage and best practices will be described here. Read carefully before you begin
+            using <classname>Zend_TimeSync</classname>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.timesync.introduction.decision">
-
         <title>Decide which server to use</title>
 
         <para>
-            You should select the time server that you want to use very carefully according to the following criteria:
+            You should select the time server that you want to use very carefully according to the
+            following criteria:
         </para>
 
         <itemizedlist mark='opencircle'>
@@ -148,41 +149,48 @@
                 <para>
                     Distance
                 </para>
+
                 <para>
-                    The distance from your application server to the time server.
-                    If your server is in Europe, it would make little sense to select a time server in
-                    Tahiti. Always select a server which is not far away. This reduces the request time and overall network load.
+                    The distance from your application server to the time server. If your server is
+                    in Europe, it would make little sense to select a time server in Tahiti. Always
+                    select a server which is not far away. This reduces the request time and overall
+                    network load.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Speed
                 </para>
+
                 <para>
-                    How long it takes to receive the request is also relevant. Try different servers to get the
-                    best result. If you are requesting a server which is never accessible, you will always
-                    have an unnecessary delay.
+                    How long it takes to receive the request is also relevant. Try different servers
+                    to get the best result. If you are requesting a server which is never
+                    accessible, you will always have an unnecessary delay.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     Splitting
                 </para>
+
                 <para>
-                    Do not always use the same server. All time servers will lock out requests from servers that
-                    are flooding the server. If your application requires heavy use of time servers, you
-                    should consider one of the pools described later.
+                    Do not always use the same server. All time servers will lock out requests from
+                    servers that are flooding the server. If your application requires heavy use of
+                    time servers, you should consider one of the pools described later.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            So where can you find a time server? Generally you can use any timeserver you can connect to. This can be
-            a time server within your LAN or any public time server you have access to. If you decide to use a public
-            time server, you should consider using a server pool. Server pools are public addresses from which you will get
-            a random, pooled time server by requesting the time. This way you will not have to split your
-            requests. There are public server pools available for many regions which you may use to avoid
-            problems mentioned above.
+            So where can you find a time server? Generally you can use any timeserver you can
+            connect to. This can be a time server within your LAN or any public time server you have
+            access to. If you decide to use a public time server, you should consider using a server
+            pool. Server pools are public addresses from which you will get a random, pooled time
+            server by requesting the time. This way you will not have to split your requests. There
+            are public server pools available for many regions which you may use to avoid problems
+            mentioned above.
         </para>
 
         <para>
@@ -190,7 +198,5 @@
             server pool. For example, if your server is located within Germany you can connect to
             <emphasis>0.europe.pool.ntp.org</emphasis>.
         </para>
-
     </sect2>
-
 </sect1>

+ 160 - 144
documentation/manual/en/module_specs/Zend_Tool-Extending.xml

@@ -19,12 +19,11 @@
 
         <para>
             <classname>Zend_Tool_Project</classname> builds on and extends the capabilities of
-            <classname>Zend_Tool_Framework</classname> to that of managing a "project". In general, a
-            "project" is a planned endeavor or an initiative. In the computer world, projects generally
-            are a collection of resources. These resources can be files, directories, databases,
-            schemas, images, styles, and more.
+            <classname>Zend_Tool_Framework</classname> to that of managing a "project". In general,
+            a "project" is a planned endeavor or an initiative. In the computer world, projects
+            generally are a collection of resources. These resources can be files, directories,
+            databases, schemas, images, styles, and more.
         </para>
-
     </sect2>
 
     <sect2 id="zend.tool.extending.zend-tool-framework">
@@ -51,8 +50,8 @@
                         <emphasis>Base client functionality</emphasis> and a concrete
                         console implementation that connect external tools and
                         interfaces to the <classname>Zend_Tool_Framework</classname>. The Console
-                        client may be used in <acronym>CLI</acronym> environments such as unix shells and
-                        the Windows console.
+                        client may be used in <acronym>CLI</acronym> environments such as unix
+                        shells and the Windows console.
                     </para>
                 </listitem>
 
@@ -91,58 +90,69 @@
             </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>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>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>
-                    <classname>Zend_Tool_Project</classname> Provider - A set of providers
-                    specifically for creating and maintaining Zend Framework-based
-                    projects.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <emphasis>Tooling Client</emphasis> - A developer tool that connects
+                        to and consumes <classname>Zend_Tool_Framework</classname>.
+                    </para>
+                </listitem>
 
-            </itemizedlist>
+                <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>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>
+                        <classname>Zend_Tool_Project</classname> Provider - A set of providers
+                        specifically for creating and maintaining Zend Framework-based
+                        projects.
+                    </para>
+                </listitem>
+            </itemizedlist>
         </sect3>
 
         <sect3 id="zend.tool.extending.zend-tool-framework.cli-client">
             <title>Understanding the CLI Client</title>
 
             <para>
-                The <acronym>CLI</acronym>, or command line tool (internally known as the console tool),
-                is currently the primary interface for dispatching <classname>Zend_Tool</classname>
-                requests. With the <acronym>CLI</acronym> tool, developers can issue tooling requests
-                inside the "command line windows", also commonly known as a "terminal"
-                window. This environment is predominant in the *nix environment, but
-                also has a common implementation in windows with the
+                The <acronym>CLI</acronym>, or command line tool (internally known as the console
+                tool), is currently the primary interface for dispatching
+                <classname>Zend_Tool</classname> requests. With the <acronym>CLI</acronym> tool,
+                developers can issue tooling requests inside the "command line windows", also
+                commonly known as a "terminal" window. This environment is predominant in the *nix
+                environment, but also has a common implementation in windows with the
                 <filename>cmd.exe</filename>, console2 and also with the Cygwin project.
             </para>
 
@@ -153,8 +163,8 @@
                     To issue tooling requests via the command line client, you first
                     need to set up the client so that your system can handle the "zf"
                     command. The command line client, for all intents and purposes, is
-                    the <filename>.sh</filename> or <filename>.bat</filename> file that is provided with
-                    your Zend Framework distribution. In trunk, it can be found here:
+                    the <filename>.sh</filename> or <filename>.bat</filename> file that is provided
+                    with your Zend Framework distribution. In trunk, it can be found here:
                     <ulink
                         url="http://framework.zend.com/svn/framework/standard/trunk/bin/">http://framework.zend.com/svn/framework/standard/trunk/bin/</ulink>.
                 </para>
@@ -188,6 +198,7 @@
                             current working directory is.
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             <filename>ZendFramework/library</filename> is in your
@@ -203,7 +214,6 @@
                         to work as <filename>./path/to/zf.php</filename> some command.
                     </para>
                 </note>
-
             </sect4>
 
             <sect4 id="zend.tool.extending.zend-tool-framework.cli-client.setup-starnix">
@@ -211,9 +221,9 @@
 
                 <para>
                     The most common setup in the *nix environment, is to copy the
-                    <filename>zf.sh</filename> and <filename>zf.php</filename> into the same directory
-                    as your <acronym>PHP</acronym> binary. This can generally be found in one of the
-                    following places:
+                    <filename>zf.sh</filename> and <filename>zf.php</filename> into the same
+                    directory as your <acronym>PHP</acronym> binary. This can generally be found in
+                    one of the following places:
                 </para>
 
                 <programlisting language="text"><![CDATA[
@@ -224,23 +234,26 @@
 ]]></programlisting>
 
                 <para>
-                    To find out the location of your <acronym>PHP</acronym> binary, you can execute 'which
-                    php' on the command line. This will return the location of the <acronym>PHP</acronym>
-                    binary you will be using to run <acronym>PHP</acronym> scripts in this environment.
+                    To find out the location of your <acronym>PHP</acronym> binary, you can execute
+                    'which php' on the command line. This will return the location of the
+                    <acronym>PHP</acronym> binary you will be using to run <acronym>PHP</acronym>
+                    scripts in this environment.
                 </para>
 
                 <para>
                     The next order of business is to ensure that Zend Framework
                     library is set up correctly inside of the system <acronym>PHP</acronym>
                     <property>include_path</property>. To find out where your
-                    <property>include_path</property> is located, you can execute <command>php -i</command>
-                    and look for the <property>include_path</property> variable, or more succinctly,
-                    execute <command>php -i | grep include_path</command>. Once you have found where
+                    <property>include_path</property> is located, you can execute
+                    <command>php -i</command> and look for the <property>include_path</property>
+                    variable, or more succinctly, execute
+                    <command>php -i | grep include_path</command>. Once you have found where
                     your <property>include_path</property> is located (this will generally be
-                    something like <filename>/usr/lib/php</filename>, <filename>/usr/share/php</filename>,
-                    <filename>/usr/local/lib/php</filename>, or similar), ensure that the contents of the
-                    <filename>/library/</filename> directory are put
-                    inside your <property>include_path</property> specified directory.
+                    something like <filename>/usr/lib/php</filename>,
+                    <filename>/usr/share/php</filename>, <filename>/usr/local/lib/php</filename>, or
+                    similar), ensure that the contents of the <filename>/library/</filename>
+                    directory are put inside your <property>include_path</property> specified
+                    directory.
                 </para>
 
                 <para>
@@ -266,12 +279,12 @@
 
                 <para>
                     <emphasis>Alternative Setup</emphasis> involves keeping the Zend
-                    Framework download together as is, and creating a link from a <constant>PATH</constant>
-                    location to the <filename>zf.sh</filename>. What this means is you can
-                    place the contents of the ZendFramework download into a location
-                    such as <filename>/usr/local/share/ZendFramework</filename>, or more locally
-                    like <filename>/home/username/lib/ZendFramework</filename>, and creating a
-                    symbolic link to the <filename>zf.sh</filename>.
+                    Framework download together as is, and creating a link from a
+                    <constant>PATH</constant> location to the <filename>zf.sh</filename>. What this
+                    means is you can place the contents of the ZendFramework download into a
+                    location such as <filename>/usr/local/share/ZendFramework</filename>, or more
+                    locally like <filename>/home/username/lib/ZendFramework</filename>, and creating
+                    a symbolic link to the <filename>zf.sh</filename>.
                 </para>
 
                 <para>
@@ -280,7 +293,7 @@
                     <filename>/home/username/bin/</filename> for example) you would issue a
                     command similar to this: </para>
 
-                <programlisting language="sh"><![CDATA[
+                    <programlisting language="sh"><![CDATA[
 ln -s /usr/local/share/ZendFramework/bin/zf.sh /usr/local/bin/zf
 
 # OR (for example)
@@ -291,7 +304,6 @@ ln -s /home/username/lib/ZendFramework/bin/zf.sh /home/username/bin/zf
                     This will create a link which you should be able to access globally
                     on the command line.
                 </para>
-
             </sect4>
 
             <sect4 id="zend.tool.extending.zend-tool-framework.cli-client.setup-windows">
@@ -300,8 +312,8 @@ ln -s /home/username/lib/ZendFramework/bin/zf.sh /home/username/bin/zf
                 <para>
                     The most common setup in the Windows Win32 environment, is to copy
                     the <filename>zf.bat</filename> and <filename>zf.php</filename> into the same
-                    directory as your <acronym>PHP</acronym> binary. This can generally be found in one of
-                    the following places:
+                    directory as your <acronym>PHP</acronym> binary. This can generally be found in
+                    one of the following places:
                 </para>
 
                 <programlisting language="text"><![CDATA[
@@ -322,12 +334,14 @@ C:\WAMP\PHP\bin
                     The next order of business is to ensure that Zend Framework
                     library is set up correctly inside of the system <acronym>PHP</acronym>
                     <property>include_path</property>. To find out where your
-                    <property>include_path</property> is located, you can type <command>php -i</command> and
-                    look for the <property>include_path</property> variable, or more succinctly
-                    execute <command>php -i | grep include_path</command> if you have Cygwin setup with
+                    <property>include_path</property> is located, you can type
+                    <command>php -i</command> and look for the <property>include_path</property>
+                    variable, or more succinctly execute
+                    <command>php -i | grep include_path</command> if you have Cygwin setup with
                     grep available. Once you have found where your
                     <property>include_path</property> is located (this will generally be
-                    something like <filename>C:\PHP\pear</filename>, <filename>C:\PHP\share</filename>,
+                    something like <filename>C:\PHP\pear</filename>,
+                    <filename>C:\PHP\share</filename>,
                     <filename>C:\Program%20Files\ZendServer\share</filename> or similar), ensure
                     that the contents of the library/ directory are put inside your
                     <property>include_path</property> specified directory.
@@ -365,7 +379,6 @@ C:\WAMP\PHP\bin
                     <filename>C:\Path\To\ZendFramework\library</filename> is in your
                     <property>include_path</property>.
                 </para>
-
             </sect4>
 
             <sect4 id="zend.tool.extending.zend-tool-framework.cli-client.setup-othernotes">
@@ -382,8 +395,8 @@ C:\WAMP\PHP\bin
                 <para>
                     The first is <constant>ZEND_TOOL_INCLUDE_PATH_PREPEND</constant>, which will
                     prepend the value of this environment variable to the system
-                    (<filename>php.ini</filename>) <property>include_path</property> before loading the
-                    client.
+                    (<filename>php.ini</filename>) <property>include_path</property> before loading
+                    the client.
                 </para>
 
                 <para>
@@ -394,7 +407,6 @@ C:\WAMP\PHP\bin
                     command line tool.
                 </para>
             </sect4>
-
         </sect3>
 
         <sect3 id="zend.tool.extending.zend-tool-framework.providers-and-manifests">
@@ -420,8 +432,8 @@ C:\WAMP\PHP\bin
                     or <classname>Zend_Tool_Framework_Manifest_ProviderManifestable</classname>.
                     Instances of the provider interface make up for the real functionality
                     and all their public methods are accessible as provider actions.
-                    The ProviderManifestable interface however requires the implementation of a method
-                    <methodname>getProviders()</methodname> which returns an array of
+                    The ProviderManifestable interface however requires the implementation of a
+                    method <methodname>getProviders()</methodname> which returns an array of
                     instantiated provider interface instances.
                 </para>
 
@@ -438,6 +450,7 @@ C:\WAMP\PHP\bin
                             provider being accessible by the name "hello".
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             If your provider has a method <methodname>getName()</methodname>
@@ -445,6 +458,7 @@ C:\WAMP\PHP\bin
                             the name.
                         </para>
                     </listitem>
+
                     <listitem>
                         <para>
                             If your provider has "Provider" as prefix, e.g. it is called
@@ -460,7 +474,8 @@ C:\WAMP\PHP\bin
                     they have to be physically present in the include paths.</para>
                 </note>
 
-                <example id="zend.tool.extending.zend-tool-framework.providers-and-manifests.loading.example">
+                <example
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.loading.example">
                     <title>Exposing Your Providers with a Manifest</title>
 
                     <para>
@@ -486,7 +501,6 @@ class My_Component_Manifest
     }
 }
 ]]></programlisting>
-
                 </example>
             </sect4>
 
@@ -532,11 +546,11 @@ Hello from my provider!
                 <title>The response object</title>
 
                 <para>
-                    As discussed in the architecture section Zend Tool allows to hook different clients for
-                    using your Zend Tool providers. To keep compliant with different clients you should
-                    use the response object to return messages from your providers instead of using
-                    <methodname>echo()</methodname> or a similiar output mechanism. Rewritting our hello
-                    provider with this knowledge it looks like:
+                    As discussed in the architecture section Zend Tool allows to hook different
+                    clients for using your Zend Tool providers. To keep compliant with different
+                    clients you should use the response object to return messages from your
+                    providers instead of using <methodname>echo()</methodname> or a similiar output
+                    mechanism. Rewritting our hello provider with this knowledge it looks like:
                 </para>
 
                 <programlisting language="php"><![CDATA[
@@ -552,16 +566,18 @@ 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>
-                    instance.
+                    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>
             </sect4>
 
             <sect4 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced">
                 <title>Advanced Development Information</title>
 
-                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.variables">
+                <sect5
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.variables">
                     <title>Passing Variables to a Provider</title>
 
                     <para>
@@ -582,7 +598,7 @@ class My_Component_HelloProvider
                         would probably do this in OO code:
                     </para>
 
-                <programlisting language="php"><![CDATA[
+                    <programlisting language="php"><![CDATA[
 class My_Component_HelloProvider
     implements Zend_Tool_Framework_Provider_Interface
 {
@@ -595,16 +611,16 @@ class My_Component_HelloProvider
 
                     <para>
                         The above example can then be called via the command line
-                        <command>zf say hello Joe</command>. "Joe" will be supplied to the provider as
-                        a parameter of the method call. Also note, as you see that the
+                        <command>zf say hello Joe</command>. "Joe" will be supplied to the provider
+                        as a parameter of the method call. Also note, as you see that the
                         parameter is optional, that means it is also optional on the command
                         line, so that <command>zf say hello</command> will still work, and default
                         to the name "Ralph".
                     </para>
-
                 </sect5>
 
-                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.prompt">
+                <sect5
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.prompt">
                     <title>Prompt the User for Input</title>
 
                     <para>
@@ -636,7 +652,8 @@ class My_Component_HelloProvider
                     </para>
                 </sect5>
 
-                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.pretendable">
+                <sect5
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.pretendable">
                     <title>Pretending to execute a Provider Action</title>
 
                     <para>
@@ -682,10 +699,10 @@ class My_Component_HelloProvider
 % zf --pretend say hello Ralph
 I would say hello Ralph.
 ]]></programlisting>
-
                 </sect5>
 
-                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.verbosedebug">
+                <sect5
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.verbosedebug">
                     <title>Verbose and Debug modes</title>
 
                     <para>
@@ -712,7 +729,8 @@ class My_Component_HelloProvider
 ]]></programlisting>
                 </sect5>
 
-                <sect5 id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.configstorage">
+                <sect5
+                    id="zend.tool.extending.zend-tool-framework.providers-and-manifests.advanced.configstorage">
                     <title>Accessing User Config and Storage</title>
 
                     <para>
@@ -742,14 +760,15 @@ class My_Component_HelloProvider
                     <para>
                         The returned configuration is of the type
                         <classname>Zend_Tool_Framework_Client_Config</classname> but internally the
-                        <methodname>__get()</methodname> and <methodname>__set()</methodname> magic methods
-                        proxy to a <classname>Zend_Config</classname> of the given configuration type.
+                        <methodname>__get()</methodname> and <methodname>__set()</methodname> magic
+                        methods proxy to a <classname>Zend_Config</classname> of the given
+                        configuration type.
                     </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[
@@ -783,56 +802,54 @@ class Zend_Tool_Framework_Client_Storage
 
                     <important>
                         <para>
-                            When designing your providers that are config or storage aware remember to
-                            check if the required user-config or storage keys really exist for a user.
-                            You won't run into fatal errors when none of these are provided though,
-                            since empty ones are created upon request.
+                            When designing your providers that are config or storage aware remember
+                            to check if the required user-config or storage keys really exist for a
+                            user. You won't run into fatal errors when none of these are provided
+                            though, since empty ones are created upon request.
                         </para>
                     </important>
                 </sect5>
-
             </sect4>
-
         </sect3>
-
     </sect2>
 
     <sect2 id="zend.tool.extending.zend-tool-project">
         <title>Zend_Tool_Project Extensions</title>
 
         <para>
-            Zend_Tool_Project exposes a rich set of functionality and capabilities that make the task
-            of creating new providers, specficially those targetting project easier and more manageable.
+            Zend_Tool_Project exposes a rich set of functionality and capabilities that make the
+            task of creating new providers, specficially those targetting project easier and more
+            manageable.
         </para>
 
         <sect3 id="zend.tool.extending.zend-tool-project.architecture">
             <title>Overall Architecture</title>
 
             <para>
-                This same concept applies to Zend Framework projects. In Zend Framework projects, you have
-                controllers, actions, views, models, databases and so on and so forth. In terms of
-                <classname>Zend_Tool</classname>, we need a way to track these types of resources - thus
-                <classname>Zend_Tool_Project</classname>.
+                This same concept applies to Zend Framework projects. In Zend Framework projects,
+                you have controllers, actions, views, models, databases and so on and so forth. In
+                terms of <classname>Zend_Tool</classname>, we need a way to track these types of
+                resources - thus <classname>Zend_Tool_Project</classname>.
             </para>
 
             <para>
-                <classname>Zend_Tool_Project</classname> is capable of tracking project resources throughout
-                the development of a project. So, for example, if in one command you created a controller,
-                and in the next command you wish to create an action within that controller,
-                <classname>Zend_Tool_Project</classname> is gonna have to <emphasis>know</emphasis> about
-                the controller file you created so that you can (in the next action), be able to append that
-                action to it. This is what keeps our projects up to date and <emphasis>stateful</emphasis>.
+                <classname>Zend_Tool_Project</classname> is capable of tracking project resources
+                throughout the development of a project. So, for example, if in one command you
+                created a controller, and in the next command you wish to create an action within
+                that controller, <classname>Zend_Tool_Project</classname> is gonna have to
+                <emphasis>know</emphasis> about the controller file you created so that you can (in
+                the next action), be able to append that action to it. This is what keeps our
+                projects up to date and <emphasis>stateful</emphasis>.
             </para>
 
             <para>
-                Another important point to understand about projects is that typically, resources are
-                organized in a hierarchical fashion. With that in mind,
-                <classname>Zend_Tool_Project</classname> is capable of serializing the current project into
-                a internal representation that allows it to keep track of not only <emphasis>what</emphasis>
-                resources are part of a project at any given time, but also <emphasis>where</emphasis> they
-                are in relation to one another.
+                Another important point to understand about projects is that typically, resources
+                are organized in a hierarchical fashion. With that in mind,
+                <classname>Zend_Tool_Project</classname> is capable of serializing the current
+                project into a internal representation that allows it to keep track of not only
+                <emphasis>what</emphasis> resources are part of a project at any given time, but
+                also <emphasis>where</emphasis> they are in relation to one another.
             </para>
-
         </sect3>
 
 
@@ -840,11 +857,12 @@ class Zend_Tool_Framework_Client_Storage
             <title>Creating Providers</title>
 
             <para>
-                Project specific providers are created in the same fashion as plain framework providers, with
-                one exception: project providers must extend the <code>Zend_Tool_Project_Provider_Abstract</code>.
-                This class comes with some significant functionality that helps developers load existing project,
-                obtian the profile object, and be able to search the profile, then later store any changes to the
-                current project profile.
+                Project specific providers are created in the same fashion as plain framework
+                providers, with one exception: project providers must extend the
+                <code>Zend_Tool_Project_Provider_Abstract</code>. This class comes with some
+                significant functionality that helps developers load existing project, obtian the
+                profile object, and be able to search the profile, then later store any changes to
+                the current project profile.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -861,7 +879,6 @@ class My_Component_HelloProvider
     }
 }
 ]]></programlisting>
-
         </sect3>
 
         <!--
@@ -872,6 +889,5 @@ class My_Component_HelloProvider
 
         </sect3>
         -->
-
     </sect2>
 </sect1>

+ 0 - 2
documentation/manual/en/module_specs/Zend_Tool_Framework-Architecture.xml

@@ -109,7 +109,6 @@ abstract class Zend_Tool_Framework_Provider_Abstract
     );
 }
 ]]></programlisting>
-
     </sect2>
 
     <sect2 id="zend.tool.framework.architecture.loaders">
@@ -405,6 +404,5 @@ abstract class Zend_Tool_Framework_Client_Abstract
                 url="http://framework.zend.com/svn/framework/standard/branches/release-1.8/library/Zend/Tool/Framework/Client/Console.php">source
                 code</ulink>.
         </para>
-
     </sect2>
 </sect1>

+ 2 - 4
documentation/manual/en/module_specs/Zend_Tool_Framework-CliTool.xml

@@ -55,6 +55,7 @@
                     current working directory is.
                 </para>
             </listitem>
+
             <listitem>
                 <para>
                     <filename>ZendFramework/library</filename> is in your
@@ -70,7 +71,6 @@
                 to work as <filename>./path/to/zf.php</filename> some command.
             </para>
         </note>
-
     </sect2>
 
     <sect2 id="zend.tool.framework.clitool.setup-starnix">
@@ -147,7 +147,7 @@
             <filename>/home/username/bin/</filename> for example) you would issue a
             command similar to this: </para>
 
-        <programlisting language="sh"><![CDATA[
+            <programlisting language="sh"><![CDATA[
 ln -s /usr/local/share/ZendFramework/bin/zf.sh /usr/local/bin/zf
 
 # OR (for example)
@@ -158,7 +158,6 @@ ln -s /home/username/lib/ZendFramework/bin/zf.sh /home/username/bin/zf
             This will create a link which you should be able to access globally
             on the command line.
         </para>
-
     </sect2>
 
     <sect2 id="zend.tool.framework.clitool.setup-windows">
@@ -232,7 +231,6 @@ C:\WAMP\PHP\bin
             <filename>C:\Path\To\ZendFramework\library</filename> is in your
             <property>include_path</property>.
         </para>
-
     </sect2>
 
     <sect2 id="zend.tool.framework.clitool.setup-othernotes">

+ 84 - 76
documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml

@@ -4,141 +4,148 @@
     <title>Extending and Configuring Zend_Tool_Framework</title>
 
     <sect2 id="zend.tool.framework.console-client">
-
         <title>Customizing Zend_Tool Console Client</title>
 
         <para>
-            As of Zend Framework 1.9, <classname>Zend_Tool_Framework</classname> allows developers to store information,
-            provider specific configuration values, and custom files in a special location on the developers machine.
-            These configuration values and files can be used by providers to extend functionality, customize
-            functionality, or any other reasons a provider sees fit.
+            As of Zend Framework 1.9, <classname>Zend_Tool_Framework</classname> allows developers
+            to store information, provider specific configuration values, and custom files in a
+            special location on the developers machine. These configuration values and files can be
+            used by providers to extend functionality, customize functionality, or any other reasons
+            a provider sees fit.
         </para>
 
         <para>
-            The primary purpose, and the purpose most immediately used by existing providers is to allow developers to
-            customize the way the "out of the box" providers do work.
+            The primary purpose, and the purpose most immediately used by existing providers is to
+            allow developers to customize the way the "out of the box" providers do work.
         </para>
 
         <para>
-            One of the more commonly requested features is to be able to provide custom project profiles to
-            <classname>Zend_Tool_Project</classname>'s Project Provider. This would allow developers to store a
-            custom profile in a special place that can be used repeatedly by the <classname>Zend_Tool</classname>
-            system in order to build custom profiles. Another commonly requested feature is to be able to configure
-            the behavior of providers with a configuration setting. In order to achieve this, not only do we have
-            to have a <classname>Zend_Tool</classname> configuration file, but we also have to have a place
-            to find this configuration file.
+            One of the more commonly requested features is to be able to provide custom project
+            profiles to <classname>Zend_Tool_Project</classname>'s Project Provider. This would
+            allow developers to store a custom profile in a special place that can be used
+            repeatedly by the <classname>Zend_Tool</classname> system in order to build custom
+            profiles. Another commonly requested feature is to be able to configure the behavior of
+            providers with a configuration setting. In order to achieve this, not only do we have to
+            have a <classname>Zend_Tool</classname> configuration file, but we also have to have a
+            place to find this configuration file.
         </para>
 
         <sect3 id="zend.tool.framework.console-client.home-directory">
-
             <title>The Home Directory</title>
 
             <para>
-                Before the Console Client can start searching for a <classname>Zend_Tool</classname> configuration
-                file or a local storage directory, it must first be able to identify where the "home directory" is
-                located.
+                Before the Console Client can start searching for a <classname>Zend_Tool</classname>
+                configuration file or a local storage directory, it must first be able to identify
+                where the "home directory" is located.
             </para>
 
             <para>
-                On *nix-based machines, <acronym>PHP</acronym> will be populated with an environment variable named
-                <constant>HOME</constant> with a path to the current users home directory. Typically, this path will
-                be very similar to <filename>/home/myusername</filename>.
+                On *nix-based machines, <acronym>PHP</acronym> will be populated with an environment
+                variable named <constant>HOME</constant> with a path to the current users home
+                directory. Typically, this path will be very similar to
+                <filename>/home/myusername</filename>.
             </para>
 
             <para>
-                On Windows-based machines, <acronym>PHP</acronym> will typically be populated with an environment
-                variable named <constant>HOMEPATH</constant> with the current users home directory. This directory
-                is usually found in either <filename>C:\Documents and Settings\Username\</filename>, or in Vista at
+                On Windows-based machines, <acronym>PHP</acronym> will typically be populated with
+                an environment variable named <constant>HOMEPATH</constant> with the current users
+                home directory. This directory is usually found in either
+                <filename>C:\Documents and Settings\Username\</filename>, or in Vista at
                 <filename>C:\Users\Username</filename>.
             </para>
 
             <para>
-                If either a home directory cannot be found, or you wish to change the location of where
-                <classname>Zend_Tool_Framework</classname> Console Client finds the home directory, you can provide
-                an environment variable named <constant>ZF_HOME</constant> to specify where to find the home
-                directory.
+                If either a home directory cannot be found, or you wish to change the location of
+                where <classname>Zend_Tool_Framework</classname> Console Client finds the home
+                directory, you can provide an environment variable named
+                <constant>ZF_HOME</constant> to specify where to find the home directory.
             </para>
         </sect3>
 
         <sect3 id="zend.tool.framework.console-client.local-storage">
-
             <title>Local Storage</title>
 
             <para>
-                Once a home directory can be located, <classname>Zend_Tool_Framework</classname>'s Console Client
-                can either autodiscover the local storage directory, or it can be told where to expect the local
-                storage directory.
+                Once a home directory can be located, <classname>Zend_Tool_Framework</classname>'s
+                Console Client can either autodiscover the local storage directory, or it can be
+                told where to expect the local storage directory.
             </para>
 
             <para>
-                Assuming the home directory has been found (here noted as <varname>$HOME</varname>), the Console
-                Client will then look for the local storage directory in <filename>$HOME/.zf/</filename>. If found,
-                it will set the local storage directory to this location.
+                Assuming the home directory has been found (here noted as <varname>$HOME</varname>),
+                the Console Client will then look for the local storage directory in
+                <filename>$HOME/.zf/</filename>. If found, it will set the local storage directory
+                to this location.
             </para>
 
             <para>
-                If the directory cannot be found, or the developer wishes to override this location, that can be done
-                by setting an environment variable. Regardless if <varname>$HOME</varname> has been previously set or
-                not, the developer may supply the environment variable <constant>ZF_STORAGE_DIR</constant>.
+                If the directory cannot be found, or the developer wishes to override this location,
+                that can be done by setting an environment variable. Regardless if
+                <varname>$HOME</varname> has been previously set or not, the developer may supply
+                the environment variable <constant>ZF_STORAGE_DIR</constant>.
             </para>
 
             <para>
-                Once the path to a local storage directory is found, the directory <emphasis>must</emphasis> exist
-                for it to be passed into the <classname>Zend_Tool_Framework</classname> runtime, as it will not be
-                created for you.
+                Once the path to a local storage directory is found, the directory
+                <emphasis>must</emphasis> exist for it to be passed into the
+                <classname>Zend_Tool_Framework</classname> runtime, as it will not be created for
+                you.
             </para>
         </sect3>
 
         <sect3 id="zend.tool.framework.console-client.configuration-file">
-
             <title>User Configuration</title>
 
             <para>
-                Like local storage, once a home directory can be located, <classname>Zend_Tool_Framework</classname>'s
-                Console Client can then either attempt to autodiscover the path to a configuration file, or it can be
-                told specifically where to find the configuration file.
+                Like local storage, once a home directory can be located,
+                <classname>Zend_Tool_Framework</classname>'s Console Client can then either attempt
+                to autodiscover the path to a configuration file, or it can be told specifically
+                where to find the configuration file.
             </para>
 
             <para>
-                Assuming the home directory has been found (here noted as <varname>$HOME</varname>), the Console Client
-                will then attempt to look for the existence of a configuration file located at
-                <filename>$HOME/.zf.ini</filename>. This file, if found, will be used as the configuration file for
-                <classname>Zend_Tool_Framework</classname>.
+                Assuming the home directory has been found (here noted as <varname>$HOME</varname>),
+                the Console Client will then attempt to look for the existence of a configuration
+                file located at <filename>$HOME/.zf.ini</filename>. This file, if found, will be
+                used as the configuration file for <classname>Zend_Tool_Framework</classname>.
             </para>
 
             <para>
-                If that location does not exist, but a local storage directory does, then the Console Client will then
-                attempt to locate the configuration file within the local storage directory. Assuming the local storage
-                directory exists in <varname>$LOCAL_STORAGE</varname>, then if a file exists as
-                <filename>$LOCAL_STORAGE/zf.ini</filename>, it will be found by the Console Client and utilized as the
-                <classname>Zend_Tool_Framework</classname> configuration file.
+                If that location does not exist, but a local storage directory does, then the
+                Console Client will then attempt to locate the configuration file within the local
+                storage directory. Assuming the local storage directory exists in
+                <varname>$LOCAL_STORAGE</varname>, then if a file exists as
+                <filename>$LOCAL_STORAGE/zf.ini</filename>, it will be found by the Console Client
+                and utilized as the <classname>Zend_Tool_Framework</classname> configuration file.
             </para>
 
             <para>
-                If the file cannot be autodiscovered or the developer wishes to specify the location of location of the
-                configuration file, the developer can do so by setting an environment variable. If the environment
-                variable <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the location of the
-                configuration file to use with the Console Client. The <constant>ZF_CONFIG_FILE</constant> can
-                point to any Zend_Config readable INI, XML or PHP File.
+                If the file cannot be autodiscovered or the developer wishes to specify the location
+                of location of the configuration file, the developer can do so by setting an
+                environment variable. If the environment variable
+                <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the
+                location of the configuration file to use with the Console Client. The
+                <constant>ZF_CONFIG_FILE</constant> can point to any Zend_Config readable INI, XML
+                or PHP File.
             </para>
 
             <para>
-                If the file does not exist in either the autodiscovered or the provided location, it will not be used as
-                <classname>Zend_Tool_Framework</classname> does not attempt to create the file automatically.
+                If the file does not exist in either the autodiscovered or the provided location, it
+                will not be used as <classname>Zend_Tool_Framework</classname> does not attempt to
+                create the file automatically.
             </para>
-
         </sect3>
 
         <sect3 id="zend.tool.framework.console-client.configuration-content">
-
             <title>User Configuration File Content</title>
 
             <para>
-                The configuration file should be structured as a <classname>Zend_Config</classname> configuration
-                file, in ini format, and without any sections being defined. First level keys should be used by the
-                provider searching for a specific value. For example, if the "Project" provider is expecting a
-                "profiles" directory, then it should typically be understood that it will search for the following ini
-                key value pair:
+                The configuration file should be structured as a <classname>Zend_Config</classname>
+                configuration file, in ini format, and without any sections being defined. First
+                level keys should be used by the provider searching for a specific value. For
+                example, if the "Project" provider is expecting a "profiles" directory, then it
+                should typically be understood that it will search for the following ini key value
+                pair:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -146,9 +153,10 @@ project.profile = some/path/to/some-directory
 ]]></programlisting>
 
             <para>
-                The only reserved ini prefix is the value "php". The "php" prefix to values will be reserved to store
-                names and values of runtime settable php values, such as <property>include_path</property> or
-                <property>error_reporting</property>. To override the <property>include_path</property> and
+                The only reserved ini prefix is the value "php". The "php" prefix to values will be
+                reserved to store names and values of runtime settable php values, such as
+                <property>include_path</property> or <property>error_reporting</property>. To
+                override the <property>include_path</property> and
                 <property>error_reporting</property> with an ini value, a developer would set:
             </para>
 
@@ -158,11 +166,11 @@ php.error_reporting = 1
 ]]></programlisting>
 
             <important>
-                <para>The reserved prefix "php" only works with INI files. You can't set PHP INI values with PHP or XML config.</para>
+                <para>
+                    The reserved prefix "php" only works with INI files. You can't set PHP INI
+                    values with PHP or XML config.
+                </para>
             </important>
-
         </sect3>
-
     </sect2>
-
-</sect1>
+</sect1>

+ 32 - 64
documentation/manual/en/module_specs/Zend_Tool_Project-Providers.xml

@@ -10,6 +10,7 @@
 
     <table id="zend.tool.project.project-provider">
         <title>Project Provider Options</title>
+
         <tgroup cols="4">
             <thead>
                 <row>
@@ -19,89 +20,56 @@
                     <entry><acronym>CLI</acronym> Usage</entry>
                 </row>
             </thead>
+
             <tbody>
                 <row>
-                    <entry>
-                        Controller
-                    </entry>
-                    <entry>
-                        Create
-                    </entry>
-                    <entry>
-                        create - [name, indexActionIncluded=true]
-                    </entry>
-                    <entry>
-                        <command>zf create controller foo</command>
-                    </entry>
+                    <entry>Controller</entry>
+                    <entry>Create</entry>
+                    <entry>create - [name, indexActionIncluded=true]</entry>
+                    <entry><command>zf create controller foo</command></entry>
                 </row>
+
                 <row>
-                    <entry>
-                        Action
-                    </entry>
-                    <entry>
-                        Create
-                    </entry>
-                    <entry>
-                        create - [name, controllerName=index, viewIncluded=true]
-                    </entry>
+                    <entry>Action</entry>
+                    <entry>Create</entry>
+                    <entry>create - [name, controllerName=index, viewIncluded=true]</entry>
+
                     <entry>
                         <command>zf create action bar foo</command>
                         (or <command>zf create action --name bar --controlller-name=foo</command>)
                     </entry>
                 </row>
+
                 <row>
-                    <entry>
-                        Controller
-                    </entry>
-                    <entry>
-                        Create
-                    </entry>
-                    <entry>
-                        create - [name, indexActionIncluded=true]
-                    </entry>
-                    <entry>
-                        <command>zf create controller foo</command>
-                    </entry>
+                    <entry>Controller</entry>
+                    <entry>Create</entry>
+                    <entry>create - [name, indexActionIncluded=true]</entry>
+                    <entry><command>zf create controller foo</command></entry>
                 </row>
+
                 <row>
-                    <entry>
-                        Profile
-                    </entry>
-                    <entry>
-                        Show
-                    </entry>
-                    <entry>
-                        show - []
-                    </entry>
-                    <entry>
-                        <command>zf show profile</command>
-                    </entry>
+                    <entry>Profile</entry>
+                    <entry>Show</entry>
+                    <entry>show - []</entry>
+                    <entry><command>zf show profile</command></entry>
                 </row>
+
                 <row>
-                    <entry>
-                        View
-                    </entry>
-                    <entry>
-                        Create
-                    </entry>
-                    <entry>
-                        create - [controllerName,actionNameOrSimpleName]
-                    </entry>
+                    <entry>View</entry>
+                    <entry>Create</entry>
+                    <entry>create - [controllerName,actionNameOrSimpleName]</entry>
+
                     <entry>
                         <command>zf create view foo bar</command>
                         (or <command>zf create view -c foo -a bar</command>)
                     </entry>
                 </row>
+
                 <row>
-                    <entry>
-                        Test
-                    </entry>
-                    <entry>
-                        Create / Enable / Disable
-                    </entry>
-                    <entry>
-                        create - [libraryClassName]
-                    </entry>
+                    <entry>Test</entry>
+                    <entry>Create / Enable / Disable</entry>
+                    <entry>create - [libraryClassName]</entry>
+
                     <entry>
                         <command>zf create test My_Foo_Baz</command> /
                         <command>zf disable test</command> /
@@ -111,4 +79,4 @@
             </tbody>
         </tgroup>
     </table>
-</sect1>
+</sect1>