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

[DOCUMENTATION] English:

- manual fixes, no translational changes (unified linelength)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15615 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 лет назад
Родитель
Сommit
7f80d6d809

+ 23 - 18
documentation/manual/en/module_specs/Zend_Validate-EmailAddress.xml

@@ -5,9 +5,9 @@
     <title>EmailAddress</title>
 
     <para>
-        <classname>Zend_Validate_EmailAddress</classname> allows you to validate an email address. The validator first splits
-        the email address on local-part @ hostname and attempts to match these against known specifications for email
-        addresses and hostnames.
+        <classname>Zend_Validate_EmailAddress</classname> allows you to validate an email address.
+        The validator first splits the email address on local-part @ hostname and attempts to match
+        these against known specifications for email addresses and hostnames.
     </para>
 
     <para>
@@ -38,9 +38,10 @@ if ($validator->isValid($email)) {
     </para>
 
     <para>
-        <classname>Zend_Validate_EmailAddress</classname> will match any valid email address according to RFC2822. For example,
-        valid emails include <code>bob@domain.com</code>, <code>bob+jones@domain.us</code>,
-        <code>"bob@jones"@domain.com</code> and <code>"bob jones"@domain.com</code>
+        <classname>Zend_Validate_EmailAddress</classname> will match any valid email address
+        according to RFC2822. For example, valid emails include <code>bob@domain.com</code>,
+        <code>bob+jones@domain.us</code>, <code>"bob@jones"@domain.com</code> and
+        <code>"bob jones"@domain.com</code>
     </para>
 
     <para>
@@ -53,16 +54,18 @@ if ($validator->isValid($email)) {
     </para>
 
     <para>
-        The hostname part of an email address is validated against
-        <link linkend="zend.validate.set.hostname"><classname>Zend_Validate_Hostname</classname></link>. By default
+        The hostname part of an email address is validated against <link
+            linkend="zend.validate.set.hostname">
+            <classname>Zend_Validate_Hostname</classname></link>. By default
         only DNS hostnames of the form <code>domain.com</code> are accepted, though if you wish you
         can accept IP addresses and Local hostnames too.
     </para>
 
     <para>
-        To do this you need to instantiate <classname>Zend_Validate_EmailAddress</classname> passing a parameter to indicate
-        the type of hostnames you want to accept. More details are included in <classname>Zend_Validate_Hostname</classname>,
-        though an example of how to accept both DNS and Local hostnames appears below:
+        To do this you need to instantiate <classname>Zend_Validate_EmailAddress</classname> passing
+        a parameter to indicate the type of hostnames you want to accept. More details are included
+        in <classname>Zend_Validate_Hostname</classname>, though an example of how to accept both
+        DNS and Local hostnames appears below:
 
         <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_EmailAddress(
@@ -93,8 +96,8 @@ if ($validator->isValid($email)) {
 
     <para>
         MX checking is not enabled by default and at this time is only supported by UNIX platforms.
-        To enable MX checking you can pass a second parameter to the <classname>Zend_Validate_EmailAddress</classname>
-        constructor.
+        To enable MX checking you can pass a second parameter to the
+        <classname>Zend_Validate_EmailAddress</classname> constructor.
 
         <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_EmailAddress(Zend_Validate_Hostname::ALLOW_DNS,
@@ -116,10 +119,11 @@ $validator = new Zend_Validate_EmailAddress(Zend_Validate_Hostname::ALLOW_DNS,
     </para>
 
     <para>
-        <classname>Zend_Validate_EmailAddress</classname> will also match international characters that exist in some domains.
-        This is known as International Domain Name (IDN) support. This is enabled by default, though
-        you can disable this by changing the setting via the internal <classname>Zend_Validate_Hostname</classname> object
-        that exists within <classname>Zend_Validate_EmailAddress</classname>.
+        <classname>Zend_Validate_EmailAddress</classname> will also match international characters
+        that exist in some domains. This is known as International Domain Name (IDN) support. This
+        is enabled by default, though you can disable this by changing the setting via the internal
+        <classname>Zend_Validate_Hostname</classname> object that exists within
+        <classname>Zend_Validate_EmailAddress</classname>.
 
         <programlisting role="php"><![CDATA[
 $validator->hostnameValidator->setValidateIdn(false);
@@ -140,7 +144,8 @@ $validator->hostnameValidator->setValidateIdn(false);
     <para>
         By default a hostname will be checked against a list of known TLDs. This is enabled by
         default, though you can disable this by changing the setting via the internal
-        <classname>Zend_Validate_Hostname</classname> object that exists within <classname>Zend_Validate_EmailAddress</classname>.
+        <classname>Zend_Validate_Hostname</classname> object that exists within
+        <classname>Zend_Validate_EmailAddress</classname>.
 
         <programlisting role="php"><![CDATA[
 $validator->hostnameValidator->setValidateTld(false);

+ 16 - 16
documentation/manual/en/module_specs/Zend_Validate-Hostname.xml

@@ -5,10 +5,10 @@
     <title>Hostname</title>
 
     <para>
-        Zend_Validate_Hostname allows you to validate a hostname against a set of known specifications.
-        It is possible to check for three different types of hostnames: a DNS Hostname (i.e.
-        domain.com), IP address (i.e. 1.2.3.4), and Local hostnames (i.e. localhost). By default only
-        DNS hostnames are matched.
+        Zend_Validate_Hostname allows you to validate a hostname against a set of known
+        specifications. It is possible to check for three different types of hostnames: a DNS
+        Hostname (i.e. domain.com), IP address (i.e. 1.2.3.4), and Local hostnames (i.e. localhost).
+        By default only DNS hostnames are matched.
     </para>
 
     <para>
@@ -47,10 +47,10 @@ if ($validator->isValid($hostname)) {
     </para>
 
     <para>
-        The Zend_Validate_Hostname constants are: <code>ALLOW_DNS</code> to allow only DNS hostnames,
-        <code>ALLOW_IP</code> to allow IP addresses, <code>ALLOW_LOCAL</code> to allow local network
-        names, and <code>ALLOW_ALL</code> to allow all three types. To just check for IP addresses
-        you can use the example below:
+        The Zend_Validate_Hostname constants are: <code>ALLOW_DNS</code> to allow only DNS
+        hostnames, <code>ALLOW_IP</code> to allow IP addresses, <code>ALLOW_LOCAL</code> to allow
+        local network names, and <code>ALLOW_ALL</code> to allow all three types. To just check for
+        IP addresses you can use the example below:
         <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_IP);
 if ($validator->isValid($hostname)) {
@@ -81,9 +81,9 @@ $validator = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_DNS |
 
     <para>
         Some Country Code Top Level Domains (ccTLDs), such as 'de' (Germany), support international
-        characters in domain names. These are known as International Domain Names (IDN). These domains
-        can be matched by Zend_Validate_Hostname via extended characters that are used in the validation
-        process.
+        characters in domain names. These are known as International Domain Names (IDN). These
+        domains can be matched by Zend_Validate_Hostname via extended characters that are used in
+        the validation process.
     </para>
 
     <para>
@@ -119,8 +119,8 @@ $validator = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_DNS |
     </para>
 
     <para>
-        To match an IDN domain it's as simple as just using the standard Hostname validator since IDN
-        matching is enabled by default. If you wish to disable IDN validation this can be done by
+        To match an IDN domain it's as simple as just using the standard Hostname validator since
+        IDN matching is enabled by default. If you wish to disable IDN validation this can be done
         by either passing a parameter to the Zend_Validate_Hostname constructor or via the
         <code>$validator->setValidateIdn()</code> method.
     </para>
@@ -153,9 +153,9 @@ $validator =
 
     <para>
         By default a hostname will be checked against a list of known TLDs. If this functionality
-        is not required it can be disabled in much the same way as disabling IDN support.
-        You can disable TLD validation by passing a third parameter to the Zend_Validate_Hostname constructor.
-        In the example below we are supporting IDN validation via the second parameter.
+        is not required it can be disabled in much the same way as disabling IDN support. You can
+        disable TLD validation by passing a third parameter to the Zend_Validate_Hostname
+        constructor. In the example below we are supporting IDN validation via the second parameter.
 
         <programlisting role="php"><![CDATA[
 $validator =

+ 81 - 23
documentation/manual/en/module_specs/Zend_Validate-Messages.xml

@@ -111,7 +111,10 @@
                 <row>
                     <entry morerows="6" valign="middle">EmailAddress</entry>
                     <entry>INVALID</entry>
-                    <entry>'%value%' is not a valid email address in the basic format local-part@hostname</entry>
+                    <entry>
+                        '%value%' is not a valid email address in the basic format
+                        local-part@hostname
+                    </entry>
                 </row>
                 <row>
                     <entry>INVALID_HOSTNAME</entry>
@@ -119,7 +122,10 @@
                 </row>
                 <row>
                     <entry>INVALID_MX_RECORD</entry>
-                    <entry>'%hostname%' does not appear to have a valid MX record for the email address '%value%'</entry>
+                    <entry>
+                        '%hostname%' does not appear to have a valid MX record for the email address
+                        '%value%'
+                    </entry>
                 </row>
                 <row>
                     <entry>DOT_ATOM</entry>
@@ -131,7 +137,9 @@
                 </row>
                 <row>
                     <entry>INVALID_LOCAL_PART</entry>
-                    <entry>'%localPart%' is not a valid local part for email address '%value%'</entry>
+                    <entry>
+                        '%localPart%' is not a valid local part for email address '%value%'
+                    </entry>
                 </row>
                 <row>
                     <entry>LENGTH_EXCEEDED</entry>
@@ -140,11 +148,15 @@
                 <row>
                     <entry morerows="1" valign="middle">File_Count</entry>
                     <entry>TOO_MUCH</entry>
-                    <entry>Too much files, maximum '%max%' are allowed but '%count%' are given</entry>
+                    <entry>
+                        Too much files, maximum '%max%' are allowed but '%count%' are given
+                    </entry>
                 </row>
                 <row>
                     <entry>TOO_LESS</entry>
-                    <entry>Too less files, minimum '%min%' are expected but '%count%' are given</entry>
+                    <entry>
+                        Too less files, minimum '%min%' are expected but '%count%' are given
+                    </entry>
                 </row>
                 <row>
                     <entry morerows="2" valign="middle">File_Crc32</entry>
@@ -198,11 +210,17 @@
                 <row>
                     <entry morerows="2" valign="middle">File_FilesSize</entry>
                     <entry>TOO_BIG</entry>
-                    <entry>All files in sum should have a maximum size of '%max%' but '%size%' were detected</entry>
+                    <entry>
+                        All files in sum should have a maximum size of '%max%' but '%size%' were
+                        detected
+                    </entry>
                 </row>
                 <row>
                     <entry>TOO_SMALL</entry>
-                    <entry>All files in sum should have a minimum size of '%min%' but '%size%' were detected</entry>
+                    <entry>
+                        All files in sum should have a minimum size of '%min%' but '%size%' were
+                        detected
+                    </entry>
                 </row>
                 <row>
                     <entry>NOT_READABLE</entry>
@@ -224,19 +242,31 @@
                 <row>
                     <entry morerows="5" valign="middle">File_ImageSize</entry>
                     <entry>WIDTH_TOO_BIG</entry>
-                    <entry>Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected</entry>
+                    <entry>
+                        Maximum allowed width for image '%value%' should be '%maxwidth%' but
+                        '%width%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>WIDTH_TOO_SMALL</entry>
-                    <entry>Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected</entry>
+                    <entry>
+                        Minimum expected width for image '%value%' should be '%minwidth%' but
+                        '%width%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>HEIGHT_TOO_BIG</entry>
-                    <entry>Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected</entry>
+                    <entry>
+                        Maximum allowed height for image '%value%' should be '%maxheight%' but
+                        '%height%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>HEIGHT_TOO_SMALL</entry>
-                    <entry>Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected</entry>
+                    <entry>
+                        Minimum expected height for image '%value%' should be '%minheight%' but
+                        '%height%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>NOT_DETECTED</entry>
@@ -319,11 +349,15 @@
                 <row>
                     <entry morerows="2" valign="middle">File_Size</entry>
                     <entry>TOO_BIG</entry>
-                    <entry>Maximum allowed size for file '%value%' is '%max%' but '%size%' detected</entry>
+                    <entry>
+                        Maximum allowed size for file '%value%' is '%max%' but '%size%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>TOO_SMALL</entry>
-                    <entry>Minimum expected size for file '%value%' is '%min%' but '%size%' detected</entry>
+                    <entry>
+                        Minimum expected size for file '%value%' is '%min%' but '%size%' detected
+                    </entry>
                 </row>
                 <row>
                     <entry>NOT_FOUND</entry>
@@ -356,7 +390,9 @@
                 </row>
                 <row>
                     <entry>EXTENSION</entry>
-                    <entry>The extension returned an error while uploading the file '%value%'</entry>
+                    <entry>
+                        The extension returned an error while uploading the file '%value%'
+                    </entry>
                 </row>
                 <row>
                     <entry>ATTACK</entry>
@@ -373,11 +409,15 @@
                 <row>
                     <entry morerows="2" valign="middle">File_WordCount</entry>
                     <entry>TOO_MUCH</entry>
-                    <entry>Too much words, maximum '%max%' are allowed but '%count%' were counted</entry>
+                    <entry>
+                        Too much words, maximum '%max%' are allowed but '%count%' were counted
+                    </entry>
                 </row>
                 <row>
                     <entry>TOO_LESS</entry>
-                    <entry>Too less words, minimum '%min%' are expected but '%count%' were counted</entry>
+                    <entry>
+                        Too less words, minimum '%min%' are expected but '%count%' were counted
+                    </entry>
                 </row>
                 <row>
                     <entry>NOT_FOUND</entry>
@@ -401,27 +441,42 @@
                 <row>
                     <entry morerows="7" valign="middle">Hostname</entry>
                     <entry>IP_ADDRESS_NOT_ALLOWED</entry>
-                    <entry>'%value%' appears to be an IP address, but IP addresses are not allowed</entry>
+                    <entry>
+                        '%value%' appears to be an IP address, but IP addresses are not allowed
+                    </entry>
                 </row>
                 <row>
                     <entry>UNKNOWN_TLD</entry>
-                    <entry>'%value%' appears to be a DNS hostname but cannot match TLD against known list</entry>
+                    <entry>
+                        '%value%' appears to be a DNS hostname but cannot match TLD against known
+                        list
+                    </entry>
                 </row>
                 <row>
                     <entry>INVALID_DASH</entry>
-                    <entry>'%value%' appears to be a DNS hostname but contains a dash (-) in an invalid position</entry>
+                    <entry>
+                        '%value%' appears to be a DNS hostname but contains a dash (-) in an invalid
+                        position
+                    </entry>
                 </row>
                 <row>
                     <entry>INVALID_HOSTNAME_SCHEMA</entry>
-                    <entry>'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'</entry>
+                    <entry>
+                        '%value%' appears to be a DNS hostname but cannot match against hostname
+                        schema for TLD '%tld%'
+                    </entry>
                 </row>
                 <row>
                     <entry>UNDECIPHERABLE_TLD</entry>
-                    <entry>'%value%' appears to be a DNS hostname but cannot extract TLD part</entry>
+                    <entry>
+                        '%value%' appears to be a DNS hostname but cannot extract TLD part
+                    </entry>
                 </row>
                 <row>
                     <entry>INVALID_HOSTNAME</entry>
-                    <entry>'%value%' does not match the expected structure for a DNS hostname</entry>
+                    <entry>
+                        '%value%' does not match the expected structure for a DNS hostname
+                    </entry>
                 </row>
                 <row>
                     <entry>INVALID_LOCAL_NAME</entry>
@@ -429,7 +484,10 @@
                 </row>
                 <row>
                     <entry>LOCAL_NAME_NOT_ALLOWED</entry>
-                    <entry>'%value%' appears to be a local network name but local network names are not allowed</entry>
+                    <entry>
+                        '%value%' appears to be a local network name but local network names are not
+                        allowed
+                    </entry>
                 </row>
                 <row>
                     <entry morerows="2" valign="middle">Iban</entry>

+ 65 - 51
documentation/manual/en/module_specs/Zend_Validate-Set.xml

@@ -5,21 +5,23 @@
     <title>Standard Validation Classes</title>
 
     <para>
-        Zend Framework comes with a standard set of validation classes, which are ready for you to use.
+        Zend Framework comes with a standard set of validation classes, which are ready for you to
+        use.
     </para>
 
     <sect2 id="zend.validate.set.alnum">
         <title>Alnum</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> contains only alphabetic and digit characters.
-            This validator includes an option to also consider white space characters as valid.
+            Returns <code>true</code> if and only if <code>$value</code> contains only alphabetic
+            and digit characters. This validator includes an option to also consider white space
+            characters as valid.
         </para>
 
         <note>
             <para>
                 The alphabetic characters mean characters that makes up words in each language.
-                However, the English alphabet is treated as the alphabetic characters in following languages: Chinese, Japanese, Korean.
-                The language is specified by Zend_Locale.
+                However, the English alphabet is treated as the alphabetic characters in following
+                languages: Chinese, Japanese, Korean. The language is specified by Zend_Locale.
             </para>
         </note>
 
@@ -28,48 +30,53 @@
     <sect2 id="zend.validate.set.alpha">
         <title>Alpha</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> contains only alphabetic characters. This
-            validator includes an option to also consider white space characters as valid.
+            Returns <code>true</code> if and only if <code>$value</code> contains only alphabetic
+            characters. This validator includes an option to also consider white space characters
+            as valid.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.barcode">
         <title>Barcode</title>
         <para>
-            This validator is instantiated with a barcode type against which you wish to validate a barcode value.
-            It currently supports "<code>UPC-A</code>" (Universal Product Code) and "<code>EAN-13</code>" (European
-            Article Number) barcode types, and the <code>isValid()</code> method returns true if and only if the input
-            successfully validates against the barcode validation algorithm. You should remove all characters other
-            than the digits zero through nine (0-9) from the input value before passing it on to the validator.
+            This validator is instantiated with a barcode type against which you wish to validate a
+            barcode value. It currently supports "<code>UPC-A</code>" (Universal Product Code) and
+            "<code>EAN-13</code>" (European Article Number) barcode types, and the
+            <code>isValid()</code> method returns true if and only if the input successfully
+            validates against the barcode validation algorithm. You should remove all characters
+            other than the digits zero through nine (0-9) from the input value before passing it on
+            to the validator.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.between">
         <title>Between</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> is between the minimum and maximum boundary
-            values. The comparison is inclusive by default (<code>$value</code> may equal a boundary value), though
-            this may be overridden in order to do a strict comparison, where <code>$value</code> must be strictly
-            greater than the minimum and strictly less than the maximum.
+            Returns <code>true</code> if and only if <code>$value</code> is between the minimum and
+            maximum boundary values. The comparison is inclusive by default (<code>$value</code> may
+            equal a boundary value), though this may be overridden in order to do a strict
+            comparison, where <code>$value</code> must be strictly greater than the minimum and
+            strictly less than the maximum.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.ccnum">
         <title>Ccnum</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> follows the Luhn algorithm (mod-10 checksum)
-            for credit card numbers.
+            Returns <code>true</code> if and only if <code>$value</code> follows the Luhn algorithm
+            (mod-10 checksum) for credit card numbers.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.date">
         <title>Date</title>
         <para>
-            Returns <code>true</code> if <code>$value</code> is a valid date of the format <code>YYYY-MM-DD</code>.
-            If the optional <code>locale</code> option is set then the date will be validated according to the
-            set locale. And if the optional <code>format</code> option is set this format is used for the
-            validation. For details about the optional parameters see
-            <link linkend="zend.date.others.comparison.table">Zend_Date::isDate()</link>.
+            Returns <code>true</code> if <code>$value</code> is a valid date of the format
+            <code>YYYY-MM-DD</code>. If the optional <code>locale</code> option is set then the date
+            will be validated according to the set locale. And if the optional <code>format</code>
+            option is set this format is used for the validation. for details about the optional
+            parameters see <link
+                linkend="zend.date.others.comparison.table">Zend_Date::isDate()</link>.
         </para>
     </sect2>
 
@@ -78,7 +85,8 @@
     <sect2 id="zend.validate.set.digits">
         <title>Digits</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> only contains digit characters.
+            Returns <code>true</code> if and only if <code>$value</code> only contains digit
+            characters.
         </para>
     </sect2>
 
@@ -88,23 +96,26 @@
         <title>Float</title>
         <para>
             Returns <code>true</code> if and only if <code>$value</code> is a floating-point value.
-            Since Zend Framework 1.8 this validator takes into account the actual locale from browser,
-            environment or application wide set locale. You can of course use the get/setLocale accessors
-            to change the used locale or give it while creating a instance of this validator.
+            Since Zend Framework 1.8 this validator takes into account the actual locale from
+            browser, environment or application wide set locale. You can of course use the
+            get/setLocale accessors to change the used locale or give it while creating a instance
+            of this validator.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.greater_than">
         <title>GreaterThan</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> is greater than the minimum boundary.
+            Returns <code>true</code> if and only if <code>$value</code> is greater than the minimum
+            boundary.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.hex">
         <title>Hex</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> contains only hexadecimal digit characters.
+            Returns <code>true</code> if and only if <code>$value</code> contains only hexadecimal
+            digit characters.
         </para>
     </sect2>
 
@@ -114,12 +125,12 @@
         <title>Iban</title>
         <para>
             Returns <code>true</code> if and only if <code>$value</code> contains a valid IBAN
-            (International Bank Account Number). IBAN numbers are validated against the country where they are
-            used and by a checksum.
+            (International Bank Account Number). IBAN numbers are validated against the country
+            where they are used and by a checksum.
         </para>
         <para>
-            There are two ways to validate IBAN numbers. As first way you can give a locale which represents
-            a country. Any given IBAN number will then be validated against this country.
+            There are two ways to validate IBAN numbers. As first way you can give a locale which
+            represents a country. Any given IBAN number will then be validated against this country.
         </para>
         <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_Iban('de_AT');
@@ -134,8 +145,8 @@ if ($validator->isValid($iban)) {
 }
 ]]></programlisting>
         <para>
-            This should be done when you want to validate IBAN numbers for a single countries. The simpler way
-            of validation is not to give a locale like shown in the next example.
+            This should be done when you want to validate IBAN numbers for a single countries. The
+            simpler way of validation is not to give a locale like shown in the next example.
         </para>
         <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_Iban();
@@ -147,29 +158,31 @@ if ($validator->isValid($iban)) {
 }
 ]]></programlisting>
         <para>
-            But this shows one big problem: When you have to accept only IBAN numbers from one single country,
-            for example france, then IBAN numbers from other countries would also be valid. Therefor just
-            remember: When you have to validate a IBAN number against a defined country you should give the
-            locale. And when you accept all IBAN numbers regardless of any country omit the locale for
-            simplicity.
+            But this shows one big problem: When you have to accept only IBAN numbers from one
+            single country, for example france, then IBAN numbers from other countries would also be
+            valid. Therefor just remember: When you have to validate a IBAN number against a defined
+            country you should give the locale. And when you accept all IBAN numbers regardless of
+            any country omit the locale for simplicity.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.in_array">
         <title>InArray</title>
         <para>
-            Returns <code>true</code> if and only if a "needle" <code>$value</code> is contained in a "haystack"
-            array. If the strict option is <code>true</code>, then the type of <code>$value</code> is also checked.
+            Returns <code>true</code> if and only if a "needle" <code>$value</code> is contained in
+            a "haystack" array. If the strict option is <code>true</code>, then the type of
+            <code>$value</code> is also checked.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.int">
         <title>Int</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> is a valid integer.
-            Since Zend Framework 1.8 this validator takes into account the actual locale from browser,
-            environment or application wide set locale. You can of course use the get/setLocale accessors
-            to change the used locale or give it while creating a instance of this validator.
+            Returns <code>true</code> if and only if <code>$value</code> is a valid integer. Since
+            Zend Framework 1.8 this validator takes into account the actual locale from browser,
+            environment or application wide set locale. You can of course use the get/setLocale
+            accessors to change the used locale or give it while creating a instance of this
+            validator.
         </para>
     </sect2>
 
@@ -183,7 +196,8 @@ if ($validator->isValid($iban)) {
     <sect2 id="zend.validate.set.less_than">
         <title>LessThan</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> is less than the maximum boundary.
+            Returns <code>true</code> if and only if <code>$value</code> is less than the maximum
+            boundary.
         </para>
     </sect2>
 
@@ -197,8 +211,8 @@ if ($validator->isValid($iban)) {
     <sect2 id="zend.validate.set.regex">
         <title>Regex</title>
         <para>
-            Returns <code>true</code> if and only if <code>$value</code> matches against a regular expression
-            pattern.
+            Returns <code>true</code> if and only if <code>$value</code> matches against a regular
+            expression pattern.
         </para>
     </sect2>
 
@@ -213,8 +227,8 @@ if ($validator->isValid($iban)) {
             length is set to a value greater than the set maximum length, and the
             <code>setMax()</code> method throws an exception if the maximum length is set to a
             value less than than the set minimum length. This class supports UTF-8 and other
-            character encodings, based on the current value of
-            <ulink url="http://www.php.net/manual/en/ref.iconv.php#iconv.configuration"><code>iconv.internal_encoding</code></ulink>.
+            character encodings, based on the current value of <ulink
+                url="http://www.php.net/manual/en/ref.iconv.php#iconv.configuration"><code>iconv.internal_encoding</code></ulink>.
             If you need a different encoding you can set it with the accessor methods getEncoding
             and setEncoding.
         </para>

+ 20 - 17
documentation/manual/en/module_specs/Zend_Validate-ValidatorChains.xml

@@ -5,10 +5,10 @@
     <title>Validator Chains</title>
 
     <para>
-        Often multiple validations should be applied to some value in a particular order. The following code
-        demonstrates a way to solve the example from the
-        <link linkend="zend.validate.introduction">introduction</link>, where a username must be between 6 and
-        12 alphanumeric characters:
+        Often multiple validations should be applied to some value in a particular order. The
+        following code demonstrates a way to solve the example from the
+        <link linkend="zend.validate.introduction">introduction</link>, where a username must be
+        between 6 and 12 alphanumeric characters:
 
         <programlisting role="php"><![CDATA[
 // Create a validator chain and add validators to it
@@ -27,22 +27,24 @@ if ($validatorChain->isValid($username)) {
 }
 ]]></programlisting>
 
-        Validators are run in the order they were added to <classname>Zend_Validate</classname>. In the above example,
-        the username is first checked to ensure that its length is between 6 and 12 characters, and then it is
-        checked to ensure that it contains only alphanumeric characters. The second validation, for
-        alphanumeric characters, is performed regardless of whether the first validation, for length between 6
-        and 12 characters, succeeds. This means that if both validations fail, <code>getMessages()</code> will
-        return failure messages from both validators.
+        Validators are run in the order they were added to <classname>Zend_Validate</classname>. In
+        the above example, the username is first checked to ensure that its length is between 6 and
+        12 characters, and then it is checked to ensure that it contains only alphanumeric
+        characters. The second validation, for alphanumeric characters, is performed regardless of
+        whether the first validation, for length between 6 and 12 characters, succeeds. This means
+        that if both validations fail, <code>getMessages()</code> will return failure messages from
+        both validators.
     </para>
 
     <para>
         In some cases it makes sense to have a validator break the chain if its validation process
-        fails. <classname>Zend_Validate</classname> supports such use cases with the second parameter to the
-        <code>addValidator()</code> method. By setting <code>$breakChainOnFailure</code> to <code>true</code>,
-        the added validator will break the chain execution upon failure, which avoids running any other
-        validations that are determined to be unnecessary or inappropriate for the situation. If the above
-        example were written as follows, then the alphanumeric validation would not occur if the string length
-        validation fails:
+        fails. <classname>Zend_Validate</classname> supports such use cases with the second
+        parameter to the <code>addValidator()</code> method. By setting
+        <code>$breakChainOnFailure</code> to <code>true</code>, the added validator will break the
+        chain execution upon failure, which avoids running any other validations that are determined
+        to be unnecessary or inappropriate for the situation. If the above example were written as
+        follows, then the alphanumeric validation would not occur if the string length validation
+        fails:
 
         <programlisting role="php"><![CDATA[
 $validatorChain->addValidator(new Zend_Validate_StringLength(6, 12), true)
@@ -52,7 +54,8 @@ $validatorChain->addValidator(new Zend_Validate_StringLength(6, 12), true)
     </para>
 
     <para>
-        Any object that implements <classname>Zend_Validate_Interface</classname> may be used in a validator chain.
+        Any object that implements <classname>Zend_Validate_Interface</classname> may be used in a
+        validator chain.
     </para>
 
 </sect1>

+ 61 - 51
documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml

@@ -5,43 +5,47 @@
     <title>Writing Validators</title>
 
     <para>
-        Zend_Validate supplies a set of commonly needed validators, but inevitably, developers will wish to
-        write custom validators for their particular needs. The task of writing a custom validator is
-        described in this section.
+        Zend_Validate supplies a set of commonly needed validators, but inevitably, developers will
+        wish to write custom validators for their particular needs. The task of writing a custom
+        validator is described in this section.
     </para>
 
     <para>
-        <classname>Zend_Validate_Interface</classname> defines three methods, <code>isValid()</code>,
-        <code>getMessages()</code>, and <code>getErrors()</code>, that may be implemented by user classes in order to
-        create custom validation objects. An object that implements <classname>Zend_Validate_Interface</classname> interface
-        may be added to a validator chain with <classname>Zend_Validate::addValidator()</classname>. Such objects may also be
-        used with <link linkend="zend.filter.input"><classname>Zend_Filter_Input</classname></link>.
+        <classname>Zend_Validate_Interface</classname> defines three methods,
+        <code>isValid()</code>, <code>getMessages()</code>, and <code>getErrors()</code>, that may
+        be implemented by user classes in order to create custom validation objects. An object that
+        implements <classname>Zend_Validate_Interface</classname> interface may be added to a
+        validator chain with <classname>Zend_Validate::addValidator()</classname>. Such objects may
+        also be used with <link
+            linkend="zend.filter.input"><classname>Zend_Filter_Input</classname></link>.
     </para>
 
     <para>
-        As you may already have inferred from the above description of <classname>Zend_Validate_Interface</classname>,
-        validation classes provided with Zend Framework return a boolean value for whether or not a value validates
-        successfully. They also provide information about <emphasis>why</emphasis> a value failed
-        validation. The availability of the reasons for validation failures may be valuable to an application for
+        As you may already have inferred from the above description of
+        <classname>Zend_Validate_Interface</classname>, validation classes provided with Zend
+        Framework return a boolean value for whether or not a value validates successfully. They
+        also provide information about <emphasis>why</emphasis> a value failed validation. The
+        availability of the reasons for validation failures may be valuable to an application for
         various purposes, such as providing statistics for usability analysis.
     </para>
 
     <para>
-        Basic validation failure message functionality is implemented in <classname>Zend_Validate_Abstract</classname>. To
-        include this functionality when creating a validation class, simply extend
-        <classname>Zend_Validate_Abstract</classname>. In the extending class you would implement the
-        <code>isValid()</code> method logic and define the message variables and message templates that correspond to
-        the types of validation failures that can occur. If a value fails your validation tests, then
-        <code>isValid()</code> should return <code>false</code>. If the value passes your validation tests, then
+        Basic validation failure message functionality is implemented in
+        <classname>Zend_Validate_Abstract</classname>. To include this functionality when creating a
+        validation class, simply extend <classname>Zend_Validate_Abstract</classname>. In the
+        extending class you would implement the <code>isValid()</code> method logic and define the
+        message variables and message templates that correspond to the types of validation failures
+        that can occur. If a value fails your validation tests, then <code>isValid()</code> should
+        return <code>false</code>. If the value passes your validation tests, then
         <code>isValid()</code> should return <code>true</code>.
     </para>
 
     <para>
-        In general, the <code>isValid()</code> method should not throw any exceptions, except where it is impossible
-        to determine whether or not the input value is valid. A few examples of reasonable cases for throwing an
-        exception might be if a file cannot be opened, an LDAP server could not be contacted, or a database
-        connection is unavailable, where such a thing may be required for validation success or failure to be
-        determined.
+        In general, the <code>isValid()</code> method should not throw any exceptions, except where
+        it is impossible to determine whether or not the input value is valid. A few examples of
+        reasonable cases for throwing an exception might be if a file cannot be opened, an LDAP
+        server could not be contacted, or a database connection is unavailable, where such a thing
+        may be required for validation success or failure to be determined.
     </para>
 
     <example id="zend.validate.writing_validators.example.simple">
@@ -49,8 +53,9 @@
         <title>Creating a Simple Validation Class</title>
 
         <para>
-            The following example demonstrates how a very simple custom validator might be written. In this case the
-            validation rules are simply that the input value must be a floating point value.
+            The following example demonstrates how a very simple custom validator might be written.
+            In this case the validation rules are simply that the input value must be a floating
+            point value.
 
             <programlisting role="php"><![CDATA[
 class MyValid_Float extends Zend_Validate_Abstract
@@ -75,11 +80,12 @@ class MyValid_Float extends Zend_Validate_Abstract
 }
 ]]></programlisting>
 
-            The class defines a template for its single validation failure message, which includes the built-in magic
-            parameter, <code>%value%</code>. The call to <code>_setValue()</code> prepares the object to insert the
-            tested value into the failure message automatically, should the value fail validation. The call to
-            <code>_error()</code> tracks a reason for validation failure. Since this class only defines one failure
-            message, it is not necessary to provide <code>_error()</code> with the name of the failure message
+            The class defines a template for its single validation failure message, which includes
+            the built-in magic parameter, <code>%value%</code>. The call to <code>_setValue()</code>
+            prepares the object to insert the tested value into the failure message automatically,
+            should the value fail validation. The call to <code>_error()</code> tracks a reason for
+            validation failure. Since this class only defines one failure message, it is not
+            necessary to provide <code>_error()</code> with the name of the failure message
             template.
         </para>
 
@@ -90,9 +96,10 @@ class MyValid_Float extends Zend_Validate_Abstract
         <title>Writing a Validation Class having Dependent Conditions</title>
 
         <para>
-            The following example demonstrates a more complex set of validation rules, where it is required that the
-            input value be numeric and within the range of minimum and maximum boundary values. An input value would
-            fail validation for exactly one of the following reasons:
+            The following example demonstrates a more complex set of validation rules, where it is
+            required that the input value be numeric and within the range of minimum and maximum
+            boundary values. An input value would fail validation for exactly one of the following
+            reasons:
 
             <itemizedlist>
                 <listitem>
@@ -155,19 +162,21 @@ class MyValid_NumericBetween extends Zend_Validate_Abstract
 }
 ]]></programlisting>
 
-            The public properties <code>$minimum</code> and <code>$maximum</code> have been established to provide
-            the minimum and maximum boundaries, respectively, for a value to successfully validate. The class also
-            defines two message variables that correspond to the public properties and allow <code>min</code> and
-            <code>max</code> to be used in message templates as magic parameters, just as with <code>value</code>.
+            The public properties <code>$minimum</code> and <code>$maximum</code> have been
+            established to provide the minimum and maximum boundaries, respectively, for a value to
+            successfully validate. The class also defines two message variables that correspond to
+            the public properties and allow <code>min</code> and <code>max</code> to be used in
+            message templates as magic parameters, just as with <code>value</code>.
         </para>
 
         <para>
-            Note that if any one of the validation checks in <code>isValid()</code> fails, an appropriate failure
-            message is prepared, and the method immediately returns <code>false</code>. These validation rules are
-            therefore sequentially dependent. That is, if one test should fail, there is no need to test any
-            subsequent validation rules. This need not be the case, however. The following example illustrates how to
-            write a class having independent validation rules, where the validation object may return multiple
-            reasons why a particular validation attempt failed.
+            Note that if any one of the validation checks in <code>isValid()</code> fails, an
+            appropriate failure message is prepared, and the method immediately returns
+            <code>false</code>. These validation rules are therefore sequentially dependent. That
+            is, if one test should fail, there is no need to test any subsequent validation rules.
+            This need not be the case, however. The following example illustrates how to write a
+            class having independent validation rules, where the validation object may return
+            multiple reasons why a particular validation attempt failed.
         </para>
 
     </example>
@@ -177,9 +186,9 @@ class MyValid_NumericBetween extends Zend_Validate_Abstract
         <title>Validation with Independent Conditions, Multiple Reasons for Failure</title>
 
         <para>
-            Consider writing a validation class for password strength enforcement - when a user is required to choose
-            a password that meets certain criteria for helping secure user accounts. Let us assume that the password
-            security criteria enforce that the password:
+            Consider writing a validation class for password strength enforcement - when a user is
+            required to choose a password that meets certain criteria for helping secure user
+            accounts. Let us assume that the password security criteria enforce that the password:
 
             <itemizedlist>
                 <listitem>
@@ -246,11 +255,12 @@ class MyValid_PasswordStrength extends Zend_Validate_Abstract
 }
 ]]></programlisting>
 
-            Note that the four criteria tests in <code>isValid()</code> do not immediately return <code>false</code>.
-            This allows the validation class to provide <emphasis>all</emphasis> of the reasons that the
-            input password failed to meet the validation requirements. If, for example, a user were to input the
-            string "<code>#$%</code>" as a password, <code>isValid()</code> would cause all four validation failure
-            messages to be returned by a subsequent call to <code>getMessages()</code>.
+            Note that the four criteria tests in <code>isValid()</code> do not immediately return
+            <code>false</code>. This allows the validation class to provide <emphasis>all</emphasis>
+            of the reasons that the input password failed to meet the validation requirements. if,
+            for example, a user were to input the string "<code>#$%</code>" as a password,
+            <code>isValid()</code> would cause all four validation failure messages to be returned
+            by a subsequent call to <code>getMessages()</code>.
         </para>
 
     </example>

+ 18 - 7
documentation/manual/en/module_specs/Zend_View-Helpers-Cycle.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <sect3 id="zend.view.helpers.initial.cycle">
+
     <title>Cycle Helper</title>
 
     <para>
@@ -8,6 +9,7 @@
     </para>
 
     <example id="zend.view.helpers.initial.cycle.basicusage">
+
         <title>Cycle Helper Basic Usage</title>
 
         <para>
@@ -42,14 +44,22 @@ $this->cycle()->prev();
    <td>Second</td>
 </tr>
 ]]></programlisting>
+
     </example>
-<example id="zend.view.helpers.initial.cycle.advanceusage">
-       <title>Working with two or more cycles</title>
-<para>To use two cycles you have to specify the names of cycles. Just set second parameter in cycle method.
-<code>$this->cycle(array("#F0F0F0","#FFFFFF"),'cycle2')</code>. You can also use setName($name) function.
-</para>
-</example>
-      <programlisting role="php"><![CDATA[
+
+    <example id="zend.view.helpers.initial.cycle.advanceusage">
+
+        <title>Working with two or more cycles</title>
+
+       <para>
+           To use two cycles you have to specify the names of cycles. Just set second parameter in
+           cycle method. <code>$this->cycle(array("#F0F0F0","#FFFFFF"),'cycle2')</code>. You can
+           also use setName($name) function.
+        </para>
+
+    </example>
+
+    <programlisting role="php"><![CDATA[
 <?php foreach ($this->books as $book):?>
   <tr style="background-color:<?php echo $this->cycle(array("#F0F0F0",
                                                             "#FFFFFF"))
@@ -59,6 +69,7 @@ $this->cycle()->prev();
 </tr>
 <?php endforeach;?>
 ]]></programlisting>
+
 </sect3>
 <!--
 vim:se ts=4 sw=4 et:

+ 74 - 33
documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -15,7 +15,8 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <link linkend="zend.view.helpers.initial.navigation.breadcrumbs">Breadcrumbs</link>,
+                    <link
+                        linkend="zend.view.helpers.initial.navigation.breadcrumbs">Breadcrumbs</link>,
                     used for rendering the path to the currently active page.
                 </para>
             </listitem>
@@ -41,7 +42,8 @@
             </listitem>
             <listitem>
                 <para>
-                    <link linkend="zend.view.helpers.initial.navigation.navigation">Navigation</link>,
+                    <link
+                        linkend="zend.view.helpers.initial.navigation.navigation">Navigation</link>,
                     used for proxying calls to other navigational helpers.
                 </para>
             </listitem>
@@ -135,8 +137,8 @@
                 <para>
                     <code>__call()</code> is used for proxying calls to the
                     container registered in the helper, which means you can
-                    call methods on a helper as if it was a container. See
-                    <link linkend="zend.view.helpers.initial.navigation.proxy.example">example</link>
+                    call methods on a helper as if it was a container. See <link
+                        linkend="zend.view.helpers.initial.navigation.proxy.example">example</link>
                     below.
                 </para>
             </listitem>
@@ -542,8 +544,9 @@ Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole('member');
             Breadcrumbs are used for indicating where in a sitemap
             a user is currently browsing, and are typically rendered
             like this: "You are here: Home > Products > FantasticProduct 1.0".
-            The breadcrumbs helper follows the guidelines from
-            <ulink url="http://developer.yahoo.com/ypatterns/pattern.php?pattern=breadcrumbs">Breadcrumbs Pattern - Yahoo! Design Pattern Library</ulink>,
+            The breadcrumbs helper follows the guidelines from <ulink
+                url="http://developer.yahoo.com/ypatterns/pattern.php?pattern=breadcrumbs">Breadcrumbs
+                Pattern - Yahoo! Design Pattern Library</ulink>,
             and allows simple customization (minimum/maximum depth, indentation,
             separator, and whether the last element should be linked), or
             rendering using a partial view script.
@@ -745,9 +748,11 @@ Products, Foo Server, FAQ
             The links helper is used for rendering HTML <code>LINK</code>
             elements. Links are used for describing document relationships
             of the currently active page. Read more about links and link
-            types at <ulink url="http://www.w3.org/TR/html4/struct/links.html#h-12.3">Document relationships: the LINK element (HTML4 W3C Rec.)</ulink>
-            and <ulink url="http://www.w3.org/TR/html4/types.html#h-6.12">Link types (HTML4 W3C Rec.)</ulink>
-            in the HTML4 W3C Recommendation.
+            types at <ulink url="http://www.w3.org/TR/html4/struct/links.html#h-12.3">Document
+                relationships: the LINK element (HTML4 W3C Rec.)</ulink>
+            and <ulink
+                url="http://www.w3.org/TR/html4/types.html#h-6.12">Link types (HTML4 W3C
+                Rec.)</ulink> in the HTML4 W3C Recommendation.
         </para>
 
         <para>
@@ -888,55 +893,89 @@ Products, Foo Server, FAQ
         <para>
             <itemizedlist>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_ALTERNATE</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_ALTERNATE</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_STYLESHEET</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_STYLESHEET</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_START</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_START</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_NEXT</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_NEXT</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_PREV</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_PREV</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_CONTENTS</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_CONTENTS</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_INDEX</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_INDEX</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_GLOSSARY</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_GLOSSARY</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_COPYRIGHT</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_COPYRIGHT</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_CHAPTER</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_CHAPTER</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_SECTION</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_SECTION</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_SUBSECTION</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_SUBSECTION</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_APPENDIX</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_APPENDIX</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_HELP</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_HELP</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_BOOKMARK</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_BOOKMARK</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_CUSTOM</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_CUSTOM</classname>
+                    </para>
                 </listitem>
                 <listitem>
-                    <para><classname>Zend_View_Helper_Navigation_Link::RENDER_ALL</classname></para>
+                    <para>
+                        <classname>Zend_View_Helper_Navigation_Link::RENDER_ALL</classname>
+                    </para>
                 </listitem>
             </itemizedlist>
         </para>
@@ -1717,7 +1756,8 @@ foreach ($this->container as $page) {
 
         <para>
             The Sitemap helper is used for generating XML sitemaps, as
-            defined by the <ulink url="http://www.sitemaps.org/protocol.php">Sitemaps XML format</ulink>.
+            defined by the <ulink
+                url="http://www.sitemaps.org/protocol.php">Sitemaps XML format</ulink>.
             Read more about <ulink url="http://en.wikipedia.org/wiki/Sitemaps">Sitemaps
             on Wikpedia</ulink>.
         </para>
@@ -1737,9 +1777,9 @@ foreach ($this->container as $page) {
         </para>
 
         <para>
-            The sitemap helper also supports
-            <ulink url="http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">Sitemap XSD Schema</ulink>
-            validation of the generated sitemap. This is disabled by default,
+            The sitemap helper also supports <ulink
+                url="http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">Sitemap XSD
+                Schema</ulink> validation of the generated sitemap. This is disabled by default,
             since it will require a request to the Schema file. It can be
             enabled with
             <code>$helper->setUseSchemaValidation(true)</code>.
@@ -1766,9 +1806,10 @@ foreach ($this->container as $page) {
                         <entry><code>lastmod</code></entry>
                         <entry>
                             <para>
-                                The date of last modification of the file,
-                                in <ulink url="http://www.w3.org/TR/NOTE-datetime">W3C Datetime</ulink> format.
-                                This time portion can be omitted if desired, and only use YYYY-MM-DD.
+                                The date of last modification of the file, in <ulink
+                                    url="http://www.w3.org/TR/NOTE-datetime">W3C Datetime</ulink>
+                                format. This time portion can be omitted if desired, and only use
+                                YYYY-MM-DD.
                             </para>
                             <para>
                                 The helper will try to retrieve the

+ 2 - 2
documentation/manual/en/module_specs/Zend_View-Helpers-Partial.xml

@@ -21,8 +21,8 @@
         <title>PartialLoop Counter</title>
         <para>
             The <code>PartialLoop</code> view helper assigns a variable to the view named
-            <code>partialCounter</code> which passes the current position of the array to the view script.
-            This provides an easy way to have alternating colors on table rows for example.
+            <code>partialCounter</code> which passes the current position of the array to the view
+            script. This provides an easy way to have alternating colors on table rows for example.
         </para>
 
     </note>

+ 6 - 5
documentation/manual/en/module_specs/Zend_View-Scripts.xml

@@ -186,9 +186,10 @@ if ($this->books) {
             <title>Template Systems Using Zend_View_Interface</title>
 
             <para>
-                Some may find it easier to simply provide a <classname>Zend_View</classname>-compatible
-                template engine. <classname>Zend_View_Interface</classname> defines the
-                minimum interface needed for compatability:
+                Some may find it easier to simply provide a
+                <classname>Zend_View</classname>-compatible template engine.
+                <classname>Zend_View_Interface</classname> defines the minimum interface needed for
+                compatability:
             </para>
 
             <programlisting role="php"><![CDATA[
@@ -244,8 +245,8 @@ public function render($name);
 
             <para>
                 Using this interface, it becomes relatively easy to wrap a
-                third-party template engine as a <classname>Zend_View</classname>-compatible class. As
-                an example, the following is one potential wrapper for Smarty:
+                third-party template engine as a <classname>Zend_View</classname>-compatible class.
+                As an example, the following is one potential wrapper for Smarty:
             </para>
 
             <programlisting role="php"><![CDATA[

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

@@ -27,8 +27,9 @@
     AJAX requests that require clean JSON and XML responses is possible with this approach.
   </para>
   <para>
-    There is also a <link linkend="zend.db.profiler.profilers.firebug"><classname>Zend_Db_Profiler_Firebug</classname></link>
-    component to log database profiling information to Firebug.
+    There is also a <link linkend="zend.db.profiler.profilers.firebug">
+        <classname>Zend_Db_Profiler_Firebug</classname></link> component to log database profiling
+    information to Firebug.
   </para>
 
 </sect1>

+ 38 - 19
documentation/manual/en/module_specs/Zend_XmlRpc_Client.xml

@@ -247,42 +247,58 @@ $result = $client->call('foo.bar', array(array()));
                     <tbody>
                         <row>
                             <entry>int</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_INTEGER</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_INTEGER</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Integer</classname></entry>
                         </row>
                         <row>
                             <entry>double</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_DOUBLE</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_DOUBLE</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Double</classname></entry>
                         </row>
                         <row>
                             <entry>boolean</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_BOOLEAN</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_BOOLEAN</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Boolean</classname></entry>
                         </row>
                         <row>
                             <entry>string</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_STRING</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_STRING</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_String</classname></entry>
                         </row>
                         <row>
                             <entry>base64</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_BASE64</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_BASE64</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Base64</classname></entry>
                         </row>
                         <row>
                             <entry>dateTime.iso8601</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_DATETIME</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_DATETIME</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_DateTime</classname></entry>
                         </row>
                         <row>
                             <entry>array</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_ARRAY</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_ARRAY</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Array</classname></entry>
                         </row>
                         <row>
                             <entry>struct</entry>
-                            <entry><classname>Zend_XmlRpc_Value::XMLRPC_TYPE_STRUCT</classname></entry>
+                            <entry>
+                                <classname>Zend_XmlRpc_Value::XMLRPC_TYPE_STRUCT</classname>
+                            </entry>
                             <entry><classname>Zend_XmlRpc_Value_Struct</classname></entry>
                         </row>
                     </tbody>
@@ -470,23 +486,26 @@ try {
         <title>Server Introspection</title>
         <para>
             Some XML-RPC servers support the de facto introspection methods under the XML-RPC
-            <code>system.</code> namespace. <classname>Zend_XmlRpc_Client</classname> provides special
-            support for servers with these capabilities.
+            <code>system.</code> namespace. <classname>Zend_XmlRpc_Client</classname> provides
+            special support for servers with these capabilities.
         </para>
 
         <para>
-            A <classname>Zend_XmlRpc_Client_ServerIntrospection</classname> instance may be retrieved by calling
-            the <code>getIntrospector()</code> method of <classname>Zend_XmlRpcClient</classname>. It can
-            then be used to perform introspection operations on the server.
+            A <classname>Zend_XmlRpc_Client_ServerIntrospection</classname> instance may be
+            retrieved by calling the <code>getIntrospector()</code> method of
+            <classname>Zend_XmlRpcClient</classname>. It can then be used to perform introspection
+            operations on the server.
         </para>
     </sect2>
 
     <sect2 id="zend.xmlrpc.client.request-to-response">
         <title>From Request to Response</title>
         <para>
-            Under the hood, the <code>call()</code> instance method of <classname>Zend_XmlRpc_Client</classname>
-            builds a request object (<classname>Zend_XmlRpc_Request</classname>) and sends it to another method,
-            <code>doRequest()</code>, that returns a response object (<classname>Zend_XmlRpc_Response</classname>).
+            Under the hood, the <code>call()</code> instance method of
+            <classname>Zend_XmlRpc_Client</classname> builds a request object
+            (<classname>Zend_XmlRpc_Request</classname>) and sends it to another method,
+            <code>doRequest()</code>, that returns a response object
+            (<classname>Zend_XmlRpc_Response</classname>).
         </para>
 
         <para>
@@ -540,9 +559,9 @@ $client->doRequest($request);
 
         <para>
             The <code>setHttpClient()</code> is particularly useful for unit testing. When combined
-            with the <classname>Zend_Http_Client_Adapter_Test</classname>, remote services can be mocked
-            out for testing. See the unit tests for <classname>Zend_XmlRpc_Client</classname> for examples
-            of how to do this.
+            with the <classname>Zend_Http_Client_Adapter_Test</classname>, remote services can be
+            mocked out for testing. See the unit tests for <classname>Zend_XmlRpc_Client</classname>
+            for examples of how to do this.
         </para>
     </sect2>
 

+ 16 - 14
documentation/manual/en/module_specs/Zend_XmlRpc_Server.xml

@@ -6,8 +6,9 @@
     <sect2 id="zend.xmlrpc.server.introduction">
         <title>Introduction</title>
 
-        <para><classname>Zend_XmlRpc_Server</classname> is intended as a fully-featured XML-RPC server,
-            following <ulink url="http://www.xmlrpc.com/spec">the specifications
+        <para><classname>Zend_XmlRpc_Server</classname> is intended as a fully-featured XML-RPC
+        server,
+        following <ulink url="http://www.xmlrpc.com/spec">the specifications
             outlined at www.xmlrpc.com</ulink>. Additionally, it implements the
             system.multicall() method, allowing boxcarring of requests.
         </para>
@@ -31,8 +32,8 @@ echo $server->handle();
         <title>Server Structure</title>
 
         <para>
-            <classname>Zend_XmlRpc_Server</classname> is composed of a variety of components, ranging
-            from the server itself to request, response, and fault objects.
+            <classname>Zend_XmlRpc_Server</classname> is composed of a variety of components,
+            ranging from the server itself to request, response, and fault objects.
         </para>
 
         <para>
@@ -182,11 +183,11 @@ $server->addFunction('somefunc', 'funcs');
         <title>Custom Request Objects</title>
 
         <para>
-            Most of the time, you'll simply use the default request type
-            included with <classname>Zend_XmlRpc_Server</classname>, <classname>Zend_XmlRpc_Request_Http</classname>. However,
-            there may be times when you need XML-RPC to be available via the CLI,
-            a GUI, or other environment, or want to log incoming requests. To do
-            so, you may create a custom request object that extends
+            Most of the time, you'll simply use the default request type included with
+            <classname>Zend_XmlRpc_Server</classname>,
+            <classname>Zend_XmlRpc_Request_Http</classname>. However, there may be times when you
+            need XML-RPC to be available via the CLI, a GUI, or other environment, or want to log
+            incoming requests. To do so, you may create a custom request object that extends
             <classname>Zend_XmlRpc_Request</classname>. The most important thing to remember is to
             ensure that the getMethod() and getParams() methods are implemented
             so that the XML-RPC server can retrieve that information in order to
@@ -199,15 +200,16 @@ $server->addFunction('somefunc', 'funcs');
 
         <para>
             Similar to request objects, <classname>Zend_XmlRpc_Server</classname> can return custom
-            response objects; by default, a <classname>Zend_XmlRpc_Response_Http</classname> object is
-            returned, which sends an appropriate Content-Type HTTP header for
+            response objects; by default, a <classname>Zend_XmlRpc_Response_Http</classname> object
+            is returned, which sends an appropriate Content-Type HTTP header for
             use with XML-RPC. Possible uses of a custom object would be to log
             responses, or to send responses back to STDOUT.
         </para>
 
         <para>
             To use a custom response class, use
-            <classname>Zend_XmlRpc_Server::setResponseClass()</classname> prior to calling <code>handle()</code>.
+            <classname>Zend_XmlRpc_Server::setResponseClass()</classname> prior to calling
+            <code>handle()</code>.
         </para>
     </sect2>
 
@@ -254,8 +256,8 @@ Zend_XmlRpc_Server_Fault::attachFaultException('My_Project_Exception');
         <para>
             Attaching many classes to an XML-RPC server instance can utilize a
             lot of resources; each class must introspect using the Reflection
-            API (via <classname>Zend_Server_Reflection</classname>), which in turn generates a list of
-            all possible method signatures to provide to the server class.
+            API (via <classname>Zend_Server_Reflection</classname>), which in turn generates a list
+            of all possible method signatures to provide to the server class.
         </para>
         <para>
             To reduce this performance hit somewhat, <classname>Zend_XmlRpc_Server_Cache</classname>

+ 166 - 128
documentation/manual/en/ref/coding_standard.xml

@@ -9,16 +9,18 @@
             <title>Scope</title>
 
             <para>
-                This document provides guidelines for code formatting and documentation to individuals
-                and teams contributing to Zend Framework. Many developers using Zend Framework have also
-                found these coding standards useful because their code's style remains consistent with all
-                Zend Framework code. It is also worth noting that it requires significant effort to fully
-                specify coding standards.
+                This document provides guidelines for code formatting and documentation to
+                individuals and teams contributing to Zend Framework. Many developers using Zend
+                Framework have also found these coding standards useful because their code's style
+                remains consistent with all Zend Framework code. It is also worth noting that it
+                requires significant effort to fully specify coding standards.
 
-                Note: Sometimes developers consider the establishment of a standard more important than what that
-                standard actually suggests at the most detailed level of design. The guidelines in the Zend Framework
-                coding standards capture practices that have worked well on the ZF project. You may modify these standards
-                or use them as is in accordance with the terms of our <ulink url="http://framework.zend.com/license">license</ulink>
+                Note: Sometimes developers consider the establishment of a standard more important
+                than what that standard actually suggests at the most detailed level of design. The
+                guidelines in the Zend Framework coding standards capture practices that have worked
+                well on the ZF project. You may modify these standards or use them as is in
+                accordance with the terms of our
+                <ulink url="http://framework.zend.com/license">license</ulink>
             </para>
             <para>
                 Topics covered in the ZF coding standards include:
@@ -47,9 +49,10 @@
             <title>Goals</title>
 
             <para>
-                Coding standards are important in any development project, but they are particularly important
-                when many developers are working on the same project. Coding standards
-                help ensure that the code is high quality, has fewer bugs, and can be easily maintained.
+                Coding standards are important in any development project, but they are particularly
+                important when many developers are working on the same project. Coding standards
+                help ensure that the code is high quality, has fewer bugs, and can be easily
+                maintained.
             </para>
         </sect2>
     </sect1>
@@ -61,14 +64,16 @@
             <title>General</title>
 
             <para>
-                For files that contain only PHP code, the closing tag ("?>") is never permitted. It is
-                not required by PHP, and omitting it prevents the accidental injection of trailing white space into the response.
+                For files that contain only PHP code, the closing tag ("?>") is never permitted. It
+                is not required by PHP, and omitting it prevents the accidental injection of
+                trailing white space into the response.
             </para>
 
             <para>
-                <emphasis>IMPORTANT:</emphasis> Inclusion of arbitrary binary data as permitted by <code>__HALT_COMPILER()</code>
-                is prohibited from PHP files in the Zend Framework project or files derived from them. Use of
-                this feature is only permitted for some installation scripts.
+                <emphasis>IMPORTANT:</emphasis> Inclusion of arbitrary binary data as permitted by
+                <code>__HALT_COMPILER()</code> is prohibited from PHP files in the Zend Framework
+                project or files derived from them. Use of this feature is only permitted for some
+                installation scripts.
             </para>
         </sect2>
 
@@ -82,9 +87,10 @@
             <title>Maximum Line Length</title>
 
             <para>
-                The target line length is 80 characters. That is to say, ZF developers should strive keep each line of their code
-                under 80 characters where possible and practical. However, longer lines are
-                acceptable in some circumstances. The maximum length of any line of PHP code is 120 characters.
+                The target line length is 80 characters. That is to say, ZF developers should strive
+                keep each line of their code under 80 characters where possible and practical.
+                However, longer lines are acceptable in some circumstances. The maximum length of
+                any line of PHP code is 120 characters.
             </para>
         </sect2>
 
@@ -92,13 +98,15 @@
             <title>Line Termination</title>
 
             <para>
-                Line termination follows the Unix text file convention. Lines must end
-                with a single linefeed (LF) character. Linefeed characters are represented as ordinal 10, or hexadecimal 0x0A.
+                Line termination follows the Unix text file convention. Lines must end with a
+                single linefeed (LF) character. Linefeed characters are represented as ordinal 10,
+                or hexadecimal 0x0A.
             </para>
 
             <para>
-                Note: Do not use carriage returns (CR) as is the convention in Apple OS's (0x0D) or the carriage
-                return/linefeed combination (CRLF) as is standard for the Windows OS (0x0D, 0x0A).
+                Note: Do not use carriage returns (CR) as is the convention in Apple OS's (0x0D) or
+                the carriage return/linefeed combination (CRLF) as is standard for the Windows OS
+                (0x0D, 0x0A).
             </para>
         </sect2>
     </sect1>
@@ -110,17 +118,17 @@
             <title>Classes</title>
 
             <para>
-                Zend Framework standardizes on a class naming convention whereby the names
-                of the classes directly map to the directories in which they are stored.
-                The root level directory of the ZF standard library is the "Zend/" directory, whereas
+                Zend Framework standardizes on a class naming convention whereby the names of the
+                classes directly map to the directories in which they are stored. The root level
+                directory of the ZF standard library is the "Zend/" directory, whereas
                 the root level directory of the ZF extras library is the "ZendX/" directory. All
                 Zend Framework classes are stored hierarchically under these root directories..
             </para>
 
             <para>
                 Class names may only contain alphanumeric characters. Numbers are permitted
-                in class names but are discouraged in most cases. Underscores are only permitted in place
-                of the path separator; the filename "Zend/Db/Table.php" must map to the
+                in class names but are discouraged in most cases. Underscores are only permitted in
+                place of the path separator; the filename "Zend/Db/Table.php" must map to the
                 class name "Zend_Db_Table".
             </para>
 
@@ -131,16 +139,17 @@
             </para>
 
             <para>
-                These conventions define a pseudo-namespace mechanism for Zend Framework. Zend Framework
-                will adopt the PHP namespace feature when it becomes available and is feasible for our developers to use in their applications.
+                These conventions define a pseudo-namespace mechanism for Zend Framework. Zend
+                Framework will adopt the PHP namespace feature when it becomes available and is
+                feasible for our developers to use in their applications.
             </para>
 
             <para>
-                See the class names in the standard and extras libraries for examples of this classname convention.
-
-                <emphasis>IMPORTANT:</emphasis> Code that must be deployed alongside ZF libraries but is not
-                part of the standard or extras libraries (e.g. application code or libraries that are not distributed by Zend)
-                must never start with "Zend_" or "ZendX_".
+                See the class names in the standard and extras libraries for examples of this
+                classname convention. <emphasis>IMPORTANT:</emphasis> Code that must be deployed
+                alongside ZF libraries but is not part of the standard or extras libraries (e.g.
+                application code or libraries that are not distributed by Zend) must never start
+                with "Zend_" or "ZendX_".
             </para>
         </sect2>
 
@@ -153,9 +162,9 @@
             </para>
 
             <para>
-                Any file that contains PHP code should end with the extension ".php", with the notable exception of view scripts. The following
-                examples show acceptable filenames for Zend Framework classes:
-
+                Any file that contains PHP code should end with the extension ".php", with the
+                notable exception of view scripts. The following examples show acceptable filenames
+                for Zend Framework classes:
                 <programlisting role="php"><![CDATA[
 Zend/Db.php
 
@@ -172,18 +181,20 @@ Zend/View/Helper/FormRadio.php
             <title>Functions and Methods</title>
 
             <para>
-                Function names may only contain alphanumeric characters. Underscores are not permitted.
-                Numbers are permitted in function names but are discouraged in most cases.
+                Function names may only contain alphanumeric characters. Underscores are not
+                permitted. Numbers are permitted in function names but are discouraged in most
+                cases.
             </para>
 
             <para>
-                Function names must always start with a lowercase letter. When a function name consists
-                of more than one word, the first letter of each new word must be capitalized. This is
-                commonly called "camelCase" formatting.
+                Function names must always start with a lowercase letter. When a function name
+                consists of more than one word, the first letter of each new word must be
+                capitalized. This is commonly called "camelCase" formatting.
             </para>
 
             <para>
-                Verbosity is generally encouraged. Function names should be as verbose as is practical to fully describe their purpose and behavior.
+                Verbosity is generally encouraged. Function names should be as verbose as is
+                practical to fully describe their purpose and behavior.
             </para>
 
             <para>
@@ -199,9 +210,10 @@ widgetFactory()
             </para>
 
             <para>
-                For object-oriented programming, accessors for instance or static variables should always be prefixed with
-                "get" or "set". In implementing design patterns, such as the singleton or factory
-                patterns, the name of the method should contain the pattern name where practical to more thoroughly describe behavior.
+                For object-oriented programming, accessors for instance or static variables should
+                always be prefixed with "get" or "set". In implementing design patterns, such as the
+                singleton or factory patterns, the name of the method should contain the pattern
+                name where practical to more thoroughly describe behavior.
             </para>
 
             <para>
@@ -212,8 +224,8 @@ widgetFactory()
             </para>
 
             <para>
-                Functions in the global scope (a.k.a "floating functions") are permitted but discouraged in most cases.
-                Consider wrapping these functions in a static class.
+                Functions in the global scope (a.k.a "floating functions") are permitted but
+                discouraged in most cases. Consider wrapping these functions in a static class.
             </para>
         </sect2>
 
@@ -221,15 +233,16 @@ widgetFactory()
             <title>Variables</title>
 
             <para>
-                Variable names may only contain alphanumeric characters. Underscores are not permitted.
-                Numbers are permitted in variable names but are discouraged in most cases.
+                Variable names may only contain alphanumeric characters. Underscores are not
+                permitted. Numbers are permitted in variable names but are discouraged in most
+                cases.
             </para>
 
             <para>
                 For instance variables that are declared with the "private" or "protected" modifier,
-                the first character of the variable name must be a single underscore. This is the only
-                acceptable application of an underscore in a variable name. Member variables declared "public"
-                should never start with an underscore.
+                the first character of the variable name must be a single underscore. This is the
+                only acceptable application of an underscore in a variable name. Member variables
+                declared "public" should never start with an underscore.
             </para>
 
             <para>
@@ -238,9 +251,11 @@ widgetFactory()
             </para>
 
             <para>
-                Verbosity is generally encouraged. Variables should always be as verbose as practical to describe the data that the developer
-                intends to store in them. Terse variable names such as "$i" and "$n" are discouraged for all but the smallest loop contexts.
-                If a loop contains more than 20 lines of code, the index variables should have more descriptive names.
+                Verbosity is generally encouraged. Variables should always be as verbose as
+                practical to describe the data that the developer intends to store in them. Terse
+                variable names such as "$i" and "$n" are discouraged for all but the smallest loop
+                contexts. If a loop contains more than 20 lines of code, the index variables should
+                have more descriptive names.
             </para>
         </sect2>
 
@@ -248,12 +263,13 @@ widgetFactory()
             <title>Constants</title>
 
             <para>
-                Constants may contain both alphanumeric characters and underscores. Numbers are permitted
-                in constant names.
+                Constants may contain both alphanumeric characters and underscores. Numbers are
+                permitted in constant names.
             </para>
 
             <para>
-                All letters used in a constant name must be capitalized, while all words in a constant name must be separated by underscore characters.
+                All letters used in a constant name must be capitalized, while all words in a
+                constant name must be separated by underscore characters.
             </para>
 
             <para>
@@ -262,8 +278,9 @@ widgetFactory()
             </para>
 
             <para>
-                Constants must be defined as class members with the "const" modifier. Defining constants
-                in the global scope with the "define" function is permitted but strongly discouraged.
+                Constants must be defined as class members with the "const" modifier. Defining
+                constants in the global scope with the "define" function is permitted but strongly
+                discouraged.
             </para>
         </sect2>
     </sect1>
@@ -285,8 +302,9 @@ widgetFactory()
             </para>
 
             <para>
-                Short tags are never allowed. For files containing only PHP code, the
-                closing tag must always be omitted (See <xref linkend="coding-standard.php-file-formatting.general" />).
+                Short tags are never allowed. For files containing only PHP code, the closing tag
+                must always be omitted (See <xref
+                    linkend="coding-standard.php-file-formatting.general" />).
             </para>
         </sect2>
 
@@ -386,8 +404,8 @@ $sql = "SELECT `id`, `name` FROM `people` "
                 </para>
 
                 <para>
-                    When declaring indexed arrays with the <code>array</code> function, a trailing space must be
-                    added after each comma delimiter to improve readability:
+                    When declaring indexed arrays with the <code>array</code> function, a trailing
+                    space must be added after each comma delimiter to improve readability:
 
                     <programlisting role="php"><![CDATA[
 $sampleArray = array(1, 2, 3, 'Zend', 'Studio');
@@ -395,9 +413,9 @@ $sampleArray = array(1, 2, 3, 'Zend', 'Studio');
                 </para>
 
                 <para>
-                    It is permitted to declare multi-line indexed arrays using the "array" construct.
-                    In this case, each successive line must be padded with spaces such that beginning of
-                    each line is aligned:
+                    It is permitted to declare multi-line indexed arrays using the "array"
+                    construct. In this case, each successive line must be padded with spaces such
+                    that beginning of each line is aligned:
 
                     <programlisting role="php"><![CDATA[
 $sampleArray = array(1, 2, 3, 'Zend', 'Studio',
@@ -411,9 +429,10 @@ $sampleArray = array(1, 2, 3, 'Zend', 'Studio',
                 <title>Associative Arrays</title>
 
                 <para>
-                    When declaring associative arrays with the <code>array</code> construct, breaking the statement into multiple lines
-                    is encouraged. In this case, each successive line must be padded with white space such that both the keys and the values are aligned:
-
+                    When declaring associative arrays with the <code>array</code> construct,
+                    breaking the statement into multiple lines is encouraged. In this case, each
+                    successive line must be padded with white space such that both the keys and the
+                    values are aligned:
                     <programlisting role="php"><![CDATA[
 $sampleArray = array('firstKey'  => 'firstValue',
                      'secondKey' => 'secondValue');
@@ -433,14 +452,16 @@ $sampleArray = array('firstKey'  => 'firstValue',
                 </para><para>
                     The brace should always be written on the line underneath the class name.
                 </para><para>
-                    Every class must have a documentation block that conforms to the PHPDocumentor standard.
+                    Every class must have a documentation block that conforms to the PHPDocumentor
+                    standard.
                 </para><para>
                     All code in a class must be indented with four spaces.
                 </para><para>
                     Only one class is permitted in each PHP file.
                 </para><para>
                     Placing additional code in class files is permitted but discouraged.
-                    In such files, two blank lines must separate the class from any additional PHP code in the class file.
+                    In such files, two blank lines must separate the class from any additional PHP
+                    code in the class file.
                 </para><para>
                     The following is an example of an acceptable class declaration:
 
@@ -461,17 +482,19 @@ class SampleClass
                 <title>Class Member Variables</title>
 
                 <para>
-                    Member variables must be named according to Zend Framework's variable naming conventions.
+                    Member variables must be named according to Zend Framework's variable naming
+                    conventions.
                 </para>
                 <para>
-                    Any variables declared in a class must be listed at the top of the class, above the
-                    declaration of any methods.
+                    Any variables declared in a class must be listed at the top of the class, above
+                    the declaration of any methods.
                 </para>
                 <para>
                     The <code>var</code> construct is not permitted. Member variables always declare
-                    their visibility by using one of the <code>private</code>, <code>protected</code>,
-                    or <code>public</code> modifiers. Giving access to member variables directly by declaring them
-                    as public is permitted but discouraged in favor of accessor methods (set/get).
+                    their visibility by using one of the <code>private</code>,
+                    <code>protected</code>, or <code>public</code> modifiers. Giving access to
+                    member variables directly by declaring them as public is permitted but
+                    discouraged in favor of accessor methods (set/get).
                 </para>
             </sect3>
         </sect2>
@@ -483,7 +506,8 @@ class SampleClass
                 <title>Function and Method Declaration</title>
 
                 <para>
-                    Functions must be named according to the Zend Framework function naming conventions.
+                    Functions must be named according to the Zend Framework function naming
+                    conventions.
                 </para>
                 <para>
                     Methods inside classes must always declare their visibility by using
@@ -492,9 +516,8 @@ class SampleClass
                 </para>
                 <para>
                     As with classes, the brace should always be written on the line underneath the
-                    function name.
-
-                    Space between the function name and the opening parenthesis for the arguments is not permitted.
+                    function name. Space between the function name and the opening parenthesis for
+                    the arguments is not permitted.
                 </para>
                 <para>
                     Functions in the global scope are strongly discouraged.
@@ -521,7 +544,8 @@ class Foo
                 </para>
 
                 <para>
-                    <emphasis>NOTE:</emphasis> Pass-by-reference is the only parameter passing mechanism permitted in a method declaration.
+                    <emphasis>NOTE:</emphasis> Pass-by-reference is the only parameter passing
+                    mechanism permitted in a method declaration.
 
                     <programlisting role="php"><![CDATA[
 /**
@@ -543,8 +567,9 @@ class Foo
                 </para>
 
                 <para>
-                    The return value must not be enclosed in parentheses. This can hinder readability, in additional to breaking code
-                    if a method is later changed to return by reference.
+                    The return value must not be enclosed in parentheses. This can hinder
+                    readability, in additional to breaking code if a method is later changed to
+                    return by reference.
 
                     <programlisting role="php"><![CDATA[
 /**
@@ -577,8 +602,9 @@ class Foo
                 <title>Function and Method Usage</title>
 
                 <para>
-                    Function arguments should be separated by a single trailing space after the comma delimiter.
-                    The following is an example of an acceptable invocation of a function that takes three arguments:
+                    Function arguments should be separated by a single trailing space after the
+                    comma delimiter. The following is an example of an acceptable invocation of a
+                    function that takes three arguments:
 
                     <programlisting role="php"><![CDATA[
 threeArguments(1, 2, 3);
@@ -586,8 +612,8 @@ threeArguments(1, 2, 3);
                 </para>
 
                 <para>
-                    Call-time pass-by-reference is strictly prohibited. See the function declarations section
-                    for the proper way to pass function arguments by-reference.
+                    Call-time pass-by-reference is strictly prohibited. See the function
+                    declarations section for the proper way to pass function arguments by-reference.
                 </para>
                 <para>
                     In passing arrays as arguments to a function, the function call may include the
@@ -613,20 +639,20 @@ threeArguments(array(1, 2, 3, 'Zend', 'Studio',
 
                 <para>
                     Control statements based on the <code>if</code> and <code>elseif</code>
-                    constructs must have a single space before the opening parenthesis of the conditional
-                    and a single space after the closing parenthesis.
+                    constructs must have a single space before the opening parenthesis of the
+                    conditional and a single space after the closing parenthesis.
                 </para>
 
                 <para>
-                    Within the conditional statements between the parentheses, operators must be separated
-                    by spaces for readability. Inner parentheses are encouraged to improve logical grouping
-                    for larger conditional expressions.
+                    Within the conditional statements between the parentheses, operators must be
+                    separated by spaces for readability. Inner parentheses are encouraged to improve
+                    logical grouping for larger conditional expressions.
                 </para>
 
                 <para>
-                    The opening brace is written on the same line as the conditional statement. The closing
-                    brace is always written on its own line. Any content within the braces must be
-                    indented using four spaces.
+                    The opening brace is written on the same line as the conditional statement. The
+                    closing brace is always written on its own line. Any content within the braces
+                    must be indented using four spaces.
 
                     <programlisting role="php"><![CDATA[
 if ($a != 2) {
@@ -636,8 +662,9 @@ if ($a != 2) {
                 </para>
 
                 <para>
-                    For "if" statements that include "elseif" or "else", the formatting conventions are similar to the "if" construct.
-                    The following examples demonstrate proper formatting for "if" statements with "else" and/or "elseif" constructs:
+                    For "if" statements that include "elseif" or "else", the formatting conventions
+                    are similar to the "if" construct. The following examples demonstrate proper
+                    formatting for "if" statements with "else" and/or "elseif" constructs:
 
                     <programlisting role="php"><![CDATA[
 if ($a != 2) {
@@ -654,14 +681,14 @@ if ($a != 2) {
     $a = 7;
 }
 ]]></programlisting>
-                    PHP allows statements to be written without braces in some circumstances.
-                    This coding standard makes no differentiation- all "if", "elseif" or "else" statements
-                    must use braces.
+                    PHP allows statements to be written without braces in some circumstances. This
+                    coding standard makes no differentiation- all "if", "elseif" or "else"
+                    statements must use braces.
                 </para>
 
                 <para>
-                    Use of the "elseif" construct is permitted but strongly discouraged in favor of the
-                    "else if" combination.
+                    Use of the "elseif" construct is permitted but strongly discouraged in favor of
+                    the "else if" combination.
                 </para>
             </sect3>
 
@@ -669,13 +696,15 @@ if ($a != 2) {
                 <title>Switch</title>
 
                 <para>
-                    Control statements written with the "switch" statement must have a single space before
-                    the opening parenthesis of the conditional statement and after the closing parenthesis.
+                    Control statements written with the "switch" statement must have a single space
+                    before the opening parenthesis of the conditional statement and after the
+                    closing parenthesis.
                 </para>
 
                 <para>
-                    All content within the "switch" statement must be indented using four spaces. Content under
-                    each "case" statement must be indented using an additional four spaces.
+                    All content within the "switch" statement must be indented using four spaces.
+                    Content under each "case" statement must be indented using an additional four
+                    spaces.
                 </para>
 
                 <programlisting role="php"><![CDATA[
@@ -692,14 +721,17 @@ switch ($numPeople) {
 ]]></programlisting>
 
                 <para>
-                    The construct <code>default</code> should never be omitted from a <code>switch</code> statement.
+                    The construct <code>default</code> should never be omitted from a
+                    <code>switch</code> statement.
                 </para>
 
                 <para>
-                    <emphasis>NOTE:</emphasis> It is sometimes useful to write a <code>case</code> statement which falls through
-                    to the next case by not including a <code>break</code> or <code>return</code> within that case. To distinguish
-                    these cases from bugs, any <code>case</code> statement where <code>break</code> or <code>return</code> are
-                    omitted should contain a comment indicating that the break was intentionally omitted.
+                    <emphasis>NOTE:</emphasis> It is sometimes useful to write a <code>case</code>
+                    statement which falls through to the next case by not including a
+                    <code>break</code> or <code>return</code> within that case. To distinguish these
+                    cases from bugs, any <code>case</code> statement where <code>break</code> or
+                    <code>return</code> are omitted should contain a comment indicating that the
+                    break was intentionally omitted.
                 </para>
             </sect3>
         </sect2>
@@ -711,14 +743,16 @@ switch ($numPeople) {
                 <title>Documentation Format</title>
 
                 <para>
-                    All documentation blocks ("docblocks") must be compatible with the phpDocumentor format.
-                    Describing the phpDocumentor format is beyond the scope of this document.
-                    For more information, visit: <ulink url="http://phpdoc.org/">http://phpdoc.org/</ulink>
+                    All documentation blocks ("docblocks") must be compatible with the phpDocumentor
+                    format. Describing the phpDocumentor format is beyond the scope of this
+                    document. For more information, visit: <ulink
+                        url="http://phpdoc.org/">http://phpdoc.org/</ulink>
                 </para>
 
                 <para>
-                    All class files must contain a "file-level" docblock at the top of each file and a "class-level" docblock
-                    immediately above each class. Examples of such docblocks can be found below.
+                    All class files must contain a "file-level" docblock at the top of each file and
+                    a "class-level" docblock immediately above each class. Examples of such
+                    docblocks can be found below.
                 </para>
             </sect3>
 
@@ -726,8 +760,8 @@ switch ($numPeople) {
                 <title>Files</title>
 
                 <para>
-                    Every file that contains PHP code must have a docblock at the top of the file that
-                    contains these phpDocumentor tags at a minimum:
+                    Every file that contains PHP code must have a docblock at the top of the file
+                    that contains these phpDocumentor tags at a minimum:
 
                     <programlisting role="php"><![CDATA[
 /**
@@ -751,7 +785,8 @@ switch ($numPeople) {
                 <title>Classes</title>
 
                 <para>
-                    Every class must have a docblock that contains these phpDocumentor tags at a minimum:
+                    Every class must have a docblock that contains these phpDocumentor tags at a
+                    minimum:
 
                     <programlisting role="php"><![CDATA[
 /**
@@ -774,7 +809,8 @@ switch ($numPeople) {
                 <title>Functions</title>
 
                 <para>
-                Every function, including object methods, must have a docblock that contains at a minimum:
+                Every function, including object methods, must have a docblock that contains at a
+                minimum:
 
                     <itemizedlist>
                         <listitem><para>A description of the function</para></listitem>
@@ -784,12 +820,14 @@ switch ($numPeople) {
                 </para>
 
                 <para>
-                    It is not necessary to use the "@access" tag because the access level is already known
-                    from the "public", "private", or "protected" modifier used to declare the function.
+                    It is not necessary to use the "@access" tag because the access level is already
+                    known from the "public", "private", or "protected" modifier used to declare the
+                    function.
                 </para>
 
                 <para>
-                    If a function/method may throw an exception, use @throws for all known exception classes:
+                    If a function/method may throw an exception, use @throws for all known exception
+                    classes:
 
                     <programlisting role="php"><![CDATA[
 @throws exceptionclass [description]