Ver código fonte

[DOCUMENTATION] English:

- manual fixes (only line length)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17600 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 anos atrás
pai
commit
200e6194d6

+ 24 - 8
documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml

@@ -392,7 +392,9 @@ Array
                         </entry>
                     </row>
                     <row>
-                        <entry><emphasis><property>accountCanonicalForm</property></emphasis></entry>
+                        <entry>
+                            <emphasis><property>accountCanonicalForm</property></emphasis>
+                        </entry>
                         <entry>
                             A value of 2, 3 or 4 indicating the form to which account names should
                             be canonicalized after successful authentication. Values are as
@@ -439,7 +441,9 @@ Array
                         </entry>
                     </row>
                     <row>
-                        <entry><emphasis><property>accountDomainNameShort</property></emphasis></entry>
+                        <entry>
+                            <emphasis><property>accountDomainNameShort</property></emphasis>
+                        </entry>
                         <entry>
                             The 'short' domain for which the target <acronym>LDAP</acronym> server
                             is an authority (e.g., <acronym>FOO</acronym>). Note that there is a
@@ -612,7 +616,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountCanonicalForm</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountCanonicalForm</property></emphasis>
+                            </entry>
                             <entry>
                                 You almost certainly want this to be 3 for backslash style names
                                 (e.g., <filename>FOO\alice</filename>), which are most familiar to
@@ -625,7 +631,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountDomainName</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountDomainName</property></emphasis>
+                            </entry>
                             <entry>
                                 This is required with AD unless
                                 <property>accountCanonicalForm</property> 2 is used, which, again,
@@ -633,7 +641,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountDomainNameShort</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountDomainNameShort</property></emphasis>
+                            </entry>
                             <entry>
                                 The NetBIOS name of the domain that users are in and for which the
                                 AD server is an authority. This is required if the backslash style
@@ -727,7 +737,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountCanonicalForm</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountCanonicalForm</property></emphasis>
+                            </entry>
                             <entry>
                                 Optional, but the default value is 4 (principal style names like
                                 <filename>alice@foo.net</filename>), which may not be ideal if your
@@ -737,7 +749,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountDomainName</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountDomainName</property></emphasis>
+                            </entry>
                             <entry>
                                 Required unless you're using
                                 <property>accountCanonicalForm</property> 2, which is not
@@ -745,7 +759,9 @@ Array
                             </entry>
                         </row>
                         <row>
-                            <entry><emphasis><property>accountDomainNameShort</property></emphasis></entry>
+                            <entry>
+                                <emphasis><property>accountDomainNameShort</property></emphasis>
+                            </entry>
                             <entry>
                                 If AD is not also being used, this value is not required.
                                 Otherwise, if <property>accountCanonicalForm</property> 3 is used,

+ 10 - 10
documentation/manual/en/module_specs/Zend_Controller-Router.xml

@@ -7,8 +7,8 @@
         <para>
             <classname>Zend_Controller_Router_Rewrite</classname> is the standard
             framework router. Routing is the process of taking a <acronym>URI</acronym> endpoint
-            (that part of the <acronym>URI</acronym> which comes after the base <acronym>URL</acronym>) and
-            decomposing it into parameters to determine which module,
+            (that part of the <acronym>URI</acronym> which comes after the base
+            <acronym>URL</acronym>) and decomposing it into parameters to determine which module,
             controller, and action of that controller should receive the
             request. This values of the module, controller, action and other
             parameters are packaged into a
@@ -45,8 +45,8 @@ RewriteRule ^.*$ index.php [NC,L]
 ]]></programlisting>
 
         <para>
-            The rewrite router can also be used with the <acronym>IIS</acronym> webserver (versions &lt;= 7.0) if
-            <ulink url="http://www.isapirewrite.com">Isapi_Rewrite</ulink> has been
+            The rewrite router can also be used with the <acronym>IIS</acronym> webserver (versions
+            &lt;= 7.0) if <ulink url="http://www.isapirewrite.com">Isapi_Rewrite</ulink> has been
             installed as an Isapi extension with the following rewrite rule:
         </para>
 
@@ -57,8 +57,8 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
         <note>
             <title>IIS Isapi_Rewrite</title>
             <para>
-                When using <acronym>IIS</acronym>, <varname>$_SERVER['REQUEST_URI']</varname> will either
-                not exist, or be set as an empty string. In this case,
+                When using <acronym>IIS</acronym>, <varname>$_SERVER['REQUEST_URI']</varname> will
+                either not exist, or be set as an empty string. In this case,
                 <classname>Zend_Controller_Request_Http</classname> will attempt to use
                 the <varname>$_SERVER['HTTP_X_REWRITE_URL']</varname> value set by the
                 Isapi_Rewrite extension.
@@ -66,8 +66,8 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
         </note>
 
         <para>
-            <acronym>IIS</acronym> 7.0 introduces a native <acronym>URL</acronym> rewriting module, and it can be
-            configured as follows:
+            <acronym>IIS</acronym> 7.0 introduces a native <acronym>URL</acronym> rewriting module,
+            and it can be configured as follows:
         </para>
 
         <programlisting language="xml"><![CDATA[
@@ -433,8 +433,8 @@ routes.archive.map.1 = "year"
 ]]></programlisting>
 
         <para>
-            The above <acronym>INI</acronym> file can then be read into a <classname>Zend_Config</classname>
-            object as follows:
+            The above <acronym>INI</acronym> file can then be read into a
+            <classname>Zend_Config</classname> object as follows:
         </para>
 
         <programlisting language="php"><![CDATA[

+ 16 - 15
documentation/manual/en/module_specs/Zend_Date-Additional.xml

@@ -7,7 +7,8 @@
     <para>
         Within this chapter, we will describe several additional functions which are also available
         through <classname>Zend_Date</classname>. Of course all described functions have additional
-        examples to show the expected working and the simple <acronym>API</acronym> for the proper using of them.
+        examples to show the expected working and the simple <acronym>API</acronym> for the proper
+        using of them.
     </para>
 
     <sect2 id="zend.date.additional.checking">
@@ -48,8 +49,8 @@
             create a date like '31.February.2000' with <classname>Zend_Date</classname> because
             <classname>Zend_Date</classname> will automatically correct the date and return the
             proper date. In our case '03.March.2000'. <methodname>isDate()</methodname> on the
-            other side does this check and will return <constant>FALSE</constant> on '31.February.2000' because it knows
-            that this date is impossible.
+            other side does this check and will return <constant>FALSE</constant> on
+            '31.February.2000' because it knows that this date is impossible.
         </para>
 
         <example id="zend.date.additional.checking.example-1">
@@ -237,21 +238,21 @@ foreach ($info as $sun) {
             A <classname>Zend_Date</classname> object of course also stores the actual timezone.
             Even if the timezone is changed after the creation of the object it remembers the
             original timezone and works with it. It is also not necessary to change the timezone
-            within the code with <acronym>PHP</acronym> functions. <classname>Zend_Date</classname> has two built-in
-            functions which makes it possible to handle this.
+            within the code with <acronym>PHP</acronym> functions. <classname>Zend_Date</classname>
+            has two built-in functions which makes it possible to handle this.
         </para>
 
         <para>
             <methodname>getTimezone()</methodname> returns the actual set timezone of within the
             <classname>Zend_Date</classname> object. Remember that <classname>Zend_Date</classname>
-            is not coupled with <acronym>PHP</acronym> internals. So the returned timezone is not the timezone of the
-            <acronym>PHP</acronym> script but the timezone of the object. <methodname>setTimezone($zone)</methodname>
-            is the second function and makes it possible to set new timezone for
-            <classname>Zend_Date</classname>. A given timezone is always checked. If it does not
-            exist an exception will be thrown. Additionally the actual scripts or systems timezone
-            can be set to the date object by calling <methodname>setTimezone()</methodname>
-            without the zone parameter. This is also done automatically when the date object is
-            created.
+            is not coupled with <acronym>PHP</acronym> internals. So the returned timezone is not
+            the timezone of the <acronym>PHP</acronym> script but the timezone of the object.
+            <methodname>setTimezone($zone)</methodname> is the second function and makes it possible
+            to set new timezone for <classname>Zend_Date</classname>. A given timezone is always
+            checked. If it does not exist an exception will be thrown. Additionally the actual
+            scripts or systems timezone can be set to the date object by calling
+            <methodname>setTimezone()</methodname> without the zone parameter. This is also done
+            automatically when the date object is created.
         </para>
 
         <example id="zend.date.additional.timezones.example-1">
@@ -288,8 +289,8 @@ print $date->getIso();
             also has an effect to the date itself. Dates are always related to a timezone. Changing
             the timezone for a <classname>Zend_Date</classname> object does not change the time of
             <classname>Zend_Date</classname>. Remember that internally dates are always stored as
-            timestamps and in <acronym>GMT</acronym>. So the timezone means how much hours should be substracted or
-            added to get the actual global time for the own timezone and region.
+            timestamps and in <acronym>GMT</acronym>. So the timezone means how much hours should be
+            substracted or added to get the actual global time for the own timezone and region.
         </para>
 
         <para>

+ 93 - 53
documentation/manual/en/module_specs/Zend_Date-Constants.xml

@@ -22,9 +22,9 @@
             of the world, the object's timezone will automatically be used to compute the correct
             value, even though the internal timestamp is the same for the same moment in time,
             regardless of the user's physical location in the world. Regardless of the units
-            involved, output must be expressed either as <acronym>GMT</acronym>/UTC or localized to a locale. The
-            example output below reflects localization to Europe/GMT+1 hour (e.g. Germany, Austria,
-            France).
+            involved, output must be expressed either as <acronym>GMT</acronym>/UTC or localized to
+            a locale. The example output below reflects localization to Europe/GMT+1 hour (e.g.
+            Germany, Austria, France).
         </para>
 
         <table id="zend.date.constants.using.table">
@@ -77,20 +77,20 @@
                     </row>
                     <row>
                         <entry>equals(14, Zend_Date::HOUR)</entry>
-                        <entry>Compares the hour, returns <constant>TRUE</constant> or <constant>FALSE</constant></entry>
-                        <entry>2009-02-13T14:53:27+01:00</entry>
+                        <entry>Compares the hour, returns <constant>TRUE</constant> or
+                        <constant>FALSE</constant></entry> <entry>2009-02-13T14:53:27+01:00</entry>
                         <entry><constant>TRUE</constant></entry>
                     </row>
                     <row>
                         <entry>isEarlier(12, Zend_Date::HOUR)</entry>
-                        <entry>Compares the hour, returns <constant>TRUE</constant> or <constant>FALSE</constant></entry>
-                        <entry>2009-02-13T14:53:27+01:00</entry>
+                        <entry>Compares the hour, returns <constant>TRUE</constant> or
+                        <constant>FALSE</constant></entry> <entry>2009-02-13T14:53:27+01:00</entry>
                         <entry><constant>TRUE</constant></entry>
                     </row>
                     <row>
                         <entry>isLater(12, Zend_Date::HOUR)</entry>
-                        <entry>Compares the hour, returns <constant>TRUE</constant> or <constant>FALSE</constant></entry>
-                        <entry>2009-02-13T14:53:27+01:00</entry>
+                        <entry>Compares the hour, returns <constant>TRUE</constant> or
+                        <constant>FALSE</constant></entry> <entry>2009-02-13T14:53:27+01:00</entry>
                         <entry><constant>FALSE</constant></entry>
                     </row>
                 </tbody>
@@ -172,7 +172,10 @@
                     </row>
                     <row>
                         <entry><constant>Zend_Date::WEEKDAY_8601</constant></entry>
-                        <entry>Weekday according to <acronym>ISO</acronym> 8601 (1 = Monday, 7 = Sunday)</entry>
+                        <entry>
+                            Weekday according to <acronym>ISO</acronym> 8601 (1 = Monday, 7 =
+                            Sunday)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>5</emphasis> for Friday</entry>
                     </row>
@@ -308,14 +311,19 @@
                     </row>
                     <row>
                         <entry><constant>Zend_Date::YEAR_SHORT_8601</constant></entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601 (number, two digit)</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601 (number, two digit)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>09</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>Zend_Date::LEAPYEAR</constant></entry>
-                        <entry>Is the year a leap year? (<constant>TRUE</constant> or <constant>FALSE</constant>)</entry>
+                        <entry>
+                            Is the year a leap year? (<constant>TRUE</constant> or
+                            <constant>FALSE</constant>)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>FALSE</emphasis>
                         </entry>
@@ -441,7 +449,10 @@
                     </row>
                     <row>
                         <entry><constant>Zend_Date::TIMEZONE_SECS</constant></entry>
-                        <entry>Difference of the time zone to <acronym>GMT</acronym> in seconds (integer)</entry>
+                        <entry>
+                            Difference of the time zone to <acronym>GMT</acronym> in seconds
+                            (integer)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>3600</emphasis> seconds to <acronym>GMT</acronym></entry>
                     </row>
@@ -454,14 +465,19 @@
                     </row>
                     <row>
                         <entry><constant>Zend_Date::GMT_DIFF_SEP</constant></entry>
-                        <entry>Difference to <acronym>GMT</acronym> in seconds (string, separated)</entry>
+                        <entry>
+                            Difference to <acronym>GMT</acronym> in seconds (string, separated)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>+01:00</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>Zend_Date::DAYLIGHT</constant></entry>
-                        <entry>Summer time or Winter time? (<constant>TRUE</constant> or <constant>FALSE</constant>)</entry>
+                        <entry>
+                            Summer time or Winter time? (<constant>TRUE</constant> or
+                            <constant>FALSE</constant>)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>FALSE</emphasis>
                         </entry>
@@ -484,7 +500,9 @@
                 <tbody>
                     <row>
                         <entry><constant>Zend_Date::ISO_8601</constant></entry>
-                        <entry>Date according to <acronym>ISO</acronym> 8601 (string, complete)</entry>
+                        <entry>
+                            Date according to <acronym>ISO</acronym> 8601 (string, complete)
+                        </entry>
                         <entry>2009-02-13T14:53:27+01:00</entry>
                         <entry><emphasis>2009-02-13T14:53:27+01:00</emphasis>
                         </entry>
@@ -683,14 +701,17 @@
                         <entry><constant>Zend_Date::DATETIME_FULL</constant></entry>
                         <entry>Complete date with time (string, localized, complete)</entry>
                         <entry>2009-02-13T14:53:27+01:00</entry>
-                        <entry><emphasis>Friday, 13. February 2009 14:53 Uhr <acronym>CET</acronym></emphasis>
+                        <entry>
+                            <emphasis>Friday, 13. February 2009 14:53 Uhr
+                                <acronym>CET</acronym></emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>Zend_Date::DATETIME_LONG</constant></entry>
                         <entry>Long date with time (string, localized, long)</entry>
                         <entry>2009-02-13T14:53:27+01:00</entry>
-                        <entry><emphasis>13. February 2009 14:53:27 <acronym>CET</acronym></emphasis>
+                        <entry>
+                            <emphasis>13. February 2009 14:53:27 <acronym>CET</acronym></emphasis>
                         </entry>
                     </row>
                     <row>
@@ -719,18 +740,21 @@
 
         <para>
             If you need a date format not shown above, then use a self-defined format composed from
-            the <acronym>ISO</acronym> format token specifiers below. The following examples illustrate the usage of
-            constants from the table below to create self-defined <acronym>ISO</acronym> formats. The format length is
-            unlimited. Also, multiple usage of format constants is allowed.
+            the <acronym>ISO</acronym> format token specifiers below. The following examples
+            illustrate the usage of constants from the table below to create self-defined
+            <acronym>ISO</acronym> formats. The format length is unlimited. Also, multiple usage of
+            format constants is allowed.
         </para>
 
         <para>
-            The accepted format specifiers can be changed from <acronym>ISO</acronym> Format to <acronym>PHP</acronym>'s date format if
-            you are more comfortable with it. However, not all formats defined in the <acronym>ISO</acronym> norm are
-            supported with <acronym>PHP</acronym>'s date format specifiers. Use the
+            The accepted format specifiers can be changed from <acronym>ISO</acronym> Format to
+            <acronym>PHP</acronym>'s date format if you are more comfortable with it. However, not
+            all formats defined in the <acronym>ISO</acronym> norm are supported with
+            <acronym>PHP</acronym>'s date format specifiers. Use the
             <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
-            switch <classname>Zend_Date</classname> methods from supporting <acronym>ISO</acronym> format specifiers to <acronym>PHP</acronym> date() type
-            specifiers (see <xref linkend="zend.date.constants.phpformats" /> below).
+            switch <classname>Zend_Date</classname> methods from supporting <acronym>ISO</acronym>
+            format specifiers to <acronym>PHP</acronym> date() type specifiers (see <xref
+                linkend="zend.date.constants.phpformats" /> below).
         </para>
 
         <example id="zend.date.constants.selfdefinedformats.example-1">
@@ -826,35 +850,45 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
                     </row>
                     <row>
                         <entry>Y</entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least one digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least one digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_8601</constant></entry>
                         <entry><emphasis>9</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry>YY</entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least two digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least two digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_SHORT_8601</constant></entry>
                         <entry><emphasis>09</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>YYY</constant></entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least three digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least three digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_8601</constant></entry>
                         <entry><emphasis>2009</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>YYYY</constant></entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least four digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least four digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_8601</constant></entry>
                         <entry><emphasis>2009</emphasis>
                         </entry>
                     </row>
                     <row>
                         <entry><constant>YYYYY</constant></entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least five digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least five digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_8601</constant></entry>
                         <entry><emphasis>02009</emphasis>
                         </entry>
@@ -1131,10 +1165,10 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
 
         <note>
             <para>
-                Note that the default <acronym>ISO</acronym> format differs from <acronym>PHP</acronym>'s format which can be
-                irritating if you have not used in previous. Especially the format specifiers
-                for <emphasis>Year and Minute</emphasis> are often not used in the
-                intended way.
+                Note that the default <acronym>ISO</acronym> format differs from
+                <acronym>PHP</acronym>'s format which can be irritating if you have not used in
+                previous. Especially the format specifiers for <emphasis>Year and Minute</emphasis>
+                are often not used in the intended way.
             </para>
 
             <para>
@@ -1142,8 +1176,8 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
                 which are often mistaken. The <emphasis>Y</emphasis> specifier
                 for the <acronym>ISO</acronym> year and the <emphasis>y</emphasis> specifier for the
                 real year. The difference is small but significant.
-                <emphasis>Y</emphasis> calculates the <acronym>ISO</acronym> year, which is often used
-                for calendar formats. See for example the 31. December 2007. The real year is
+                <emphasis>Y</emphasis> calculates the <acronym>ISO</acronym> year, which is often
+                used for calendar formats. See for example the 31. December 2007. The real year is
                 2007, but it is the first day of the first week in the week 1 of the year 2008.
                 So, if you are using 'dd.MM.yyyy' you will get '31.December.2007' but if you use
                 'dd.MM.YYYY' you will get '31.December.2008'. As you see this is no bug but a
@@ -1164,16 +1198,18 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
         <title>Self-Defined OUTPUT Formats Using PHP's date() Format Specifiers</title>
 
         <para>
-            If you are more comfortable with <acronym>PHP</acronym>'s date format specifier than with <acronym>ISO</acronym> format
-            specifiers, then you can use the
+            If you are more comfortable with <acronym>PHP</acronym>'s date format specifier than
+            with <acronym>ISO</acronym> format specifiers, then you can use the
             <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
-            switch <classname>Zend_Date</classname> methods from supporting <acronym>ISO</acronym> format specifiers to <acronym>PHP</acronym> date() type
-            specifiers. Afterwards, all format parameters must be given with
-            <ulink url="http://php.net/date">PHP's <methodname>date()</methodname> format
-                specifiers</ulink>. The <acronym>PHP</acronym> date format lacks some of the formats supported by the
-            <acronym>ISO</acronym> Format, and vice-versa. If you are not already comfortable with it, then use the
-            standard <acronym>ISO</acronym> format instead. Also, if you have legacy code using <acronym>PHP</acronym>'s date format,
-            then either manually convert it to the <acronym>ISO</acronym> format using <link
+            switch <classname>Zend_Date</classname> methods from supporting <acronym>ISO</acronym>
+            format specifiers to <acronym>PHP</acronym> date() type specifiers. Afterwards, all
+            format parameters must be given with <ulink url="http://php.net/date">PHP's
+                <methodname>date()</methodname> format specifiers</ulink>. The
+            <acronym>PHP</acronym> date format lacks some of the formats supported by the
+            <acronym>ISO</acronym> Format, and vice-versa. If you are not already comfortable with
+            it, then use the standard <acronym>ISO</acronym> format instead. Also, if you have
+            legacy code using <acronym>PHP</acronym>'s date format, then either manually convert it
+            to the <acronym>ISO</acronym> format using <link
                 linkend="zend.locale.date.normalize">Zend_Locale_Format::convertPhpToIsoFormat()</link>,
             or use <methodname>setOptions()</methodname>. The following examples illustrate the
             usage of constants from the table below to create self-defined formats.
@@ -1194,12 +1230,14 @@ print $date->toString("'Format:D M j G:i:s T Y='D M j G:i:s T Y");
         </example>
 
         <para>
-            The following table shows the list of <acronym>PHP</acronym> date format specifiers with their equivalent
-            <classname>Zend_Date</classname> constants and <acronym>CLDR</acronym>/ISO equivalent format specifiers. In most cases, when the
-            <acronym>CLDR</acronym>/ISO format does not have an equivalent format specifier, the <acronym>PHP</acronym> format specifier
-            is not altered by <methodname>Zend_Locale_Format::convertPhpToIsoFormat()</methodname>,
-            and the <classname>Zend_Date</classname> methods then recognize these "peculiar" <acronym>PHP</acronym> format specifiers, even
-            when in the default "ISO" format mode.
+            The following table shows the list of <acronym>PHP</acronym> date format specifiers with
+            their equivalent <classname>Zend_Date</classname> constants and
+            <acronym>CLDR</acronym>/ISO equivalent format specifiers. In most cases, when the
+            <acronym>CLDR</acronym>/ISO format does not have an equivalent format specifier, the
+            <acronym>PHP</acronym> format specifier is not altered by
+            <methodname>Zend_Locale_Format::convertPhpToIsoFormat()</methodname>, and the
+            <classname>Zend_Date</classname> methods then recognize these "peculiar"
+            <acronym>PHP</acronym> format specifiers, even when in the default "ISO" format mode.
         </para>
 
         <table id="zend.date.constants.phpformats.table">
@@ -1337,7 +1375,9 @@ print $date->toString("'Format:D M j G:i:s T Y='D M j G:i:s T Y");
                     </row>
                     <row>
                         <entry>o</entry>
-                        <entry>Year according to <acronym>ISO</acronym> 8601, at least four digit</entry>
+                        <entry>
+                            Year according to <acronym>ISO</acronym> 8601, at least four digit
+                        </entry>
                         <entry><constant>Zend_Date::YEAR_8601</constant></entry>
                         <entry>YYYY</entry>
                         <entry><emphasis>2009</emphasis>

+ 28 - 23
documentation/manual/en/module_specs/Zend_Date-Introduction.xml

@@ -5,12 +5,13 @@
     <title>Introduction</title>
 
     <para>
-        The <classname>Zend_Date</classname> component offers a detailed, but simple <acronym>API</acronym> for
-        manipulating dates and times. Its methods accept a wide variety of types of information,
-        including date parts, in numerous combinations yielding many features and possibilities
-        above and beyond the existing <acronym>PHP</acronym> date related functions. For the very latest manual
-        updates, please see <ulink url="http://framework.zend.com/wiki/display/ZFDOCDEV/Home">our
-            online manual (frequently synced to Subversion)</ulink>.
+        The <classname>Zend_Date</classname> component offers a detailed, but simple
+        <acronym>API</acronym> for manipulating dates and times. Its methods accept a wide variety
+        of types of information, including date parts, in numerous combinations yielding many
+        features and possibilities above and beyond the existing <acronym>PHP</acronym> date related
+        functions. For the very latest manual updates, please see <ulink
+            url="http://framework.zend.com/wiki/display/ZFDOCDEV/Home">our online manual (frequently
+            synced to Subversion)</ulink>.
     </para>
 
     <para>
@@ -60,9 +61,10 @@ date_default_timezone_set('Europe/Berlin');
         <para>
             Keep in mind that the timezones <emphasis>UTC</emphasis> and
             <emphasis>GMT</emphasis> do not include Daylight Saving Time. This means that even if
-            you define per hand that <classname>Zend_Date</classname> should work with <acronym>DST</acronym>, it would
-            automatically be switched back for the instances of <classname>Zend_Date</classname>
-            which have been set to <acronym>UTC</acronym> or <acronym>GMT</acronym>.
+            you define per hand that <classname>Zend_Date</classname> should work with
+            <acronym>DST</acronym>, it would automatically be switched back for the instances of
+            <classname>Zend_Date</classname> which have been set to <acronym>UTC</acronym> or
+            <acronym>GMT</acronym>.
         </para>
     </sect2>
 
@@ -81,9 +83,10 @@ date_default_timezone_set('Europe/Berlin');
                     Simple <acronym>API</acronym>
                 </para>
                 <para>
-                    <classname>Zend_Date</classname> offers a very simple <acronym>API</acronym>, which combines the
-                    best of date/time functionality from four programming languages. It is possible,
-                    for example, to add or compare two times within a single row.
+                    <classname>Zend_Date</classname> offers a very simple <acronym>API</acronym>,
+                    which combines the best of date/time functionality from four programming
+                    languages. It is possible, for example, to add or compare two times within a
+                    single row.
                 </para>
             </listitem>
             <listitem>
@@ -102,14 +105,15 @@ date_default_timezone_set('Europe/Berlin');
                     Unlimited timestamps
                 </para>
                 <para>
-                    Although <acronym>PHP</acronym> 5.2 docs state, "The valid range of a timestamp is typically from
-                    Fri, 13 Dec 1901 20:45:54 <acronym>GMT</acronym> to Tue, 19 Jan 2038 03:14:07 <acronym>GMT</acronym>,"
-                    <classname>Zend_Date</classname> supports a nearly unlimited range, with the
-                    help of the BCMath extension. If BCMath is not available, then <classname>Zend_Date</classname> will
-                    have reduced support only for timestamps within the range of the
-                    <code>float</code> type supported by your server. "The size of a float is
-                    platform-dependent, although a maximum of ~1.8e308 with a precision of roughly
-                    14 decimal digits is a common value (that's 64 bit IEEE format)." [ <ulink
+                    Although <acronym>PHP</acronym> 5.2 docs state, "The valid range of a timestamp
+                    is typically from Fri, 13 Dec 1901 20:45:54 <acronym>GMT</acronym> to Tue, 19
+                    Jan 2038 03:14:07 <acronym>GMT</acronym>," <classname>Zend_Date</classname>
+                    supports a nearly unlimited range, with the help of the BCMath extension. If
+                    BCMath is not available, then <classname>Zend_Date</classname> will have reduced
+                    support only for timestamps within the range of the <code>float</code> type
+                    supported by your server. "The size of a float is platform-dependent, although a
+                    maximum of ~1.8e308 with a precision of roughly 14 decimal digits is a common
+                    value (that's 64 bit IEEE format)." [ <ulink
                         url="http://www.php.net/float">http://www.php.net/float</ulink> ].
                     Additionally, inherent limitations of float data types, and rounding error of
                     float numbers may introduce errors into calculations. To avoid these problems,
@@ -129,7 +133,8 @@ date_default_timezone_set('Europe/Berlin');
                     <classname>Zend_Date</classname> using the <link
                         linkend="zend.date.constants.list">Zend_Date::ISO_8601</link> format
                     specification constant. When date strings conform to "Y/m/d" or "Y-m-d H:i:s",
-                    according to <acronym>PHP</acronym> date() format tokens, use <classname>Zend_Date</classname>'s built-in support for <acronym>ISO</acronym>
+                    according to <acronym>PHP</acronym> date() format tokens, use
+                    <classname>Zend_Date</classname>'s built-in support for <acronym>ISO</acronym>
                     8601 formatted dates.
                 </para>
             </listitem>
@@ -139,8 +144,8 @@ date_default_timezone_set('Europe/Berlin');
                 </para>
                 <para>
                     For any place and day, the times for sunrise and sunset can be displayed, so
-                    that you won't miss a single daylight second for working on your favorite <acronym>PHP</acronym>
-                    project :)
+                    that you won't miss a single daylight second for working on your favorite
+                    <acronym>PHP</acronym> project :)
                 </para>
             </listitem>
         </itemizedlist>

+ 85 - 74
documentation/manual/en/module_specs/Zend_Date-Overview.xml

@@ -5,8 +5,9 @@
     <title>Zend_Date API Overview</title>
 
     <para>
-        While the <classname>Zend_Date</classname> <acronym>API</acronym> remains simplistic and unitary, its design
-        remains flexible and powerful through the rich permutations of operations and operands.
+        While the <classname>Zend_Date</classname> <acronym>API</acronym> remains simplistic and
+        unitary, its design remains flexible and powerful through the rich permutations of
+        operations and operands.
     </para>
 
     <sect2 id="zend.date.options">
@@ -18,15 +19,16 @@
             <title>Selecting the Date Format Type</title>
 
             <para>
-                Several methods use date format strings, in a way similar to <acronym>PHP</acronym>'s
-                <methodname>date()</methodname>. If you are more comfortable with <acronym>PHP</acronym>'s date format
-                specifier than with <acronym>ISO</acronym> format specifiers, then you can use
+                Several methods use date format strings, in a way similar to
+                <acronym>PHP</acronym>'s <methodname>date()</methodname>. If you are more
+                comfortable with <acronym>PHP</acronym>'s date format specifier than with
+                <acronym>ISO</acronym> format specifiers, then you can use
                 <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname>.
-                Afterward, use <acronym>PHP</acronym>'s date format specifiers for all functions which accept a
-                <varname>$format</varname> parameter. Use
+                Afterward, use <acronym>PHP</acronym>'s date format specifiers for all functions
+                which accept a <varname>$format</varname> parameter. Use
                 <methodname>Zend_Date::setOptions(array('format_type' => 'iso'))</methodname> to
-                switch back to the default mode of supporting only <acronym>ISO</acronym> date format tokens. For a
-                list of supported format codes, see
+                switch back to the default mode of supporting only <acronym>ISO</acronym> date
+                format tokens. For a list of supported format codes, see
                 <xref linkend="zend.date.constants.phpformats" />
             </para>
 
@@ -37,35 +39,38 @@
             <title>DST and Date Math</title>
 
             <para>
-                When dates are manipulated, sometimes they cross over a <acronym>DST</acronym> change, normally
-                resulting in the date losing or gaining an hour. For exmaple, when adding months to
-                a date before a <acronym>DST</acronym> change, if the resulting date is after the <acronym>DST</acronym> change, then the
-                resulting date will appear to lose or gain an hour, resulting in the time value of
-                the date changing. For boundary dates, such as midnight of the first or last day of
-                a month, adding enough months to cross a date boundary results in the date losing an
-                hour and becoming the last hour of the preceding month, giving the appearance of an
-                "off by 1" error. To avoid this situation, the <acronym>DST</acronym> change ignored by using the
-                <code>fix_dst</code> option. When crossing the Summer/Winter <acronym>DST</acronym> boundary, normally
-                an hour is substracted or added depending on the date. For example, date math
-                crossing the Spring <acronym>DST</acronym> leads to a date having a day value one less than expected,
-                if the time part of the date was originally 00:00:00. Since <classname>Zend_Date</classname> is based on
-                timestamps, and not calendar dates with a time component, the timestamp loses an
-                hour, resulting in the date having a calendar day value one less than expected. To
-                prevent such problems use the option <code>fix_dst</code>, which defaults to <constant>TRUE</constant>,
-                causing <acronym>DST</acronym> to have no effect on date "math" (<methodname>addMonth()</methodname>,
-                <methodname>subMonth()</methodname>). Use
+                When dates are manipulated, sometimes they cross over a <acronym>DST</acronym>
+                change, normally resulting in the date losing or gaining an hour. For exmaple, when
+                adding months to a date before a <acronym>DST</acronym> change, if the resulting
+                date is after the <acronym>DST</acronym> change, then the resulting date will appear
+                to lose or gain an hour, resulting in the time value of the date changing. For
+                boundary dates, such as midnight of the first or last day of a month, adding enough
+                months to cross a date boundary results in the date losing an hour and becoming the
+                last hour of the preceding month, giving the appearance of an "off by 1" error. To
+                avoid this situation, the <acronym>DST</acronym> change ignored by using the
+                <code>fix_dst</code> option. When crossing the Summer/Winter <acronym>DST</acronym>
+                boundary, normally an hour is substracted or added depending on the date. For
+                example, date math crossing the Spring <acronym>DST</acronym> leads to a date having
+                a day value one less than expected, if the time part of the date was originally
+                00:00:00. Since <classname>Zend_Date</classname> is based on timestamps, and not
+                calendar dates with a time component, the timestamp loses an hour, resulting in the
+                date having a calendar day value one less than expected. To prevent such problems
+                use the option <code>fix_dst</code>, which defaults to <constant>TRUE</constant>,
+                causing <acronym>DST</acronym> to have no effect on date "math"
+                (<methodname>addMonth()</methodname>, <methodname>subMonth()</methodname>). Use
                 <methodname>Zend_Date::setOptions(array('fix_dst' => false))</methodname> to
-                enable the subtraction or addition of the <acronym>DST</acronym> adjustment when performing date
-                "math".
+                enable the subtraction or addition of the <acronym>DST</acronym> adjustment when
+                performing date "math".
             </para>
 
             <para>
                 <emphasis>If your actual timezone within the instance of
-                <classname>Zend_Date</classname> is set to <acronym>UTC</acronym> or <acronym>GMT</acronym> the option
-                <code>'fix_dst'</code> will not be used</emphasis> because these two timezones do
-                not work with <acronym>DST</acronym>. When you change the timezone for this instance again to a
-                timezone which is not <acronym>UTC</acronym> or <acronym>GMT</acronym> the previous set 'fix_dst' option will be used
-                again for date "math".
+                <classname>Zend_Date</classname> is set to <acronym>UTC</acronym> or
+                <acronym>GMT</acronym> the option <code>'fix_dst'</code> will not be used</emphasis>
+                because these two timezones do not work with <acronym>DST</acronym>. When you change
+                the timezone for this instance again to a timezone which is not
+                <acronym>UTC</acronym> or <acronym>GMT</acronym> the previous set 'fix_dst' option
+                will be used again for date "math".
             </para>
         </sect3>
 
@@ -77,17 +82,18 @@
                 When adding or substracting months from an existing date, the resulting value for
                 the day of the month might be unexpected, if the original date fell on a day close
                 to the end of the month. For example, when adding one month to January 31st, people
-                familiar with <acronym>SQL</acronym> will expect February 28th as the result. On the other side, people
-                familiar with Excel and OpenOffice will expect March 3rd as the result. The problem
-                only occurs, if the resulting month does not have the day, which is set in the
-                original date. For Zend Framework developers, the desired behavior is selectable
-                using the <code>extend_month</code> option to choose either the <acronym>SQL</acronym> behaviour, if
-                set to <constant>FALSE</constant>, or the spreadsheet behaviour when set to <constant>TRUE</constant>. The default behaviour
-                for <code>extend_month</code> is <constant>FALSE</constant>, providing behavior compatible to <acronym>SQL</acronym>. By
-                default, <classname>Zend_Date</classname> computes month calculations by truncating
-                dates to the end of the month (if necessary), without wrapping into the next month
-                when the original date designates a day of the month exceeding the number of days in
-                the resulting month. Use
+                familiar with <acronym>SQL</acronym> will expect February 28th as the result. On the
+                other side, people familiar with Excel and OpenOffice will expect March 3rd as the
+                result. The problem only occurs, if the resulting month does not have the day, which
+                is set in the original date. For Zend Framework developers, the desired behavior is
+                selectable using the <code>extend_month</code> option to choose either the
+                <acronym>SQL</acronym> behaviour, if set to <constant>FALSE</constant>, or the
+                spreadsheet behaviour when set to <constant>TRUE</constant>. The default behaviour
+                for <code>extend_month</code> is <constant>FALSE</constant>, providing behavior
+                compatible to <acronym>SQL</acronym>. By default, <classname>Zend_Date</classname>
+                computes month calculations by truncating dates to the end of the month (if
+                necessary), without wrapping into the next month when the original date designates a
+                day of the month exceeding the number of days in the resulting month. Use
                 <classname>Zend_Date::setOptions(array('extend_month' => true));</classname> to make
                 month calculations work like popular spreadsheet programs.
             </para>
@@ -115,12 +121,14 @@
             <title>Receiving Syncronised Timestamps with Zend_TimeSync</title>
 
             <para>
-                Normally the clocks from servers and computers differ from each other. <classname>Zend_Date</classname>
-                is able to handle such problems with the help of <classname>Zend_TimeSync</classname>. You can set a
-                timeserver with <classname>Zend_Date::setOptions(array('timesync' => $timeserver));</classname> which
-                will set the offset between the own actual timestamp and the real actual timestamp for all
-                instances of <classname>Zend_Date</classname>. Using this option does not change the timestamp of existing instances.
-                So best usage is to set it within the bootstrap file.
+                Normally the clocks from servers and computers differ from each other.
+                <classname>Zend_Date</classname> is able to handle such problems with the help of
+                <classname>Zend_TimeSync</classname>. You can set a timeserver with
+                <classname>Zend_Date::setOptions(array('timesync' => $timeserver));</classname>
+                which will set the offset between the own actual timestamp and the real actual
+                timestamp for all instances of <classname>Zend_Date</classname>. Using this option
+                does not change the timestamp of existing instances. So best usage is to set it
+                within the bootstrap file.
             </para>
 
         </sect3>
@@ -136,10 +144,10 @@
             object, it will have an associated timezone, but an internal representation using
             standard <ulink url="http://en.wikipedia.org/wiki/Unix_Time">UNIX timestamps</ulink>.
             In order for a date to be rendered in a localized manner, a timezone must be known
-            first. The default timezone is always <acronym>GMT</acronym>/UTC. To examine an object's timezone use
-            <methodname>getTimeZone()</methodname>. To change an object's timezone, use
-            <methodname>setTimeZone()</methodname>. All manipulations of these objects are assumed to be
-            relative to this timezone.
+            first. The default timezone is always <acronym>GMT</acronym>/UTC. To examine an object's
+            timezone use <methodname>getTimeZone()</methodname>. To change an object's timezone, use
+            <methodname>setTimeZone()</methodname>. All manipulations of these objects are assumed
+            to be relative to this timezone.
         </para>
 
         <para>
@@ -431,10 +439,11 @@ print $date;
                                 <ulink url="http://www.faqs.org/rfcs/rfc822.html">Arpa</ulink>
                             </entry>
                             <entry>
-                                Arpa dates (i.e. <acronym>RFC</acronym> 822 formatted dates) are supported. Output uses
-                                either a "GMT" or "Local differential hours+min" format (see section
-                                5 of <acronym>RFC</acronym> 822). Before <acronym>PHP</acronym> 5.2.2, using the DATE_RFC822 constant with
-                                <acronym>PHP</acronym> date functions sometimes produces <ulink
+                                Arpa dates (i.e. <acronym>RFC</acronym> 822 formatted dates) are
+                                supported. Output uses either a "GMT" or "Local differential
+                                hours+min" format (see section 5 of <acronym>RFC</acronym> 822).
+                                Before <acronym>PHP</acronym> 5.2.2, using the DATE_RFC822 constant
+                                with <acronym>PHP</acronym> date functions sometimes produces <ulink
                                     url="http://bugs.php.net/bug.php?id=40308">incorrect
                                     results</ulink>. Zend_Date's results are correct. Example:
                                 <code>Mon, 31 Dec 06 23:59:59 GMT</code>
@@ -445,8 +454,8 @@ print $date;
                                 <ulink url="http://en.wikipedia.org/wiki/ISO_8601">Iso</ulink>
                             </entry>
                             <entry>
-                                Only complete <acronym>ISO</acronym> 8601 dates are supported for output. Example:
-                                <code>2009-02-14T00:31:30+01:00</code>
+                                Only complete <acronym>ISO</acronym> 8601 dates are supported for
+                                output. Example: <code>2009-02-14T00:31:30+01:00</code>
                             </entry>
                         </row>
                     </tbody>
@@ -613,9 +622,9 @@ print $date;
                                 <emphasis>isEarlier($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns <constant>TRUE</constant>, if <varname>$part</varname> of this object's date is
-                                earlier than <varname>$part</varname> of <varname>$date</varname>
-                                having a locale <varname>$locale</varname>
+                                returns <constant>TRUE</constant>, if <varname>$part</varname> of
+                                this object's date is earlier than <varname>$part</varname> of
+                                <varname>$date</varname> having a locale <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>
@@ -626,9 +635,9 @@ print $date;
                                 <emphasis>isLater($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns <constant>TRUE</constant>, if <varname>$part</varname> of this object's date is
-                                later than <varname>$part</varname> of <varname>$date</varname>
-                                having a locale <varname>$locale</varname>
+                                returns <constant>TRUE</constant>, if <varname>$part</varname> of
+                                this object's date is later than <varname>$part</varname> of
+                                <varname>$date</varname> having a locale <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>
@@ -691,10 +700,11 @@ print $date;
                                 <emphasis>isDate($date, $format = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                This method checks if a given date is a real date and returns <constant>TRUE</constant>
-                                if all checks are ok. It works like <acronym>PHP</acronym>'s checkdate() function but
-                                can also check for localized month names and for dates extending the
-                                range of checkdate()
+                                This method checks if a given date is a real date and returns
+                                <constant>TRUE</constant> if all checks are ok. It works like
+                                <acronym>PHP</acronym>'s checkdate() function but can also check for
+                                localized month names and for dates extending the range of
+                                checkdate()
                             </para>
                         </entry>
                     </row>
@@ -846,10 +856,11 @@ print $date;
                                 <constant>Zend_Date::MONTH_NAME_SHORT</constant>.
                                 <emphasis>NOTE:</emphasis> This method calls <link
                                     linkend="id.date.basic.operations"><methodname>get()</methodname></link>
-                                and casts the result to a <acronym>PHP</acronym> integer, which will give
-                                unpredictable results, if <methodname>get()</methodname> returns a
-                                numeric string containing a number too large for a <acronym>PHP</acronym> integer on
-                                your system. Use <methodname>get()</methodname> instead.
+                                and casts the result to a <acronym>PHP</acronym> integer, which will
+                                give unpredictable results, if <methodname>get()</methodname>
+                                returns a numeric string containing a number too large for a
+                                <acronym>PHP</acronym> integer on your system. Use
+                                <methodname>get()</methodname> instead.
                             </para>
                         </entry>
                     </row>

+ 112 - 86
documentation/manual/en/module_specs/Zend_Db_Adapter.xml

@@ -5,48 +5,52 @@
     <title>Zend_Db_Adapter</title>
 
     <para>
-        <classname>Zend_Db</classname> and its related classes provide a simple <acronym>SQL</acronym> database
-        interface for Zend Framework. The <classname>Zend_Db_Adapter</classname> is the basic class
-        you use to connect your <acronym>PHP</acronym> application to an <acronym>RDBMS</acronym>. There is a different Adapter
-        class for each brand of <acronym>RDBMS</acronym>.
+        <classname>Zend_Db</classname> and its related classes provide a simple
+        <acronym>SQL</acronym> database interface for Zend Framework. The
+        <classname>Zend_Db_Adapter</classname> is the basic class you use to connect your
+        <acronym>PHP</acronym> application to an <acronym>RDBMS</acronym>. There is a different
+        Adapter class for each brand of <acronym>RDBMS</acronym>.
     </para>
 
     <para>
-        The <classname>Zend_Db</classname> adapters create a bridge from the vendor-specific <acronym>PHP</acronym>
-        extensions to a common interface to help you write <acronym>PHP</acronym> applications
-        once and deploy with multiple brands of <acronym>RDBMS</acronym> with very little effort.
+        The <classname>Zend_Db</classname> adapters create a bridge from the vendor-specific
+        <acronym>PHP</acronym> extensions to a common interface to help you write
+        <acronym>PHP</acronym> applications once and deploy with multiple brands of
+        <acronym>RDBMS</acronym> with very little effort.
     </para>
 
     <para>
         The interface of the adapter class is similar to the interface of the
         <ulink url="http://www.php.net/pdo">PHP Data Objects</ulink> extension.
-        <classname>Zend_Db</classname> provides Adapter classes to <acronym>PDO</acronym> drivers for the following
-        <acronym>RDBMS</acronym> brands:
+        <classname>Zend_Db</classname> provides Adapter classes to <acronym>PDO</acronym> drivers
+        for the following <acronym>RDBMS</acronym> brands:
     </para>
 
     <itemizedlist>
         <listitem>
             <para>
                 IBM DB2 and Informix Dynamic Server (IDS), using the
-                <ulink url="http://www.php.net/pdo-ibm">pdo_ibm</ulink> <acronym>PHP</acronym> extension
+                <ulink url="http://www.php.net/pdo-ibm">pdo_ibm</ulink> <acronym>PHP</acronym>
+                extension
             </para>
         </listitem>
         <listitem>
             <para>
-                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink> <acronym>PHP</acronym>
-                extension
+                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink>
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
                 Microsoft <acronym>SQL</acronym> Server, using the <ulink
-                url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> <acronym>PHP</acronym> extension
+                    url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> <acronym>PHP</acronym>
+                extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink> <acronym>PHP</acronym>
-                extension
+                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink>
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
@@ -57,50 +61,56 @@
         </listitem>
         <listitem>
             <para>
-                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink> <acronym>PHP</acronym>
-                extension
+                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink>
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
 
     </itemizedlist>
 
     <para>
-        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize <acronym>PHP</acronym>
-        database extensions for the following <acronym>RDBMS</acronym> brands:
+        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize
+        <acronym>PHP</acronym> database extensions for the following <acronym>RDBMS</acronym>
+        brands:
     </para>
 
     <itemizedlist>
         <listitem>
             <para>
-                MySQL, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink> <acronym>PHP</acronym> extension
+                MySQL, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink>
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Oracle, using the <ulink url="http://www.php.net/oci8">oci8</ulink> <acronym>PHP</acronym> extension
+                Oracle, using the <ulink url="http://www.php.net/oci8">oci8</ulink>
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
                 IBM DB2 and DB2/i5, using the <ulink
-                    url="http://www.php.net/ibm_db2">ibm_db2</ulink> <acronym>PHP</acronym> extension
+                    url="http://www.php.net/ibm_db2">ibm_db2</ulink> <acronym>PHP</acronym>
+                extension
             </para>
         </listitem>
         <listitem>
             <para>
                 Firebird/Interbase, using the <ulink
-                    url="http://www.php.net/ibase">php_interbase</ulink> <acronym>PHP</acronym> extension
+                    url="http://www.php.net/ibase">php_interbase</ulink> <acronym>PHP</acronym>
+                extension
             </para>
         </listitem>
     </itemizedlist>
 
     <note>
         <para>
-            Each <classname>Zend_Db</classname> Adapter uses a <acronym>PHP</acronym> extension. You must have the
-            respective <acronym>PHP</acronym> extension enabled in your <acronym>PHP</acronym> environment to use a
-            <classname>Zend_Db</classname> Adapter. For example, if you use any of the <acronym>PDO</acronym>
-            <classname>Zend_Db</classname> Adapters, you need to enable both the <acronym>PDO</acronym> extension and
-            the <acronym>PDO</acronym> driver for the brand of <acronym>RDBMS</acronym> you use.
+            Each <classname>Zend_Db</classname> Adapter uses a <acronym>PHP</acronym> extension. You
+            must have the respective <acronym>PHP</acronym> extension enabled in your
+            <acronym>PHP</acronym> environment to use a <classname>Zend_Db</classname> Adapter. For
+            example, if you use any of the <acronym>PDO</acronym> <classname>Zend_Db</classname>
+            Adapters, you need to enable both the <acronym>PDO</acronym> extension and the
+            <acronym>PDO</acronym> driver for the brand of <acronym>RDBMS</acronym> you use.
         </para>
     </note>
 
@@ -110,8 +120,8 @@
 
         <para>
             This section describes how to create an instance of a database Adapter.
-            This corresponds to making a connection to your <acronym>RDBMS</acronym> server from your
-            <acronym>PHP</acronym> application.
+            This corresponds to making a connection to your <acronym>RDBMS</acronym> server from
+            your <acronym>PHP</acronym> application.
         </para>
 
         <sect3 id="zend.db.adapter.connecting.constructor">
@@ -153,8 +163,8 @@ $db = new Zend_Db_Adapter_Pdo_Mysql(array(
             <para>
                 The first argument is a string that names the base name of the
                 adapter class. For example the string 'Pdo_Mysql' corresponds
-                to the class <classname>Zend_Db_Adapter_Pdo_Mysql</classname>. The second argument is
-                the same array of parameters you would have given to the
+                to the class <classname>Zend_Db_Adapter_Pdo_Mysql</classname>. The second argument
+                is the same array of parameters you would have given to the
                 adapter constructor.
             </para>
 
@@ -469,8 +479,8 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
                 an object for the connection as represented by the respective
                 <acronym>PHP</acronym> database extension. For example, if you use any of the
                 Adapter classes for <acronym>PDO</acronym> drivers, then
-                <methodname>getConnection()</methodname> returns the <acronym>PDO</acronym> object, after
-                initiating it as a live connection to the specific database.
+                <methodname>getConnection()</methodname> returns the <acronym>PDO</acronym> object,
+                after initiating it as a live connection to the specific database.
             </para>
 
             <para>
@@ -1238,11 +1248,12 @@ echo $sql;
 
         <para>
             The <classname>Zend_Db</classname> Adapter class provides convenient functions to help
-            you reduce vulnerabilities to <acronym>SQL</acronym> Injection attacks in your <acronym>PHP</acronym> code.
-            The solution is to escape special characters such as quotes in <acronym>PHP</acronym>
-            values before they are interpolated into your <acronym>SQL</acronym> strings.
-            This protects against both accidental and deliberate manipulation
-            of <acronym>SQL</acronym> strings by <acronym>PHP</acronym> variables that contain special characters.
+            you reduce vulnerabilities to <acronym>SQL</acronym> Injection attacks in your
+            <acronym>PHP</acronym> code. The solution is to escape special characters such as quotes
+            in <acronym>PHP</acronym> values before they are interpolated into your
+            <acronym>SQL</acronym> strings. This protects against both accidental and deliberate
+            manipulation of <acronym>SQL</acronym> strings by <acronym>PHP</acronym> variables that
+            contain special characters.
         </para>
 
         <sect3 id="zend.db.adapter.quoting.quote">
@@ -1311,17 +1322,17 @@ $sql = 'SELECT * FROM atable WHERE intColumn = '
 
             <para>
                 Each <classname>Zend_Db_Adapter</classname> class has encoded the names of numeric
-                <acronym>SQL</acronym> datatypes for the respective brand of <acronym>RDBMS</acronym>. You can also
-                use the constants <constant>Zend_Db::INT_TYPE</constant>,
-                <constant>Zend_Db::BIGINT_TYPE</constant>, and
-                <constant>Zend_Db::FLOAT_TYPE</constant> to write code in a more
+                <acronym>SQL</acronym> datatypes for the respective brand of
+                <acronym>RDBMS</acronym>. You can also use the constants
+                <constant>Zend_Db::INT_TYPE</constant>, <constant>Zend_Db::BIGINT_TYPE</constant>,
+                and <constant>Zend_Db::FLOAT_TYPE</constant> to write code in a more
                 <acronym>RDBMS</acronym>-independent way.
             </para>
 
             <para>
                 <classname>Zend_Db_Table</classname> specifies <acronym>SQL</acronym> types to
-                <methodname>quote()</methodname> automatically when generating <acronym>SQL</acronym> queries that
-                reference a table's key columns.
+                <methodname>quote()</methodname> automatically when generating
+                <acronym>SQL</acronym> queries that reference a table's key columns.
             </para>
 
         </sect3>
@@ -1363,8 +1374,8 @@ echo $sql;
 
             <para>
                 You can use the optional third parameter of
-                <methodname>quoteInto()</methodname> to specify the <acronym>SQL</acronym> datatype. Numeric
-                datatypes are not quoted, and other types are quoted.
+                <methodname>quoteInto()</methodname> to specify the <acronym>SQL</acronym> datatype.
+                Numeric datatypes are not quoted, and other types are quoted.
             </para>
 
             <example id="zend.db.adapter.quoting.quote-into.example-2">
@@ -1396,10 +1407,10 @@ echo $sql;
             </para>
 
             <para>
-                However, <acronym>SQL</acronym> has a feature called <emphasis>delimited identifiers</emphasis>,
-                which allows broader choices for the spelling of identifiers.
-                If you enclose a <acronym>SQL</acronym> identifier in the proper types of quotes,
-                you can use identifiers with spellings that would be invalid
+                However, <acronym>SQL</acronym> has a feature called
+                <emphasis>delimited identifiers</emphasis>, which allows broader choices for the
+                spelling of identifiers. If you enclose a <acronym>SQL</acronym> identifier in the
+                proper types of quotes, you can use identifiers with spellings that would be invalid
                 without the quotes. Delimited identifiers can contain spaces,
                 punctuation, or international characters. You can also use <acronym>SQL</acronym>
                 reserved words if you enclose them in identifier delimiters.
@@ -1438,9 +1449,9 @@ echo $sql
             </para>
 
             <para>
-                In most cases where <acronym>SQL</acronym> is generated within <classname>Zend_Db</classname> classes,
-                the default is that all identifiers are delimited
-                automatically. You can change this behavior with the option
+                In most cases where <acronym>SQL</acronym> is generated within
+                <classname>Zend_Db</classname> classes, the default is that all identifiers are
+                delimited automatically. You can change this behavior with the option
                 <constant>Zend_Db::AUTO_QUOTE_IDENTIFIERS</constant>. Specify this
                 when instantiating the Adapter.
                 See <xref linkend="zend.db.adapter.connecting.parameters.example2" />.
@@ -1462,8 +1473,8 @@ echo $sql
             them implicitly. This is called <emphasis>auto-commit</emphasis>
             mode, in which the database driver creates a transaction for every
             statement you execute, and commits that transaction after your
-            <acronym>SQL</acronym> statement has been executed. By default, all <classname>Zend_Db</classname> Adapter
-            classes operate in auto-commit mode.
+            <acronym>SQL</acronym> statement has been executed. By default, all
+            <classname>Zend_Db</classname> Adapter classes operate in auto-commit mode.
         </para>
 
         <para>
@@ -1596,29 +1607,41 @@ try {
                         <entry><constant>NULLABLE</constant></entry>
                         <entry>(boolean)</entry>
                         <entry>
-                            True if the column accepts <acronym>SQL</acronym> NULLs, false if the column has a NOT NULL
-                            constraint.
+                            True if the column accepts <acronym>SQL</acronym> NULLs, false if the
+                            column has a NOT NULL constraint.
                         </entry>
                     </row>
                     <row>
                         <entry><constant>LENGTH</constant></entry>
                         <entry>(integer)</entry>
-                        <entry>Length or size of the column as reported by the <acronym>RDBMS</acronym>.</entry>
+                        <entry>
+                            Length or size of the column as reported by the
+                            <acronym>RDBMS</acronym>.
+                        </entry>
                     </row>
                     <row>
                         <entry><constant>SCALE</constant></entry>
                         <entry>(integer)</entry>
-                        <entry>Scale of <acronym>SQL</acronym> NUMERIC or <constant>DECIMAL</constant> type.</entry>
+                        <entry>
+                            Scale of <acronym>SQL</acronym> NUMERIC or <constant>DECIMAL</constant>
+                            type.
+                        </entry>
                     </row>
                     <row>
                         <entry><constant>PRECISION</constant></entry>
                         <entry>(integer)</entry>
-                        <entry>Precision of <acronym>SQL</acronym> NUMERIC or <constant>DECIMAL</constant> type.</entry>
+                        <entry>
+                            Precision of <acronym>SQL</acronym> NUMERIC or
+                            <constant>DECIMAL</constant> type.
+                        </entry>
                     </row>
                     <row>
                         <entry><constant>UNSIGNED</constant></entry>
                         <entry>(boolean)</entry>
-                        <entry>True if an integer-based type is reported as <constant>UNSIGNED</constant>.</entry>
+                        <entry>
+                            True if an integer-based type is reported as
+                            <constant>UNSIGNED</constant>.
+                        </entry>
                     </row>
                     <row>
                         <entry><constant>PRIMARY</constant></entry>
@@ -1697,13 +1720,13 @@ try {
         </para>
 
         <para>
-            Since release 1.7.2, you could check you are currently connected to the <acronym>RDBMS</acronym>
-            server with the method <methodname>isConnected()</methodname>. This means that a
-            connection resource has been initiated and wasn't closed. This function is not
-            currently able to test for example a server side closing of the connection. This is
-            internally use to close the connection. It allow you to close the connection
-            multiple times without errors. It was already the case before 1.7.2 for <acronym>PDO</acronym>
-            adapters but not for the others.
+            Since release 1.7.2, you could check you are currently connected to the
+            <acronym>RDBMS</acronym> server with the method <methodname>isConnected()</methodname>.
+            This means that a connection resource has been initiated and wasn't closed. This
+            function is not currently able to test for example a server side closing of the
+            connection. This is internally use to close the connection. It allow you to close the
+            connection multiple times without errors. It was already the case before 1.7.2 for
+            <acronym>PDO</acronym> adapters but not for the others.
         </para>
 
         <example id="zend.db.adapter.closing.example">
@@ -1752,7 +1775,8 @@ $db = Zend_Db::factory('Oracle', array(
             </para>
             <para>
                 Currently, only Oracle, DB2, and the <acronym>PDO</acronym> adapters (where
-                specified by <acronym>PHP</acronym>) support persistence in <classname>Zend_Db</classname>.
+                specified by <acronym>PHP</acronym>) support persistence in
+                <classname>Zend_Db</classname>.
             </para>
         </note>
 
@@ -1770,19 +1794,20 @@ $db = Zend_Db::factory('Oracle', array(
         </para>
 
         <para>
-            For example, all <acronym>SQL</acronym> statements run by <classname>Zend_Db</classname> are prepared, then
-            executed. However, some database features are incompatible with
+            For example, all <acronym>SQL</acronym> statements run by <classname>Zend_Db</classname>
+            are prepared, then executed. However, some database features are incompatible with
             prepared statements. DDL statements like CREATE and ALTER cannot
-            be prepared in MySQL. Also, <acronym>SQL</acronym> statements don't benefit from the <ulink
-                url="http://dev.mysql.com/doc/refman/5.1/en/query-cache-how.html">MySQL Query
+            be prepared in MySQL. Also, <acronym>SQL</acronym> statements don't benefit from the
+            <ulink url="http://dev.mysql.com/doc/refman/5.1/en/query-cache-how.html">MySQL Query
                 Cache</ulink>, prior to MySQL 5.1.17.
         </para>
 
         <para>
-            Most <acronym>PHP</acronym> database extensions provide a method to execute <acronym>SQL</acronym>
-            statements without preparing them. For example, in <acronym>PDO</acronym>, this
-            method is <methodname>exec()</methodname>. You can access the connection
-            object in the <acronym>PHP</acronym> extension directly using getConnection().
+            Most <acronym>PHP</acronym> database extensions provide a method to execute
+            <acronym>SQL</acronym> statements without preparing them. For example, in
+            <acronym>PDO</acronym>, this method is <methodname>exec()</methodname>. You can access
+            the connection object in the <acronym>PHP</acronym> extension directly using
+            getConnection().
         </para>
 
         <example id="zend.db.adapter.other-statements.example">
@@ -1812,9 +1837,9 @@ $result = $db->getConnection()->exec('DROP TABLE bugs');
         <title>Retrieving Server Version</title>
 
         <para>
-            Since release 1.7.2, you could retrieve the server version in <acronym>PHP</acronym> syntax
-            style to be able to use <methodname>version_compare()</methodname>. If the information
-            isn't available, you will receive <constant>NULL</constant>.
+            Since release 1.7.2, you could retrieve the server version in <acronym>PHP</acronym>
+            syntax style to be able to use <methodname>version_compare()</methodname>. If the
+            information isn't available, you will receive <constant>NULL</constant>.
         </para>
 
         <example id="zend.db.adapter.server-version.example">
@@ -2068,10 +2093,10 @@ if (!is_null($version)) {
                     <para>
                         <classname>Zend_Db_Adapter_Pdo_Mssql</classname> sets
                         <constant>QUOTED_IDENTIFIER ON</constant> immediately after connecting to a
-                        <acronym>SQL</acronym> Server database. This makes the driver use the standard <acronym>SQL</acronym> identifier
-                        delimiter symbol (<code>"</code>) instead of the
-                        proprietary square-brackets syntax <acronym>SQL</acronym> Server uses for
-                        delimiting identifiers.
+                        <acronym>SQL</acronym> Server database. This makes the driver use the
+                        standard <acronym>SQL</acronym> identifier delimiter symbol (<code>"</code>)
+                        instead of the proprietary square-brackets syntax <acronym>SQL</acronym>
+                        Server uses for delimiting identifiers.
                     </para>
                 </listitem>
                 <listitem>
@@ -2254,7 +2279,8 @@ if (!is_null($version)) {
                 <listitem>
                     <para>Adapter name is <classname>ZendX_Db_Adapter_Firebird</classname>.</para>
                     <para>
-                        Remember to use the param adapterNamespace with value <classname>ZendX_Db_Adapter</classname>.
+                        Remember to use the param adapterNamespace with value
+                        <classname>ZendX_Db_Adapter</classname>.
                     </para>
                     <para>
                         We recommend to update the gds32.dll (or linux equivalent) bundled with php,

+ 2 - 2
documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml

@@ -12,8 +12,8 @@
     <para>
         All data is sent via the <classname>Zend_Wildfire_Channel_HttpHeaders</classname>
         component which uses <acronym>HTTP</acronym> headers to ensure the page content is not
-        disturbed. Debugging <acronym>AJAX</acronym> requests that require clean <acronym>JSON</acronym> and <acronym>XML</acronym>
-        responses is possible with this approach.
+        disturbed. Debugging <acronym>AJAX</acronym> requests that require clean
+        <acronym>JSON</acronym> and <acronym>XML</acronym> responses is possible with this approach.
     </para>
 
     <para>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Db_Profiler.xml

@@ -184,9 +184,9 @@ $profiler = $db->getProfiler();
         <itemizedlist>
             <listitem>
                 <para>
-                    <methodname>getQuery()</methodname> returns the <acronym>SQL</acronym> text of the query.
-                    The <acronym>SQL</acronym> text of a prepared statement with parameters is the
-                    text at the time the query was prepared, so it contains
+                    <methodname>getQuery()</methodname> returns the <acronym>SQL</acronym> text of
+                    the query. The <acronym>SQL</acronym> text of a prepared statement with
+                    parameters is the text at the time the query was prepared, so it contains
                     parameter placeholders, not the values used when the
                     statement is executed.
                 </para>

+ 194 - 172
documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -9,11 +9,12 @@
         <title>Introduction</title>
 
         <para>
-            The <classname>Zend_Db_Select</classname> object represents a <acronym>SQL</acronym> <acronym>SELECT</acronym>
-            query statement. The class has methods for adding individual parts to the query. You can
-            specify some parts of the query using <acronym>PHP</acronym> methods and data structures, and the class
-            forms the correct <acronym>SQL</acronym> syntax for you. After you build a query, you can execute the query
-            as if you had written it as a string.
+            The <classname>Zend_Db_Select</classname> object represents a <acronym>SQL</acronym>
+            <acronym>SELECT</acronym> query statement. The class has methods for adding individual
+            parts to the query. You can specify some parts of the query using <acronym>PHP</acronym>
+            methods and data structures, and the class forms the correct <acronym>SQL</acronym>
+            syntax for you. After you build a query, you can execute the query as if you had written
+            it as a string.
         </para>
 
         <para>
@@ -23,13 +24,15 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    Object-oriented methods for specifying <acronym>SQL</acronym> queries in a piece-by-piece manner;
+                    Object-oriented methods for specifying <acronym>SQL</acronym> queries in a
+                    piece-by-piece manner;
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    Database-independent abstraction of some parts of the <acronym>SQL</acronym> query;
+                    Database-independent abstraction of some parts of the <acronym>SQL</acronym>
+                    query;
                 </para>
             </listitem>
 
@@ -42,15 +45,16 @@
 
             <listitem>
                 <para>
-                    Quoting identifiers and values, to help reduce risk of <acronym>SQL</acronym> injection attacks.
+                    Quoting identifiers and values, to help reduce risk of <acronym>SQL</acronym>
+                    injection attacks.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             Using <classname>Zend_Db_Select</classname> is not mandatory. For very simple SELECT
-            queries, it is usually simpler to specify the entire <acronym>SQL</acronym> query as a string and execute
-            it using Adapter methods like <methodname>query()</methodname> or
+            queries, it is usually simpler to specify the entire <acronym>SQL</acronym> query as a
+            string and execute it using Adapter methods like <methodname>query()</methodname> or
             <methodname>fetchAll()</methodname>. Using
             <classname>Zend_Db_Select</classname> is helpful if you need to assemble a SELECT query
             procedurally, or based on conditional logic in your application.
@@ -64,8 +68,8 @@
 
         <para>
             You can create an instance of a <classname>Zend_Db_Select</classname> object using the
-            <methodname>select()</methodname> method of a <classname>Zend_Db_Adapter_Abstract</classname>
-            object.
+            <methodname>select()</methodname> method of a
+            <classname>Zend_Db_Adapter_Abstract</classname> object.
         </para>
 
         <example id="zend.db.select.creating.example-db">
@@ -182,8 +186,8 @@ $select = $db->select()
             <para>
                 You can also specify the correlation name (sometimes called the "table alias") for
                 a table. Instead of a simple string, use an associative array mapping the
-                correlation name to the table name. In other clauses of the <acronym>SQL</acronym> query, use this
-                correlation name. If your query joins more than one table,
+                correlation name to the table name. In other clauses of the <acronym>SQL</acronym>
+                query, use this correlation name. If your query joins more than one table,
                 <classname>Zend_Db_Select</classname> generates unique correlation names based on
                 the table names, for any tables for which you don't specify the correlation name.
             </para>
@@ -204,8 +208,8 @@ $select = $db->select()
             </example>
 
             <para>
-                Some <acronym>RDBMS</acronym> brands support a leading schema specifier for a table. You can specify
-                the table name as "<code>schemaName.tableName</code>", where
+                Some <acronym>RDBMS</acronym> brands support a leading schema specifier for a table.
+                You can specify the table name as "<code>schemaName.tableName</code>", where
                 <classname>Zend_Db_Select</classname> quotes each part individually, or you may
                 specify the schema name separately. A schema name specified in the table name takes
                 precedence over a schema provided separately in the event that both are provided.
@@ -240,7 +244,8 @@ $select = $db->select()
             <para>
                 In the second argument of the <methodname>from()</methodname> method, you can
                 specify the columns to select from the respective table. If you specify no columns,
-                the default is "<code>*</code>", the <acronym>SQL</acronym> wildcard for "all columns".
+                the default is "<code>*</code>", the <acronym>SQL</acronym> wildcard for "all
+                columns".
             </para>
 
             <para>
@@ -303,10 +308,10 @@ $select = $db->select()
             <title>Adding Expression Columns</title>
 
             <para>
-                Columns in <acronym>SQL</acronym> queries are sometimes expressions, not simply column names from a
-                table. Expressions should not have correlation names or quoting applied. If your
-                column string contains parentheses, <classname>Zend_Db_Select</classname> recognizes
-                it as an expression.
+                Columns in <acronym>SQL</acronym> queries are sometimes expressions, not simply
+                column names from a table. Expressions should not have correlation names or quoting
+                applied. If your column string contains parentheses,
+                <classname>Zend_Db_Select</classname> recognizes it as an expression.
             </para>
 
             <para>
@@ -375,21 +380,22 @@ $select = $db->select()
             </para>
 
             <para>
-                If your column names are <acronym>SQL</acronym> keywords or contain special characters, you should use
-                the Adapter's <methodname>quoteIdentifier()</methodname> method and interpolate the result into
-                the string. The <methodname>quoteIdentifier()</methodname> method uses <acronym>SQL</acronym> quoting to delimit
-                the identifier, which makes it clear that it is an identifier for a table or a
-                column, and not any other part of <acronym>SQL</acronym> syntax.
+                If your column names are <acronym>SQL</acronym> keywords or contain special
+                characters, you should use the Adapter's <methodname>quoteIdentifier()</methodname>
+                method and interpolate the result into the string. The
+                <methodname>quoteIdentifier()</methodname> method uses <acronym>SQL</acronym>
+                quoting to delimit the identifier, which makes it clear that it is an identifier for
+                a table or a column, and not any other part of <acronym>SQL</acronym> syntax.
             </para>
 
             <para>
                 Your code is more database-independent if you use the
-                <methodname>quoteIdentifier()</methodname> method instead of typing quotes literally in your
-                string, because some <acronym>RDBMS</acronym> brands use nonstandard symbols for quoting identifiers.
-                The <methodname>quoteIdentifier()</methodname> method is designed to use the appropriate
-                quoting symbols based on the adapter type. The <methodname>quoteIdentifier()</methodname>
-                method also escapes any quote characters that appear within the identifier name
-                itself.
+                <methodname>quoteIdentifier()</methodname> method instead of typing quotes literally
+                in your string, because some <acronym>RDBMS</acronym> brands use nonstandard symbols
+                for quoting identifiers. The <methodname>quoteIdentifier()</methodname> method is
+                designed to use the appropriate quoting symbols based on the adapter type. The
+                <methodname>quoteIdentifier()</methodname> method also escapes any quote characters
+                that appear within the identifier name itself.
             </para>
 
             <example id="zend.db.select.building.columns-quoteid.example">
@@ -419,12 +425,12 @@ $select = $db->select()
 
             <para>
                 There may be cases where you wish to add columns to an existing FROM or JOIN table
-                after those methods have been called. The <methodname>columns()</methodname> method allows you
-                to add specific columns at any point before the query is executed. You can supply
-                the columns as either a string or <classname>Zend_Db_Expr</classname> or as an array
-                of these elements. The second argument to this method can be omitted, implying that
-                the columns are to be added to the FROM table, otherwise an existing correlation
-                name must be used.
+                after those methods have been called. The <methodname>columns()</methodname> method
+                allows you to add specific columns at any point before the query is executed. You
+                can supply the columns as either a string or <classname>Zend_Db_Expr</classname> or
+                as an array of these elements. The second argument to this method can be omitted,
+                implying that the columns are to be added to the FROM table, otherwise an existing
+                correlation name must be used.
             </para>
 
             <example id="zend.db.select.building.columns-atomic.example">
@@ -459,11 +465,11 @@ $select = $db->select()
             <title>Adding Another Table to the Query with JOIN</title>
 
             <para>
-                Many useful queries involve using a <acronym>JOIN</acronym> to combine rows from multiple
-                tables. You can add tables to a <classname>Zend_Db_Select</classname> query using
-                the <methodname>join()</methodname> method. Using this method is similar to the
-                <methodname>from()</methodname> method, except you can also specify a join condition in most
-                cases.
+                Many useful queries involve using a <acronym>JOIN</acronym> to combine rows from
+                multiple tables. You can add tables to a <classname>Zend_Db_Select</classname> query
+                using the <methodname>join()</methodname> method. Using this method is similar to
+                the <methodname>from()</methodname> method, except you can also specify a join
+                condition in most cases.
             </para>
 
             <example id="zend.db.select.building.join.example">
@@ -486,9 +492,10 @@ $select = $db->select()
             </example>
 
             <para>
-                The second argument to <methodname>join()</methodname> is a string that is the join condition.
-                This is an expression that declares the criteria by which rows in one table match
-                rows in the other table. You can use correlation names in this expression.
+                The second argument to <methodname>join()</methodname> is a string that is the join
+                condition. This is an expression that declares the criteria by which rows in one
+                table match rows in the other table. You can use correlation names in this
+                expression.
             </para>
 
             <note>
@@ -496,23 +503,25 @@ $select = $db->select()
                 <para>
                     No quoting is applied to the expression you specify for the join condition; if
                     you have column names that need to be quoted, you must use
-                    <methodname>quoteIdentifier()</methodname> as you form the string for the join condition.
+                    <methodname>quoteIdentifier()</methodname> as you form the string for the join
+                    condition.
                 </para>
 
             </note>
 
             <para>
-                The third argument to <methodname>join()</methodname> is an array of column names, like that
-                used in the <methodname>from()</methodname> method. It defaults to "<code>*</code>", supports
-                correlation names, expressions, and <classname>Zend_Db_Expr</classname> in the same
-                way as the array of column names in the <methodname>from()</methodname> method.
+                The third argument to <methodname>join()</methodname> is an array of column names,
+                like that used in the <methodname>from()</methodname> method. It defaults to
+                "<code>*</code>", supports correlation names, expressions, and
+                <classname>Zend_Db_Expr</classname> in the same way as the array of column names in
+                the <methodname>from()</methodname> method.
             </para>
 
             <para>
                 To select no columns from a table, use an empty array for the list of columns. This
-                usage works in the <methodname>from()</methodname> method too, but typically you want some
-                columns from the primary table in your queries, whereas you might want no columns
-                from a joined table.
+                usage works in the <methodname>from()</methodname> method too, but typically you
+                want some columns from the primary table in your queries, whereas you might want no
+                columns from a joined table.
             </para>
 
             <example id="zend.db.select.building.join.example-no-columns">
@@ -534,15 +543,15 @@ $select = $db->select()
 ]]></programlisting>
 
                 <para>
-                    Note the empty <methodname>array()</methodname> in the above example in place of a list of
-                    columns from the joined table.
+                    Note the empty <methodname>array()</methodname> in the above example in place of
+                    a list of columns from the joined table.
                 </para>
 
             </example>
 
             <para>
-                <acronym>SQL</acronym> has several types of joins. See the list below for the methods to support
-                different join types in <classname>Zend_Db_Select</classname>.
+                <acronym>SQL</acronym> has several types of joins. See the list below for the
+                methods to support different join types in <classname>Zend_Db_Select</classname>.
             </para>
 
             <itemizedlist>
@@ -596,9 +605,9 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        Some <acronym>RDBMS</acronym> brands don't support this join type, but in general any right
-                        join can be represented as a left join by reversing the order of the
-                        tables.
+                        Some <acronym>RDBMS</acronym> brands don't support this join type, but in
+                        general any right join can be represented as a left join by reversing the
+                        order of the tables.
                     </para>
                 </listitem>
 
@@ -635,8 +644,9 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        The <methodname>joinCross()</methodname> method has no parameter to specify the join
-                        condition. Some <acronym>RDBMS</acronym> brands don't support this join type.
+                        The <methodname>joinCross()</methodname> method has no parameter to specify
+                        the join condition. Some <acronym>RDBMS</acronym> brands don't support this
+                        join type.
                     </para>
                 </listitem>
 
@@ -650,13 +660,13 @@ $select = $db->select()
                         A natural join compares any column(s) that appear with the same name in
                         both tables. The comparison is equality of all the column(s); comparing the
                         columns using inequality is not a natural join. Only natural inner joins
-                        are supported by this <acronym>API</acronym>, even though <acronym>SQL</acronym> permits natural outer joins as
-                        well.
+                        are supported by this <acronym>API</acronym>, even though
+                        <acronym>SQL</acronym> permits natural outer joins as well.
                     </para>
 
                     <para>
-                        The <methodname>joinNatural()</methodname> method has no parameter to specify the join
-                        condition.
+                        The <methodname>joinNatural()</methodname> method has no parameter to
+                        specify the join condition.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -728,8 +738,9 @@ $select = $db->select()
 
             <para>
                 You can specify criteria for restricting rows of the result set using the
-                <methodname>where()</methodname> method. The first argument of this method is a <acronym>SQL</acronym> expression,
-                and this expression is used in a <acronym>SQL</acronym> <acronym>WHERE</acronym> clause in the query.
+                <methodname>where()</methodname> method. The first argument of this method is a
+                <acronym>SQL</acronym> expression, and this expression is used in a
+                <acronym>SQL</acronym> <acronym>WHERE</acronym> clause in the query.
             </para>
 
             <example id="zend.db.select.building.where.example">
@@ -753,19 +764,20 @@ $select = $db->select()
             <note>
 
                 <para>
-                    No quoting is applied to expressions given to the <methodname>where()</methodname> or
-                    <methodname>orWhere()</methodname> methods. If you have column names that need to be
-                    quoted, you must use <methodname>quoteIdentifier()</methodname> as you form the string for
-                    the condition.
+                    No quoting is applied to expressions given to the
+                    <methodname>where()</methodname> or <methodname>orWhere()</methodname> methods.
+                    If you have column names that need to be quoted, you must use
+                    <methodname>quoteIdentifier()</methodname> as you form the string for the
+                    condition.
                 </para>
 
             </note>
 
             <para>
-                The second argument to the <methodname>where()</methodname> method is optional. It is a value
-                to substitute into the expression. <classname>Zend_Db_Select</classname> quotes the
-                value and substitutes it for a question-mark ("<code>?</code>") symbol in the
-                expression.
+                The second argument to the <methodname>where()</methodname> method is optional. It
+                is a value to substitute into the expression. <classname>Zend_Db_Select</classname>
+                quotes the value and substitutes it for a question-mark ("<code>?</code>") symbol in
+                the expression.
             </para>
 
             <para>
@@ -795,8 +807,8 @@ $select = $db->select()
             </example>
 
             <para>
-                You can invoke the <methodname>where()</methodname> method multiple times on the same
-                <classname>Zend_Db_Select</classname> object. The resulting query combines the
+                You can invoke the <methodname>where()</methodname> method multiple times on the
+                same <classname>Zend_Db_Select</classname> object. The resulting query combines the
                 multiple terms together using <acronym>AND</acronym> between them.
             </para>
 
@@ -825,9 +837,9 @@ $select = $db->select()
 
             <para>
                 If you need to combine terms together using <acronym>OR</acronym>, use the
-                <methodname>orWhere()</methodname> method. This method is used in the same way as the
-                <methodname>where()</methodname> method, except that the term specified is preceded by
-                <acronym>OR</acronym>, instead of <acronym>AND</acronym>.
+                <methodname>orWhere()</methodname> method. This method is used in the same way as
+                the <methodname>where()</methodname> method, except that the term specified is
+                preceded by <acronym>OR</acronym>, instead of <acronym>AND</acronym>.
             </para>
 
             <example id="zend.db.select.building.where.example-or">
@@ -855,9 +867,9 @@ $select = $db->select()
 
             <para>
                 <classname>Zend_Db_Select</classname> automatically puts parentheses around each
-                expression you specify using the <methodname>where()</methodname> or <methodname>orWhere()</methodname>
-                methods. This helps to ensure that Boolean operator precedence does not cause
-                unexpected results.
+                expression you specify using the <methodname>where()</methodname> or
+                <methodname>orWhere()</methodname> methods. This helps to ensure that Boolean
+                operator precedence does not cause unexpected results.
             </para>
 
             <example id="zend.db.select.building.where.example-parens">
@@ -888,8 +900,8 @@ $select = $db->select()
                 In the example above, the results would be quite different without the parentheses,
                 because <acronym>AND</acronym> has higher precedence than <acronym>OR</acronym>.
                 <classname>Zend_Db_Select</classname> applies the parentheses so the effect is that
-                each expression in successive calls to the <methodname>where()</methodname> bind more tightly
-                than the <acronym>AND</acronym> that combines the expressions.
+                each expression in successive calls to the <methodname>where()</methodname> bind
+                more tightly than the <acronym>AND</acronym> that combines the expressions.
             </para>
 
         </sect3>
@@ -899,15 +911,15 @@ $select = $db->select()
             <title>Adding a GROUP BY Clause</title>
 
             <para>
-                In <acronym>SQL</acronym>, the <command>GROUP BY</command> clause allows you to reduce the rows of a query
-                result set to one row per unique value found in the column(s) named in the
-                <command>GROUP BY</command> clause.
+                In <acronym>SQL</acronym>, the <command>GROUP BY</command> clause allows you to
+                reduce the rows of a query result set to one row per unique value found in the
+                column(s) named in the <command>GROUP BY</command> clause.
             </para>
 
             <para>
                 In <classname>Zend_Db_Select</classname>, you can specify the column(s) to use for
-                calculating the groups of rows using the <methodname>group()</methodname> method. The argument
-                to this method is a column or an array of columns to use in the
+                calculating the groups of rows using the <methodname>group()</methodname> method.
+                The argument to this method is a column or an array of columns to use in the
                 <command>GROUP BY</command> clause.
             </para>
 
@@ -934,9 +946,9 @@ $select = $db->select()
             </example>
 
             <para>
-                Like the columns array in the <methodname>from()</methodname> method, you can use correlation
-                names in the column name strings, and the column is quoted as an identifier unless
-                the string contains parentheses or is an object of type
+                Like the columns array in the <methodname>from()</methodname> method, you can use
+                correlation names in the column name strings, and the column is quoted as an
+                identifier unless the string contains parentheses or is an object of type
                 <classname>Zend_Db_Expr</classname>.
             </para>
 
@@ -947,21 +959,23 @@ $select = $db->select()
             <title>Adding a HAVING Clause</title>
 
             <para>
-                In <acronym>SQL</acronym>, the <constant>HAVING</constant> clause applies a restriction condition on groups of
-                rows. This is similar to how a <constant>WHERE</constant> clause applies a restriction
-                condition on rows. But the two clauses are different because <constant>WHERE</constant>
-                conditions are applied before groups are defined, whereas <constant>HAVING</constant>
-                conditions are applied after groups are defined.
+                In <acronym>SQL</acronym>, the <constant>HAVING</constant> clause applies a
+                restriction condition on groups of rows. This is similar to how a
+                <constant>WHERE</constant> clause applies a restriction condition on rows. But the
+                two clauses are different because <constant>WHERE</constant> conditions are applied
+                before groups are defined, whereas <constant>HAVING</constant> conditions are
+                applied after groups are defined.
             </para>
 
             <para>
                 In <classname>Zend_Db_Select</classname>, you can specify conditions for restricting
-                groups using the <methodname>having()</methodname> method. Its usage is similar to that of the
-                <methodname>where()</methodname> method. The first argument is a string containing a <acronym>SQL</acronym>
-                expression. The optional second argument is a value that is used to replace a
-                positional parameter placeholder in the <acronym>SQL</acronym> expression. Expressions given in
-                multiple invocations of the <methodname>having()</methodname> method are combined using the
-                Boolean <constant>AND</constant> operator, or the <code>OR</code> operator if you use the
+                groups using the <methodname>having()</methodname> method. Its usage is similar to
+                that of the <methodname>where()</methodname> method. The first argument is a string
+                containing a <acronym>SQL</acronym> expression. The optional second argument is a
+                value that is used to replace a positional parameter placeholder in the
+                <acronym>SQL</acronym> expression. Expressions given in multiple invocations of the
+                <methodname>having()</methodname> method are combined using the Boolean
+                <constant>AND</constant> operator, or the <code>OR</code> operator if you use the
                 <methodname>orHaving()</methodname> method.
             </para>
 
@@ -992,10 +1006,11 @@ $select = $db->select()
             <note>
 
                 <para>
-                    No quoting is applied to expressions given to the <methodname>having()</methodname> or
-                    <methodname>orHaving()</methodname> methods. If you have column names that need to be
-                    quoted, you must use <methodname>quoteIdentifier()</methodname> as you form the string for
-                    the condition.
+                    No quoting is applied to expressions given to the
+                    <methodname>having()</methodname> or <methodname>orHaving()</methodname>
+                    methods. If you have column names that need to be quoted, you must use
+                    <methodname>quoteIdentifier()</methodname> as you form the string for the
+                    condition.
                 </para>
 
             </note>
@@ -1007,26 +1022,27 @@ $select = $db->select()
             <title>Adding an ORDER BY Clause</title>
 
             <para>
-                In <acronym>SQL</acronym>, the <code>ORDER BY</code> clause specifies one or more columns or
-                expressions by which the result set of a query is sorted. If multiple columns are
-                listed, the secondary columns are used to resolve ties; the sort order is
-                determined by the secondary columns if the preceding columns contain identical
+                In <acronym>SQL</acronym>, the <code>ORDER BY</code> clause specifies one or more
+                columns or expressions by which the result set of a query is sorted. If multiple
+                columns are listed, the secondary columns are used to resolve ties; the sort order
+                is determined by the secondary columns if the preceding columns contain identical
                 values. The default sorting is from least value to greatest value. You can also
                 sort by greatest value to least value for a given column in the list by specifying
                 the keyword <constant>DESC</constant> after that column.
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can use the <methodname>order()</methodname>
-                method to specify a column or an array of columns by which to sort. Each element of
-                the array is a string naming a column. Optionally with the <constant>ASC</constant>
-                <constant>DESC</constant> keyword following it, separated by a space.
+                In <classname>Zend_Db_Select</classname>, you can use the
+                <methodname>order()</methodname> method to specify a column or an array of columns
+                by which to sort. Each element of the array is a string naming a column. Optionally
+                with the <constant>ASC</constant> <constant>DESC</constant> keyword following it,
+                separated by a space.
             </para>
 
             <para>
-                Like in the <methodname>from()</methodname> and <methodname>group()</methodname> methods, column names are
-                quoted as identifiers, unless they contain parentheses or are an object of
-                type <classname>Zend_Db_Expr</classname>.
+                Like in the <methodname>from()</methodname> and <methodname>group()</methodname>
+                methods, column names are quoted as identifiers, unless they contain parentheses or
+                are an object of type <classname>Zend_Db_Expr</classname>.
             </para>
 
             <example id="zend.db.select.building.order.example">
@@ -1061,18 +1077,19 @@ $select = $db->select()
             <title>Adding a LIMIT Clause</title>
 
             <para>
-                Some <acronym>RDBMS</acronym> brands extend <acronym>SQL</acronym> with a query clause known as the <constant>LIMIT</constant>
-                clause. This clause reduces the number of rows in the result set to at most a
-                number you specify. You can also specify to skip a number of rows before starting
-                to output. This feature makes it easy to take a subset of a result set, for example
-                when displaying query results on progressive pages of output.
+                Some <acronym>RDBMS</acronym> brands extend <acronym>SQL</acronym> with a query
+                clause known as the <constant>LIMIT</constant> clause. This clause reduces the
+                number of rows in the result set to at most a number you specify. You can also
+                specify to skip a number of rows before starting to output. This feature makes it
+                easy to take a subset of a result set, for example when displaying query results on
+                progressive pages of output.
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can use the <methodname>limit()</methodname>
-                method to specify the count of rows and the number of rows to skip. The first
-                argument to this method is the desired count of rows. The second argument is the
-                number of rows to skip.
+                In <classname>Zend_Db_Select</classname>, you can use the
+                <methodname>limit()</methodname> method to specify the count of rows and the number
+                of rows to skip. The first argument to this method is the desired count of rows. The
+                second argument is the number of rows to skip.
             </para>
 
             <example id="zend.db.select.building.limit.example">
@@ -1096,8 +1113,9 @@ $select = $db->select()
             <note>
 
                 <para>
-                    The <constant>LIMIT</constant> syntax is not supported by all <acronym>RDBMS</acronym> brands. Some <acronym>RDBMS</acronym>
-                    require different syntax to support similar functionality. Each
+                    The <constant>LIMIT</constant> syntax is not supported by all
+                    <acronym>RDBMS</acronym> brands. Some <acronym>RDBMS</acronym> require different
+                    syntax to support similar functionality. Each
                     <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to
                     produce <acronym>SQL</acronym> appropriate for that <acronym>RDBMS</acronym>.
                 </para>
@@ -1105,13 +1123,14 @@ $select = $db->select()
             </note>
 
             <para>
-                Use the <methodname>limitPage()</methodname> method for an alternative way to specify row count
-                and offset. This method allows you to limit the result set to one of a series of
-                fixed-length subsets of rows from the query's total result set. In other words, you
-                specify the length of a "page" of results, and the ordinal number of the single
-                page of results you want the query to return. The page number is the first argument
-                of the <methodname>limitPage()</methodname> method, and the page length is the second argument.
-                Both arguments are required; they have no default values.
+                Use the <methodname>limitPage()</methodname> method for an alternative way to
+                specify row count and offset. This method allows you to limit the result set to one
+                of a series of fixed-length subsets of rows from the query's total result set. In
+                other words, you specify the length of a "page" of results, and the ordinal number
+                of the single page of results you want the query to return. The page number is the
+                first argument of the <methodname>limitPage()</methodname> method, and the page
+                length is the second argument. Both arguments are required; they have no default
+                values.
             </para>
 
             <example id="zend.db.select.building.limit.example2">
@@ -1139,8 +1158,8 @@ $select = $db->select()
             <title>Adding the DISTINCT Query Modifier</title>
 
             <para>
-                The <methodname>distinct()</methodname> method enables you to add the <constant>DISTINCT</constant>
-                keyword to your <acronym>SQL</acronym> query.
+                The <methodname>distinct()</methodname> method enables you to add the
+                <constant>DISTINCT</constant> keyword to your <acronym>SQL</acronym> query.
             </para>
 
             <example id="zend.db.select.building.distinct.example">
@@ -1166,8 +1185,8 @@ $select = $db->select()
             <title>Adding the FOR UPDATE Query Modifier</title>
 
             <para>
-                The <methodname>forUpdate()</methodname> method enables you to add the <code>FOR UPDATE</code>
-                modifier to your <acronym>SQL</acronym> query.
+                The <methodname>forUpdate()</methodname> method enables you to add the
+                <code>FOR UPDATE</code> modifier to your <acronym>SQL</acronym> query.
             </para>
 
             <example id="zend.db.select.building.for-update.example">
@@ -1205,8 +1224,8 @@ $select = $db->select()
 
             <para>
                 You can execute the query represented by the <classname>Zend_Db_Select</classname>
-                object by passing it as the first argument to the <methodname>query()</methodname> method of a
-                <classname>Zend_Db_Adapter_Abstract</classname> object. Use the
+                object by passing it as the first argument to the <methodname>query()</methodname>
+                method of a <classname>Zend_Db_Adapter_Abstract</classname> object. Use the
                 <classname>Zend_Db_Select</classname> objects instead of a string query.
             </para>
 
@@ -1237,8 +1256,8 @@ $result = $stmt->fetchAll();
             <title>Executing Select Queries from the Object</title>
 
             <para>
-                As an alternative to using the <methodname>query()</methodname> method of the adapter object,
-                you can use the <methodname>query()</methodname> method of the
+                As an alternative to using the <methodname>query()</methodname> method of the
+                adapter object, you can use the <methodname>query()</methodname> method of the
                 <classname>Zend_Db_Select</classname> object. Both methods return an object of type
                 <classname>Zend_Db_Statement</classname> or PDOStatement, depending on the adapter
                 type.
@@ -1265,9 +1284,9 @@ $result = $stmt->fetchAll();
             <title>Converting a Select Object to a SQL String</title>
 
             <para>
-                If you need access to a string representation of the <acronym>SQL</acronym> query corresponding to the
-                <classname>Zend_Db_Select</classname> object, use the <methodname>__toString()</methodname>
-                method.
+                If you need access to a string representation of the <acronym>SQL</acronym> query
+                corresponding to the <classname>Zend_Db_Select</classname> object, use the
+                <methodname>__toString()</methodname> method.
             </para>
 
             <example id="zend.db.select.execute.tostring.example">
@@ -1297,7 +1316,8 @@ echo "$sql\n";
 
         <para>
             This section describes other methods of the <classname>Zend_Db_Select</classname> class
-            that are not covered above: <methodname>getPart()</methodname> and <methodname>reset()</methodname>.
+            that are not covered above: <methodname>getPart()</methodname> and
+            <methodname>reset()</methodname>.
         </para>
 
         <sect3 id="zend.db.select.other.get-part">
@@ -1305,32 +1325,32 @@ echo "$sql\n";
             <title>Retrieving Parts of the Select Object</title>
 
             <para>
-                The <methodname>getPart()</methodname> method returns a representation of one part of your <acronym>SQL</acronym>
-                query. For example, you can use this method to return the array of expressions for
-                the <constant>WHERE</constant> clause, or the array of columns (or column expressions) that
-                are in the <constant>SELECT</constant> list, or the values of the count and offset for the
-                <constant>LIMIT</constant> clause.
+                The <methodname>getPart()</methodname> method returns a representation of one part
+                of your <acronym>SQL</acronym> query. For example, you can use this method to return
+                the array of expressions for the <constant>WHERE</constant> clause, or the array of
+                columns (or column expressions) that are in the <constant>SELECT</constant> list, or
+                the values of the count and offset for the <constant>LIMIT</constant> clause.
             </para>
 
             <para>
-                The return value is not a string containing a fragment of <acronym>SQL</acronym> syntax. The return
-                value is an internal representation, which is typically an array structure
-                containing values and expressions. Each part of the query has a different
+                The return value is not a string containing a fragment of <acronym>SQL</acronym>
+                syntax. The return value is an internal representation, which is typically an array
+                structure containing values and expressions. Each part of the query has a different
                 structure.
             </para>
 
             <para>
-                The single argument to the <methodname>getPart()</methodname> method is a string that
-                identifies which part of the Select query to return. For example, the string
+                The single argument to the <methodname>getPart()</methodname> method is a string
+                that identifies which part of the Select query to return. For example, the string
                 <code>'from'</code> identifies the part of the Select object that stores
-                information about the tables in the <constant>FROM</constant> clause, including joined
-                tables.
+                information about the tables in the <constant>FROM</constant> clause, including
+                joined tables.
             </para>
 
             <para>
                 The <classname>Zend_Db_Select</classname> class defines constants you can use for
-                parts of the <acronym>SQL</acronym> query. You can use these constant definitions, or you can the
-                literal strings.
+                parts of the <acronym>SQL</acronym> query. You can use these constant definitions,
+                or you can the literal strings.
             </para>
 
             <table id="zend.db.select.other.get-part.table">
@@ -1428,20 +1448,22 @@ print_r( $orderData );
             <title>Resetting Parts of the Select Object</title>
 
             <para>
-                The <methodname>reset()</methodname> method enables you to clear one specified part of the <acronym>SQL</acronym>
-                query, or else clear all parts of the <acronym>SQL</acronym> query if you omit the argument.
+                The <methodname>reset()</methodname> method enables you to clear one specified part
+                of the <acronym>SQL</acronym> query, or else clear all parts of the
+                <acronym>SQL</acronym> query if you omit the argument.
             </para>
 
             <para>
                 The single argument is optional. You can specify the part of the query to clear,
-                using the same strings you used in the argument to the <methodname>getPart()</methodname>
-                method. The part of the query you specify is reset to a default state.
+                using the same strings you used in the argument to the
+                <methodname>getPart()</methodname> method. The part of the query you specify is
+                reset to a default state.
             </para>
 
             <para>
-                If you omit the parameter, <methodname>reset()</methodname> changes all parts of the query to
-                their default state. This makes the <classname>Zend_Db_Select</classname> object
-                equivalent to a new object, as though you had just instantiated it.
+                If you omit the parameter, <methodname>reset()</methodname> changes all parts of the
+                query to their default state. This makes the <classname>Zend_Db_Select</classname>
+                object equivalent to a new object, as though you had just instantiated it.
             </para>
 
             <example id="zend.db.select.other.reset.example">

+ 135 - 120
documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -28,10 +28,10 @@
         <title>Using Zend_Db_Table as a concrete class</title>
 
         <para>
-            As of Zend Framework 1.9, you can instantiate <classname>Zend_Db_Table</classname>. This added benefit is that
-            you do not have to extend a base class and configure it to do simple operations
-            such as selecting, inserting, updating and deleteing on a single table. Below
-            is an example of the simplest of use cases.
+            As of Zend Framework 1.9, you can instantiate <classname>Zend_Db_Table</classname>. This
+            added benefit is that you do not have to extend a base class and configure it to do
+            simple operations such as selecting, inserting, updating and deleteing on a single
+            table. below is an example of the simplest of use cases.
         </para>
 
         <example id="zend.db.table.defining.concrete-instantiation.example1">
@@ -47,9 +47,10 @@ $bugTable = new Zend_Db_Table('bug');
 
         <para>
             The above example represents the simplest of use cases. Make not of all the
-            options describe below for configuring <classname>Zend_Db_Table</classname> tables. If you want to be
-            able to use the concrete usage case, in addition to the more complex relationhip
-            features, see the <classname>Zend_Db_Table_Definition</classname> documentation.
+            options describe below for configuring <classname>Zend_Db_Table</classname> tables. If
+            you want to be able to use the concrete usage case, in addition to the more complex
+            relationhip features, see the <classname>Zend_Db_Table_Definition</classname>
+            documentation.
         </para>
 
     </sect2>
@@ -110,8 +111,8 @@ class bugs extends Zend_Db_Table_Abstract
                 <varname>$_schema</varname>, or with the schema prepended to the table name in the
                 <varname>$_name</varname> property. Any schema specified with the
                 <varname>$_name</varname> property takes precedence over a schema specified with the
-                <varname>$_schema</varname> property. In some <acronym>RDBMS</acronym> brands, the term for schema is
-                "database" or "tablespace," but it is used similarly.
+                <varname>$_schema</varname> property. In some <acronym>RDBMS</acronym> brands, the
+                term for schema is "database" or "tablespace," but it is used similarly.
             </para>
 
             <example id="zend.db.table.defining.table-schema.example3">
@@ -222,8 +223,8 @@ class Bugs extends Zend_Db_Table_Abstract
                     Every table class must know which column(s) can be used to address rows
                     uniquely. If no primary key column(s) are specified in the table class
                     definition or the table constructor arguments, or discovered in the table
-                    metadata provided by <methodname>describeTable()</methodname>, then the table cannot be
-                    used with <classname>Zend_Db_Table</classname>.
+                    metadata provided by <methodname>describeTable()</methodname>, then the table
+                    cannot be used with <classname>Zend_Db_Table</classname>.
                 </para>
 
             </note>
@@ -265,36 +266,38 @@ class Bugs extends Zend_Db_Table_Abstract
             <itemizedlist>
                 <listitem>
                     <para>
-                        <methodname>_setupDatabaseAdapter()</methodname> checks that an adapter has been
-                        provided; gets a default adapter from the registry if needed. By overriding
-                        this method, you can set a database adapter from some other source.
+                        <methodname>_setupDatabaseAdapter()</methodname> checks that an adapter has
+                        been provided; gets a default adapter from the registry if needed. By
+                        overriding this method, you can set a database adapter from some other
+                        source.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <methodname>_setupTableName()</methodname> defaults the table name to the name of the
-                        class. By overriding this method, you can set the table name before this
-                        default behavior runs.
+                        <methodname>_setupTableName()</methodname> defaults the table name to the
+                        name of the class. By overriding this method, you can set the table name
+                        before this default behavior runs.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <methodname>_setupMetadata()</methodname> sets the schema if the table name contains
-                        the pattern "schema.table"; calls <methodname>describeTable()</methodname> to get
-                        metadata information; defaults the <varname>$_cols</varname> array to the
-                        columns reported by <methodname>describeTable()</methodname>. By overriding this method,
-                        you can specify the columns.
+                        <methodname>_setupMetadata()</methodname> sets the schema if the table name
+                        contains the pattern "schema.table"; calls
+                        <methodname>describeTable()</methodname> to get metadata information;
+                        defaults the <varname>$_cols</varname> array to the columns reported by
+                        <methodname>describeTable()</methodname>. By overriding this method, you can
+                        specify the columns.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <methodname>_setupPrimaryKey()</methodname> defaults the primary key columns to those
-                        reported by <methodname>describeTable()</methodname>; checks that the primary key
-                        columns are included in the <varname>$_cols</varname> array. By overriding
-                        this method, you can specify the primary key columns.
+                        <methodname>_setupPrimaryKey()</methodname> defaults the primary key columns
+                        to those reported by <methodname>describeTable()</methodname>; checks that
+                        the primary key columns are included in the <varname>$_cols</varname> array.
+                        By overriding this method, you can specify the primary key columns.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -307,10 +310,10 @@ class Bugs extends Zend_Db_Table_Abstract
 
             <para>
                 If application-specific logic needs to be initialized when a Table class is
-                constructed, you can select to move your tasks to the <methodname>init()</methodname> method,
-                which is called after all Table metadata has been processed. This is recommended
-                over the <code>__construct</code> method if you do not need to alter the metadata
-                in any programmatic way.
+                constructed, you can select to move your tasks to the
+                <methodname>init()</methodname> method, which is called after all Table metadata has
+                been processed. This is recommended over the <code>__construct</code> method if you
+                do not need to alter the metadata in any programmatic way.
             </para>
 
             <example id="zend.db.table.defining.init.usage.example">
@@ -343,8 +346,8 @@ class Bugs extends Zend_Db_Table_Abstract
             Before you use a Table class, create an instance using its constructor. The
             constructor's argument is an array of options. The most important option to a Table
             constructor is the database adapter instance, representing a live connection to an
-            <acronym>RDBMS</acronym>. There are three ways of specifying the database adapter to a Table class, and
-            these three ways are described below:
+            <acronym>RDBMS</acronym>. There are three ways of specifying the database adapter to a
+            Table class, and these three ways are described below:
         </para>
 
         <sect3 id="zend.db.table.constructing.adapter">
@@ -380,8 +383,8 @@ $table = new Bugs(array('db' => $db));
                 object of type <classname>Zend_Db_Adapter_Abstract</classname> to be a default
                 database adapter for all subsequent instances of Tables in your application. You can
                 do this with the static method
-                <methodname>Zend_Db_Table_Abstract::setDefaultAdapter()</methodname>. The argument is
-                an object of type <classname>Zend_Db_Adapter_Abstract</classname>.
+                <methodname>Zend_Db_Table_Abstract::setDefaultAdapter()</methodname>. The argument
+                is an object of type <classname>Zend_Db_Adapter_Abstract</classname>.
             </para>
 
             <example id="zend.db.table.constructing.default-adapter.example">
@@ -440,9 +443,9 @@ $table = new Bugs(array('db' => 'my_db'));
                 Like setting the default adapter, this gives you the means to ensure that the same
                 adapter instance is used throughout your application. Using the registry is more
                 flexible, because you can store more than one adapter instance. A given adapter
-                instance is specific to a certain <acronym>RDBMS</acronym> brand and database instance. If your
-                application needs access to multiple databases or even multiple database brands,
-                then you need to use multiple adapters.
+                instance is specific to a certain <acronym>RDBMS</acronym> brand and database
+                instance. If your application needs access to multiple databases or even multiple
+                database brands, then you need to use multiple adapters.
             </para>
 
         </sect3>
@@ -455,8 +458,8 @@ $table = new Bugs(array('db' => 'my_db'));
 
         <para>
             You can use the Table object to insert rows into the database table on which the Table
-            object is based. Use the <methodname>insert()</methodname> method of your Table object. The
-            argument is an associative array, mapping column names to values.
+            object is based. Use the <methodname>insert()</methodname> method of your Table object.
+            The argument is an associative array, mapping column names to values.
         </para>
 
         <example id="zend.db.table.insert.example">
@@ -479,8 +482,8 @@ $table->insert($data);
 
         <para>
             By default, the values in your data array are inserted as literal values, using
-            parameters. If you need them to be treated as <acronym>SQL</acronym> expressions, you must make sure they
-            are distinct from plain strings. Use an object of type
+            parameters. If you need them to be treated as <acronym>SQL</acronym> expressions, you
+            must make sure they are distinct from plain strings. Use an object of type
             <classname>Zend_Db_Expr</classname> to do this.
         </para>
 
@@ -513,7 +516,8 @@ $data = array(
 
             <para>
                 An auto-incrementing primary key generates a unique integer value for you if you
-                omit the primary key column from your <acronym>SQL</acronym> <constant>INSERT</constant> statement.
+                omit the primary key column from your <acronym>SQL</acronym>
+                <constant>INSERT</constant> statement.
             </para>
 
             <para>
@@ -541,15 +545,15 @@ class Bugs extends Zend_Db_Table_Abstract
             </example>
 
             <para>
-                MySQL, Microsoft <acronym>SQL</acronym> Server, and SQLite are examples of <acronym>RDBMS</acronym> brands that support
-                auto-incrementing primary keys.
+                MySQL, Microsoft <acronym>SQL</acronym> Server, and SQLite are examples of
+                <acronym>RDBMS</acronym> brands that support auto-incrementing primary keys.
             </para>
 
             <para>
-                PostgreSQL has a <constant>SERIAL</constant> notation that implicitly defines a sequence
-                based on the table and column name, and uses the sequence to generate key values
-                for new rows. IBM DB2 has an <constant>IDENTITY</constant> notation that works similarly.
-                If you use either of these notations, treat your
+                PostgreSQL has a <constant>SERIAL</constant> notation that implicitly defines a
+                sequence based on the table and column name, and uses the sequence to generate key
+                values for new rows. IBM DB2 has an <constant>IDENTITY</constant> notation that
+                works similarly. If you use either of these notations, treat your
                 <classname>Zend_Db_Table</classname> class as having an auto-incrementing column
                 with respect to declaring the <varname>$_sequence</varname> member as
                 <constant>TRUE</constant>.
@@ -589,8 +593,8 @@ class Bugs extends Zend_Db_Table_Abstract
             </example>
 
             <para>
-                Oracle, PostgreSQL, and IBM DB2 are examples of <acronym>RDBMS</acronym> brands that support sequence
-                objects in the database.
+                Oracle, PostgreSQL, and IBM DB2 are examples of <acronym>RDBMS</acronym> brands that
+                support sequence objects in the database.
             </para>
 
             <para>
@@ -616,8 +620,8 @@ class Bugs extends Zend_Db_Table_Abstract
                 If you define the <varname>$_sequence</varname> to be the Boolean value
                 <constant>FALSE</constant>, then <classname>Zend_Db_Table_Abstract</classname>
                 assumes that the table has a natural primary key. You must provide values for the
-                primary key columns in the array of data to the <methodname>insert()</methodname> method, or
-                else this method throws a <classname>Zend_Db_Table_Exception</classname>.
+                primary key columns in the array of data to the <methodname>insert()</methodname>
+                method, or else this method throws a <classname>Zend_Db_Table_Exception</classname>.
             </para>
 
             <example id="zend.db.table.insert.key-natural.example">
@@ -638,9 +642,10 @@ class BugStatus extends Zend_Db_Table_Abstract
             <note>
 
                 <para>
-                    All <acronym>RDBMS</acronym> brands support tables with natural keys. Examples of tables that are
-                    often declared as having natural keys are lookup tables, intersection tables in
-                    many-to-many relationships, or most tables with compound primary keys.
+                    All <acronym>RDBMS</acronym> brands support tables with natural keys. Examples
+                    of tables that are often declared as having natural keys are lookup tables,
+                    intersection tables in many-to-many relationships, or most tables with compound
+                    primary keys.
                 </para>
 
             </note>
@@ -656,8 +661,8 @@ class BugStatus extends Zend_Db_Table_Abstract
         <para>
             You can update rows in a database table using the <code>update</code> method of a Table
             class. This method takes two arguments: an associative array of columns to change and
-            new values to assign to these columns; and an <acronym>SQL</acronym> expression that is used in a
-            <constant>WHERE</constant> clause, as criteria for the rows to change in the
+            new values to assign to these columns; and an <acronym>SQL</acronym> expression that is
+            used in a <constant>WHERE</constant> clause, as criteria for the rows to change in the
             <constant>UPDATE</constant> operation.
         </para>
 
@@ -682,18 +687,19 @@ $table->update($data, $where);
 
         <para>
             Since the table <methodname>update()</methodname> method proxies to the database adapter
-            <link linkend="zend.db.adapter.write.update"><methodname>update()</methodname></link> method, the
-            second argument can be an array of <acronym>SQL</acronym> expressions. The expressions are combined as
-            Boolean terms using an <constant>AND</constant> operator.
+            <link linkend="zend.db.adapter.write.update"><methodname>update()</methodname></link>
+            method, the second argument can be an array of <acronym>SQL</acronym> expressions. The
+            expressions are combined as Boolean terms using an <constant>AND</constant> operator.
         </para>
 
         <note>
 
             <para>
-                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted for you. If you
-                have values or identifiers that require quoting, you are responsible for doing
-                this. Use the <methodname>quote()</methodname>, <methodname>quoteInto()</methodname>, and
-                <methodname>quoteIdentifier()</methodname> methods of the database adapter.
+                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
+                for you. If you have values or identifiers that require quoting, you are responsible
+                for doing this. Use the <methodname>quote()</methodname>,
+                <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
+                methods of the database adapter.
             </para>
 
         </note>
@@ -705,9 +711,9 @@ $table->update($data, $where);
         <title>Deleting Rows from a Table</title>
 
         <para>
-            You can delete rows from a database table using the <methodname>delete()</methodname> method. This
-            method takes one argument, which is an <acronym>SQL</acronym> expression that is used in a
-            <constant>WHERE</constant> clause, as criteria for the rows to delete.
+            You can delete rows from a database table using the <methodname>delete()</methodname>
+            method. This method takes one argument, which is an <acronym>SQL</acronym> expression
+            that is used in a <constant>WHERE</constant> clause, as criteria for the rows to delete.
         </para>
 
         <example id="zend.db.table.delete.example">
@@ -726,18 +732,19 @@ $table->delete($where);
 
         <para>
             Since the table <methodname>delete()</methodname> method proxies to the database adapter
-            <link linkend="zend.db.adapter.write.delete"><methodname>delete()</methodname></link> method, the
-            argument can also be an array of <acronym>SQL</acronym> expressions. The expressions are combined as
-            Boolean terms using an <constant>AND</constant> operator.
+            <link linkend="zend.db.adapter.write.delete"><methodname>delete()</methodname></link>
+            method, the argument can also be an array of <acronym>SQL</acronym> expressions. The
+            expressions are combined as Boolean terms using an <constant>AND</constant> operator.
         </para>
 
         <note>
 
             <para>
-                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted for you. If you
-                have values or identifiers that require quoting, you are responsible for doing
-                this. Use the <methodname>quote()</methodname>, <methodname>quoteInto()</methodname>, and
-                <methodname>quoteIdentifier()</methodname> methods of the database adapter.
+                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
+                for you. If you have values or identifiers that require quoting, you are responsible
+                for doing this. Use the <methodname>quote()</methodname>,
+                <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
+                methods of the database adapter.
             </para>
 
         </note>
@@ -750,8 +757,9 @@ $table->delete($where);
 
         <para>
             You can query the database table for rows matching specific values in the primary key,
-            using the <methodname>find()</methodname> method. The first argument of this method is either a
-            single value or an array of values to match against the primary key of the table.
+            using the <methodname>find()</methodname> method. The first argument of this method is
+            either a single value or an array of values to match against the primary key of the
+            table.
         </para>
 
         <example id="zend.db.table.find.example">
@@ -780,18 +788,18 @@ $rows = $table->find(array(1234, 5678));
         </para>
 
         <para>
-            The <methodname>find()</methodname> method might return fewer rows than the number of values you
-            specify for the primary key, if some of the values don't match any rows in the database
-            table. The method even may return zero rows. Because the number of rows returned is
-            variable, the <methodname>find()</methodname> method returns an object of type
-            <classname>Zend_Db_Table_Rowset_Abstract</classname>.
+            The <methodname>find()</methodname> method might return fewer rows than the number of
+            values you specify for the primary key, if some of the values don't match any rows in
+            the database table. The method even may return zero rows. Because the number of rows
+            returned is variable, the <methodname>find()</methodname> method returns an object of
+            type <classname>Zend_Db_Table_Rowset_Abstract</classname>.
         </para>
 
         <para>
             If the primary key is a compound key, that is, it consists of multiple columns, you can
-            specify the additional columns as additional arguments to the <methodname>find()</methodname>
-            method. You must provide as many arguments as the number of columns in the table's
-            primary key.
+            specify the additional columns as additional arguments to the
+            <methodname>find()</methodname> method. You must provide as many arguments as the number
+            of columns in the table's primary key.
         </para>
 
         <para>
@@ -807,9 +815,9 @@ $rows = $table->find(array(1234, 5678));
             <title>Example of finding rows by compound primary key values</title>
 
             <para>
-                The call to <methodname>find()</methodname> below to match multiple rows can match two rows in
-                the database. The first row must have primary key value (1234, 'ABC'), and the
-                second row must have primary key value (5678, 'DEF').
+                The call to <methodname>find()</methodname> below to match multiple rows can match
+                two rows in the database. The first row must have primary key value (1234, 'ABC'),
+                and the second row must have primary key value (5678, 'DEF').
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -847,10 +855,11 @@ $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
                 <warning>
 
                     <para>
-                        The <acronym>API</acronym> for fetch operations has been superseded to allow a
-                        <classname>Zend_Db_Table_Select</classname> object to modify the query.
+                        The <acronym>API</acronym> for fetch operations has been superseded to allow
+                        a <classname>Zend_Db_Table_Select</classname> object to modify the query.
                         However, the deprecated usage of the <methodname>fetchRow()</methodname> and
-                        <methodname>fetchAll()</methodname> methods will continue to work without modification.
+                        <methodname>fetchAll()</methodname> methods will continue to work without
+                        modification.
                     </para>
 
                     <para>
@@ -930,10 +939,11 @@ $row = $table->fetchRow(
                 <listitem>
                     <para>
                         You <emphasis>can not</emphasis> specify columns from a JOINed tabled to be
-                        returned in a row/rowset. Doing so will trigger a <acronym>PHP</acronym> error. This was done
-                        to ensure the integrity of the <classname>Zend_Db_Table</classname> is
-                        retained. i.e. A <classname>Zend_Db_Table_Row</classname> should only
-                        reference columns derived from its parent table.
+                        returned in a row/rowset. Doing so will trigger a <acronym>PHP</acronym>
+                        error. This was done to ensure the integrity of the
+                        <classname>Zend_Db_Table</classname> is retained. i.e. A
+                        <classname>Zend_Db_Table_Row</classname> should only reference columns
+                        derived from its parent table.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -987,8 +997,9 @@ $rows =
 
             <para>
                 You can query for a set of rows using any criteria other than the primary key
-                values, using the <methodname>fetchAll()</methodname> method of the Table class. This method
-                returns an object of type <classname>Zend_Db_Table_Rowset_Abstract</classname>.
+                values, using the <methodname>fetchAll()</methodname> method of the Table class.
+                This method returns an object of type
+                <classname>Zend_Db_Table_Rowset_Abstract</classname>.
             </para>
 
             <example id="zend.db.table.qry.rows.set.finding.row.example">
@@ -1008,8 +1019,9 @@ $rows = $table->fetchAll($select);
             <para>
                 You may also pass sorting criteria in an <code>ORDER BY</code> clause, as well as
                 count and offset integer values, used to make the query return a specific subset of
-                rows. These values are used in a <constant>LIMIT</constant> clause, or in equivalent logic
-                for <acronym>RDBMS</acronym> brands that do not support the <constant>LIMIT</constant> syntax.
+                rows. These values are used in a <constant>LIMIT</constant> clause, or in equivalent
+                logic for <acronym>RDBMS</acronym> brands that do not support the
+                <constant>LIMIT</constant> syntax.
             </para>
 
             <example id="zend.db.table.fetch-all.example2">
@@ -1207,7 +1219,8 @@ $row = $table->fetchRow($select);
         <para>
             This method returns an object of type <classname>Zend_Db_Table_Row_Abstract</classname>.
             If the search criteria you specified match no rows in the database table, then
-            <methodname>fetchRow()</methodname> returns <acronym>PHP</acronym>'s <constant>NULL</constant> value.
+            <methodname>fetchRow()</methodname> returns <acronym>PHP</acronym>'s
+            <constant>NULL</constant> value.
         </para>
 
     </sect2>
@@ -1218,8 +1231,8 @@ $row = $table->fetchRow($select);
 
         <para>
             The <classname>Zend_Db_Table_Abstract</classname> class provides some information about
-            its metadata. The <methodname>info()</methodname> method returns an array structure with information
-            about the table, its columns and primary key, and other metadata.
+            its metadata. The <methodname>info()</methodname> method returns an array structure with
+            information about the table, its columns and primary key, and other metadata.
         </para>
 
         <example id="zend.db.table.info.example">
@@ -1237,7 +1250,8 @@ echo "The table name is " . $info['name'] . "\n";
         </example>
 
         <para>
-            The keys of the array returned by the <methodname>info()</methodname> method are described below:
+            The keys of the array returned by the <methodname>info()</methodname> method are
+            described below:
         </para>
 
         <itemizedlist>
@@ -1581,10 +1595,10 @@ $rows = $table->fetchAll($where);
             </example>
 
             <para>
-                You can change the classes by specifying them with the <methodname>setRowClass()</methodname>
-                and <methodname>setRowsetClass()</methodname> methods. This applies to rows and rowsets created
-                subsequently; it does not change the class of any row or rowset objects you have
-                created previously.
+                You can change the classes by specifying them with the
+                <methodname>setRowClass()</methodname> and <methodname>setRowsetClass()</methodname>
+                methods. This applies to rows and rowsets created subsequently; it does not change
+                the class of any row or rowset objects you have created previously.
             </para>
 
             <example id="zend.db.table.extending.row-rowset.example2">
@@ -1624,10 +1638,10 @@ $rowsCustom = $table->fetchAll($where);
             <title>Defining Custom Logic for Insert, Update, and Delete</title>
 
             <para>
-                You can override the <methodname>insert()</methodname> and <methodname>update()</methodname> methods in
-                your Table class. This gives you the opportunity to implement custom code that is
-                executed before performing the database operation. Be sure to call the parent class
-                method when you are done.
+                You can override the <methodname>insert()</methodname> and
+                <methodname>update()</methodname> methods in your Table class. This gives you the
+                opportunity to implement custom code that is executed before performing the database
+                operation. Be sure to call the parent class method when you are done.
             </para>
 
             <example id="zend.db.table.extending.insert-update.example">
@@ -1674,10 +1688,10 @@ class Bugs extends Zend_Db_Table_Abstract
             <para>
                 You can implement custom query methods in your Table class, if you have frequent
                 need to do queries against this table with specific criteria. Most queries can be
-                written using <methodname>fetchAll()</methodname>, but this requires that you duplicate code to
-                form the query conditions if you need to run the query in several places in your
-                application. Therefore it can be convenient to implement a method in the Table
-                class to perform frequently-used queries against this table.
+                written using <methodname>fetchAll()</methodname>, but this requires that you
+                duplicate code to form the query conditions if you need to run the query in several
+                places in your application. Therefore it can be convenient to implement a method in
+                the Table class to perform frequently-used queries against this table.
             </para>
 
             <example id="zend.db.table.extending.finders.example">
@@ -1706,8 +1720,9 @@ class Bugs extends Zend_Db_Table_Abstract
             <title>Define Inflection in Zend_Db_Table</title>
 
             <para>
-                Some people prefer that the table class name match a table name in the <acronym>RDBMS</acronym> by
-                using a string transformation called <emphasis>inflection</emphasis>.
+                Some people prefer that the table class name match a table name in the
+                <acronym>RDBMS</acronym> by using a string transformation called
+                <emphasis>inflection</emphasis>.
             </para>
 
             <para>
@@ -1733,15 +1748,15 @@ class Bugs extends Zend_Db_Table_Abstract
 
             <para>
                 It is inappropriate to transform identifiers from the database, because this can
-                lead to ambiguity or make some identifiers inaccessible. Using the <acronym>SQL</acronym> identifiers
-                exactly as they appear in the database makes
+                lead to ambiguity or make some identifiers inaccessible. Using the
+                <acronym>SQL</acronym> identifiers exactly as they appear in the database makes
                 <classname>Zend_Db_Table_Abstract</classname> both simpler and more flexible.
             </para>
 
             <para>
                 If you prefer to use inflection, then you must implement the transformation
-                yourself, by overriding the <methodname>_setupTableName()</methodname> method in your Table
-                classes. One way to do this is to define an abstract class that extends
+                yourself, by overriding the <methodname>_setupTableName()</methodname> method in
+                your Table classes. One way to do this is to define an abstract class that extends
                 <classname>Zend_Db_Table_Abstract</classname>, and then the rest of your tables
                 extend your new abstract class.
             </para>

+ 54 - 49
documentation/manual/en/module_specs/Zend_Db_Table_Row.xml

@@ -28,10 +28,11 @@
         <title>Fetching a Row</title>
 
         <para>
-            <classname>Zend_Db_Table_Abstract</classname> provides methods <methodname>find()</methodname> and
-            <methodname>fetchAll()</methodname>, which each return an object of type
-            <classname>Zend_Db_Table_Rowset</classname>, and the method <methodname>fetchRow()</methodname>,
-            which returns an object of type <classname>Zend_Db_Table_Row</classname>.
+            <classname>Zend_Db_Table_Abstract</classname> provides methods
+            <methodname>find()</methodname> and <methodname>fetchAll()</methodname>, which each
+            return an object of type <classname>Zend_Db_Table_Rowset</classname>, and the method
+            <methodname>fetchRow()</methodname>, which returns an object of type
+            <classname>Zend_Db_Table_Row</classname>.
         </para>
 
         <example id="zend.db.table.row.read.example">
@@ -109,9 +110,9 @@ echo $row->bug_description;
             <title>Retrieving Row Data as an Array</title>
 
             <para>
-                You can access the row's data as an array using the <methodname>toArray()</methodname> method
-                of the Row object. This returns an associative array of the column names to the
-                column values.
+                You can access the row's data as an array using the
+                <methodname>toArray()</methodname> method of the Row object. This returns an
+                associative array of the column names to the column values.
             </para>
 
             <example id="zend.db.table.row.read.to-array.example">
@@ -135,9 +136,9 @@ foreach ($rowArray as $column => $value) {
             </example>
 
             <para>
-                The array returned from <methodname>toArray()</methodname> is not updateable. You can modify
-                values in the array as you can with any array, but you cannot save changes to this
-                array to the database directly.
+                The array returned from <methodname>toArray()</methodname> is not updateable. You
+                can modify values in the array as you can with any array, but you cannot save
+                changes to this array to the database directly.
             </para>
 
         </sect3>
@@ -200,10 +201,10 @@ $row->save();
             <title>Inserting a new row</title>
 
             <para>
-                You can create a new row for a given table with the <methodname>createRow()</methodname> method
-                of the table class. You can access fields of this row with the object-oriented
-                interface, but the row is not stored in the database until you call the
-                <methodname>save()</methodname> method.
+                You can create a new row for a given table with the
+                <methodname>createRow()</methodname> method of the table class. You can access
+                fields of this row with the object-oriented interface, but the row is not stored in
+                the database until you call the <methodname>save()</methodname> method.
             </para>
 
             <example id="zend.db.table.row.write.insert.example">
@@ -251,10 +252,11 @@ $newRow->save();
             <note>
 
                 <para>
-                    The <methodname>createRow()</methodname> method was called <methodname>fetchNew()</methodname> in
-                    earlier releases of <classname>Zend_Db_Table</classname>. You are encouraged to
-                    use the new method name, even though the old name continues to work for the sake
-                    of backward compatibility.
+                    The <methodname>createRow()</methodname> method was called
+                    <methodname>fetchNew()</methodname> in earlier releases of
+                    <classname>Zend_Db_Table</classname>. You are encouraged to use the new method
+                    name, even though the old name continues to work for the sake of backward
+                    compatibility.
                 </para>
 
             </note>
@@ -267,10 +269,10 @@ $newRow->save();
 
             <para>
                 <classname>Zend_Db_Table_Row_Abstract</classname> provides the
-                <methodname>setFromArray()</methodname> method to enable you to set several columns in a single
-                row at once, specified in an associative array that maps the column names to values.
-                You may find this method convenient for setting values both for new rows and for
-                rows you need to update.
+                <methodname>setFromArray()</methodname> method to enable you to set several columns
+                in a single row at once, specified in an associative array that maps the column
+                names to values. You may find this method convenient for setting values both for new
+                rows and for rows you need to update.
             </para>
 
             <example id="zend.db.table.row.write.set-from-array.example">
@@ -303,8 +305,8 @@ $newRow->save();
             <title>Deleting a row</title>
 
             <para>
-                You can call the <methodname>delete()</methodname> method on a Row object. This deletes rows in
-                the database matching the primary key in the Row object.
+                You can call the <methodname>delete()</methodname> method on a Row object. This
+                deletes rows in the database matching the primary key in the Row object.
             </para>
 
             <example id="zend.db.table.row.write.delete.example">
@@ -322,8 +324,8 @@ $row->delete();
             </example>
 
             <para>
-                You do not have to call <methodname>save()</methodname> to apply the delete; it is executed
-                against the database immediately.
+                You do not have to call <methodname>save()</methodname> to apply the delete; it is
+                executed against the database immediately.
             </para>
 
         </sect3>
@@ -346,8 +348,8 @@ $row->delete();
             <title>Serializing a Row</title>
 
             <para>
-                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to create a string containing a
-                byte-stream representation of the Row object argument.
+                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to
+                create a string containing a byte-stream representation of the Row object argument.
             </para>
 
             <example id="zend.db.table.row.serialize.serializing.example">
@@ -373,8 +375,9 @@ $serializedRow = serialize($row);
             <title>Unserializing Row Data</title>
 
             <para>
-                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to restore a string containing a
-                byte-stream representation of an object. The function returns the original object.
+                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to
+                restore a string containing a byte-stream representation of an object. The function
+                returns the original object.
             </para>
 
             <para>
@@ -420,8 +423,8 @@ echo $rowClone->bug_description;
             <title>Reactivating a Row as Live Data</title>
 
             <para>
-                You can reactivate a disconnected Row, using the <methodname>setTable()</methodname> method.
-                The argument to this method is a valid object of type
+                You can reactivate a disconnected Row, using the <methodname>setTable()</methodname>
+                method. The argument to this method is a valid object of type
                 <classname>Zend_Db_Table_Abstract</classname>, which you create. Creating a Table
                 object requires a live connection to the database, so by reassociating the Table
                 with the Row, the Row gains access to the database. Subsequently, you can change
@@ -497,9 +500,9 @@ $bugs = new Bugs(array('rowClass' => 'MyRow'));
 
             <para>
                 If application-specific logic needs to be initialized when a row is constructed,
-                you can select to move your tasks to the <methodname>init()</methodname> method, which is
-                called after all row metadata has been processed. This is recommended over the
-                <code>__construct</code> method if you do not need to alter the metadata in any
+                you can select to move your tasks to the <methodname>init()</methodname> method,
+                which is called after all row metadata has been processed. This is recommended over
+                the <code>__construct</code> method if you do not need to alter the metadata in any
                 programmatic way.
 
                 <example id="zend.db.table.row.init.usage.example">
@@ -530,18 +533,18 @@ class MyApplicationRow extends Zend_Db_Table_Row_Abstract
 
             <para>
                 The Row class calls protected methods <methodname>_insert()</methodname>,
-                <methodname>_update()</methodname>, and <methodname>_delete()</methodname> before performing the
-                corresponding operations <constant>INSERT</constant>, <constant>UPDATE</constant>, and
-                <constant>DELETE</constant>. You can add logic to these methods in your custom Row
-                subclass.
+                <methodname>_update()</methodname>, and <methodname>_delete()</methodname> before
+                performing the corresponding operations <constant>INSERT</constant>,
+                <constant>UPDATE</constant>, and <constant>DELETE</constant>. You can add logic to
+                these methods in your custom Row subclass.
             </para>
 
             <para>
                 If you need to do custom logic in a specific table, and the custom logic must occur
                 for every operation on that table, it may make more sense to implement your custom
-                code in the <methodname>insert()</methodname>, <methodname>update()</methodname> and <methodname>delete()</methodname>
-                methods of your Table class. However, sometimes it may be necessary to do custom
-                logic in the Row class.
+                code in the <methodname>insert()</methodname>, <methodname>update()</methodname> and
+                <methodname>delete()</methodname> methods of your Table class. However, sometimes it
+                may be necessary to do custom logic in the Row class.
             </para>
 
             <para>
@@ -640,8 +643,9 @@ class Products extends Zend_Db_Table_Abstract
             <title>Define Inflection in Zend_Db_Table_Row</title>
 
             <para>
-                Some people prefer that the table class name match a table name in the <acronym>RDBMS</acronym> by
-                using a string transformation called <emphasis>inflection</emphasis>.
+                Some people prefer that the table class name match a table name in the
+                <acronym>RDBMS</acronym> by using a string transformation called
+                <emphasis>inflection</emphasis>.
             </para>
 
             <para>
@@ -652,9 +656,9 @@ class Products extends Zend_Db_Table_Abstract
 
             <para>
                 If you prefer to use inflection, then you must implement the transformation
-                yourself, by overriding the <methodname>_transformColumn()</methodname> method in a custom Row
-                class, and using that custom Row class when you perform queries against your Table
-                class.
+                yourself, by overriding the <methodname>_transformColumn()</methodname> method in a
+                custom Row class, and using that custom Row class when you perform queries against
+                your Table class.
             </para>
 
             <example id="zend.db.table.row.extending.inflection.example">
@@ -663,8 +667,9 @@ class Products extends Zend_Db_Table_Abstract
 
                 <para>
                     This allows you to use an inflected version of the column name in the
-                    accessors. The Row class uses the <methodname>_transformColumn()</methodname> method to
-                    change the name you use to the native column name in the database table.
+                    accessors. The Row class uses the <methodname>_transformColumn()</methodname>
+                    method to change the name you use to the native column name in the database
+                    table.
                 </para>
 
                 <programlisting language="php"><![CDATA[

+ 15 - 14
documentation/manual/en/module_specs/Zend_Dom-Query.xml

@@ -4,10 +4,11 @@
     <title>Zend_Dom_Query</title>
 
     <para>
-        <classname>Zend_Dom_Query</classname> provides mechanisms for querying <acronym>XML</acronym> and
-        (X)HTML documents utilizing either XPath or <acronym>CSS</acronym> selectors. It was
-        developed to aid with functional testing of <acronym>MVC</acronym> applications, but could
-        also be used for rapid development of screen scrapers.
+        <classname>Zend_Dom_Query</classname> provides mechanisms for querying
+        <acronym>XML</acronym> and (X)HTML documents utilizing either XPath or
+        <acronym>CSS</acronym> selectors. It was developed to aid with functional testing of
+        <acronym>MVC</acronym> applications, but could also be used for rapid development of screen
+        scrapers.
     </para>
 
     <para>
@@ -177,13 +178,13 @@ foreach ($results as $result) {
 
             <itemizedlist>
                 <listitem><para>
-                    <methodname>setDocumentXml($document)</methodname>: specify an <acronym>XML</acronym>
-                    string to query against.
+                    <methodname>setDocumentXml($document)</methodname>: specify an
+                    <acronym>XML</acronym> string to query against.
                 </para></listitem>
 
                 <listitem><para>
-                    <methodname>setDocumentXhtml($document)</methodname>: specify an <acronym>XHTML</acronym>
-                    string to query against.
+                    <methodname>setDocumentXhtml($document)</methodname>: specify an
+                    <acronym>XHTML</acronym> string to query against.
                 </para></listitem>
 
                 <listitem><para>
@@ -210,8 +211,8 @@ foreach ($results as $result) {
                 </para></listitem>
 
                 <listitem><para>
-                    <methodname>query($query)</methodname>: query the document using <acronym>CSS</acronym>
-                    selector notation.
+                    <methodname>query($query)</methodname>: query the document using
+                    <acronym>CSS</acronym> selector notation.
                 </para></listitem>
 
                 <listitem><para>
@@ -235,15 +236,15 @@ foreach ($results as $result) {
 
             <itemizedlist>
                 <listitem><para>
-                    <methodname>getCssQuery()</methodname>: return the <acronym>CSS</acronym> selector query
-                    used to produce the result (if any).
+                    <methodname>getCssQuery()</methodname>: return the <acronym>CSS</acronym>
+                    selector query used to produce the result (if any).
                 </para></listitem>
 
                 <listitem><para>
                     <methodname>getXpathQuery()</methodname>: return the XPath query
                     used to produce the result. Internally,
-                    <classname>Zend_Dom_Query</classname> converts <acronym>CSS</acronym> selector queries to
-                    XPath, so this value will always be populated.
+                    <classname>Zend_Dom_Query</classname> converts <acronym>CSS</acronym> selector
+                    queries to XPath, so this value will always be populated.
                 </para></listitem>
 
                 <listitem><para>