瀏覽代碼

[MANUAL] English:

- fixing line length
(no translation needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21815 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 15 年之前
父節點
當前提交
d2329a78c7
共有 28 個文件被更改,包括 365 次插入238 次删除
  1. 15 11
      documentation/manual/en/module_specs/Zend_Captcha-Adapters.xml
  2. 47 38
      documentation/manual/en/module_specs/Zend_Feed_Writer.xml
  3. 5 5
      documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml
  4. 1 1
      documentation/manual/en/module_specs/Zend_Gdata_ClientLogin.xml
  5. 2 1
      documentation/manual/en/module_specs/Zend_Gdata_Photos.xml
  6. 5 4
      documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml
  7. 7 3
      documentation/manual/en/module_specs/Zend_Http_Client.xml
  8. 20 13
      documentation/manual/en/module_specs/Zend_Http_Cookie-Handling.xml
  9. 3 4
      documentation/manual/en/module_specs/Zend_Layout-Advanced.xml
  10. 3 2
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Dn.xml
  11. 23 11
      documentation/manual/en/module_specs/Zend_Log-Overview.xml
  12. 185 112
      documentation/manual/en/module_specs/Zend_Mail_Read.xml
  13. 6 6
      documentation/manual/en/module_specs/Zend_Markup-Renderers.xml
  14. 4 2
      documentation/manual/en/module_specs/Zend_Measure-Edit.xml
  15. 2 1
      documentation/manual/en/module_specs/Zend_Measure-Types.xml
  16. 1 1
      documentation/manual/en/module_specs/Zend_ProgressBar_Adapter_JsPush.xml
  17. 8 2
      documentation/manual/en/module_specs/Zend_Service_Amazon.xml
  18. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml
  19. 3 2
      documentation/manual/en/module_specs/Zend_Service_Technorati.xml
  20. 2 1
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml
  21. 4 3
      documentation/manual/en/module_specs/Zend_Session-BasicUsage.xml
  22. 2 1
      documentation/manual/en/module_specs/Zend_Soap_Server.xml
  23. 2 2
      documentation/manual/en/module_specs/Zend_Translate-Using.xml
  24. 2 1
      documentation/manual/en/module_specs/Zend_Validate-Between.xml
  25. 2 1
      documentation/manual/en/module_specs/Zend_Validate-GreaterThan.xml
  26. 3 2
      documentation/manual/en/module_specs/Zend_Validate-Isbn.xml
  27. 2 2
      documentation/manual/en/module_specs/Zend_Validate-StringLength.xml
  28. 4 4
      documentation/manual/en/tutorials/quickstart-create-project.xml

+ 15 - 11
documentation/manual/en/module_specs/Zend_Captcha-Adapters.xml

@@ -53,7 +53,8 @@
                 <para>
                 <para>
                     <methodname>setUseNumbers($numbers)</methodname> and
                     <methodname>setUseNumbers($numbers)</methodname> and
                     <methodname>getUseNumbers()</methodname> allow you to specify if numbers will be
                     <methodname>getUseNumbers()</methodname> allow you to specify if numbers will be
-                    considered as possible characters for the random work or only letters would be used.
+                    considered as possible characters for the random work or only letters would be
+                    used.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -242,16 +243,19 @@
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
-            <listitem><para>
-                <methodname>setDotNoiseLevel($level)</methodname> and <methodname>getDotNoiseLevel()</methodname>,
-                along with <methodname>setLineNoiseLevel($level)</methodname> and
-                <methodname>getLineNoiseLevel()</methodname>,
-                allow you to control how much "noise" in the form of random dots and lines the image
-                would contain. Each unit of <varname>$level</varname> produces one random dot or line.
-                The default is 100 dots and 5 lines. The noise is added twice - before and after
-                the image distortion transformation.
-            </para></listitem>
-            </itemizedlist>
+            <listitem>
+                <para>
+                    <methodname>setDotNoiseLevel($level)</methodname> and
+                    <methodname>getDotNoiseLevel()</methodname>, along with
+                    <methodname>setLineNoiseLevel($level)</methodname> and
+                    <methodname>getLineNoiseLevel()</methodname>,
+                    allow you to control how much "noise" in the form of random dots and lines the
+                    image would contain. Each unit of <varname>$level</varname> produces one random
+                    dot or line. The default is 100 dots and 5 lines. The noise is added twice -
+                    before and after the image distortion transformation.
+                </para>
+            </listitem>
+        </itemizedlist>
 
 
         <para>
         <para>
             All of the above options may be passed to the
             All of the above options may be passed to the

+ 47 - 38
documentation/manual/en/module_specs/Zend_Feed_Writer.xml

@@ -27,8 +27,8 @@
 
 
         <para>
         <para>
             As a result of this design, the rest may even be obvious. Behind the scenes, data set on
             As a result of this design, the rest may even be obvious. Behind the scenes, data set on
-            any <classname>Zend_Feed_Writer</classname> Data Container object is translated at render time onto a
-            DOMDocument object using the necessary feed elements. For each
+            any <classname>Zend_Feed_Writer</classname> Data Container object is translated at
+            render time onto a DOMDocument object using the necessary feed elements. For each
             supported feed type there is both an Atom 1.0 and <acronym>RSS</acronym> 2.0 renderer.
             supported feed type there is both an Atom 1.0 and <acronym>RSS</acronym> 2.0 renderer.
             Using a DOMDocument class rather than a templating solution has numerous advantages,
             Using a DOMDocument class rather than a templating solution has numerous advantages,
             the most obvious being the ability to export the DOMDocument for
             the most obvious being the ability to export the DOMDocument for
@@ -57,37 +57,39 @@
             to any Feed class. The sole purpose of these containers is to collect data about the
             to any Feed class. The sole purpose of these containers is to collect data about the
             feed to generate using a simple interface of setter methods. These methods perform some
             feed to generate using a simple interface of setter methods. These methods perform some
             data validity testing. For example, it will validate any passed <acronym>URI</acronym>s,
             data validity testing. For example, it will validate any passed <acronym>URI</acronym>s,
-            dates, etc. These checks are not tied to any of the feed standards definitions. The container
-            objects also contain methods to allow for fast rendering and export of the final feed,
-            and these can be reused at will.
+            dates, etc. These checks are not tied to any of the feed standards definitions. The
+            container objects also contain methods to allow for fast rendering and export of the
+            final feed, and these can be reused at will.
         </para>
         </para>
 
 
         <para>
         <para>
-            In addition to the main data container classes, there are two additional Atom 2.0 specific
-            classes. <classname>Zend_Feed_Writer_Source</classname> and <classname>
-            Zend_Feed_Writer_Deleted</classname>. The former implements Atom 2.0 source elements which
-            carry source feed metadata for a specific entry within an aggregate feed (i.e. the current feed
-            is not the entry's original source). The latter implements the Atom Tombstones RFC allowing
-            feeds to carry references to entries which have been deleted.
+            In addition to the main data container classes, there are two additional Atom 2.0
+            specific classes. <classname>Zend_Feed_Writer_Source</classname> and
+            <classname>Zend_Feed_Writer_Deleted</classname>. The former implements Atom 2.0 source
+            elements which carry source feed metadata for a specific entry within an aggregate feed
+            (i.e. the current feed is not the entry's original source). The latter implements the
+            Atom Tombstones RFC allowing feeds to carry references to entries which have been
+            deleted.
         </para>
         </para>
 
 
         <para>
         <para>
-            While there are two main data container types, there are four renderers - two matching container
-            renderers per supported feed type. Each renderer accepts a container, and based on its
-            content attempts to generate valid feed markup. If the renderer is unable to generate valid
-            feed markup, perhaps due to the container missing an obligatory data point, it will report this
-            by throwing an <classname>Exception</classname>. While it is possible to ignore
-            <classname>Exception</classname>s, this removes the default safeguard of ensuring you
-            have sufficient data set to render a wholly valid feed.
+            While there are two main data container types, there are four renderers - two matching
+            container renderers per supported feed type. Each renderer accepts a container, and
+            based on its content attempts to generate valid feed markup. If the renderer is unable
+            to generate valid feed markup, perhaps due to the container missing an obligatory data
+            point, it will report this by throwing an <classname>Exception</classname>. While it is
+            possible to ignore <classname>Exception</classname>s, this removes the default safeguard
+            of ensuring you have sufficient data set to render a wholly valid feed.
         </para>
         </para>
 
 
         <para>
         <para>
-            To explain this more clearly, you may construct a set of data containers for a feed where
-            there is a Feed container, into which has been added some Entry containers and a Deleted
-            container. This forms a data hierarchy resembling a normal feed. When rendering is performed,
-            this hierarchy has its pieces passed to relevant renderers and the partial feeds (all DOMDocuments)
-            are then pieced together to create a complete feed. In the case of Source or Deleted (Tomestone)
-            containers, these are rendered only for Atom 2.0 and ignored for RSS.
+            To explain this more clearly, you may construct a set of data containers for a feed
+            where there is a Feed container, into which has been added some Entry containers and a
+            Deleted container. This forms a data hierarchy resembling a normal feed. When rendering
+            is performed, this hierarchy has its pieces passed to relevant renderers and the partial
+            feeds (all DOMDocuments) are then pieced together to create a complete feed. In the case
+            of Source or Deleted (Tomestone) containers, these are rendered only for Atom 2.0 and
+            ignored for RSS.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -254,9 +256,10 @@ $out = $feed->export('atom');
         </para>
         </para>
 
 
         <para>
         <para>
-            The Feed Level API for data is contained in <classname>Zend_Feed_Writer_Feed</classname>.
-            In addition to the API detailed below, the class also implements the <classname>Countable
-            </classname> and <classname>Iterator</classname> interfaces.
+            The Feed Level API for data is contained in
+            <classname>Zend_Feed_Writer_Feed</classname>. In addition to the API detailed below, the
+            class also implements the <classname>Countable</classname> and
+            <classname>Iterator</classname> interfaces.
         </para>
         </para>
 
 
         <table>
         <table>
@@ -432,8 +435,8 @@ $out = $feed->export('atom');
                     <row>
                     <row>
                         <entry><methodname>createTombstone()</methodname></entry>
                         <entry><methodname>createTombstone()</methodname></entry>
                         <entry>Returns a new instance of <classname>Zend_Feed_Writer_Deleted
                         <entry>Returns a new instance of <classname>Zend_Feed_Writer_Deleted
-                        </classname>. This is the Atom 2.0 Tombstone level data container. New entries
-                        are not automatically assigned to the current feed, so you
+                        </classname>. This is the Atom 2.0 Tombstone level data container. New
+                        entries are not automatically assigned to the current feed, so you
                         must explicitly call <methodname>addTombstone()</methodname>
                         must explicitly call <methodname>addTombstone()</methodname>
                         to add the deleted entry for rendering.</entry>
                         to add the deleted entry for rendering.</entry>
                     </row>
                     </row>
@@ -462,8 +465,10 @@ $out = $feed->export('atom');
         </table>
         </table>
 
 
         <note>
         <note>
-            <para>In addition to these setters, there are also matching getters to retrieve data from the
-            Entry data container.</para>
+            <para>
+                In addition to these setters, there are also matching getters to retrieve data from
+                the Entry data container.
+            </para>
         </note>
         </note>
 
 
         <!-- remaining feed stuff -->
         <!-- remaining feed stuff -->
@@ -484,7 +489,8 @@ $out = $feed->export('atom');
         </para>
         </para>
 
 
         <para>
         <para>
-            The Entry Level API for data is contained in <classname>Zend_Feed_Writer_Entry</classname>.
+            The Entry Level API for data is contained in
+            <classname>Zend_Feed_Writer_Entry</classname>.
         </para>
         </para>
 
 
         <table>
         <table>
@@ -627,7 +633,8 @@ $out = $feed->export('atom');
                         <entry><methodname>setCommentLink()</methodname></entry>
                         <entry><methodname>setCommentLink()</methodname></entry>
 
 
                         <entry>
                         <entry>
-                            Seta a link to a HTML page containing comments associated with this entry.
+                            Seta a link to a HTML page containing comments associated with this
+                            entry.
                         </entry>
                         </entry>
                     </row>
                     </row>
 
 
@@ -635,9 +642,9 @@ $out = $feed->export('atom');
                         <entry><methodname>setCommentFeedLink()</methodname></entry>
                         <entry><methodname>setCommentFeedLink()</methodname></entry>
 
 
                         <entry>
                         <entry>
-                            Sets a link to a XML feed containing comments associated with this entry.
-                            The parameter is an array containing the keys "uri" and "type", where
-                            the type is one of "rdf", "rss" or "atom".
+                            Sets a link to a XML feed containing comments associated with this
+                            entry. The parameter is an array containing the keys "uri" and "type",
+                            where the type is one of "rdf", "rss" or "atom".
                         </entry>
                         </entry>
                     </row>
                     </row>
 
 
@@ -664,8 +671,10 @@ $out = $feed->export('atom');
         </table>
         </table>
 
 
         <note>
         <note>
-            <para>In addition to these setters, there are also matching getters to retrieve data from the
-            Entry data container.</para>
+            <para>
+                In addition to these setters, there are also matching getters to retrieve data from
+                from the Entry data container.
+            </para>
         </note>
         </note>
     </sect2>
     </sect2>
 </sect1>
 </sect1>

+ 5 - 5
documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml

@@ -435,16 +435,16 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
         <title>Crc32 Validator</title>
         <title>Crc32 Validator</title>
 
 
         <para>
         <para>
-            The <classname>Crc32</classname> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension from <acronym>PHP</acronym> with the crc32
-            algorithm. It supports the following options:
+            The <classname>Crc32</classname> validator checks the content of a transferred file by
+            hashing it. This validator uses the hash extension from <acronym>PHP</acronym> with the
+            crc32 algorithm. It supports the following options:
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <property>*</property>: Sets any key or use a numeric array. The values will be used
-                    as hash to validate against.
+                    <property>*</property>: Sets any key or use a numeric array. The values will be
+                    used as hash to validate against.
                 </para>
                 </para>
 
 
                 <para>
                 <para>

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

@@ -11,7 +11,7 @@
 
 
     <para>
     <para>
         See <ulink
         See <ulink
-            url="http://code.google.com/apis/accounts/AuthForInstalledApps.html"> http://code.google.com/apis/accounts/AuthForInstalledApps.html </ulink>
+            url="http://code.google.com/apis/accounts/AuthForInstalledApps.html">http://code.google.com/apis/accounts/AuthForInstalledApps.html</ulink>
         for more information about Google Data ClientLogin authentication.
         for more information about Google Data ClientLogin authentication.
     </para>
     </para>
 
 

+ 2 - 1
documentation/manual/en/module_specs/Zend_Gdata_Photos.xml

@@ -40,7 +40,8 @@
             The Picasa Web Albums <acronym>API</acronym>, like all GData <acronym>API</acronym>s, is
             The Picasa Web Albums <acronym>API</acronym>, like all GData <acronym>API</acronym>s, is
             based off of the Atom Publishing Protocol (APP), an <acronym>XML</acronym> based format
             based off of the Atom Publishing Protocol (APP), an <acronym>XML</acronym> based format
             for managing web-based resources. Traffic between a client and the servers occurs over
             for managing web-based resources. Traffic between a client and the servers occurs over
-            <acronym>HTTP</acronym> and allows for both authenticated and unauthenticated connections.
+            <acronym>HTTP</acronym> and allows for both authenticated and unauthenticated
+            connections.
         </para>
         </para>
 
 
         <para>
         <para>

+ 5 - 4
documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml

@@ -453,10 +453,11 @@ $client = new Zend_Http_Client('http://www.example.com', $config);
         <para>
         <para>
             cURL is a standard <acronym>HTTP</acronym> client library that is distributed with many
             cURL is a standard <acronym>HTTP</acronym> client library that is distributed with many
             operating systems and can be used in <acronym>PHP</acronym> via the cURL extension. It
             operating systems and can be used in <acronym>PHP</acronym> via the cURL extension. It
-            offers functionality for many special cases which can occur for a <acronym>HTTP</acronym>
-            client and make it a perfect choice for a <acronym>HTTP</acronym> adapter. It supports
-            secure connections, proxy, all sorts of authentication mechanisms
-            and shines in applications that move large files around between servers.
+            offers functionality for many special cases which can occur for a
+            <acronym>HTTP</acronym> client and make it a perfect choice for a
+            <acronym>HTTP</acronym> adapter. It supports secure connections, proxy, all sorts of
+            authentication mechanisms and shines in applications that move large files around
+            between servers.
         </para>
         </para>
 
 
         <example id="zend.http.client.adapters.curl.example-1">
         <example id="zend.http.client.adapters.curl.example-1">

+ 7 - 3
documentation/manual/en/module_specs/Zend_Http_Client.xml

@@ -172,9 +172,13 @@ $client->setConfig($config);
                         </row>
                         </row>
                         <row>
                         <row>
                             <entry>encodecookies</entry>
                             <entry>encodecookies</entry>
-                            <entry>Whether to pass the cookie value through urlencode/urldecode.
-                            Enabling this breaks support with some web servers.
-                            Disabling this limits the range of values the cookies can contain.</entry>
+
+                            <entry>
+                                Whether to pass the cookie value through urlencode/urldecode.
+                                Enabling this breaks support with some web servers.
+                                Disabling this limits the range of values the cookies can contain.
+                            </entry>
+
                             <entry>boolean</entry>
                             <entry>boolean</entry>
                             <entry><constant>TRUE</constant></entry>
                             <entry><constant>TRUE</constant></entry>
                         </row>
                         </row>

+ 20 - 13
documentation/manual/en/module_specs/Zend_Http_Cookie-Handling.xml

@@ -95,34 +95,41 @@
 
 
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        By calling the fromString($cookieStr, [$refUri, [$encodeValue]]) static method, , with a cookie string as
-                        represented in the 'Set-Cookie' <acronym>HTTP</acronym> response header or
-                        'Cookie' <acronym>HTTP</acronym> request header. In this case, the cookie
-                        value must already be encoded. When the cookie string does not contain a
-                        'domain' part, you must provide a reference <acronym>URI</acronym> according
-                        to which the cookie's domain and path will be set.
+                        By calling the fromString($cookieStr, [$refUri, [$encodeValue]]) static
+                        method, with a cookie string as represented in the 'Set-Cookie
+                       ' <acronym>HTTP</acronym> response header or 'Cookie' <acronym>HTTP</acronym>
+                       request header. In this case, the cookie value must already be encoded. When
+                       the cookie string does not contain a 'domain' part, you must provide a
+                       reference <acronym>URI</acronym> according to which the cookie's domain and
+                       path will be set.
                     </para>
                     </para>
+
                     <para>
                     <para>
                         The <code>fromString</code> method accepts the following parameters:
                         The <code>fromString</code> method accepts the following parameters:
                     </para>
                     </para>
+
                     <itemizedlist>
                     <itemizedlist>
                         <listitem>
                         <listitem>
                             <para>
                             <para>
-                            <varname>$cookieStr</varname>: a cookie string as represented in the
-                           'Set-Cookie' <acronym>HTTP</acronym> response header or 'Cookie'
-                           <acronym>HTTP</acronym> request header (required)
+                                <varname>$cookieStr</varname>: a cookie string as represented in the
+                               'Set-Cookie' <acronym>HTTP</acronym> response header or 'Cookie'
+                               <acronym>HTTP</acronym> request header (required)
                             </para>
                             </para>
                         </listitem>
                         </listitem>
+
                         <listitem>
                         <listitem>
                             <para>
                             <para>
-                            <varname>$refUri</varname>: a reference <acronym>URI</acronym> according to which the cookie's domain and path
-                            will be set. (optional, defaults to parsing the value from the $cookieStr)
+                                <varname>$refUri</varname>: a reference <acronym>URI</acronym>
+                                according to which the cookie's domain and path will be set.
+                                (optional, defaults to parsing the value from the $cookieStr)
                             </para>
                             </para>
                         </listitem>
                         </listitem>
+
                         <listitem>
                         <listitem>
                             <para>
                             <para>
-                            <varname>$encodeValue</varname>: If the value should be passed through urldecode. Also effects the cookie's
-                            behavior when being converted back to a cookie string. (optional, defaults to true)
+                                <varname>$encodeValue</varname>: If the value should be passed
+                                through urldecode. Also effects the cookie's behavior when being
+                                converted back to a cookie string. (optional, defaults to true)
                             </para>
                             </para>
                         </listitem>
                         </listitem>
                     </itemizedlist>
                     </itemizedlist>

+ 3 - 4
documentation/manual/en/module_specs/Zend_Layout-Advanced.xml

@@ -93,10 +93,9 @@ $layout->setView($view);
             </para>
             </para>
 
 
             <para>
             <para>
-                Alternately, if your view implementation supports any sort of
-                plugin capability, you can access the variables via the
-                'Zend_Layout' placeholder, using the <link linkend="zend.view.helpers.initial.placeholder">placeholder
-                    helper</link>:
+                Alternately, if your view implementation supports any sort of plugin capability, you
+                can access the variables via the 'Zend_Layout' placeholder, using the <link
+                    linkend="zend.view.helpers.initial.placeholder">placeholder helper</link>:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[

+ 3 - 2
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Dn.xml

@@ -133,8 +133,9 @@
 
 
                     <entry>
                     <entry>
                         Returns a slice of the current DN determined by
                         Returns a slice of the current DN determined by
-                        <varname>$index</varname> and <varname>$length</varname>. <varname>$index</varname>
-                        starts with <code>0</code> on the DN part from the left.
+                        <varname>$index</varname> and <varname>$length</varname>.
+                        <varname>$index</varname> starts with <code>0</code> on the DN part from the
+                        left.
                     </entry>
                     </entry>
                 </row>
                 </row>
 
 

+ 23 - 11
documentation/manual/en/module_specs/Zend_Log-Overview.xml

@@ -207,8 +207,8 @@ $logger->foo('Foo Message');
         </para>
         </para>
 
 
         <para>
         <para>
-            To add a new item to every future event, call the <methodname>setEventItem()</methodname>
-            method giving a key and a value:
+            To add a new item to every future event, call the
+            <methodname>setEventItem()</methodname> method giving a key and a value:
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $logger->setEventItem('pid', getmypid());
 $logger->setEventItem('pid', getmypid());
@@ -241,9 +241,12 @@ $logger->setEventItem('pid', getmypid());
         </para>
         </para>
 
 
         <table id="zend.log.overview.as-errorHandler.properties.table-1">
         <table id="zend.log.overview.as-errorHandler.properties.table-1">
-            <title>Zend_Log events from PHP errors have the additional fields matching
-            <methodname>handler  ( int $errno  , string $errstr  [, string $errfile  [, int $errline  [, array $errcontext  ]]] )</methodname>
-            from <ulink url="http://us3.php.net/manual/en/function.set-error-handler.php">set_error_handler</ulink></title>
+            <title>
+                Zend_Log events from PHP errors have the additional fields matching
+                <methodname>handler  ( int $errno  , string $errstr  [, string $errfile  [, int
+                    $errline  [, array $errcontext  ]]] )</methodname> from <ulink
+                    url="http://us3.php.net/manual/en/function.set-error-handler.php">set_error_handler</ulink>
+            </title>
 
 
             <tgroup cols="3">
             <tgroup cols="3">
                 <thead>
                 <thead>
@@ -270,22 +273,31 @@ $logger->setEventItem('pid', getmypid());
                     <row>
                     <row>
                         <entry>file</entry>
                         <entry>file</entry>
                         <entry>errfile</entry>
                         <entry>errfile</entry>
-                        <entry>Contains the filename that the error was raised in, as a string.</entry>
+
+                        <entry>
+                            Contains the filename that the error was raised in, as a string.
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>line</entry>
                         <entry>line</entry>
                         <entry>errline</entry>
                         <entry>errline</entry>
-                        <entry>Contains the line number the error was raised at, as an integer. </entry>
+
+                        <entry>
+                            Contains the line number the error was raised at, as an integer.
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>context</entry>
                         <entry>context</entry>
                         <entry>errcontext</entry>
                         <entry>errcontext</entry>
-                        <entry>(optional) An array that points to the active symbol table at the point the
-                        error occurred. In other words, errcontext  will contain an array of every variable
-                        that existed in the scope the error was triggered in. User error handler must not
-                        modify error context.</entry>
+
+                        <entry>
+                            (optional) An array that points to the active symbol table at the point
+                            the error occurred. In other words, errcontext  will contain an array of
+                            every variable that existed in the scope the error was triggered in.
+                            User error handler must not modify error context.
+                        </entry>
                     </row>
                     </row>
 
 
                 </tbody>
                 </tbody>

+ 185 - 112
documentation/manual/en/module_specs/Zend_Mail_Read.xml

@@ -4,13 +4,15 @@
     <title>Reading Mail Messages</title>
     <title>Reading Mail Messages</title>
 
 
     <para>
     <para>
-        <classname>Zend_Mail</classname> can read mail messages from several local or remote mail storages. All of them have the
-        same basic <acronym>API</acronym> to count and fetch messages and some of them implement additional interfaces for not so common
-        features. For a feature overview of the implemented storages, see the following table.
+        <classname>Zend_Mail</classname> can read mail messages from several local or remote mail
+        storages. All of them have the same basic <acronym>API</acronym> to count and fetch messages
+        and some of them implement additional interfaces for not so common features. For a feature
+        overview of the implemented storages, see the following table.
     </para>
     </para>
 
 
     <table id="zend.mail.read.table-1">
     <table id="zend.mail.read.table-1">
         <title>Mail Read Feature Overview</title>
         <title>Mail Read Feature Overview</title>
+
         <tgroup cols="5">
         <tgroup cols="5">
             <thead>
             <thead>
                 <row>
                 <row>
@@ -21,6 +23,7 @@
                     <entry><constant>IMAP</constant></entry>
                     <entry><constant>IMAP</constant></entry>
                 </row>
                 </row>
             </thead>
             </thead>
+
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry>Storage type</entry>
                     <entry>Storage type</entry>
@@ -29,6 +32,7 @@
                     <entry>remote</entry>
                     <entry>remote</entry>
                     <entry>remote</entry>
                     <entry>remote</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Fetch message</entry>
                     <entry>Fetch message</entry>
                     <entry>Yes</entry>
                     <entry>Yes</entry>
@@ -36,6 +40,7 @@
                     <entry>Yes</entry>
                     <entry>Yes</entry>
                     <entry>Yes</entry>
                     <entry>Yes</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Fetch <acronym>MIME</acronym>-part</entry>
                     <entry>Fetch <acronym>MIME</acronym>-part</entry>
                     <entry>emulated</entry>
                     <entry>emulated</entry>
@@ -43,6 +48,7 @@
                     <entry>emulated</entry>
                     <entry>emulated</entry>
                     <entry>emulated</entry>
                     <entry>emulated</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Folders</entry>
                     <entry>Folders</entry>
                     <entry>Yes </entry>
                     <entry>Yes </entry>
@@ -50,6 +56,7 @@
                     <entry>No</entry>
                     <entry>No</entry>
                     <entry>Yes</entry>
                     <entry>Yes</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Create message/folder</entry>
                     <entry>Create message/folder</entry>
                     <entry>No</entry>
                     <entry>No</entry>
@@ -57,6 +64,7 @@
                     <entry>No</entry>
                     <entry>No</entry>
                     <entry>todo</entry>
                     <entry>todo</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Flags</entry>
                     <entry>Flags</entry>
                     <entry>No</entry>
                     <entry>No</entry>
@@ -64,6 +72,7 @@
                     <entry>No</entry>
                     <entry>No</entry>
                     <entry>Yes</entry>
                     <entry>Yes</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry>Quota</entry>
                     <entry>Quota</entry>
                     <entry>No</entry>
                     <entry>No</entry>
@@ -88,17 +97,19 @@ foreach ($mail as $message) {
     echo "Mail from '{$message->from}': {$message->subject}\n";
     echo "Mail from '{$message->from}': {$message->subject}\n";
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-open-local">
     <sect2 id="zend.mail.read-open-local">
         <title>Opening a local storage</title>
         <title>Opening a local storage</title>
 
 
         <para>
         <para>
-            Mbox and Maildir are the two supported formats for local mail storages, both in their most simple formats.
+            Mbox and Maildir are the two supported formats for local mail storages, both in their
+            most simple formats.
         </para>
         </para>
+
         <para>
         <para>
-            If you want to read from a Mbox file you only need to give the filename to the constructor of
-            <classname>Zend_Mail_Storage_Mbox</classname>:
+            If you want to read from a Mbox file you only need to give the filename to the
+            constructor of <classname>Zend_Mail_Storage_Mbox</classname>:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -113,16 +124,19 @@ $mail = new Zend_Mail_Storage_Maildir(array('dirname' =>
                                                 '/home/test/mail/'));
                                                 '/home/test/mail/'));
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>Both constructors throw a <classname>Zend_Mail_Exception</classname> if the storage can't be read.</para>
-
+        <para>
+            Both constructors throw a <classname>Zend_Mail_Exception</classname> if the storage
+            can't be read.
+        </para>
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-open-remote">
     <sect2 id="zend.mail.read-open-remote">
         <title>Opening a remote storage</title>
         <title>Opening a remote storage</title>
 
 
         <para>
         <para>
-            For remote storages the two most popular protocols are supported: Pop3 and Imap. Both need at least a host
-            and a user to connect and login. The default password is an empty string, the default port as given in the
-            protocol <acronym>RFC</acronym>.
+            For remote storages the two most popular protocols are supported: Pop3 and Imap. Both
+            need at least a host and a user to connect and login. The default password is an empty
+            string, the default port as given in the protocol <acronym>RFC</acronym>.
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -144,7 +158,8 @@ $mail = new Zend_Mail_Storage_Pop3(array('host'     => 'example.com',
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            For both storages <acronym>SSL</acronym> and TLS are supported. If you use <acronym>SSL</acronym> the default port changes as given in the <acronym>RFC</acronym>.
+            For both storages <acronym>SSL</acronym> and TLS are supported. If you use
+            <acronym>SSL</acronym> the default port changes as given in the <acronym>RFC</acronym>.
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -164,17 +179,19 @@ $mail = new Zend_Mail_Storage_Pop3(array('host'     => 'example.com',
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            Both constructors can throw <classname>Zend_Mail_Exception</classname> or <classname>Zend_Mail_Protocol_Exception</classname>
-            (extends <classname>Zend_Mail_Exception</classname>), depending on the type of error.
+            Both constructors can throw <classname>Zend_Mail_Exception</classname> or
+            <classname>Zend_Mail_Protocol_Exception</classname> (extends
+            <classname>Zend_Mail_Exception</classname>), depending on the type of error.
         </para>
         </para>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-fetching">
     <sect2 id="zend.mail.read-fetching">
         <title>Fetching messages and simple methods</title>
         <title>Fetching messages and simple methods</title>
 
 
         <para>
         <para>
-            Messages can be fetched after you've opened the storage . You need the message number, which is a counter
-            starting with 1 for the first message. To fetch the message, you use the method <methodname>getMessage()</methodname>:
+            Messages can be fetched after you've opened the storage . You need the message number,
+            which is a counter starting with 1 for the first message. To fetch the message, you use
+            the method <methodname>getMessage()</methodname>:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -182,8 +199,9 @@ $message = $mail->getMessage($messageNum);
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            Array access is also supported, but this access method won't supported any additional parameters that could be added to
-            <methodname>getMessage()</methodname>. As long as you don't mind, and can live with the default values, you may use:
+            Array access is also supported, but this access method won't supported any additional
+            parameters that could be added to <methodname>getMessage()</methodname>. As long as you
+            don't mind, and can live with the default values, you may use:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -199,8 +217,8 @@ foreach ($mail as $messageNum => $message) {
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            To count the messages in the storage, you can either use the method <methodname>countMessages()</methodname> or use array
-            access:
+            To count the messages in the storage, you can either use the method
+            <methodname>countMessages()</methodname> or use array access:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -211,7 +229,10 @@ $maxMessage = $mail->countMessages();
 $maxMessage = count($mail);
 $maxMessage = count($mail);
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>To remove a mail, you use the method <methodname>removeMessage()</methodname> or again array access:</para>
+        <para>
+            To remove a mail, you use the method <methodname>removeMessage()</methodname> or again
+            array access:
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // method
 // method
@@ -220,17 +241,21 @@ $mail->removeMessage($messageNum);
 // array access
 // array access
 unset($mail[$messageNum]);
 unset($mail[$messageNum]);
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-message">
     <sect2 id="zend.mail.read-message">
         <title>Working with messages</title>
         <title>Working with messages</title>
 
 
-        <para>After you fetch the messages with <methodname>getMessage()</methodname> you want to fetch headers, the content
-        or single parts of a multipart message. All headers can be accessed via properties or the method
-        <methodname>getHeader()</methodname> if you want more control or have unusual header names. The header names are
-        lower-cased internally, thus the case of the header name in the mail message doesn't matter. Also headers
-        with a dash can be written in camel-case. If no header is found for both notations an exception is thrown.
-        To encounter this the method <methodname>headerExists()</methodname> can be used to check the existence of a header.</para>
+        <para>
+            After you fetch the messages with <methodname>getMessage()</methodname> you want to
+            fetch headers, the content or single parts of a multipart message. All headers can be
+            accessed via properties or the method <methodname>getHeader()</methodname> if you want
+            more control or have unusual header names. The header names are lower-cased internally,
+            thus the case of the header name in the mail message doesn't matter. Also headers with a
+            dash can be written in camel-case. If no header is found for both notations an exception
+            is thrown. To encounter this the method <methodname>headerExists()</methodname> can be
+            used to check the existence of a header.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // get the message object
 // get the message object
@@ -248,8 +273,11 @@ if( isset($message->cc) ) { // or $message->headerExists('cc');
 }
 }
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>If you have multiple headers with the same name- i.e. the Received headers- you might want an array
-        instead of a string. In this case, use the <methodname>getHeader()</methodname> method.</para>
+        <para>
+            If you have multiple headers with the same name- i.e. the Received headers- you might
+            want an array instead of a string. In this case, use the
+            <methodname>getHeader()</methodname> method.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // get header as property - the result is always a string,
 // get header as property - the result is always a string,
@@ -273,8 +301,11 @@ if (is_string($received)) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>The method <methodname>getHeaders()</methodname> returns all headers as array with the lower-cased name as
-        key and the value as and array for multiple headers or as string for single headers.</para>
+        <para>
+            The method <methodname>getHeaders()</methodname> returns all headers as array with the
+            lower-cased name as key and the value as and array for multiple headers or as string for
+            single headers.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // dump all headers
 // dump all headers
@@ -289,8 +320,11 @@ foreach ($message->getHeaders() as $name => $value) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>If you don't have a multipart message, fetching the content is easily done via
-        <methodname>getContent()</methodname>. Unlike the headers, the content is only fetched when needed (aka late-fetch).</para>
+        <para>
+            If you don't have a multipart message, fetching the content is easily done via
+            <methodname>getContent()</methodname>. Unlike the headers, the content is only fetched
+            when needed (aka late-fetch).
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // output message content for HTML
 // output message content for HTML
@@ -299,11 +333,16 @@ echo $message->getContent();
 echo '</pre>';
 echo '</pre>';
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>Checking for multipart messages is done with the method <methodname>isMultipart()</methodname>. If you have
-        multipart message you can get an instance of <classname>Zend_Mail_Part</classname> with the method
-        <methodname>getPart()</methodname>. <classname>Zend_Mail_Part</classname> is the base class of <classname>Zend_Mail_Message</classname>,
-        so you have the same methods: <methodname>getHeader()</methodname>, <methodname>getHeaders()</methodname>, <methodname>getContent()</methodname>,
-        <methodname>getPart()</methodname>, <code>isMultipart</code> and the properties for headers.</para>
+        <para>
+            Checking for multipart messages is done with the method
+            <methodname>isMultipart()</methodname>. If you have multipart message you can get an
+            instance of <classname>Zend_Mail_Part</classname> with the method
+            <methodname>getPart()</methodname>. <classname>Zend_Mail_Part</classname> is the base
+            class of <classname>Zend_Mail_Message</classname>, so you have the same methods:
+            <methodname>getHeader()</methodname>, <methodname>getHeaders()</methodname>,
+            <methodname>getContent()</methodname>, <methodname>getPart()</methodname>,
+            <code>isMultipart</code> and the properties for headers.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // get the first none multipart part
 // get the first none multipart part
@@ -316,8 +355,11 @@ echo "Content:\n";
 echo $part->getContent();
 echo $part->getContent();
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para><classname>Zend_Mail_Part</classname> also implements <code>RecursiveIterator</code>, which makes it easy to scan through all parts. And
-        for easy output, it also implements the magic method <methodname>__toString()</methodname>, which returns the content.</para>
+        <para>
+            <classname>Zend_Mail_Part</classname> also implements <code>RecursiveIterator</code>,
+            which makes it easy to scan through all parts. And for easy output, it also implements
+            the magic method <methodname>__toString()</methodname>, which returns the content.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // output first text/plain part
 // output first text/plain part
@@ -338,15 +380,19 @@ if (!$foundPart) {
     echo "plain text part: \n" . $foundPart;
     echo "plain text part: \n" . $foundPart;
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-flags">
     <sect2 id="zend.mail.read-flags">
         <title>Checking for flags</title>
         <title>Checking for flags</title>
 
 
-        <para>Maildir and IMAP support storing flags. The class <classname>Zend_Mail_Storage</classname> has constants for all known
-        maildir and IMAP system flags, named <classname>Zend_Mail_Storage::FLAG_&lt;flagname&gt;</classname>. To check
-        for flags <classname>Zend_Mail_Message</classname> has a method called <methodname>hasFlag()</methodname>. With
-        <methodname>getFlags()</methodname> you'll get all set flags.</para>
+        <para>
+            Maildir and IMAP support storing flags. The class
+            <classname>Zend_Mail_Storage</classname> has constants for all known maildir and IMAP
+            system flags, named <classname>Zend_Mail_Storage::FLAG_&lt;flagname&gt;</classname>. To
+            check for flags <classname>Zend_Mail_Message</classname> has a method called
+            <methodname>hasFlag()</methodname>. With <methodname>getFlags()</methodname> you'll get
+            all set flags.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // find unread messages
 // find unread messages
@@ -386,9 +432,11 @@ foreach ($flags as $flag) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
 
 
-        <para>As IMAP allows user or client defined flags, you could get flags that don't have a constant in
-        <classname>Zend_Mail_Storage</classname>. Instead, they are returned as strings and can be checked the same way with
-        <methodname>hasFlag()</methodname>.</para>
+        <para>
+            As IMAP allows user or client defined flags, you could get flags that don't have a
+            constant in <classname>Zend_Mail_Storage</classname>. Instead, they are returned as
+            strings and can be checked the same way with <methodname>hasFlag()</methodname>.
+        </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 // check message for client defined flags $IsSpam, $SpamTested
 // check message for client defined flags $IsSpam, $SpamTested
@@ -400,25 +448,32 @@ if (!$message->hasFlag('$SpamTested')) {
     echo 'this message is ham';
     echo 'this message is ham';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-folders">
     <sect2 id="zend.mail.read-folders">
         <title>Using folders</title>
         <title>Using folders</title>
 
 
         <para>
         <para>
-            All storages, except Pop3, support folders, also called mailboxes. The interface implemented by all storages
-            supporting folders is called <classname>Zend_Mail_Storage_Folder_Interface</classname>. Also all of these classes have an
-            additional optional parameter called <code>folder</code>, which is the folder selected after login, in the constructor.
+            All storages, except Pop3, support folders, also called mailboxes. The interface
+            implemented by all storages supporting folders is called
+            <classname>Zend_Mail_Storage_Folder_Interface</classname>. Also all of these classes
+            have an additional optional parameter called <code>folder</code>, which is the folder
+            selected after login, in the constructor.
         </para>
         </para>
+
         <para>
         <para>
-            For the local storages you need to use separate classes called <classname>Zend_Mail_Storage_Folder_Mbox</classname> or
-            <classname>Zend_Mail_Storage_Folder_Maildir</classname>. Both need one parameter called <code>dirname</code> with the name of the base dir.
-            The format for maildir is as defined in maildir++ (with a dot as default delimiter), Mbox is a directory
-            hierarchy with Mbox files. If you don't have a Mbox file called INBOX in your Mbox base dir you need to set
+            For the local storages you need to use separate classes called
+            <classname>Zend_Mail_Storage_Folder_Mbox</classname> or
+            <classname>Zend_Mail_Storage_Folder_Maildir</classname>. Both need one parameter called
+            <code>dirname</code> with the name of the base dir. The format for maildir is as defined
+            in maildir++ (with a dot as default delimiter), Mbox is a directory hierarchy with Mbox
+            files. If you don't have a Mbox file called INBOX in your Mbox base dir you need to set
             another folder in the constructor.
             another folder in the constructor.
         </para>
         </para>
+
         <para>
         <para>
-            <classname>Zend_Mail_Storage_Imap</classname> already supports folders by default. Examples for opening these storages:
+            <classname>Zend_Mail_Storage_Imap</classname> already supports folders by default.
+            Examples for opening these storages:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -449,16 +504,19 @@ $mail = new Zend_Mail_Storage_Imap(array('host'     => 'example.com',
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            With the method getFolders($root = null) you can get the folder hierarchy starting with the root folder or
-            the given folder. It's returned as an instance of <classname>Zend_Mail_Storage_Folder</classname>, which implements
-            <code>RecursiveIterator</code> and all children are also instances of <classname>Zend_Mail_Storage_Folder</classname>. Each of
-            these instances has a local and a global name returned by the methods <methodname>getLocalName()</methodname> and
-            <methodname>getGlobalName()</methodname>. The global name is the absolute name from the root folder (including
-            delimiters), the local name is the name in the parent folder.
+            With the method getFolders($root = null) you can get the folder hierarchy starting with
+            the root folder or the given folder. It's returned as an instance of
+            <classname>Zend_Mail_Storage_Folder</classname>, which implements
+            <code>RecursiveIterator</code> and all children are also instances of
+            <classname>Zend_Mail_Storage_Folder</classname>. Each of these instances has a local and
+            a global name returned by the methods <methodname>getLocalName()</methodname> and
+            <methodname>getGlobalName()</methodname>. The global name is the absolute name from the
+            root folder (including delimiters), the local name is the name in the parent folder.
         </para>
         </para>
 
 
         <table id="zend.mail.read-folders.table-1">
         <table id="zend.mail.read-folders.table-1">
             <title>Mail Folder Names</title>
             <title>Mail Folder Names</title>
+
             <tgroup cols="2">
             <tgroup cols="2">
                 <thead>
                 <thead>
                     <row>
                     <row>
@@ -466,15 +524,18 @@ $mail = new Zend_Mail_Storage_Imap(array('host'     => 'example.com',
                         <entry>Local Name</entry>
                         <entry>Local Name</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>/INBOX</entry>
                         <entry>/INBOX</entry>
                         <entry>INBOX</entry>
                         <entry>INBOX</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>/Archive/2005</entry>
                         <entry>/Archive/2005</entry>
                         <entry>2005</entry>
                         <entry>2005</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>List.ZF.General</entry>
                         <entry>List.ZF.General</entry>
                         <entry>General</entry>
                         <entry>General</entry>
@@ -484,10 +545,12 @@ $mail = new Zend_Mail_Storage_Imap(array('host'     => 'example.com',
         </table>
         </table>
 
 
         <para>
         <para>
-            If you use the iterator, the key of the current element is the local name. The global name is also returned
-            by the magic method <methodname>__toString()</methodname>. Some folders may not be selectable, which means they can't
-            store messages and selecting them results in an error. This can be checked with the method
-            <methodname>isSelectable()</methodname>. So it's very easy to output the whole tree in a view:
+            If you use the iterator, the key of the current element is the local name. The global
+            name is also returned by the magic method <methodname>__toString()</methodname>. Some
+            folders may not be selectable, which means they can't store messages and selecting them
+            results in an error. This can be checked with the method
+            <methodname>isSelectable()</methodname>. So it's very easy to output the whole tree in a
+            view:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -508,9 +571,11 @@ echo '</select>';
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            The current selected folder is returned by the method <methodname>getSelectedFolder()</methodname>. Changing the folder
-            is done with the method <methodname>selectFolder()</methodname>, which needs the global name as parameter. If you want
-            to avoid to write delimiters you can also use the properties of a <classname>Zend_Mail_Storage_Folder</classname> instance:
+            The current selected folder is returned by the method
+            <methodname>getSelectedFolder()</methodname>. Changing the folder is done with the
+            method <methodname>selectFolder()</methodname>, which needs the global name as
+            parameter. If you want to avoid to write delimiters you can also use the properties of a
+            <classname>Zend_Mail_Storage_Folder</classname> instance:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -526,8 +591,8 @@ echo 'Last folder was '
    . "new folder is $folder\n";
    . "new folder is $folder\n";
 $mail->selectFolder($folder);
 $mail->selectFolder($folder);
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
+
     <sect2 id="zend.mail.read-advanced">
     <sect2 id="zend.mail.read-advanced">
         <title>Advanced Use</title>
         <title>Advanced Use</title>
 
 
@@ -535,8 +600,8 @@ $mail->selectFolder($folder);
             <title>Using NOOP</title>
             <title>Using NOOP</title>
 
 
             <para>
             <para>
-                If you're using a remote storage and have some long tasks you might need to keep the connection alive
-                via noop:
+                If you're using a remote storage and have some long tasks you might need to keep
+                the connection alive via noop:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -551,20 +616,24 @@ foreach ($mail as $message) {
     $mail->noop(); // keep alive
     $mail->noop(); // keep alive
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </sect3>
         </sect3>
+
         <sect3 id="zend.mail.read-advanced.caching">
         <sect3 id="zend.mail.read-advanced.caching">
             <title>Caching instances</title>
             <title>Caching instances</title>
 
 
             <para>
             <para>
-            <classname>Zend_Mail_Storage_Mbox</classname>, <classname>Zend_Mail_Storage_Folder_Mbox</classname>, <classname>Zend_Mail_Storage_Maildir</classname> and
-            <classname>Zend_Mail_Storage_Folder_Maildir</classname> implement the magic methods <methodname>__sleep()</methodname> and
-            <methodname>__wakeup()</methodname>, which means they are serializable. This avoids parsing the files or directory tree
-            more than once. The disadvantage is that your Mbox or Maildir storage should not change. Some easy checks
-            may be done, like reparsing the current Mbox file if the modification time changes, or reparsing the folder
-            structure if a folder has vanished (which still results in an error, but you can search for another folder
-            afterwards). It's better if you have something like a signal file for changes and check it before using the
-            cached instance.
+                <classname>Zend_Mail_Storage_Mbox</classname>,
+                <classname>Zend_Mail_Storage_Folder_Mbox</classname>,
+                <classname>Zend_Mail_Storage_Maildir</classname> and
+                <classname>Zend_Mail_Storage_Folder_Maildir</classname> implement the magic methods
+                <methodname>__sleep()</methodname> and <methodname>__wakeup()</methodname>, which
+                means they are serializable. This avoids parsing the files or directory tree more
+                than once. The disadvantage is that your Mbox or Maildir storage should not change.
+                Some easy checks may be done, like reparsing the current Mbox file if the
+                modification time changes, or reparsing the folder structure if a folder has
+                vanished (which still results in an error, but you can search for another folder
+                afterwards). It's better if you have something like a signal file for changes and
+                check it before using the cached instance.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -587,22 +656,24 @@ if (!$cache->isCached($cache_id) ||
 
 
 $cache->set($cache_id, $mail);
 $cache->set($cache_id, $mail);
 ]]></programlisting>
 ]]></programlisting>
-
         </sect3>
         </sect3>
+
         <sect3 id="zend.mail.read-advanced.extending">
         <sect3 id="zend.mail.read-advanced.extending">
             <title>Extending Protocol Classes</title>
             <title>Extending Protocol Classes</title>
 
 
             <para>
             <para>
-                Remote storages use two classes: <classname>Zend_Mail_Storage_&lt;Name&gt;</classname> and
-                <classname>Zend_Mail_Protocol_&lt;Name&gt;</classname>. The protocol class translates the protocol commands and
-                responses from and to <acronym>PHP</acronym>, like methods for the commands or variables with different structures for
-                data. The other/main class implements the common interface.
+                Remote storages use two classes:
+                <classname>Zend_Mail_Storage_&lt;Name&gt;</classname> and
+                <classname>Zend_Mail_Protocol_&lt;Name&gt;</classname>. The protocol class
+                translates the protocol commands and responses from and to <acronym>PHP</acronym>,
+                like methods for the commands or variables with different structures for data.
+                The other/main class implements the common interface.
             </para>
             </para>
 
 
             <para>
             <para>
-                If you need additional protocol features, you can extend the protocol class and use it in the
-                constructor of the main class. As an example, assume we need to knock different ports before we can
-                connect to POP3.
+                If you need additional protocol features, you can extend the protocol class and use
+                it in the constructor of the main class. As an example, assume we need to knock
+                different ports before we can connect to POP3.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -674,26 +745,29 @@ $mail = new Example_Mail_Pop3_Knock(array('host'        => 'localhost',
 ]]></programlisting>
 ]]></programlisting>
 
 
             <para>
             <para>
-                As you see, we always assume we're connected, logged in and, if supported, a folder is selected in the
-                constructor of the main class. Thus if you assign your own protocol class, you always need to make sure
-                that's done or the next method will fail if the server doesn't allow it in the current state.
+                As you see, we always assume we're connected, logged in and, if supported, a folder
+                is selected in the constructor of the main class. Thus if you assign your own
+                protocol class, you always need to make sure that's done or the next method will
+                fail if the server doesn't allow it in the current state.
             </para>
             </para>
-
         </sect3>
         </sect3>
+
         <sect3 id="zend.mail.read-advanced.quota">
         <sect3 id="zend.mail.read-advanced.quota">
             <title>Using Quota (since 1.5)</title>
             <title>Using Quota (since 1.5)</title>
 
 
             <para>
             <para>
-            <classname>Zend_Mail_Storage_Writable_Maildir</classname> has support for Maildir++ quotas. It's disabled by default,
-            but it's possible to use it manually, if the automatic checks are not desired (this means
-            <methodname>appendMessage()</methodname>, <methodname>removeMessage()</methodname> and <methodname>copyMessage()</methodname> do no checks
-            and do not add entries to the maildirsize file). If enabled, an exception is thrown if you try to write
-            to the maildir and it's already over quota.
+                <classname>Zend_Mail_Storage_Writable_Maildir</classname> has support for Maildir++
+                quotas. It's disabled by default, but it's possible to use it manually, if the
+                automatic checks are not desired (this means
+                <methodname>appendMessage()</methodname>, <methodname>removeMessage()</methodname>
+                and <methodname>copyMessage()</methodname> do no checks and do not add entries to
+                the maildirsize file). If enabled, an exception is thrown if you try to write to the
+                maildir and it's already over quota.
             </para>
             </para>
 
 
             <para>
             <para>
-            There are three methods used for quotas: <methodname>getQuota()</methodname>, <methodname>setQuota()</methodname> and
-            <methodname>checkQuota()</methodname>:
+                There are three methods used for quotas: <methodname>getQuota()</methodname>,
+                <methodname>setQuota()</methodname> and <methodname>checkQuota()</methodname>:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -706,7 +780,7 @@ echo 'You are ', $mail->checkQuota() ? 'over quota' : 'not over quota', "\n";
 ]]></programlisting>
 ]]></programlisting>
 
 
             <para>
             <para>
-            <methodname>checkQuota()</methodname> can also return a more detailed response:
+                <methodname>checkQuota()</methodname> can also return a more detailed response:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -721,8 +795,8 @@ echo $quota['size'], ' of ', $quota['quota']['size'], ' octets';
 ]]></programlisting>
 ]]></programlisting>
 
 
             <para>
             <para>
-            If you want to specify your own quota instead of using the one specified in the maildirsize file you
-            can do with <methodname>setQuota()</methodname>:
+                If you want to specify your own quota instead of using the one specified in the
+                maildirsize file you can do with <methodname>setQuota()</methodname>:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -731,9 +805,10 @@ $quota = $mail->setQuota(array('size' => 10000, 'count' => 100));
 ]]></programlisting>
 ]]></programlisting>
 
 
             <para>
             <para>
-            To add your own quota checks use single letters as keys, and they will be preserved (but obviously not checked).
-            It's also possible to extend <classname>Zend_Mail_Storage_Writable_Maildir</classname> to define your own quota only
-            if the maildirsize file is missing (which can happen in Maildir++):
+                To add your own quota checks use single letters as keys, and they will be preserved
+                (but obviously not checked). It's also possible to extend
+                <classname>Zend_Mail_Storage_Writable_Maildir</classname> to define your own quota
+                only if the maildirsize file is missing (which can happen in Maildir++):
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -755,11 +830,9 @@ class Example_Mail_Storage_Maildir extends Zend_Mail_Storage_Writable_Maildir {
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </sect3>
         </sect3>
     </sect2>
     </sect2>
 </sect1>
 </sect1>
-
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:
 -->
 -->

+ 6 - 6
documentation/manual/en/module_specs/Zend_Markup-Renderers.xml

@@ -13,9 +13,9 @@
 
 
         <para>
         <para>
             By adding your own markups, you can add your own functionality to the
             By adding your own markups, you can add your own functionality to the
-            <classname>Zend_Markup</classname> renderers. With the markup structure, you can add about
-            any functionality you want. From simple markups, to complicated markup structures. A simple
-            example for a 'foo' markup:
+            <classname>Zend_Markup</classname> renderers. With the markup structure, you can add
+            about any functionality you want. From simple markups, to complicated markup structures.
+            A simple example for a 'foo' markup:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -43,9 +43,9 @@ echo $bbcode->render('my [foo]markup[/foo]');
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            Please note that creating your own markups only makes sense when your parser also supports
-            it with a markup structure. Currently, only BBCode supports this. Textile doesn't have
-            support for custom markups.
+            Please note that creating your own markups only makes sense when your parser also
+            supports it with a markup structure. Currently, only BBCode supports this. Textile
+            doesn't have support for custom markups.
         </para>
         </para>
 
 
         <para>
         <para>

+ 4 - 2
documentation/manual/en/module_specs/Zend_Measure-Edit.xml

@@ -32,14 +32,16 @@
         <listitem>
         <listitem>
             <para>
             <para>
                 <link
                 <link
-                    linkend="zend.measure.edit.compare"><code>Compare to greater/smaller</code></link>
+                    linkend="zend.measure.edit.compare"><code>Compare to
+                    greater/smaller</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
 
 
         <listitem>
         <listitem>
             <para>
             <para>
                 <link
                 <link
-                    linkend="zend.measure.edit.changevalue"><code>Manually change values</code></link>
+                    linkend="zend.measure.edit.changevalue"><code>Manually change
+                    values</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
 
 

+ 2 - 1
documentation/manual/en/module_specs/Zend_Measure-Types.xml

@@ -357,7 +357,8 @@
             conputer conversion KIBIBYTE = 1024 - new notation KILO_BINARY_BYTE = 1024 - new</code>,
             conputer conversion KIBIBYTE = 1024 - new notation KILO_BINARY_BYTE = 1024 - new</code>,
             or the notation, long format
             or the notation, long format
             <code>KILOBYTE_SI = 1000 - SI notation for kilo (1000)</code>. DVDs for example are
             <code>KILOBYTE_SI = 1000 - SI notation for kilo (1000)</code>. DVDs for example are
-            marked with the SI-notation, but almost all harddisks are marked in computer binary notation.
+            marked with the SI-notation, but almost all harddisks are marked in computer binary
+            notation.
         </para>
         </para>
     </sect2>
     </sect2>
 
 

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

@@ -150,7 +150,7 @@ function Zend_ProgressBar_Update(data)
             <listitem>
             <listitem>
                 <para>
                 <para>
                     Dojo: <ulink
                     Dojo: <ulink
-                        url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/user-assistance-and-feedback/progress-bar" />
+                        url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/user-assistance-and-feedback/progress-bar"/>
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 

+ 8 - 2
documentation/manual/en/module_specs/Zend_Service_Amazon.xml

@@ -10,7 +10,8 @@
             <classname>Zend_Service_Amazon</classname> is a simple <acronym>API</acronym> for using
             <classname>Zend_Service_Amazon</classname> is a simple <acronym>API</acronym> for using
             Amazon web services. <classname>Zend_Service_Amazon</classname> has two
             Amazon web services. <classname>Zend_Service_Amazon</classname> has two
             <acronym>API</acronym>s: a more traditional one that follows Amazon's own
             <acronym>API</acronym>s: a more traditional one that follows Amazon's own
-            <acronym>API</acronym>, and a simpler "Query <acronym>API</acronym>" for constructing even complex search queries easily.
+            <acronym>API</acronym>, and a simpler "Query <acronym>API</acronym>" for constructing
+            even complex search queries easily.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -756,7 +757,12 @@ foreach ($results as $result) {
                             <row>
                             <row>
                                 <entry>MerchantName</entry>
                                 <entry>MerchantName</entry>
                                 <entry>string</entry>
                                 <entry>string</entry>
-                                <entry>Merchants Amazon Name.  Requires setting the <code>ResponseGroup</code> option to <code>OfferFull</code> to retrieve.</entry>
+
+                                <entry>
+                                    Merchants Amazon Name. Requires setting the
+                                    <code>ResponseGroup</code> option to <code>OfferFull</code> to
+                                    retrieve.
+                                </entry>
                             </row>
                             </row>
                             <row>
                             <row>
                                 <entry>GlancePage</entry>
                                 <entry>GlancePage</entry>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml

@@ -191,8 +191,8 @@ $return = $ec2_ebs->attachVolume('volumeId', 'instanceid', '/dev/sdh');
                 <code>detachVolume</code> will detach an EBS Volume from a running Instance.
                 <code>detachVolume</code> will detach an EBS Volume from a running Instance.
                 <code>detachVolume</code> requires that you specify the volumeId with the optional
                 <code>detachVolume</code> requires that you specify the volumeId with the optional
                 instanceId and device name that was passed when attaching the volume. If you need to
                 instanceId and device name that was passed when attaching the volume. If you need to
-                force the detachment you can set the fourth parameter to be <constant>TRUE</constant>
-                and it will force the volume to detach.
+                force the detachment you can set the fourth parameter to be
+                <constant>TRUE</constant> and it will force the volume to detach.
             </para>
             </para>
 
 
             <para>
             <para>

+ 3 - 2
documentation/manual/en/module_specs/Zend_Service_Technorati.xml

@@ -300,7 +300,8 @@ echo "Daily Usage: " . $key->getApiQueries() . "/" .
         <title>Available Technorati Queries</title>
         <title>Available Technorati Queries</title>
 
 
         <para>
         <para>
-            <classname>Zend_Service_Technorati</classname> provides support for the following queries:
+            <classname>Zend_Service_Technorati</classname> provides support for the following
+            queries:
 
 
             <itemizedlist>
             <itemizedlist>
                 <listitem>
                 <listitem>
@@ -975,7 +976,7 @@ foreach ($resultSet as $result) {
                 <classname>Zend_Service_Technorati_TagsResult</classname> represents a single
                 <classname>Zend_Service_Technorati_TagsResult</classname> represents a single
                 Technorati TopTags or BlogPostTags query result object. It is never returned as a
                 Technorati TopTags or BlogPostTags query result object. It is never returned as a
                 standalone object, but it always belongs to a valid <link
                 standalone object, but it always belongs to a valid <link
-                    linkend="zend.service.technorati.classes.tagsresultset">Zend_Service_Technorati_TagsResultSet </link>
+                    linkend="zend.service.technorati.classes.tagsresultset">Zend_Service_Technorati_TagsResultSet</link>
                 object.
                 object.
             </para>
             </para>
 
 

+ 2 - 1
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml

@@ -249,7 +249,8 @@ public $<property name in PHP>;
                 storage:
                 storage:
             </para>
             </para>
 
 
-            <example id="zend.service.windowsazure.storage.table.entities.enforced.schema-property-sample">
+            <example
+                id="zend.service.windowsazure.storage.table.entities.enforced.schema-property-sample">
                 <title>Sample enforced property</title>
                 <title>Sample enforced property</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[

+ 4 - 3
documentation/manual/en/module_specs/Zend_Session-BasicUsage.xml

@@ -138,9 +138,10 @@ foreach ($aNamespace as $index => $value) {
             <classname>Zend_Session_Namespace</classname> implements the
             <classname>Zend_Session_Namespace</classname> implements the
             <methodname>__get()</methodname>, <methodname>__set()</methodname>,
             <methodname>__get()</methodname>, <methodname>__set()</methodname>,
             <methodname>__isset()</methodname>, and <methodname>__unset()</methodname> <ulink
             <methodname>__isset()</methodname>, and <methodname>__unset()</methodname> <ulink
-                url="http://www.php.net/manual/en/language.oop5.overloading.php">magic methods</ulink>,
-            which should not be invoked directly, except from within a subclass. Instead, the normal
-            operators automatically invoke these methods, such as in the following example:
+                url="http://www.php.net/manual/en/language.oop5.overloading.php">magic
+                methods</ulink>, which should not be invoked directly, except from within a
+            subclass. Instead, the normal operators automatically invoke these methods, such as in
+            the following example:
         </para>
         </para>
 
 
         <example id="zend.session.basic_usage.accessors.example">
         <example id="zend.session.basic_usage.accessors.example">

+ 2 - 1
documentation/manual/en/module_specs/Zend_Soap_Server.xml

@@ -49,7 +49,8 @@
                 <orderedlist>
                 <orderedlist>
                     <listitem>
                     <listitem>
                         <para>
                         <para>
-                            <varname>$wsdl</varname>, which is an <acronym>URI</acronym> of a WSDL file
+                            <varname>$wsdl</varname>, which is an <acronym>URI</acronym> of a WSDL
+                            file
 
 
                             <footnote>
                             <footnote>
                                 <para>
                                 <para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Translate-Using.xml

@@ -140,8 +140,8 @@ print $translate->_(2) . "\n";
     <para>
     <para>
         Also you will have problems if some strings are not translated.
         Also you will have problems if some strings are not translated.
         You must always keep in mind how translation works.
         You must always keep in mind how translation works.
-        First <classname>Zend_Translate</classname> checks whether the specified language has a translation
-        for the given message ID or string.
+        First <classname>Zend_Translate</classname> checks whether the specified language has a
+        translation for the given message ID or string.
         If no translation string has been found it refers to the next lower
         If no translation string has been found it refers to the next lower
         level language as defined within <classname>Zend_Locale</classname>.
         level language as defined within <classname>Zend_Locale</classname>.
         So "<emphasis>de_AT</emphasis>" becomes
         So "<emphasis>de_AT</emphasis>" becomes

+ 2 - 1
documentation/manual/en/module_specs/Zend_Validate-Between.xml

@@ -95,7 +95,8 @@ $result = $valid->isValid($value);
 
 
         <para>
         <para>
             The example is almost equal to our first example but we excluded the border value. Now
             The example is almost equal to our first example but we excluded the border value. Now
-            the values '0' and '10' are no longer allowed and will return <constant>FALSE</constant>.
+            the values '0' and '10' are no longer allowed and will return
+            <constant>FALSE</constant>.
         </para>
         </para>
     </sect3>
     </sect3>
 </sect2>
 </sect2>

+ 2 - 1
documentation/manual/en/module_specs/Zend_Validate-GreaterThan.xml

@@ -21,7 +21,8 @@
         <title>Supported options for Zend_Validate_GreaterThan</title>
         <title>Supported options for Zend_Validate_GreaterThan</title>
 
 
         <para>
         <para>
-            The following options are supported for <classname>Zend_Validate_GreaterThan</classname>:
+            The following options are supported for
+            <classname>Zend_Validate_GreaterThan</classname>:
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>

+ 3 - 2
documentation/manual/en/module_specs/Zend_Validate-Isbn.xml

@@ -18,8 +18,9 @@
         <itemizedlist>
         <itemizedlist>
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis><property>separator</property></emphasis>: Defines the allowed separator
-                    for the <acronym>ISBN</acronym> number. It defaults to an empty string.
+                    <emphasis><property>separator</property></emphasis>: Defines the allowed
+                    separator for the <acronym>ISBN</acronym> number. It defaults to an empty
+                    string.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 

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

@@ -11,8 +11,8 @@
         <title>Zend_Validate_StringLength supports only string validation</title>
         <title>Zend_Validate_StringLength supports only string validation</title>
 
 
         <para>
         <para>
-            It should be noted that Zend_Validate_StringLength supports only the validation of strings.
-            Integers, floats, dates or objects can not be validated with this validator.
+            It should be noted that Zend_Validate_StringLength supports only the validation of
+            strings. Integers, floats, dates or objects can not be validated with this validator.
         </para>
         </para>
     </note>
     </note>
 
 

+ 4 - 4
documentation/manual/en/tutorials/quickstart-create-project.xml

@@ -421,10 +421,10 @@ class ErrorController extends Zend_Controller_Action
         <para>
         <para>
             For purposes of this quick start, we will assume you are using the <ulink
             For purposes of this quick start, we will assume you are using the <ulink
                 url="http://httpd.apache.org/">Apache web server</ulink>. Zend Framework works
                 url="http://httpd.apache.org/">Apache web server</ulink>. Zend Framework works
-            perfectly well with other web servers -- including Microsoft Internet Information Server,
-            lighttpd, nginx, and more -- but most developers should be famililar with Apache at the
-            minimum, and it provides an easy introduction to Zend Framework's directory structure
-            and rewrite capabilities.
+            perfectly well with other web servers -- including Microsoft Internet Information
+            Server, lighttpd, nginx, and more -- but most developers should be famililar with Apache
+            at the minimum, and it provides an easy introduction to Zend Framework's directory
+            structure and rewrite capabilities.
         </para>
         </para>
 
 
         <para>
         <para>