Преглед изворни кода

[DOCUMENTATION] English:

- manual fixes (only line length)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15851 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas пре 16 година
родитељ
комит
fb6affd982
20 измењених фајлова са 1199 додато и 922 уклоњено
  1. 90 74
      documentation/manual/en/module_specs/Zend_Date-Additional.xml
  2. 30 24
      documentation/manual/en/module_specs/Zend_Date-Basic.xml
  3. 67 48
      documentation/manual/en/module_specs/Zend_Date-Constants.xml
  4. 46 40
      documentation/manual/en/module_specs/Zend_Date-Creation.xml
  5. 66 58
      documentation/manual/en/module_specs/Zend_Date-Introduction.xml
  6. 314 193
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  7. 28 20
      documentation/manual/en/module_specs/Zend_Date-Theory.xml
  8. 72 52
      documentation/manual/en/module_specs/Zend_Db_Adapter.xml
  9. 20 15
      documentation/manual/en/module_specs/Zend_Db_Profiler.xml
  10. 112 95
      documentation/manual/en/module_specs/Zend_Db_Select.xml
  11. 12 7
      documentation/manual/en/module_specs/Zend_Db_Statement.xml
  12. 91 88
      documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml
  13. 106 94
      documentation/manual/en/module_specs/Zend_Db_Table.xml
  14. 48 42
      documentation/manual/en/module_specs/Zend_Db_Table_Row.xml
  15. 71 57
      documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml
  16. 2 2
      documentation/manual/en/module_specs/Zend_Dojo-Data.xml
  17. 15 6
      documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml
  18. 1 1
      documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml
  19. 5 5
      documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml
  20. 3 1
      documentation/manual/en/module_specs/Zend_Dojo.xml

+ 90 - 74
documentation/manual/en/module_specs/Zend_Date-Additional.xml

@@ -5,9 +5,9 @@
     <title>Working Examples</title>
 
     <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 API for the proper using of them.
+        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 API for the proper using of them.
     </para>
 
     <sect2 id="zend.date.additional.checking">
@@ -15,37 +15,41 @@
         <title>Checking Dates</title>
 
         <para>
-            Probably most dates you will get as input are strings. But the problem with strings is that
-            you can not be sure if the string is a real date. Therefor <classname>Zend_Date</classname> has spent
-            an own static function to check date strings. <classname>Zend_Locale</classname> has an own function
-            <code>getDate($date, $locale);</code> which parses a date and returns the proper and normalized
-            date parts. A monthname for example will be recognised and returned just a month number.
-            But as <classname>Zend_Locale</classname> does not know anything about dates because it is a
-            normalizing and localizing class we have integrated an own function <code>isDate($date);</code>
-            which checks this.
+            Probably most dates you will get as input are strings. But the problem with strings is
+            that you can not be sure if the string is a real date. Therefor
+            <classname>Zend_Date</classname> has spent an own static function to check date strings.
+            <classname>Zend_Locale</classname> has an own function
+            <code>getDate($date, $locale);</code> which parses a date and returns the proper and
+            normalized date parts. A monthname for example will be recognised and returned just a
+            month number. But as <classname>Zend_Locale</classname> does not know anything about
+            dates because it is a normalizing and localizing class we have integrated an own
+            function <code>isDate($date);</code> which checks this.
         </para>
 
         <para>
-            <code>isDate($date, $format, $locale);</code> can take up to 3 parameters and needs minimum one
-            parameter. So what we need to verify a date is, of course, the date itself as string.
-            The second parameter can be the format which the date is expected to have. If no format is given
-            the standard date format from your locale is used. For details about how formats should look like
-            see the chapter about <link linkend="zend.date.constants.selfdefinedformats">self defined formats</link>
-            .
+            <code>isDate($date, $format, $locale);</code> can take up to 3 parameters and needs
+            minimum one parameter. So what we need to verify a date is, of course, the date itself
+            as string. The second parameter can be the format which the date is expected to have. If
+            no format is given the standard date format from your locale is used. For details about
+            how formats should look like see the chapter about <link
+                linkend="zend.date.constants.selfdefinedformats">self defined formats</link>.
         </para>
 
         <para>
-            The third parameter is also optional as the second parameter and can be used to give a locale.
-            We need the locale to normalize monthnames and daynames. So with the third parameter we are able
-            to recognise dates like '01.Jänner.2000' or '01.January.2000' depending on the given locale.
+            The third parameter is also optional as the second parameter and can be used to give a
+            locale. We need the locale to normalize monthnames and daynames. So with the third
+            parameter we are able to recognise dates like '01.Jänner.2000' or '01.January.2000'
+            depending on the given locale.
         </para>
 
         <para>
-            <code>isDate();</code> of course checks if a date does exist. <classname>Zend_Date</classname> itself does not
-            check a date. So it is possible to 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'. <code>isDate()</code> on the other side does this check and will return
-            false on '31.February.2000' because it knows that this date is impossible.
+            <code>isDate();</code> of course checks if a date does exist.
+            <classname>Zend_Date</classname> itself does not check a date. So it is possible to
+            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'. <code>isDate()</code> on the other side does
+            this check and will return false on '31.February.2000' because it knows that this date
+            is impossible.
         </para>
 
         <example id="zend.date.additional.checking.example-1">
@@ -84,22 +88,24 @@ if (Zend_Date::isDate($date,'dd MMMM yyyy', 'en')) {
         <title>Sunrise and Sunset</title>
 
         <para>
-            <classname>Zend_Date</classname> has also functions integrated for getting informations from the sun. Often it is
-            necessary to get the time for sunrise or sunset within a particularly day. This is quite easy with
-            <classname>Zend_Date</classname> as just the expected day has to be given and additionally location for which
-            the sunrise or sunset has to be calculated.
+            <classname>Zend_Date</classname> has also functions integrated for getting informations
+            from the sun. Often it is necessary to get the time for sunrise or sunset within a
+            particularly day. This is quite easy with <classname>Zend_Date</classname> as just the
+            expected day has to be given and additionally location for which the sunrise or sunset
+            has to be calculated.
         </para>
 
         <para>
-            As most people do not know the location of their city we have also spent a helper class which provides
-            the location data for about 250 capital and other big cities around the whole world. Most people could
-            use cities near themself as the difference for locations situated to each other can only be measured
-            within some seconds.
+            As most people do not know the location of their city we have also spent a helper class
+            which provides the location data for about 250 capital and other big cities around the
+            whole world. Most people could use cities near themself as the difference for locations
+            situated to each other can only be measured within some seconds.
         </para>
 
         <para>
-            For creating a listbox and choosing a special city the function <classname>Zend_Date_Cities::getCityList</classname>
-            can be used. It returns the names of all available predefined cities for the helper class.
+            For creating a listbox and choosing a special city the function
+            <classname>Zend_Date_Cities::getCityList</classname> can be used. It returns the names
+            of all available predefined cities for the helper class.
         </para>
 
         <example id="zend.date.additional.sunrise-sunset.example-1">
@@ -111,15 +117,16 @@ print_r (Zend_Date_Cities::getCityList());
         </example>
 
         <para>
-            The location itself can be received with the <classname>Zend_Date_Cities::City()</classname> function.
-            It accepts the name of the city as returned by the <classname>Zend_Date_Cities::getCityList()</classname>
-            function and optional as second parameter the horizon to set.
+            The location itself can be received with the
+            <classname>Zend_Date_Cities::City()</classname> function. It accepts the name of the
+            city as returned by the <classname>Zend_Date_Cities::getCityList()</classname> function
+            and optional as second parameter the horizon to set.
         </para>
 
         <para>
-            There are 4 defined horizons which can be used with locations to receive the exact time of sunset and
-            sunrise. The '<code>horizon</code>' parameter is always optional in all functions. If it is not set, the
-            '<code>effective</code>' horizon is used.
+            There are 4 defined horizons which can be used with locations to receive the exact time
+            of sunset and sunrise. The '<code>horizon</code>' parameter is always optional in all
+            functions. If it is not set, the '<code>effective</code>' horizon is used.
         </para>
 
         <table id="zend.date.additional.sunrise-sunset.table">
@@ -136,7 +143,10 @@ print_r (Zend_Date_Cities::getCityList());
                     <row>
                         <entry>effective</entry>
                         <entry>Standard horizon</entry>
-                        <entry>Expects the world to be a ball. This horizon is always used if non is defined.</entry>
+                        <entry>
+                            Expects the world to be a ball. This horizon is always used if non is
+                            defined.
+                        </entry>
                     </row>
                     <row>
                         <entry>civil</entry>
@@ -158,8 +168,9 @@ print_r (Zend_Date_Cities::getCityList());
         </table>
 
         <para>
-            Of course also a self-defined location can be given and calculated with. Therefor a '<code>latitude</code>'
-            and a '<code>longitude</code>' has to be given and optional the '<code>horizon</code>'.
+            Of course also a self-defined location can be given and calculated with. Therefor a
+            '<code>latitude</code>' and a '<code>longitude</code>' has to be given and optional the
+            '<code>horizon</code>'.
         </para>
 
         <example id="zend.date.additional.sunrise-sunset.example-2">
@@ -178,11 +189,13 @@ $mylocation = array('latitude' => 41.5, 'longitude' => 13.2446);
         </example>
 
         <para>
-            As now all needed data can be set the next is to create a <classname>Zend_Date</classname> object with the day where
-            sunset or sunrise should be calculated. For the calculation there are 3 functions available. It is possible
-            to calculate sunset with '<code>getSunset()</code>', sunrise with '<code>getSunrise()</code>' and all
-            available informations related to the sun with '<code>getSunInfo()</code>'. After the calculation the
-            <classname>Zend_Date</classname> object will be returned with the calculated time.
+            As now all needed data can be set the next is to create a
+            <classname>Zend_Date</classname> object with the day where sunset or sunrise should be
+            calculated. For the calculation there are 3 functions available. It is possible to
+            calculate sunset with '<code>getSunset()</code>', sunrise with
+            '<code>getSunrise()</code>' and all available informations related to the sun with
+            '<code>getSunInfo()</code>'. After the calculation the <classname>Zend_Date</classname>
+            object will be returned with the calculated time.
         </para>
 
         <example id="zend.date.additional.sunrise-sunset.example-3">
@@ -213,29 +226,31 @@ foreach ($info as $sun) {
         <title>Time Zones</title>
 
         <para>
-            Time zones are as important as dates themselves. There are several time zones depending on where
-            in the world a user lives. So working with dates also means to set the proper timezone.
-            This may sound complicated but it's easier as expected. As already mentioned in the first chapter
-            of <classname>Zend_Date</classname> the default timezone has to be set. Either by <code>php.ini</code> or
-            by definition within the bootstrap file.
+            Time zones are as important as dates themselves. There are several time zones depending
+            on where in the world a user lives. So working with dates also means to set the proper
+            timezone. This may sound complicated but it's easier as expected. As already mentioned
+            in the first chapter of <classname>Zend_Date</classname> the default timezone has to be
+            set. Either by <code>php.ini</code> or by definition within the bootstrap file.
         </para>
 
         <para>
-            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 PHP functions.
-            <classname>Zend_Date</classname> has two built-in functions which makes it possible to handle this.
+            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 PHP functions. <classname>Zend_Date</classname> has two built-in
+            functions which makes it possible to handle this.
         </para>
 
         <para>
-            <code>getTimezone()</code> returns the actual set timezone of within the <classname>Zend_Date</classname>
-            object. Remember that <classname>Zend_Date</classname> is not coupled with PHP internals. So the returned
-            timezone is not the timezone of the PHP script but the timezone of the object.
-            <code>setTimezone($zone)</code> 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  <code>setTimezone()</code> without the zone parameter. This is also done automatically
-            when the date object is created.
+            <code>getTimezone()</code> returns the actual set timezone of within the
+            <classname>Zend_Date</classname> object. Remember that <classname>Zend_Date</classname>
+            is not coupled with PHP internals. So the returned timezone is not the timezone of the
+            PHP script but the timezone of the object. <code>setTimezone($zone)</code> 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  <code>setTimezone()</code> without the zone parameter. This is also done
+            automatically when the date object is created.
         </para>
 
         <example id="zend.date.additional.timezones.example-1">
@@ -267,17 +282,18 @@ print $date->getIso();
         </example>
 
         <para>
-            <classname>Zend_Date</classname> always takes the actual timezone for object creation as shown in the first
-            lines of the example. Changing the timezone within the created object 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 GMT. So the timezone means how much hours should be substracted or added
-            to get the actual global time for the own timezone and region.
+            <classname>Zend_Date</classname> always takes the actual timezone for object creation as
+            shown in the first lines of the example. Changing the timezone within the created object
+            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 GMT. 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>
-            Having the timezone coupled within <classname>Zend_Date</classname> has another positive effect. It is possible
-            to have several dates with different timezones.
+            Having the timezone coupled within <classname>Zend_Date</classname> has another positive
+            effect. It is possible to have several dates with different timezones.
         </para>
 
         <example id="zend.date.additional.timezones.example-2">

+ 30 - 24
documentation/manual/en/module_specs/Zend_Date-Basic.xml

@@ -5,19 +5,21 @@
     <title>Basic Methods</title>
 
     <para>
-        The following sections show basic usage of <classname>Zend_Date</classname> primarily by example. For this manual, "dates"
-        always imply a calendar date with a time, even when not explicitly mentioned, and vice-versa. The part not
-        specified defaults to an internal representation of "zero". Thus, adding a date having no calendar date and a
-        time value of 12 hours to another date consisting only of a calendar date would result in a date having that
+        The following sections show basic usage of <classname>Zend_Date</classname> primarily by
+        example. For this manual, "dates" always imply a calendar date with a time, even when not
+        explicitly mentioned, and vice-versa. The part not specified defaults to an internal
+        representation of "zero". Thus, adding a date having no calendar date and a time value of 12
+        hours to another date consisting only of a calendar date would result in a date having that
         calendar date and a time of "noon".
     </para>
 
     <para>
-        Setting only a specific date, with no time part, implies a time set to 00:00:00. Conversely, setting only a
-        specific time implies a date internally set to 01.01.1970 plus the number of seconds equal to the elapsed hours,
-        minutes, and seconds identified by the time. Normally, people measure things from a starting point, such as the
-        year 0 A.D. However, many software systems use the first second of the year 1970 as the starting point, and
-        denote times as a timestamp offset counting the number of seconds elapsed from this starting point.
+        Setting only a specific date, with no time part, implies a time set to 00:00:00. Conversely,
+        setting only a specific time implies a date internally set to 01.01.1970 plus the number of
+        seconds equal to the elapsed hours, minutes, and seconds identified by the time. Normally,
+        people measure things from a starting point, such as the year 0 A.D. However, many software
+        systems use the first second of the year 1970 as the starting point, and denote times as a
+        timestamp offset counting the number of seconds elapsed from this starting point.
     </para>
 
     <sect2 id="zend.date.basic.creation">
@@ -25,8 +27,8 @@
         <title>Current Date</title>
 
         <para>
-            Without any arguments, constructing an instance returns an object in the default locale with the current,
-            local date using PHP's <code>time()</code> function to obtain the
+            Without any arguments, constructing an instance returns an object in the default locale
+            with the current, local date using PHP's <code>time()</code> function to obtain the
             <ulink url="http://en.wikipedia.org/wiki/Unix_Time">UNIX timestamp</ulink>
             for the object. Make sure your PHP environment has the correct
             <link linkend="zend.date.setdefaulttimezone">default timezone</link>
@@ -50,8 +52,9 @@ print $date;
         <title>Zend_Date by Example</title>
 
         <para>
-            Reviewing basic methods of <classname>Zend_Date</classname> is a good place to start for those unfamiliar with date
-            objects in other languages or frameworks. A small example will be provided for each method below.
+            Reviewing basic methods of <classname>Zend_Date</classname> is a good place to start for
+            those unfamiliar with date objects in other languages or frameworks. A small example
+            will be provided for each method below.
         </para>
 
         <sect3 id="zend.date.simple.functions.get">
@@ -59,8 +62,9 @@ print $date;
             <title>Output a Date</title>
 
             <para>
-                The date in a <classname>Zend_Date</classname> object may be obtained as a localized integer or string using the
-                <code>get()</code> method. There are many available options, which will be explained in later sections.
+                The date in a <classname>Zend_Date</classname> object may be obtained as a localized
+                integer or string using the <code>get()</code> method. There are many available
+                options, which will be explained in later sections.
             </para>
 
             <example id="zend.date.simple.functions.get.example-1">
@@ -80,8 +84,9 @@ print $date->get();
             <title>Setting a Date</title>
 
             <para>
-                The <code>set()</code> method alters the date stored in the object, and returns the final date value as
-                a timestamp (not an object). Again, there are many options which will be explored in later sections.
+                The <code>set()</code> method alters the date stored in the object, and returns the
+                final date value as a timestamp (not an object). Again, there are many options which
+                will be explored in later sections.
             </para>
 
             <example id="zend.date.simple.functions.set.example-1">
@@ -102,10 +107,10 @@ print $date->get(Zend_Date::W3C);
             <title>Adding and Subtracting Dates</title>
 
             <para>
-                Adding two dates with <code>add()</code> usually involves adding a real date in time with an artificial
-                timestramp representing a date part, such as 12 hours, as shown in the example below. Both
-                <code>add()</code> and <code>sub()</code> use the same set of options as <code>set()</code>, which will
-                be explained later.
+                Adding two dates with <code>add()</code> usually involves adding a real date in time
+                with an artificial timestramp representing a date part, such as 12 hours, as shown
+                in the example below. Both <code>add()</code> and <code>sub()</code> use the same
+                set of options as <code>set()</code>, which will be explained later.
             </para>
 
             <example id="zend.date.simple.functions.add.example-1">
@@ -130,9 +135,10 @@ echo "Date via toString() = ", $date, "\n";
             <title>Comparison of Dates</title>
 
             <para>
-                All basic <classname>Zend_Date</classname> methods can operate on entire dates contained in the objects, or can
-                operate on date parts, such as comparing the minutes value in a date to an absolute value. For example,
-                the current minutes in the current time may be compared with a specific number of minutes using
+                All basic <classname>Zend_Date</classname> methods can operate on entire dates
+                contained in the objects, or can operate on date parts, such as comparing the
+                minutes value in a date to an absolute value. For example, the current minutes in
+                the current time may be compared with a specific number of minutes using
                 <code>compare()</code>, as in the example below.
             </para>
 

+ 67 - 48
documentation/manual/en/module_specs/Zend_Date-Constants.xml

@@ -5,9 +5,10 @@
     <title>Constants for General Date Functions</title>
 
     <para>
-        Whenever a <classname>Zend_Date</classname> method has a <varname>$parts</varname> parameter, one of the constants below can be
-        used as the argument for that parameter, in order to select a specific part of a date or indicate the date
-        format used or desired (e.g. RFC 822).
+        Whenever a <classname>Zend_Date</classname> method has a <varname>$parts</varname>
+        parameter, one of the constants below can be used as the argument for that parameter, in
+        order to select a specific part of a date or indicate the date format used or desired (e.g.
+        RFC 822).
     </para>
 
     <sect2 id="zend.date.constants.using">
@@ -15,13 +16,15 @@
         <title>Using Constants</title>
 
         <para>
-            For example, the constant <classname>Zend_Date::HOUR</classname> can be used in the ways shown below. When working
-            with days of the week, calendar dates, hours, minutes, seconds, and any other date parts that are expressed
-            differently when in different parts 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 GMT/UTC or localized to a locale. The example output below reflects localization to
-            Europe/GMT+1 hour (e.g. Germany, Austria, France).
+            For example, the constant <classname>Zend_Date::HOUR</classname> can be used in the ways
+            shown below. When working with days of the week, calendar dates, hours, minutes,
+            seconds, and any other date parts that are expressed differently when in different parts
+            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 GMT/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">
@@ -101,8 +104,8 @@
         <title>List of All Constants</title>
 
         <para>
-            Each part of a date/time has a unique constant in <classname>Zend_Date</classname>. All constants supported by
-            <classname>Zend_Date</classname> are listed below.
+            Each part of a date/time has a unique constant in <classname>Zend_Date</classname>. All
+            constants supported by <classname>Zend_Date</classname> are listed below.
         </para>
 
         <table id="zend.date.constants.list.table-1">
@@ -138,19 +141,26 @@
                     </row>
                     <row>
                         <entry>Zend_Date::WEEKDAY_SHORT</entry>
-                        <entry>Weekday (Name of the day, localized, abbreviated, the first three digits)</entry>
+                        <entry>
+                            Weekday (Name of the day, localized, abbreviated, the first three
+                            digits)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>Fri</emphasis> for Friday</entry>
                     </row>
                     <row>
                         <entry>Zend_Date::WEEKDAY_NAME</entry>
-                        <entry>Weekday (Name of the day, localized, abbreviated, the first two digits)</entry>
+                        <entry>
+                            Weekday (Name of the day, localized, abbreviated, the first two digits)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>Fr</emphasis> for Friday</entry>
                     </row>
                     <row>
                         <entry>Zend_Date::WEEKDAY_NARROW</entry>
-                        <entry>Weekday (Name of the day, localized, abbreviated, only the first digit)</entry>
+                        <entry>
+                            Weekday (Name of the day, localized, abbreviated, only the first digit)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>F</emphasis> for Friday</entry>
                     </row>
@@ -228,7 +238,9 @@
                     </row>
                     <row>
                         <entry>Zend_Date::MONTH_NAME_SHORT</entry>
-                        <entry>Month (Name of the month, localized, abbreviated, three digit)</entry>
+                        <entry>
+                            Month (Name of the month, localized, abbreviated, three digit)
+                        </entry>
                         <entry>2009-02-06T14:53:27+01:00</entry>
                         <entry><emphasis>Feb</emphasis>
                         </entry>
@@ -487,7 +499,9 @@
                     <row>
                         <entry>Zend_Date::TIMESTAMP</entry>
                         <entry>
-                            <ulink url="http://en.wikipedia.org/wiki/Unix_Time">Unix time</ulink> (seconds since 1.1.1970, mixed)</entry>
+                            <ulink url="http://en.wikipedia.org/wiki/Unix_Time">Unix time</ulink>
+                            (seconds since 1.1.1970, mixed)
+                        </entry>
                         <entry>2009-02-13T14:53:27+01:00</entry>
                         <entry><emphasis>1234533207</emphasis>
                         </entry>
@@ -553,11 +567,13 @@
         </table>
 
         <para>
-            Especially note <classname>Zend_Date::DATES</classname>, since this format specifier has a unique property within
-            <classname>Zend_Date</classname> as an <emphasis>input</emphasis> format specifier. When used as an
-            input format for <varname>$part</varname>, this constant provides the most flexible acceptance of a variety of
-            similar date formats. Heuristics are used to automatically extract dates from an input string and then "fix"
-            simple errors in dates (if any), such as swapping of years, months, and days, when possible.
+            Especially note <classname>Zend_Date::DATES</classname>, since this format specifier has
+            a unique property within <classname>Zend_Date</classname> as an
+            <emphasis>input</emphasis> format specifier. When used as an input format for
+            <varname>$part</varname>, this constant provides the most flexible acceptance of a
+            variety of similar date formats. Heuristics are used to automatically extract dates from
+            an input string and then "fix" simple errors in dates (if any), such as swapping of
+            years, months, and days, when possible.
         </para>
 
         <table id="zend.date.constants.list.table-8">
@@ -666,19 +682,19 @@
         <title>Self-Defined OUTPUT Formats with ISO</title>
 
         <para>
-            If you need a date format not shown above, then use a self-defined format composed from the ISO format token
-            specifiers below. The following examples illustrate the usage of constants from the table below to create
-            self-defined ISO formats. The format length is unlimited. Also, multiple usage of format constants is
-            allowed.
+            If you need a date format not shown above, then use a self-defined format composed from
+            the ISO format token specifiers below. The following examples illustrate the usage of
+            constants from the table below to create self-defined ISO formats. The format length is
+            unlimited. Also, multiple usage of format constants is allowed.
         </para>
 
         <para>
-            The accepted format specifiers can be changed from ISO Format to PHP's date format if you are more
-            comfortable with it. However, not all formats defined in the ISO norm are supported with PHP's date format
-            specifiers. Use the <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to switch
-            Zend_Date methods from supporting ISO format specifiers to PHP date() type specifiers (see
-            <xref linkend="zend.date.constants.phpformats" />
-            below).
+            The accepted format specifiers can be changed from ISO Format to PHP's date format if
+            you are more comfortable with it. However, not all formats defined in the ISO norm are
+            supported with PHP's date format specifiers. Use the
+            <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to
+            switch Zend_Date methods from supporting ISO format specifiers to PHP date() type
+            specifiers (see <xref linkend="zend.date.constants.phpformats" /> below).
         </para>
 
         <example id="zend.date.constants.selfdefinedformats.example-1">
@@ -1112,17 +1128,19 @@ 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 PHP's date format specifier than with ISO format specifiers, then you can
-            use the <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to switch Zend_Date methods from
-            supporting ISO format specifiers to PHP date() type specifiers. Afterwards, all format parameters must be
-            given with
-            <ulink url="http://php.net/date">PHP's <code>date()</code> format specifiers</ulink>
-            . The PHP date format lacks some of the formats supported by the ISO Format, and vice-versa. If you are not
-            already comfortable with it, then use the standard ISO format instead. Also, if you have legacy code using
-            PHP's date format, then either manually convert it to the ISO format using
-            <link linkend="zend.locale.date.normalize">Zend_Locale_Format::convertPhpToIsoFormat()</link>
-            , or use <code>setOptions()</code>. The following examples illustrate the usage of constants from the table
-            below to create self-defined formats.
+            If you are more comfortable with PHP's date format specifier than with ISO format
+            specifiers, then you can use the
+            <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to
+            switch Zend_Date methods from supporting ISO format specifiers to PHP date() type
+            specifiers. Afterwards, all format parameters must be given with
+            <ulink url="http://php.net/date">PHP's <code>date()</code> format specifiers</ulink>.
+            The PHP date format lacks some of the formats supported by the ISO Format, and
+            vice-versa. If you are not already comfortable with it, then use the standard ISO format
+            instead. Also, if you have legacy code using PHP's date format, then either manually
+            convert it to the ISO format using <link
+                linkend="zend.locale.date.normalize">Zend_Locale_Format::convertPhpToIsoFormat()</link>,
+            or use <code>setOptions()</code>. The following examples illustrate the usage of
+            constants from the table below to create self-defined formats.
         </para>
 
         <example id="zend.date.constants.phpformats.example-1">
@@ -1140,11 +1158,12 @@ 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 PHP date format specifiers with their equivalent Zend_Date constants
-            and CLDR/ISO equivalent format specifiers. In most cases, when the CLDR/ISO format does not have an
-            equivalent format specifier, the PHP format specifier is not altered by
-            <classname>Zend_Locale_Format::convertPhpToIsoFormat()</classname>, and the Zend_Date methods then recognize these
-            "peculiar" PHP format specifiers, even when in the default "ISO" format mode.
+            The following table shows the list of PHP date format specifiers with their equivalent
+            Zend_Date constants and CLDR/ISO equivalent format specifiers. In most cases, when the
+            CLDR/ISO format does not have an equivalent format specifier, the PHP format specifier
+            is not altered by <classname>Zend_Locale_Format::convertPhpToIsoFormat()</classname>,
+            and the Zend_Date methods then recognize these "peculiar" PHP format specifiers, even
+            when in the default "ISO" format mode.
         </para>
 
         <table id="zend.date.constants.phpformats.table">

+ 46 - 40
documentation/manual/en/module_specs/Zend_Date-Creation.xml

@@ -5,8 +5,8 @@
     <title>Creation of Dates</title>
 
     <para>
-        <classname>Zend_Date</classname> provides several different ways to create a new instance of itself. As there are
-        different needs the most convenient ways will be shown in this chapter.
+        <classname>Zend_Date</classname> provides several different ways to create a new instance of
+        itself. As there are different needs the most convenient ways will be shown in this chapter.
     </para>
 
     <sect2 id="zend.date.creation.actual">
@@ -14,11 +14,11 @@
         <title>Create the Actual Date</title>
 
         <para>
-            The simplest way of creating a date object is to create the actual date. You can either create a new
-            instance with <emphasis>new Zend_Date()</emphasis> or use the convenient static method
-            <emphasis>Zend_Date::now()</emphasis> which both will return the actual date as new
-            instance of <classname>Zend_Date</classname>. The actual date always include the actual date and time for the
-            actual set timezone.
+            The simplest way of creating a date object is to create the actual date. You can either
+            create a new instance with <emphasis>new Zend_Date()</emphasis> or use the convenient
+            static method <emphasis>Zend_Date::now()</emphasis> which both will return the actual
+            date as new instance of <classname>Zend_Date</classname>. The actual date always include
+            the actual date and time for the actual set timezone.
         </para>
 
         <example id="zend.date.creation.actual.example-1">
@@ -26,9 +26,10 @@
             <title>Date Creation by Instance</title>
 
             <para>
-                Date creation by creating a new instance means that you do not need to give an parameter. Of course
-                there are several parameters which will be described later but normally this is the simplest and
-                most used way to get the actual date as <classname>Zend_Date</classname> instance.
+                Date creation by creating a new instance means that you do not need to give an
+                parameter. Of course there are several parameters which will be described later but
+                normally this is the simplest and most used way to get the actual date as
+                <classname>Zend_Date</classname> instance.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -42,10 +43,11 @@ $date = new Zend_Date();
             <title>Static Date Creation</title>
 
             <para>
-                Sometimes it is easier to use a static method for date creation. Therefor you can use the
-                <emphasis><code>now()</code></emphasis> method. It returns a new instance of
-                <classname>Zend_Date</classname> the same way as if you would use <code>new Zend_Date()</code>. But it will
-                always return the actual date and can not be changed by giving optional parameters.
+                Sometimes it is easier to use a static method for date creation. Therefor you can
+                use the <emphasis><code>now()</code></emphasis> method. It returns a new instance of
+                <classname>Zend_Date</classname> the same way as if you would use
+                <code>new Zend_Date()</code>. But it will always return the actual date and can not
+                be changed by giving optional parameters.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -61,17 +63,18 @@ $date = Zend_Date::now();
         <title>Create a Date from Database</title>
 
         <para>
-            Databases are often used to store date values. But the problem is, that every database outputs its
-            date values in a different way. <code>MsSQL</code> databases use a quite different standard date
-            output than <code>MySQL</code> databases. But for simplification <classname>Zend_Date</classname> makes it very
-            easy to create a date from database date values.
+            Databases are often used to store date values. But the problem is, that every database
+            outputs its date values in a different way. <code>MsSQL</code> databases use a quite
+            different standard date output than <code>MySQL</code> databases. But for simplification
+            <classname>Zend_Date</classname> makes it very easy to create a date from database date
+            values.
         </para>
 
         <para>
-            Of course each database can be said to convert the output of a defined column to a special value.
-            For example you could convert a <code>datetime</code> value to output a minute value. But this is
-            time expensive and often you are in need of handling dates in an other way than expected when creating
-            the database query.
+            Of course each database can be said to convert the output of a defined column to a
+            special value. For example you could convert a <code>datetime</code> value to output a
+            minute value. But this is time expensive and often you are in need of handling dates in
+            an other way than expected when creating the database query.
         </para>
 
         <para>
@@ -83,10 +86,11 @@ $date = Zend_Date::now();
             <title>Quick Creation of Dates from Database Date Values</title>
 
             <para>
-                All databases are known to handle queries as fast as possible. They are built to act and respond
-                quick. The quickest way for handling dates is to get unix timestamps from the database. All
-                databases store date values internal as timestamp (not unix timestamp). This means that the time
-                for creating a timestamp through a query is much smaller than converting it to a specified format.
+                All databases are known to handle queries as fast as possible. They are built to act
+                and respond quick. The quickest way for handling dates is to get unix timestamps
+                from the database. All databases store date values internal as timestamp (not unix
+                timestamp). This means that the time for creating a timestamp through a query is
+                much smaller than converting it to a specified format.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -101,15 +105,17 @@ $date = new Zend_Date($unixtimestamp, Zend_Date::TIMESTAMP);
             <title>Convenient Creation of Dates from Database Date Values</title>
 
             <para>
-                The standard output of all databases is quite different even if it looks the same on the first
-                eyecatch. But all are part of the <code>ISO</code> Standard and explained through it. So the
-                easiest way of date creation is the usage of <classname>Zend_Date::ISO_8601</classname>. Databases which are
-                known to be recognised by <classname>Zend_Date::ISO_8601</classname> are <code>MySQL</code>,
-                <code>MsSQL</code> for example. But all databases are also able to return a <code>ISO 8601</code>
-                representation of a date column. <code>ISO 8601</code> has the big advantage that it is human
-                readable. The disadvantage is that <code>ISO 8601</code> needs more time for computation than a
-                simple unix timestamp. But it should also be mentioned that unix timestamps are only supported
-                for dates after 1 January 1970.
+                The standard output of all databases is quite different even if it looks the same on
+                the first eyecatch. But all are part of the <code>ISO</code> Standard and explained
+                through it. So the easiest way of date creation is the usage of
+                <classname>Zend_Date::ISO_8601</classname>. Databases which are known to be
+                recognised by <classname>Zend_Date::ISO_8601</classname> are <code>MySQL</code>,
+                <code>MsSQL</code> for example. But all databases are also able to return a
+                <code>ISO 8601</code> representation of a date column. <code>ISO 8601</code> has the
+                big advantage that it is human readable. The disadvantage is that <code>ISO
+                8601</code> needs more time for computation than a simple unix timestamp. But it
+                should also be mentioned that unix timestamps are only supported for dates after 1
+                January 1970.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -126,8 +132,8 @@ $date = new Zend_Date($datecolumn, Zend_Date::ISO_8601);
         <title>Create Dates from an Array</title>
 
         <para>
-            Dates can also be created by the usage of an array. This is a simple and easy way. The used array
-            keys are:
+            Dates can also be created by the usage of an array. This is a simple and easy way. The
+            used array keys are:
         </para>
 
         <para>
@@ -170,9 +176,9 @@ $date = new Zend_Date($datecolumn, Zend_Date::ISO_8601);
             <title>Date Creation by Array</title>
 
             <para>
-                Normally you will give a complete date array for creation of a new date instance. But when you
-                do not give all values, the not given array values are zeroed. This means that if f.e. no hour is
-                given the hour <emphasis>0</emphasis> is used.
+                Normally you will give a complete date array for creation of a new date instance.
+                But when you do not give all values, the not given array values are zeroed. This
+                means that if f.e. no hour is given the hour <emphasis>0</emphasis> is used.
             </para>
 
             <programlisting language="php"><![CDATA[

+ 66 - 58
documentation/manual/en/module_specs/Zend_Date-Introduction.xml

@@ -5,29 +5,28 @@
     <title>Introduction</title>
 
     <para>
-        The <classname>Zend_Date</classname> component offers a detailed, but simple API 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 PHP 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 API 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 PHP 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>
-        Although simplicity remains the goal, working with localized dates and times while modifying, combining, and
-        comparing parts involves some unavoidable complexity. Dates, as well as times, are often written differently in
-        different locales. For example, some place the month first, while other write the year first when expressing
-        calendar dates. For more information about handling localization and normalization, please refer to
-        <link linkend="zend.locale.date.datesandtimes"><classname>Zend_Locale</classname>
-        </link>
-        .
+        Although simplicity remains the goal, working with localized dates and times while
+        modifying, combining, and comparing parts involves some unavoidable complexity. Dates, as
+        well as times, are often written differently in different locales. For example, some place
+        the month first, while other write the year first when expressing calendar dates. For more
+        information about handling localization and normalization, please refer to <link
+            linkend="zend.locale.date.datesandtimes"><classname>Zend_Locale</classname></link>.
     </para>
 
     <para>
-        <classname>Zend_Date</classname> also supports abbreviated names of months in many languages. <classname>Zend_Locale</classname>
-        facilitates the normalization of localized month and weekday names to timestamps, which may, in turn, be shown
-        localized to other regions.
+        <classname>Zend_Date</classname> also supports abbreviated names of months in many
+        languages. <classname>Zend_Locale</classname> facilitates the normalization of localized
+        month and weekday names to timestamps, which may, in turn, be shown localized to other
+        regions.
     </para>
 
     <sect2 id="zend.date.setdefaulttimezone">
@@ -35,14 +34,15 @@
         <title>Always Set a Default Timezone</title>
 
         <para>
-            Before using any date related functions in PHP or Zend Framework, first make certain your application
-            has a correct default timezone, by either setting the TZ environment variable, using the
-            <code>date.timezone</code> php.ini setting, or using
-            <ulink url="http://php.net/date_default_timezone_set">date_default_timezone_set()</ulink>
-            . In PHP, we can adjust all date and time related functions to work for a particular user by setting a
-            default timezone according to the user's expectations. For a complete list of timezone settings, see the
-            <ulink url="http://unicode.org/cldr/data/diff/supplemental/territory_containment_un_m_49.html">CLDR Timezone Identifier List</ulink>
-            .
+            Before using any date related functions in PHP or Zend Framework, first make certain
+            your application has a correct default timezone, by either setting the TZ environment
+            variable, using the <code>date.timezone</code> php.ini setting, or using <ulink
+                url="http://php.net/date_default_timezone_set">date_default_timezone_set()</ulink>.
+            In PHP, we can adjust all date and time related functions to work for a particular user
+            by setting a default timezone according to the user's expectations. For a complete list
+            of timezone settings, see the <ulink
+                url="http://unicode.org/cldr/data/diff/supplemental/territory_containment_un_m_49.html">CLDR
+                Timezone Identifier List</ulink>.
             <example id="zend.date.setdefaulttimezone.example-1">
                 <title>Setting a Default Timezone</title>
                 <programlisting language="php"><![CDATA[
@@ -52,16 +52,17 @@ date_default_timezone_set('America/Los_Angeles');
 date_default_timezone_set('Europe/Berlin');
 ]]></programlisting>
             </example>
-            <emphasis>When creating Zend_Date instances, their timezone will automatically become the
-            current default timezone!</emphasis> Thus, the timezone setting will account for any Daylight Savings Time
-            (DST) in effect, eliminating the need to explicitly specify DST.
+            <emphasis>When creating Zend_Date instances, their timezone will automatically become
+            the current default timezone!</emphasis> Thus, the timezone setting will account for any
+            Daylight Savings Time (DST) in effect, eliminating the need to explicitly specify DST.
         </para>
 
         <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 DST, it would automatically
-            be switched back for the instances of <classname>Zend_Date</classname> which have been set to UTC or GMT.
+            <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 DST, it would
+            automatically be switched back for the instances of <classname>Zend_Date</classname>
+            which have been set to UTC or GMT.
         </para>
     </sect2>
 
@@ -70,7 +71,8 @@ date_default_timezone_set('Europe/Berlin');
         <title>Why Use Zend_Date?</title>
 
         <para>
-            <classname>Zend_Date</classname> offers the following features, which extend the scope of PHP date functions:
+            <classname>Zend_Date</classname> offers the following features, which extend the scope
+            of PHP date functions:
         </para>
 
         <itemizedlist mark='opencircle'>
@@ -79,9 +81,9 @@ date_default_timezone_set('Europe/Berlin');
                     Simple API
                 </para>
                 <para>
-                    <classname>Zend_Date</classname> offers a very simple API, 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 API, 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>
@@ -89,9 +91,10 @@ date_default_timezone_set('Europe/Berlin');
                     Completely internationalized
                 </para>
                 <para>
-                    All full and abbreviated names of months and weekdays are supported for more than 130 languages.
-                    Methods support both input and the output of dates using the localized names of months and weekdays,
-                    in the conventional format associated with each locale.
+                    All full and abbreviated names of months and weekdays are supported for more
+                    than 130 languages. Methods support both input and the output of dates using the
+                    localized names of months and weekdays, in the conventional format associated
+                    with each locale.
                 </para>
             </listitem>
             <listitem>
@@ -99,16 +102,18 @@ date_default_timezone_set('Europe/Berlin');
                     Unlimited timestamps
                 </para>
                 <para>
-                    Although PHP 5.2 docs state, "The valid range of a timestamp is typically from Fri, 13 Dec 1901
-                    20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT," <classname>Zend_Date</classname> supports a nearly unlimited
-                    range, with the help of the BCMath extension. If BCMath is not available, then Zend_Date 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, the ZF I18n components use
-                    BCMath extension, if available.
+                    Although PHP 5.2 docs state, "The valid range of a timestamp is typically from
+                    Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT,"
+                    <classname>Zend_Date</classname> supports a nearly unlimited range, with the
+                    help of the BCMath extension. If BCMath is not available, then Zend_Date 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,
+                    the ZF I18n components use BCMath extension, if available.
                 </para>
             </listitem>
             <listitem>
@@ -116,14 +121,16 @@ date_default_timezone_set('Europe/Berlin');
                     Support for ISO_8601 date specifications
                 </para>
                 <para>
-                    ISO_8601 date specifications are supported. Even partially compliant ISO_8601 date specifications
-                    will be identified. These date formats are particularly useful when working with databases. For
-                    example, even though MsSQL and
-                    <ulink url="http://dev.mysql.com/doc/refman/5.0/en/date-and-time-functions.html">MySQL</ulink>
-                    differ a little from each other, both are supported by <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
-                    PHP date() format tokens, use Zend_Date's built-in support for ISO 8601 formatted dates.
+                    ISO_8601 date specifications are supported. Even partially compliant ISO_8601
+                    date specifications will be identified. These date formats are particularly
+                    useful when working with databases. for example, even though MsSQL and <ulink
+                        url="http://dev.mysql.com/doc/refman/5.0/en/date-and-time-functions.html">MySQL</ulink>
+                    differ a little from each other, both are supported by
+                    <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 PHP date() format tokens, use Zend_Date's built-in support for ISO
+                    8601 formatted dates.
                 </para>
             </listitem>
             <listitem>
@@ -131,8 +138,9 @@ date_default_timezone_set('Europe/Berlin');
                     Calculate sunrise and sunset
                 </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 PHP project :)
+                    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 PHP
+                    project :)
                 </para>
             </listitem>
         </itemizedlist>

+ 314 - 193
documentation/manual/en/module_specs/Zend_Date-Overview.xml

@@ -5,8 +5,8 @@
     <title>Zend_Date API Overview</title>
 
     <para>
-        While the <classname>Zend_Date</classname> API remains simplistic and unitary, its design remains flexible and powerful
-        through the rich permutations of operations and operands.
+        While the <classname>Zend_Date</classname> API 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,12 +18,15 @@
             <title>Selecting the Date Format Type</title>
 
             <para>
-                Several methods use date format strings, in a way similar to PHP's <code>date()</code>.
-                If you are more comfortable with PHP's date format specifier than with ISO format specifiers,
-                then you can use <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname>.
-                Afterward, use PHP's date format specifiers for all functions which accept a <varname>$format</varname> parameter.
-                Use <classname>Zend_Date::setOptions(array('format_type' => 'iso'))</classname> to switch back to the default mode of
-                supporting only ISO date format tokens. For a list of supported format codes, see
+                Several methods use date format strings, in a way similar to PHP's
+                <code>date()</code>. If you are more comfortable with PHP's date format specifier
+                than with ISO format specifiers, then you can use
+                <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname>.
+                Afterward, use PHP's date format specifiers for all functions which accept a
+                <varname>$format</varname> parameter. Use
+                <classname>Zend_Date::setOptions(array('format_type' => 'iso'))</classname> to
+                switch back to the default mode of supporting only ISO date format tokens. For a
+                list of supported format codes, see
                 <xref linkend="zend.date.constants.phpformats" />
             </para>
 
@@ -34,29 +37,33 @@
             <title>DST and Date Math</title>
 
             <para>
-                When dates are manipulated, sometimes they cross over a DST change, normally resulting in the date
-                losing or gaining an hour. For exmaple, when adding months to a date before a DST change, if the
-                resulting date is after the DST 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 DST change ignored by using the <code>fix_dst</code> option.
-                When crossing the Summer/Winter DST boundary, normally an hour is substracted or added depending
-                on the date. For example, date math crossing the Spring DST 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 Zend_Date
-                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 true, causing DST
-                to have no effect on date "math" (<code>addMOnth(), subMonth()</code>). Use
-                <classname>Zend_Date::setOptions(array('fix_dst' => false))</classname> to enable the subtraction or addition
-                of the DST adjustment when performing date "math".
+                When dates are manipulated, sometimes they cross over a DST change, normally
+                resulting in the date losing or gaining an hour. For exmaple, when adding months to
+                a date before a DST change, if the resulting date is after the DST 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 DST change ignored by using the
+                <code>fix_dst</code> option. When crossing the Summer/Winter DST boundary, normally
+                an hour is substracted or added depending on the date. For example, date math
+                crossing the Spring DST 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 Zend_Date 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 true,
+                causing DST to have no effect on date "math" (<code>addMOnth(), subMonth()</code>).
+                Use <classname>Zend_Date::setOptions(array('fix_dst' => false))</classname> to
+                enable the subtraction or addition of the DST adjustment when performing date
+                "math".
             </para>
 
             <para>
-                <emphasis>If your actual timezone within the instance of <classname>Zend_Date</classname>
-                is set to UTC or GMT the option <code>'fix_dst'</code> will not be used</emphasis> because
-                these two timezones do not work with DST. When you change the timezone for this instance
-                again to a timezone which is not UTC or GMT the previous set 'fix_dst' option will be used
+                <emphasis>If your actual timezone within the instance of
+                <classname>Zend_Date</classname> is set to UTC or GMT the option
+                <code>'fix_dst'</code> will not be used</emphasis> because these two timezones do
+                not work with DST. When you change the timezone for this instance again to a
+                timezone which is not UTC or GMT the previous set 'fix_dst' option will be used
                 again for date "math".
             </para>
         </sect3>
@@ -66,19 +73,22 @@
             <title>Month Calculations</title>
 
             <para>
-                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 SQL 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 ZF developers, the desired behavior is selectable using
-                the <code>extend_month</code> option to choose either the SQL behaviour, if set to false,
-                or the spreadsheet behaviour when set to true. The default behaviour for <code>extend_month</code>
-                is false, providing behavior compatible to SQL. 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.
+                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 SQL 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 ZF developers, the desired behavior is selectable using the
+                <code>extend_month</code> option to choose either the SQL behaviour, if set to
+                false, or the spreadsheet behaviour when set to true. The default behaviour for
+                <code>extend_month</code> is false, providing behavior compatible to SQL. 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>
 
         </sect3>
@@ -88,12 +98,13 @@
             <title>Speed up Date Localization and Normalization with Zend_Cache</title>
 
             <para>
-                You can speed up <classname>Zend_Date</classname> by using an <classname>Zend_Cache</classname> adapter.
-                This speeds up all methods of <classname>Zend_Date</classname> when you are using localized data.
-                For example all methods which accept <classname>Zend_Date::DATE</classname> and
-                <classname>Zend_Date::TIME</classname> constants would benefit from this. To set an <classname>Zend_Cache</classname>
-                adapter to <classname>Zend_Date</classname> just use
-                <classname>Zend_Date::setOptions(array('cache' => $adapter));</classname>.
+                You can speed up <classname>Zend_Date</classname> by using an
+                <classname>Zend_Cache</classname> adapter. This speeds up all methods of
+                <classname>Zend_Date</classname> when you are using localized data. For example all
+                methods which accept <classname>Zend_Date::DATE</classname> and
+                <classname>Zend_Date::TIME</classname> constants would benefit from this. To set an
+                <classname>Zend_Cache</classname> adapter to <classname>Zend_Date</classname> just
+                use <classname>Zend_Date::setOptions(array('cache' => $adapter));</classname>.
             </para>
 
         </sect3>
@@ -120,35 +131,38 @@
         <title>Working with Date Values</title>
 
         <para>
-            Once input has been normalized via the creation of a <classname>Zend_Date</classname> 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 GMT/UTC. To examine an object's timezone use <code>getTimeZone())</code>. To change an
-            object's timezone, use <code>setTimeZone())</code>. All manipulations of these objects are assumed to be
+            Once input has been normalized via the creation of a <classname>Zend_Date</classname>
+            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 GMT/UTC. To examine an object's timezone use
+            <code>getTimeZone())</code>. To change an object's timezone, use
+            <code>setTimeZone())</code>. All manipulations of these objects are assumed to be
             relative to this timezone.
         </para>
 
         <para>
-            Beware of mixing and matching operations with date parts between date objects for different timezones, which
-            generally produce undesireable results, unless the manipulations are only related to the timestamp.
-            Operating on <classname>Zend_Date</classname> objects having different timezones generally works, except as just
-            noted, since dates are normalized to UNIX timestamps on instantiation of <classname>Zend_Date</classname>.
+            Beware of mixing and matching operations with date parts between date objects for
+            different timezones, which generally produce undesireable results, unless the
+            manipulations are only related to the timestamp. Operating on
+            <classname>Zend_Date</classname> objects having different timezones generally works,
+            except as just noted, since dates are normalized to UNIX timestamps on instantiation of
+            <classname>Zend_Date</classname>.
         </para>
 
         <para>
-            Most methods expect a constant selecting the desired <varname>$part</varname> of a date, such as
-            <classname>Zend_Date::HOUR</classname>. These constants are valid for all of the functions below. A list of all
-            available constants is provided in
-            <xref linkend="zend.date.constants.list" />
-            . If no <varname>$part</varname> is specified, then <classname>Zend_Date::TIMESTAMP</classname> is assumed. Alternatively, a
-            user-specified format may be used for <varname>$part</varname>, using the same underlying mechanism and format
-            codes as
-            <link linkend="zend.locale.date.normalize"><classname>Zend_Locale_Format::getDate()</classname>
-            </link>
-            . If a date object is constructed using an obviously invalid date (e.g. a month number greater than 12),
-            then <classname>Zend_Date</classname> will throw an exception, unless no specific date format has been selected -i.e.
-            <varname>$part</varname> is either <constant>NULL</constant> or <classname>Zend_Date::DATES</classname> (a "loose" format).
+            Most methods expect a constant selecting the desired <varname>$part</varname> of a date,
+            such as <classname>Zend_Date::HOUR</classname>. These constants are valid for all of the
+            functions below. A list of all available constants is provided in
+            <xref linkend="zend.date.constants.list" />. If no <varname>$part</varname> is
+            specified, then <classname>Zend_Date::TIMESTAMP</classname> is assumed. Alternatively, a
+            user-specified format may be used for <varname>$part</varname>, using the same
+            underlying mechanism and format codes as <link
+                linkend="zend.locale.date.normalize"><classname>Zend_Locale_Format::getDate()</classname></link>.
+            If a date object is constructed using an obviously invalid date (e.g. a month number
+            greater than 12), then <classname>Zend_Date</classname> will throw an exception, unless
+            no specific date format has been selected -i.e. <varname>$part</varname> is either
+            <constant>NULL</constant> or <classname>Zend_Date::DATES</classname> (a "loose" format).
         </para>
 
         <example id="zend.date.values.example-1">
@@ -167,27 +181,32 @@ echo $date3, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
         </example>
 
         <para>
-            If the optional <varname>$locale</varname> parameter is provided, then the <varname>$locale</varname> disambiguates the
-            <varname>$date</varname> operand by replacing month and weekday names for string <varname>$date</varname> operands, and
-            even parsing date strings expressed according to the conventions of that locale (see <code>
-            <link linkend="zend.locale.date.normalize">Zend_Locale_Format::getDate()</link>
-            </code> ). The automatic normalization of localized <varname>$date</varname> operands of a string type occurs when
-            <varname>$part</varname> is one of the <classname>Zend_Date::DATE*</classname> or <classname>Zend_Date::TIME*</classname> constants.
-            The locale identifies which language should be used to parse month names and weekday names, if the
-            <varname>$date</varname> is a string containing a date. If there is no <varname>$date</varname> input parameter, then
-            the <varname>$locale</varname> parameter specifies the locale to use for localizing output (e.g. the date format
-            for a string representation). Note that the <varname>$date</varname> input parameter might actually have a type
-            name instead (e.g. <varname>$hour</varname> for <code>addHour()</code>), although that does not prevent the use of
-            <classname>Zend_Date</classname> objects as arguments for that parameter. If no <varname>$locale</varname> was specified,
-            then the locale of the current object is used to interpret <varname>$date</varname>, or select the localized
-            format for output.
+            If the optional <varname>$locale</varname> parameter is provided, then the
+            <varname>$locale</varname> disambiguates the <varname>$date</varname> operand by
+            replacing month and weekday names for string <varname>$date</varname> operands, and even
+            parsing date strings expressed according to the conventions of that locale (see <code>
+            <link linkend="zend.locale.date.normalize">Zend_Locale_Format::getDate()</link> </code>
+            ). The automatic normalization of localized <varname>$date</varname> operands of a
+            string type occurs when <varname>$part</varname> is one of the
+            <classname>Zend_Date::DATE*</classname> or <classname>Zend_Date::TIME*</classname>
+            constants. The locale identifies which language should be used to parse month names and
+            weekday names, if the <varname>$date</varname> is a string containing a date. If there
+            is no <varname>$date</varname> input parameter, then the <varname>$locale</varname>
+            parameter specifies the locale to use for localizing output (e.g. the date format for a
+            string representation). Note that the <varname>$date</varname> input parameter might
+            actually have a type name instead (e.g. <varname>$hour</varname> for
+            <code>addHour()</code>), although that does not prevent the use of
+            <classname>Zend_Date</classname> objects as arguments for that parameter. If no
+             <varname>$locale</varname> was specified, then the locale of the current object is used
+             to interpret <varname>$date</varname>, or select the localized format for output.
         </para>
 
         <para>
-            Since Zend Framework 1.7.0 <classname>Zend_Date</classname> does also support the usage of an application
-            wide locale. You can simply set a <classname>Zend_Locale</classname> instance to the registry like shown
-            below. With this notation you can forget about setting the locale manually with each instance when
-            you want to use the same locale multiple times.
+            Since Zend Framework 1.7.0 <classname>Zend_Date</classname> does also support the usage
+            of an application wide locale. You can simply set a <classname>Zend_Locale</classname>
+            instance to the registry like shown below. With this notation you can forget about
+            setting the locale manually with each instance when you want to use the same locale
+            multiple times.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -206,14 +225,17 @@ $date = new Zend_Date('31.Feb.2007');
         <title>Basic Zend_Date Operations Common to Many Date Parts</title>
 
         <para>
-            The methods <code>add(), sub(), compare(), get(), and set()</code> operate generically on dates. In each
-            case, the operation is performed on the date held in the instance object. The <varname>$date</varname> operand is
-            required for all of these methods, except <code>get()</code>, and may be a <classname>Zend_Date</classname> instance
-            object, a numeric string, or an integer. These methods assume <varname>$date</varname> is a timestamp, if it is
-            not an object. However, the <varname>$part</varname> operand controls which logical part of the two dates are
-            operated on, allowing operations on parts of the object's date, such as year or minute, even when
-            <varname>$date</varname> contains a long form date string, such as, "December 31, 2007 23:59:59". The result of
-            the operation changes the date in the object, except for <code>compare()</code>, and <code>get()</code>.
+            The methods <code>add(), sub(), compare(), get(), and set()</code> operate generically
+            on dates. In each case, the operation is performed on the date held in the instance
+            object. The <varname>$date</varname> operand is required for all of these methods,
+            except <code>get()</code>, and may be a <classname>Zend_Date</classname> instance
+            object, a numeric string, or an integer. These methods assume <varname>$date</varname>
+            is a timestamp, if it is not an object. However, the <varname>$part</varname> operand
+            controls which logical part of the two dates are operated on, allowing operations on
+            parts of the object's date, such as year or minute, even when <varname>$date</varname>
+            contains a long form date string, such as, "December 31, 2007 23:59:59". The result of
+            the operation changes the date in the object, except for <code>compare()</code>, and
+            <code>get()</code>.
         </para>
 
         <example id="zend.date.basic.example-1">
@@ -228,20 +250,22 @@ print $date;
         </example>
 
         <para>
-            Convenience methods exist for each combination of the basic operations and several common date parts as
-            shown in the tables below. These convenience methods help us lazy programmers avoid having to type out the
-            <link linkend="zend.date.constants.list">date part constants</link>
-            when using the general methods above. Conveniently, they are named by combining a prefix (name of a basic
-            operation) with a suffix (type of date part), such as <code>addYear()</code>. In the list below, all
-            combinations of "Date Parts" and "Basic Operations" exist. For example, the operation "add" exists for each
-            of these date parts, including <code>addDay()</code>, <code>addYear()</code>, etc.
+            Convenience methods exist for each combination of the basic operations and several
+            common date parts as shown in the tables below. These convenience methods help us lazy
+            programmers avoid having to type out the <link linkend="zend.date.constants.list">date
+                part constants</link> when using the general methods above. Conveniently, they are
+            named by combining a prefix (name of a basic operation) with a suffix (type of date
+            part), such as <code>addYear()</code>. In the list below, all combinations of "Date
+            Parts" and "Basic Operations" exist. For example, the operation "add" exists for each of
+            these date parts, including <code>addDay()</code>, <code>addYear()</code>, etc.
         </para>
 
         <para>
-            These convenience methods have the same equivalent functionality as the basic operation methods, but expect
-            string and integer <varname>$date</varname> operands containing only the values representing the type indicated by
-            the suffix of the convenience method. Thus, the names of these methods (e.g. "Year" or "Minute") identify
-            the units of the <varname>$date</varname> operand, when <varname>$date</varname> is a string or integer.
+            These convenience methods have the same equivalent functionality as the basic operation
+            methods, but expect string and integer <varname>$date</varname> operands containing only
+            the values representing the type indicated by the suffix of the convenience method.
+            Thus, the names of these methods (e.g. "Year" or "Minute") identify the units of the
+            <varname>$date</varname> operand, when <varname>$date</varname> is a string or integer.
         </para>
 
         <sect3 id="id.date.basic.parts">
@@ -260,86 +284,164 @@ print $date;
                     <tbody>
                         <row>
                             <entry>
-                                <ulink url="http://en.wikipedia.org/wiki/Unix_Time">Timestamp</ulink>
+                                <ulink
+                                    url="http://en.wikipedia.org/wiki/Unix_Time">Timestamp</ulink>
                             </entry>
                             <entry>
-                            UNIX timestamp, expressed in seconds elapsed since January 1st, 1970 00:00:00 GMT/UTC.
-                        </entry>
+                                UNIX timestamp, expressed in seconds elapsed since January 1st, 1970
+                                00:00:00 GMT/UTC.
+                            </entry>
                         </row>
                         <row>
                             <entry>
-                                <ulink url="http://en.wikipedia.org/wiki/Gregorian_calendar">Year</ulink>
+                                <ulink
+                                    url="http://en.wikipedia.org/wiki/Gregorian_calendar">Year</ulink>
                             </entry>
                             <entry>Gregorian calendar year (e.g. 2006)</entry>
                         </row>
                         <row>
                             <entry>
-                                <ulink url="http://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars">Month</ulink>
+                                <ulink
+                                    url="http://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars">Month</ulink>
+                            </entry>
+                            <entry>
+                                Gregorian calendar month (1-12, localized names supported)
                             </entry>
-                            <entry>Gregorian calendar month (1-12, localized names supported)</entry>
                         </row>
                         <row>
                             <entry>
-                                <ulink url="http://en.wikipedia.org/wiki/24-hour_clock">24 hour clock</ulink>
+                                <ulink
+                                    url="http://en.wikipedia.org/wiki/24-hour_clock">24 hour
+                                    clock</ulink>
+                            </entry>
+                            <entry>
+                                Hours of the day (0-23) denote the hours elapsed, since the start of
+                                the day.
                             </entry>
-                            <entry>Hours of the day (0-23) denote the hours elapsed, since the start of the day.</entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Minute">minute</ulink>
                             </entry>
-                            <entry>Minutes of the hour (0-59) denote minutes elapsed, since the start of the hour.</entry>
+                            <entry>
+                                Minutes of the hour (0-59) denote minutes elapsed, since the start
+                                of the hour.
+                            </entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Second">Second</ulink>
                             </entry>
-                            <entry>Seconds of the minute (0-59) denote the elapsed seconds, since the start of the minute.</entry>
+                            <entry>
+                                Seconds of the minute (0-59) denote the elapsed seconds, since the
+                                start of the minute.
+                            </entry>
                         </row>
                         <row>
                             <entry>
-                                <ulink url="http://en.wikipedia.org/wiki/Millisecond">millisecond</ulink>
+                                <ulink
+                                    url="http://en.wikipedia.org/wiki/Millisecond">millisecond</ulink>
+                            </entry>
+                            <entry>
+                                Milliseconds denote thousandths of a second (0-999).
+                                <classname>Zend_Date</classname> supports two additional methods for
+                                working with time units smaller than seconds. By default,
+                                <classname>Zend_Date</classname> instances use a precision
+                                defaulting to milliseconds, as seen using
+                                <code>getFractionalPrecision()</code>. To change the precision use
+                                <code>setFractionalPrecision($precision)</code>. However, precision
+                                is limited practically to microseconds, since
+                                <classname>Zend_Date</classname> uses <code><ulink
+                                    url="http://php.net/microtime">microtime()</ulink></code>.
                             </entry>
-                            <entry>Milliseconds denote thousandths of a second (0-999). <classname>Zend_Date</classname> supports two additional methods for working with time units smaller than seconds. By default, <classname>Zend_Date</classname> instances use a precision defaulting to milliseconds, as seen using <code>getFractionalPrecision()</code>. To change the precision use <code>setFractionalPrecision($precision)</code>. However, precision is limited practically to microseconds, since <classname>Zend_Date</classname> uses <code>
-                                <ulink url="http://php.net/microtime">microtime()</ulink></code>.</entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Day">Day</ulink>
                             </entry>
-                            <entry><classname>Zend_Date::DAY_SHORT</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry>
+                                <classname>Zend_Date::DAY_SHORT</classname> is extracted from
+                                <varname>$date</varname> if the <varname>$date</varname> operand is
+                                an instance of <classname>Zend_Date</classname> or a numeric string.
+                                Otherwise, an attempt is made to extract the day according to the
+                                conventions documented for these constants:
+                                <classname>Zend_Date::WEEKDAY_NARROW</classname>,
+                                <classname>Zend_Date::WEEKDAY_NAME</classname>,
+                                <classname>Zend_Date::WEEKDAY_SHORT</classname>,
+                                <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar
+                                assumed)
+                            </entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Week">Week</ulink>
                             </entry>
-                            <entry><classname>Zend_Date::WEEK</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise an exception is raised. (Gregorian calendar assumed)</entry>
+                            <entry>
+                                <classname>Zend_Date::WEEK</classname> is extracted from
+                                <varname>$date</varname> if the <varname>$date</varname> operand is
+                                an instance of <classname>Zend_Date</classname> or a numeric string.
+                                Otherwise an exception is raised. (Gregorian calendar assumed)
+                            </entry>
                         </row>
                         <row>
                             <entry>Date</entry>
-                            <entry><classname>Zend_Date::DAY_MEDIUM</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname>. Otherwise, an attempt is made to normalize the <varname>$date</varname> string into a Zend_Date::DATE_MEDIUM formatted date. The format of <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's locale.</entry>
+                            <entry>
+                                <classname>Zend_Date::DAY_MEDIUM</classname> is extracted from
+                                <varname>$date</varname> if the <varname>$date</varname> operand is
+                                an instance of <classname>Zend_Date</classname>. Otherwise, an
+                                attempt is made to normalize the <varname>$date</varname> string
+                                into a Zend_Date::DATE_MEDIUM formatted date. The format of
+                                <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's
+                                locale.
+                            </entry>
                         </row>
                         <row>
                             <entry>Weekday</entry>
-                            <entry>Weekdays are represented numerically as 0 (for Sunday) through 6 (for Saturday). <classname>Zend_Date::WEEKDAY_DIGIT</classname> is extracted from <varname>$date</varname>, if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry>
+                                Weekdays are represented numerically as 0 (for Sunday) through 6
+                                (for Saturday). <classname>Zend_Date::WEEKDAY_DIGIT</classname> is
+                                extracted from <varname>$date</varname>, if the
+                                <varname>$date</varname> operand is an instance of
+                                <classname>Zend_Date</classname> or a numeric string. Otherwise, an
+                                attempt is made to extract the day according to the conventions
+                                documented for these constants:
+                                <classname>Zend_Date::WEEKDAY_NARROW</classname>,
+                                <classname>Zend_Date::WEEKDAY_NAME</classname>,
+                                <classname>Zend_Date::WEEKDAY_SHORT</classname>,
+                                <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar
+                                assumed)
+                            </entry>
                         </row>
                         <row>
                             <entry>DayOfYear</entry>
-                            <entry>In <classname>Zend_Date</classname>, the day of the year represents the number of calendar days elapsed since the start of the year (0-365). As with other units above, fractions are rounded down to the nearest whole number. (Gregorian calendar assumed)
-                        </entry>
+                            <entry>
+                                In <classname>Zend_Date</classname>, the day of the year represents
+                                the number of calendar days elapsed since the start of the year
+                                (0-365). As with other units above, fractions are rounded down to
+                                the nearest whole number. (Gregorian calendar assumed)
+                            </entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://www.faqs.org/rfcs/rfc822.html">Arpa</ulink>
                             </entry>
-                            <entry>Arpa dates (i.e. RFC 822 formatted dates) are supported. Output uses either a "GMT" or "Local differential hours+min" format (see section 5 of RFC 822). Before PHP 5.2.2, using the DATE_RFC822 constant with PHP 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>
+                            <entry>
+                                Arpa dates (i.e. RFC 822 formatted dates) are supported. Output uses
+                                either a "GMT" or "Local differential hours+min" format (see section
+                                5 of RFC 822). Before PHP 5.2.2, using the DATE_RFC822 constant with
+                                PHP 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>
                             </entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/ISO_8601">Iso</ulink>
                             </entry>
-                            <entry>Only complete ISO 8601 dates are supported for output. Example: <code>2009-02-14T00:31:30+01:00</code>
+                            <entry>
+                                Only complete ISO 8601 dates are supported for output. Example:
+                                <code>2009-02-14T00:31:30+01:00</code>
                             </entry>
                         </row>
                     </tbody>
@@ -353,8 +455,8 @@ print $date;
             <title>List of Date Operations</title>
 
             <para>
-                The basic operations below can be used instead of the convenience operations for specific date parts, if
-                the
+                The basic operations below can be used instead of the convenience operations for
+                specific date parts, if the
                 <link linkend="zend.date.constants.list">appropriate constant</link>
                 is used for the <varname>$part</varname> parameter.
             </para>
@@ -376,12 +478,15 @@ print $date;
                                     <emphasis>get($part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Use <code>get($part)</code> to retrieve the date <varname>$part</varname> of this object's
-                                    date localized to <varname>$locale</varname> as a formatted string or integer. When using
-                                    the BCMath extension, numeric strings might be returned instead of integers for
-                                    large values. <emphasis>NOTE:</emphasis> Unlike <code>get()</code>,
-                                    the other get*() convenience methods only return instances of <classname>Zend_Date</classname>
-                                    containing a date representing the selected or computed date/time.
+                                    Use <code>get($part)</code> to retrieve the date
+                                    <varname>$part</varname> of this object's date localized to
+                                    <varname>$locale</varname> as a formatted string or integer.
+                                    When using the BCMath extension, numeric strings might be
+                                    returned instead of integers for large values.
+                                    <emphasis>NOTE:</emphasis> Unlike <code>get()</code>, the other
+                                    get*() convenience methods only return instances of
+                                    <classname>Zend_Date</classname> containing a date representing
+                                    the selected or computed date/time.
                                 </para>
                             </entry>
                         </row>
@@ -392,8 +497,9 @@ print $date;
                                     <emphasis>set($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Sets the <varname>$part</varname> of the current object to the corresponding value for
-                                    that part found in the input <varname>$date</varname> having a locale
+                                    Sets the <varname>$part</varname> of the current object to the
+                                    corresponding value for that part found in the input
+                                    <varname>$date</varname> having a locale
                                     <varname>$locale</varname>.
                                 </para>
                             </entry>
@@ -405,8 +511,9 @@ print $date;
                                     <emphasis>add($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Adds the <varname>$part</varname> of <varname>$date</varname> having a locale
-                                    <varname>$locale</varname> to the current object's date.
+                                    Adds the <varname>$part</varname> of <varname>$date</varname>
+                                    having a locale <varname>$locale</varname> to the current
+                                    object's date.
                                 </para>
                             </entry>
                         </row>
@@ -417,7 +524,8 @@ print $date;
                                     <emphasis>sub($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Subtracts the <varname>$part</varname> of <varname>$date</varname> having a locale
+                                    Subtracts the <varname>$part</varname> of
+                                    <varname>$date</varname> having a locale
                                     <varname>$locale</varname> from the current object's date.
                                 </para>
                             </entry>
@@ -429,9 +537,10 @@ print $date;
                                     <emphasis>copyPart($part, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Returns a cloned object, with only <varname>$part</varname> of the object's date copied to
-                                    the clone, with the clone have its locale arbitrarily set to <varname>$locale</varname>
-                                    (if specified).
+                                    Returns a cloned object, with only <varname>$part</varname> of
+                                    the object's date copied to the clone, with the clone have its
+                                    locale arbitrarily set to <varname>$locale</varname> (if
+                                    specified).
                                 </para>
                             </entry>
                         </row>
@@ -442,9 +551,10 @@ print $date;
                                     <emphasis>compare($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    compares <varname>$part</varname> of <varname>$date</varname> to this object's timestamp,
-                                    returning 0 if they are equal, 1 if this object's part was more recent than $date's
-                                    part, otherwise -1.
+                                    compares <varname>$part</varname> of <varname>$date</varname> to
+                                    this object's timestamp, returning 0 if they are equal, 1 if
+                                    this object's part was more recent than $date's part, otherwise
+                                    -1.
                                 </para>
                             </entry>
                         </row>
@@ -461,8 +571,8 @@ print $date;
         <title>Comparing Dates</title>
 
         <para>
-            The following basic operations do not have corresponding convenience methods for the date parts listed in
-            <xref linkend="zend.date.overview" />
+            The following basic operations do not have corresponding convenience methods for the
+            date parts listed in <xref linkend="zend.date.overview" />
             .
         </para>
 
@@ -483,8 +593,9 @@ print $date;
                                 <emphasis>equals($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, if <varname>$part</varname> of <varname>$date</varname> having locale
-                                <varname>$locale</varname> is the same as this object's date <varname>$part</varname>, otherwise
+                                returns true, if <varname>$part</varname> of
+                                <varname>$date</varname> having locale <varname>$locale</varname> is
+                                the same as this object's date <varname>$part</varname>, otherwise
                                 false
                             </para>
                         </entry>
@@ -496,8 +607,9 @@ print $date;
                                 <emphasis>isEarlier($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, 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 true, 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>
@@ -508,8 +620,9 @@ print $date;
                                 <emphasis>isLater($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, 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 true, 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>
@@ -520,8 +633,8 @@ print $date;
                                 <emphasis>isToday()</emphasis>
                             </para>
                             <para>
-                                Tests if today's year, month, and day match this object's date value, using this
-                                object's timezone.
+                                Tests if today's year, month, and day match this object's date
+                                value, using this object's timezone.
                             </para>
                         </entry>
                     </row>
@@ -532,8 +645,8 @@ print $date;
                                 <emphasis>isTomorrow()</emphasis>
                             </para>
                             <para>
-                                Tests if tomorrow's year, month, and day match this object's date value, using this
-                                object's timezone.
+                                Tests if tomorrow's year, month, and day match this object's date
+                                value, using this object's timezone.
                             </para>
                         </entry>
                     </row>
@@ -544,8 +657,8 @@ print $date;
                                 <emphasis>isYesterday()</emphasis>
                             </para>
                             <para>
-                                Tests if yesterday's year, month, and day match this object's date value, using this
-                                object's timezone.
+                                Tests if yesterday's year, month, and day match this object's date
+                                value, using this object's timezone.
                             </para>
                         </entry>
                     </row>
@@ -556,9 +669,10 @@ print $date;
                                 <emphasis>isLeapYear()</emphasis>
                             </para>
                             <para>
-                                Use <code>isLeapYear()</code> to determine if the current object is a leap year, or use
-                                Zend_Date::checkLeapYear($year) to check $year, which can be a string, integer, or
-                                instance of <classname>Zend_Date</classname>. Is the year a leap year?
+                                Use <code>isLeapYear()</code> to determine if the current object is
+                                a leap year, or use Zend_Date::checkLeapYear($year) to check $year,
+                                which can be a string, integer, or instance of
+                                <classname>Zend_Date</classname>. Is the year a leap year?
                             </para>
                         </entry>
                     </row>
@@ -569,10 +683,10 @@ 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 true if all checks are ok.
-                                It works like PHP's checkdate() function but can also check for localized month names and
-                                for dates extending the range of checkdate()
-                                false
+                                This method checks if a given date is a real date and returns true
+                                if all checks are ok. It works like PHP's checkdate() function but
+                                can also check for localized month names and for dates extending the
+                                range of checkdate() false
                             </para>
                         </entry>
                     </row>
@@ -587,7 +701,8 @@ print $date;
         <title>Getting Dates and Date Parts</title>
 
         <para>
-            Several methods support retrieving values related to a <classname>Zend_Date</classname> instance.
+            Several methods support retrieving values related to a <classname>Zend_Date</classname>
+            instance.
         </para>
 
         <table id="zend.date.others.gettingparts.table">
@@ -607,12 +722,12 @@ print $date;
                                 <emphasis>toString($format = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                Invoke directly or via the magic method <code>__toString()</code>. The
-                                <code>toString()</code> method automatically formats the date object's value according
-                                to the conventions of the object's locale, or an optionally specified
-                                <varname>$locale</varname>. For a list of supported format codes, see
-                                <xref linkend="zend.date.constants.selfdefinedformats" />
-                                .
+                                Invoke directly or via the magic method <code>__toString()</code>.
+                                The <code>toString()</code> method automatically formats the date
+                                object's value according to the conventions of the object's locale,
+                                or an optionally specified <varname>$locale</varname>. For a list of
+                                supported format codes, see
+                                <xref linkend="zend.date.constants.selfdefinedformats" />.
                             </para>
                         </entry>
                     </row>
@@ -624,8 +739,10 @@ print $date;
                             </para>
                             <para>
                                 Returns an array representation of the selected date according to
-                                the conventions of the object's locale. The returned array is equivalent to
-                                PHP's <ulink url="http://php.net/getdate">getdate()</ulink> function and includes:
+                                the conventions of the object's locale. The returned array is
+                                equivalent to PHP's <ulink
+                                    url="http://php.net/getdate">getdate()</ulink> function and
+                                includes:
                             </para>
                             <para>
                                 <itemizedlist>
@@ -713,16 +830,17 @@ print $date;
                                 <emphasis>toValue($part = null)</emphasis>
                             </para>
                             <para>
-                                Returns an integer representation of the selected date <varname>$part</varname> according to
-                                the conventions of the object's locale. Returns <constant>FALSE</constant> when
+                                Returns an integer representation of the selected date
+                                <varname>$part</varname> according to the conventions of the
+                                object's locale. Returns <constant>FALSE</constant> when
                                 <varname>$part</varname> selects a non-numeric value, such as
-                                <classname>Zend_Date::MONTH_NAME_SHORT</classname>. <emphasis>NOTE:</emphasis> This
-                                method calls
-                                <link linkend="id.date.basic.operations"><code>get()</code>
-                                </link>
-                                and casts the result to a PHP integer, which will give unpredictable results, if
-                                <code>get()</code> returns a numeric string containing a number too large for a PHP
-                                integer on your system. Use <code>get()</code> instead.
+                                <classname>Zend_Date::MONTH_NAME_SHORT</classname>.
+                                <emphasis>NOTE:</emphasis> This method calls <link
+                                    linkend="id.date.basic.operations"><code>get()</code></link>
+                                and casts the result to a PHP integer, which will give unpredictable
+                                results, if <code>get()</code> returns a numeric string containing a
+                                number too large for a PHP integer on your system. Use
+                                <code>get()</code> instead.
                             </para>
                         </entry>
                     </row>
@@ -735,9 +853,9 @@ print $date;
                                 <emphasis>get($part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                This method returns the <varname>$part</varname> of object's date localized to
-                                <varname>$locale</varname> as a formatted string or integer. See
-                                <xref linkend="id.date.basic.operations" />
+                                This method returns the <varname>$part</varname> of object's date
+                                localized to <varname>$locale</varname> as a formatted string or
+                                integer. See <xref linkend="id.date.basic.operations" />
                                 for more information.
                             </para>
                         </entry>
@@ -749,8 +867,10 @@ print $date;
                                 <emphasis>now($locale = null)</emphasis>
                             </para>
                             <para>
-                                This convenience function is equivalent to <code>new Zend_Date()</code>. It returns the
-                                current date as a <classname>Zend_Date</classname> object, having <varname>$locale</varname>
+                                This convenience function is equivalent to <code>new
+                                Zend_Date()</code>. It returns the current date as a
+                                <classname>Zend_Date</classname> object, having
+                                <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>
@@ -765,7 +885,8 @@ print $date;
         <title>Working with Fractions of Seconds</title>
 
         <para>
-            Several methods support retrieving values related to a <classname>Zend_Date</classname> instance.
+            Several methods support retrieving values related to a <classname>Zend_Date</classname>
+            instance.
         </para>
 
         <table id="zend.date.others.fractions.table">
@@ -805,8 +926,8 @@ print $date;
         <title>Sunrise / Sunset</title>
 
         <para>
-            Three methods provide access to geographically localized information about the Sun, including the time of
-            sunrise and sunset.
+            Three methods provide access to geographically localized information about the Sun,
+            including the time of sunrise and sunset.
         </para>
 
         <table id="zend.date.other.sun.table">

+ 28 - 20
documentation/manual/en/module_specs/Zend_Date-Theory.xml

@@ -5,19 +5,22 @@
     <title>Theory of Operation</title>
 
     <para>
-        Why is there only one class <classname>Zend_Date</classname> for handling dates and times in the Zend Framework?
+        Why is there only one class <classname>Zend_Date</classname> for handling dates and times in
+        the Zend Framework?
     </para>
 
     <para>
-        Many languages split the handling of times and calendar dates into two classes. However, Zend Framework
-        strives for extreme simplicity, and forcing the developer to manage different objects with different methods for
-        times and dates becomes a burden in many situations. Since <classname>Zend_Date</classname> methods support working with
-        ambiguous dates that might not include all parts (era, year, month, day, hour, minute, second, timezone),
-        developers enjoy the flexibility and ease of using the same class and the same methods to perform the same
-        manipulations (e.g. addition, subtraction, comparison, merging of date parts, etc.). Splitting the handling of
-        these date fragments into multiple classes would create complications when smooth interoperation is desired with
-        a small learning curve. A single class reduces code duplication for similar operations, without the need for a
-        complex inheritance hierarchy.
+        Many languages split the handling of times and calendar dates into two classes. However,
+        Zend Framework strives for extreme simplicity, and forcing the developer to manage different
+        objects with different methods for times and dates becomes a burden in many situations.
+        Since <classname>Zend_Date</classname> methods support working with ambiguous dates that
+        might not include all parts (era, year, month, day, hour, minute, second, timezone),
+        developers enjoy the flexibility and ease of using the same class and the same methods to
+        perform the same manipulations (e.g. addition, subtraction, comparison, merging of date
+        parts, etc.). Splitting the handling of these date fragments into multiple classes would
+        create complications when smooth interoperation is desired with a small learning curve. A
+        single class reduces code duplication for similar operations, without the need for a complex
+        inheritance hierarchy.
     </para>
 
     <sect2 id="zend.date.theory.internals">
@@ -31,13 +34,16 @@
                         UNIX Timestamp
                     </para>
                     <para>
-                        All dates and times, even ambiguous ones (e.g. no year), are represented internally as absolute
-                        moments in time, represented as a UNIX timestamp expressing the difference between the desired
-                        time and January 1st, 1970 00:00:00 GMT/UTC. This was only possible, because
-                        <classname>Zend_Date</classname> is not limited to UNIX timestamps nor integer values. The BCMath
-                        extension is required to support extremely large dates outside of the range Fri, 13 Dec 1901
-                        20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT. Additional, tiny math errors may arise due to
-                        the inherent limitations of float data types and rounding, unless using the BCMath extension.
+                        All dates and times, even ambiguous ones (e.g. no year), are represented
+                        internally as absolute moments in time, represented as a UNIX timestamp
+                        expressing the difference between the desired time and January 1st, 1970
+                        00:00:00 GMT/UTC. This was only possible, because
+                        <classname>Zend_Date</classname> is not limited to UNIX timestamps nor
+                        integer values. The BCMath extension is required to support extremely large
+                        dates outside of the range Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038
+                        03:14:07 GMT. Additional, tiny math errors may arise due to the inherent
+                        limitations of float data types and rounding, unless using the BCMath
+                        extension.
                     </para>
                 </listitem>
                 <listitem>
@@ -45,8 +51,9 @@
                         Date parts as timestamp offsets
                     </para>
                     <para>
-                        Thus, an instance object representing three hours would be expressed as three hours after
-                        January 1st, 1970 00:00:00 GMT/UTC -i.e. 0 + 3 * 60 * 60 = 10800.
+                        Thus, an instance object representing three hours would be expressed as
+                        three hours after January 1st, 1970 00:00:00 GMT/UTC -i.e. 0 + 3 * 60 * 60 =
+                        10800.
                     </para>
                 </listitem>
                 <listitem>
@@ -54,7 +61,8 @@
                         PHP functions
                     </para>
                     <para>
-                        Where possible, <classname>Zend_Date</classname> usually uses PHP functions to improve performance.
+                        Where possible, <classname>Zend_Date</classname> usually uses PHP functions
+                        to improve performance.
                     </para>
                 </listitem>
             </itemizedlist>

+ 72 - 52
documentation/manual/en/module_specs/Zend_Db_Adapter.xml

@@ -5,9 +5,9 @@
     <title>Zend_Db_Adapter</title>
 
     <para>
-        <classname>Zend_Db</classname> and its related classes provide a simple SQL database interface
-        for Zend Framework. The <classname>Zend_Db_Adapter</classname> is the basic class you use to
-        connect your PHP application to an RDBMS. There is a different Adapter
+        <classname>Zend_Db</classname> and its related classes provide a simple SQL database
+        interface for Zend Framework. The <classname>Zend_Db_Adapter</classname> is the basic class
+        you use to connect your PHP application to an RDBMS. There is a different Adapter
         class for each brand of RDBMS.
     </para>
 
@@ -20,8 +20,8 @@
     <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 PDO drivers for the following RDBMS
-        brands:
+        <classname>Zend_Db</classname> provides Adapter classes to PDO drivers for the following
+        RDBMS brands:
     </para>
 
     <itemizedlist>
@@ -33,36 +33,40 @@
         </listitem>
         <listitem>
             <para>
-                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink> PHP extension
+                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink> PHP
+                extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Microsoft SQL Server, using the <ulink url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> PHP
-                extension
+                Microsoft SQL Server, using the <ulink
+                url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> PHP extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink> PHP extension
+                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink> PHP
+                extension
             </para>
         </listitem>
         <listitem>
             <para>
-                PostgreSQL, using the <ulink url="http://www.php.net/pdo-pgsql">pdo_pgsql</ulink> PHP extension
+                PostgreSQL, using the <ulink url="http://www.php.net/pdo-pgsql">pdo_pgsql</ulink>
+                PHP extension
             </para>
         </listitem>
         <listitem>
             <para>
-                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink> PHP extension
+                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink> PHP
+                extension
             </para>
         </listitem>
 
     </itemizedlist>
 
     <para>
-        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize PHP database
-        extensions for the following RDBMS brands:
+        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize PHP
+        database extensions for the following RDBMS brands:
     </para>
 
     <itemizedlist>
@@ -78,12 +82,14 @@
         </listitem>
         <listitem>
             <para>
-                IBM DB2 and DB2/i5, using the <ulink url="http://www.php.net/ibm_db2">ibm_db2</ulink> PHP extension
+                IBM DB2 and DB2/i5, using the <ulink
+                    url="http://www.php.net/ibm_db2">ibm_db2</ulink> PHP extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Firebird/Interbase, using the <ulink url="http://www.php.net/ibase">php_interbase</ulink> PHP extension
+                Firebird/Interbase, using the <ulink
+                    url="http://www.php.net/ibase">php_interbase</ulink> PHP extension
             </para>
         </listitem>
     </itemizedlist>
@@ -92,9 +98,9 @@
         <para>
             Each <classname>Zend_Db</classname> Adapter uses a PHP extension. You must have the
             respective PHP extension enabled in your PHP environment to use a
-            <classname>Zend_Db</classname> Adapter. For example, if you use any of the PDO <classname>Zend_Db</classname>
-            Adapters, you need to enable both the PDO extension and the
-            PDO driver for the brand of RDBMS you use.
+            <classname>Zend_Db</classname> Adapter. For example, if you use any of the PDO
+            <classname>Zend_Db</classname> Adapters, you need to enable both the PDO extension and
+            the PDO driver for the brand of RDBMS you use.
         </para>
     </note>
 
@@ -174,8 +180,8 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
 
             <para>
                 If you create your own class that extends
-                <classname>Zend_Db_Adapter_Abstract_Adapter</classname>, but you do not name your class with
-                the "Zend_Db_Adapter" package prefix, you can use the
+                <classname>Zend_Db_Adapter_Abstract_Adapter</classname>, but you do not name your
+                class with the "Zend_Db_Adapter" package prefix, you can use the
                 <code>factory()</code> method to load your adapter if you
                 specify the leading portion of the adapter class with the
                 'adapterNamespace' key in the parameters array.
@@ -224,9 +230,9 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
             <example id="zend.db.adapter.connecting.factory.example1">
                 <title>Using the Adapter Factory Method with a Zend_Config Object</title>
                 <para>
-                    In the example below, a <classname>Zend_Config</classname> object is created from
-                    an array. You can also load data from an external file using classes such as
-                    <link linkend="zend.config.adapters.ini">Zend_Config_Ini</link>
+                    In the example below, a <classname>Zend_Config</classname> object is created
+                    from an array. You can also load data from an external file using classes such
+                    as <link linkend="zend.config.adapters.ini">Zend_Config_Ini</link>
                     and <link linkend="zend.config.adapters.xml">Zend_Config_Xml</link>.
                 </para>
                 <programlisting language="php"><![CDATA[
@@ -263,7 +269,8 @@ $db = Zend_Db::factory($config->database);
             <title>Adapter Parameters</title>
 
             <para>
-                The following list explains common parameters recognized by <classname>Zend_Db</classname> Adapter classes.
+                The following list explains common parameters recognized by
+                <classname>Zend_Db</classname> Adapter classes.
             </para>
 
             <itemizedlist>
@@ -476,8 +483,8 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
                 adapter itself, but for other objects that aggregate it, like a
                 <classname>Zend_Db_Select</classname> object. By default, adapters are allowed
                 to be serialized, if you don't want it, you should consider passing the
-                <classname>Zend_Db::ALLOW_SERIALIZATION=false</classname> option, see the example above.
-                To respect lazy connections principle, the adapter won't reconnect itself
+                <classname>Zend_Db::ALLOW_SERIALIZATION=false</classname> option, see the example
+                above. To respect lazy connections principle, the adapter won't reconnect itself
                 after being unserialized. You must then call <code>getConnection()
                 </code> yourself. You can make the adapter auto-reconnect by passing the
                 <classname>Zend_Db::AUTO_RECONNECT_ON_UNSERIALIZE=true</classname> as an adapter
@@ -663,8 +670,8 @@ $result = $db->fetchAll($sql, 2);
                     <para>
                         <emphasis>Zend_Db::FETCH_ASSOC</emphasis>:
                         return data in an array of associative arrays.
-                        The array keys are column names, as strings.
-                        This is the default fetch mode for <classname>Zend_Db_Adapter</classname> classes.
+                        The array keys are column names, as strings. This is the default fetch mode
+                        for <classname>Zend_Db_Adapter</classname> classes.
                     </para>
                     <para>
                         Note that if your select-list contains more than one
@@ -770,7 +777,8 @@ echo $result[0]['bug_description'];
                 of values, regardless of the value you have set for the fetch mode.
                 This only returns the first column returned by the query.
                 Any other columns returned by the query are discarded.
-                If you need to return a column other than the first, see <xref linkend="zend.db.statement.fetching.fetchcolumn" />.
+                If you need to return a column other than the first, see
+                <xref linkend="zend.db.statement.fetching.fetchcolumn" />.
             </para>
 
             <example id="zend.db.adapter.select.fetchcol.example">
@@ -924,8 +932,8 @@ $db->insert('bugs', $data);
                 default, all data values passed as strings are treated as
                 string literals. To specify that the value is an SQL
                 expression and therefore should not be quoted, pass the value
-                in the data array as an object of type <classname>Zend_Db_Expr</classname> instead of
-                a plain string.
+                in the data array as an object of type <classname>Zend_Db_Expr</classname> instead
+                of a plain string.
             </para>
 
             <example id="zend.db.adapter.write.insert.example2">
@@ -1217,13 +1225,13 @@ echo $sql;
             they might be able to make your SQL queries do things that you
             didn't intend them to do, such as return data to which the person
             should not have privilege to read. This is a serious and widespread
-            technique for violating application security, known as "SQL Injection"
-            (see <ulink url="http://en.wikipedia.org/wiki/SQL_Injection">http://en.wikipedia.org/wiki/SQL_Injection</ulink>).
+            technique for violating application security, known as "SQL Injection" (see <ulink
+                url="http://en.wikipedia.org/wiki/SQL_Injection">http://en.wikipedia.org/wiki/SQL_Injection</ulink>).
         </para>
 
         <para>
-            The <classname>Zend_Db</classname> Adapter class provides convenient functions to help you
-            reduce vulnerabilities to SQL Injection attacks in your PHP code.
+            The <classname>Zend_Db</classname> Adapter class provides convenient functions to help
+            you reduce vulnerabilities to SQL Injection attacks in your PHP code.
             The solution is to escape special characters such as quotes in PHP
             values before they are interpolated into your SQL strings.
             This protects against both accidental and deliberate manipulation
@@ -1261,8 +1269,8 @@ echo $sql;
                 Note that the return value of <code>quote()</code> includes the
                 quote delimiters around the string. This is different from
                 some functions that escape special characters but do not add
-                the quote delimiters, for example
-                <ulink url="http://www.php.net/mysqli_real_escape_string">mysql_real_escape_string()</ulink>.
+                the quote delimiters, for example <ulink
+                    url="http://www.php.net/mysqli_real_escape_string">mysql_real_escape_string()</ulink>.
             </para>
 
             <para>
@@ -1580,7 +1588,10 @@ try {
                     <row>
                         <entry>NULLABLE</entry>
                         <entry>(boolean)</entry>
-                        <entry>True if the column accepts SQL NULLs, false if the column has a NOT NULL constraint.</entry>
+                        <entry>
+                            True if the column accepts SQL NULLs, false if the column has a NOT NULL
+                            constraint.
+                        </entry>
                     </row>
                     <row>
                         <entry>LENGTH</entry>
@@ -1735,9 +1746,9 @@ $db->closeConnection();
             For example, all SQL 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, SQL 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.
+            be prepared in MySQL. Also, SQL 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>
@@ -1955,18 +1966,18 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        If you are working with unicode strings in an encoding other than
-                        UCS-2 (such as UTF-8), you may have to perform a conversion in your
-                        application code or store the data in a binary column. Please
-                        refer to <ulink url="http://support.microsoft.com/kb/232580">Microsoft's Knowledge Base</ulink>
-                        for more information.
+                        If you are working with unicode strings in an encoding other than UCS-2
+                        (such as UTF-8), you may have to perform a conversion in your application
+                        code or store the data in a binary column. Please refer to <ulink
+                            url="http://support.microsoft.com/kb/232580">Microsoft's Knowledge
+                            Base</ulink> for more information.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <classname>Zend_Db_Adapter_Pdo_Mssql</classname> sets <code>QUOTED_IDENTIFIER ON</code>
-                        immediately after connecting to a SQL Server database.
-                        This makes the driver use the standard SQL identifier
+                        <classname>Zend_Db_Adapter_Pdo_Mssql</classname> sets
+                        <code>QUOTED_IDENTIFIER ON</code> immediately after connecting to a SQL
+                        Server database. This makes the driver use the standard SQL identifier
                         delimiter symbol (<code>"</code>) instead of the
                         proprietary square-brackets syntax SQL Server uses for
                         delimiting identifiers.
@@ -2151,9 +2162,18 @@ if (!is_null($version)) {
 
                 <listitem>
                     <para>Adapter name is ZendX_Db_Adapter_Firebird.</para>
-                    <para>Remember to use the param adapterNamespace with value ZendX_Db_Adapter.</para>
-                    <para>We recommend to update the gds32.dll (or linux equivalent) bundled with php, to the same version of the server. For Firebird the equivalent gds32.dll is fbclient.dll.</para>
-                    <para>By default all identifiers (tables names, fields) are returned in upper case.</para>
+                    <para>
+                        Remember to use the param adapterNamespace with value ZendX_Db_Adapter.
+                    </para>
+                    <para>
+                        We recommend to update the gds32.dll (or linux equivalent) bundled with php,
+                        to the same version of the server. For Firebird the equivalent gds32.dll is
+                        fbclient.dll.
+                    </para>
+                    <para>
+                        By default all identifiers (tables names, fields) are returned in upper
+                        case.
+                    </para>
                 </listitem>
             </itemizedlist>
         </sect3>

+ 20 - 15
documentation/manual/en/module_specs/Zend_Db_Profiler.xml

@@ -42,15 +42,15 @@ $db->getProfiler()->setEnabled(true);
 ]]></programlisting>
 
         <para>
-            The value of the '<code>profiler</code>' option is flexible. It is interpreted differently depending on its
-            type. Most often, you should use a simple boolean value, but other types enable you to customize the
-            profiler behavior.
+            The value of the '<code>profiler</code>' option is flexible. It is interpreted
+            differently depending on its type. Most often, you should use a simple boolean value,
+            but other types enable you to customize the profiler behavior.
         </para>
 
         <para>
-            A boolean argument sets the profiler to enabled if it is a <constant>TRUE</constant> value, or disabled if
-            <constant>FALSE</constant>. The profiler class is the adapter's default profiler class,
-            <classname>Zend_Db_Profiler</classname>.
+            A boolean argument sets the profiler to enabled if it is a <constant>TRUE</constant>
+            value, or disabled if <constant>FALSE</constant>. The profiler class is the adapter's
+            default profiler class, <classname>Zend_Db_Profiler</classname>.
             <programlisting language="php"><![CDATA[
 $params['profiler'] = true;
 $db = Zend_Db::factory('PDO_MYSQL', $params);
@@ -58,8 +58,9 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
         </para>
 
         <para>
-            An instance of a profiler object makes the adapter use that object. The object type must be
-            <classname>Zend_Db_Profiler</classname> or a subclass thereof. Enabling the profiler is done separately.
+            An instance of a profiler object makes the adapter use that object. The object type must
+            be <classname>Zend_Db_Profiler</classname> or a subclass thereof. Enabling the profiler
+            is done separately.
             <programlisting language="php"><![CDATA[
 $profiler = MyProject_Db_Profiler();
 $profiler->setEnabled(true);
@@ -69,12 +70,14 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
         </para>
 
         <para>
-            The argument can be an associative array containing any or all of the keys '<code>enabled</code>',
-            '<code>instance</code>', and '<code>class</code>'. The '<code>enabled</code>' and '<code>instance</code>'
-            keys correspond to the boolean and instance types documented above. The '<code>class</code>' key is used
-            to name a class to use for a custom profiler. The class must be <classname>Zend_Db_Profiler</classname> or a
-            subclass. The class is instantiated with no constructor arguments. The '<code>class</code>' option is
-            ignored when the '<code>instance</code>' option is supplied.
+            The argument can be an associative array containing any or all of the keys
+            '<code>enabled</code>', '<code>instance</code>', and '<code>class</code>'. The
+            '<code>enabled</code>' and '<code>instance</code>' keys correspond to the boolean and
+            instance types documented above. The '<code>class</code>' key is used to name a class to
+            use for a custom profiler. The class must be <classname>Zend_Db_Profiler</classname> or
+            a subclass. The class is instantiated with no constructor arguments. The
+            '<code>class</code>' option is ignored when the '<code>instance</code>' option is
+            supplied.
             <programlisting language="php"><![CDATA[
 $params['profiler'] = array(
     'enabled' => true,
@@ -85,7 +88,9 @@ $db = Zend_Db::factory('PDO_MYSQL', $params);
         </para>
 
         <para>
-            Finally, the argument can be an object of type <classname>Zend_Config</classname> containing properties, which are treated as the array keys described above. For example, a file "config.ini" might contain the following data:
+            Finally, the argument can be an object of type <classname>Zend_Config</classname>
+            containing properties, which are treated as the array keys described above. For example,
+            a file "config.ini" might contain the following data:
             <programlisting language="ini"><![CDATA[
 [main]
 db.profiler.class   = "MyProject_Db_Profiler"

+ 112 - 95
documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -9,11 +9,11 @@
         <title>Introduction</title>
 
         <para>
-            The <classname>Zend_Db_Select</classname> object represents a SQL <code>SELECT</code> query statement. The
-            class has methods for adding individual parts to the query. You can specify some
-            parts of the query using PHP methods and data structures, and the class forms the
-            correct SQL 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 SQL <code>SELECT</code>
+            query statement. The class has methods for adding individual parts to the query. You can
+            specify some parts of the query using PHP methods and data structures, and the class
+            forms the correct SQL syntax for you. After you build a query, you can execute the query
+            as if you had written it as a string.
         </para>
 
         <para>
@@ -48,11 +48,11 @@
         </itemizedlist>
 
         <para>
-            Using <classname>Zend_Db_Select</classname> is not mandatory. For very simple SELECT queries, it is usually
-            simpler to specify the entire SQL query as a string and execute it using Adapter
-            methods like <code>query()</code> or <code>fetchAll()</code>. 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.
+            Using <classname>Zend_Db_Select</classname> is not mandatory. For very simple SELECT
+            queries, it is usually simpler to specify the entire SQL query as a string and execute
+            it using Adapter methods like <code>query()</code> or <code>fetchAll()</code>. 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.
         </para>
 
     </sect2>
@@ -62,8 +62,9 @@
         <title>Creating a Select Object</title>
 
         <para>
-            You can create an instance of a <classname>Zend_Db_Select</classname> object using the <code>select()</code>
-            method of a <classname>Zend_Db_Adapter_Abstract</classname> object.
+            You can create an instance of a <classname>Zend_Db_Select</classname> object using the
+            <code>select()</code> method of a <classname>Zend_Db_Adapter_Abstract</classname>
+            object.
         </para>
 
         <example id="zend.db.select.creating.example-db">
@@ -78,8 +79,8 @@ $select = $db->select();
         </example>
 
         <para>
-            Another way to create a <classname>Zend_Db_Select</classname> object is with its constructor, specifying the
-            database adapter as an argument.
+            Another way to create a <classname>Zend_Db_Select</classname> object is with its
+            constructor, specifying the database adapter as an argument.
         </para>
 
         <example id="zend.db.select.creating.example-new">
@@ -125,9 +126,10 @@ $select->order( ...specify sorting criteria... );
         </example>
 
         <para>
-            You also can use most methods of the <classname>Zend_Db_Select</classname> object with a convenient fluent
-            interface. A fluent interface means that each method returns a reference to the object
-            on which it was called, so you can immediately call another method.
+            You also can use most methods of the <classname>Zend_Db_Select</classname> object with a
+            convenient fluent interface. A fluent interface means that each method returns a
+            reference to the object on which it was called, so you can immediately call another
+            method.
         </para>
 
         <example id="zend.db.select.building.example-fluent">
@@ -156,8 +158,8 @@ $select = $db->select()
 
             <para>
                 Specify the table for this query using the <code>from()</code> method. You can
-                specify the table name as a simple string. <classname>Zend_Db_Select</classname> applies identifier
-                quoting around the table name, so you can use special characters.
+                specify the table name as a simple string. <classname>Zend_Db_Select</classname>
+                applies identifier quoting around the table name, so you can use special characters.
             </para>
 
             <example id="zend.db.select.building.from.example">
@@ -179,9 +181,9 @@ $select = $db->select()
                 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 SQL 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.
+                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>
 
             <example id="zend.db.select.building.from.example-cname">
@@ -201,10 +203,10 @@ $select = $db->select()
 
             <para>
                 Some RDBMS 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.
+                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.
             </para>
 
             <example id="zend.db.select.building.from.example-schema">
@@ -255,9 +257,9 @@ $select = $db->select()
 
             <para>
                 You can specify the column name as "<code>correlationName.columnName</code>".
-                <classname>Zend_Db_Select</classname> quotes each part individually. If you don't specify a correlation
-                name for a column, it uses the correlation name for the table named in the current
-                <code>from()</code> method.
+                <classname>Zend_Db_Select</classname> quotes each part individually. If you don't
+                specify a correlation name for a column, it uses the correlation name for the table
+                named in the current <code>from()</code> method.
             </para>
 
             <example id="zend.db.select.building.columns.example">
@@ -301,22 +303,25 @@ $select = $db->select()
             <para>
                 Columns in SQL 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.
+                column string contains parentheses, <classname>Zend_Db_Select</classname> recognizes
+                it as an expression.
             </para>
 
             <para>
-                You also can create an object of type <classname>Zend_Db_Expr</classname> explicitly, to prevent a string
-                from being treated as a column name. <classname>Zend_Db_Expr</classname> is a minimal class that contains
-                a single string. <classname>Zend_Db_Select</classname> recognizes objects of type <classname>Zend_Db_Expr</classname> and
-                converts them back to string, but does not apply any alterations, such as quoting
-                or correlation names.
+                You also can create an object of type <classname>Zend_Db_Expr</classname>
+                explicitly, to prevent a string from being treated as a column name.
+                <classname>Zend_Db_Expr</classname> is a minimal class that contains a single
+                string. <classname>Zend_Db_Select</classname> recognizes objects of type
+                <classname>Zend_Db_Expr</classname> and converts them back to string, but does not
+                apply any alterations, such as quoting or correlation names.
             </para>
 
             <note>
 
                 <para>
-                    Using <classname>Zend_Db_Expr</classname> for column names is not necessary if your column expression
-                    contains parentheses; <classname>Zend_Db_Select</classname> recognizes parentheses and treats the
+                    Using <classname>Zend_Db_Expr</classname> for column names is not necessary if
+                    your column expression contains parentheses;
+                    <classname>Zend_Db_Select</classname> recognizes parentheses and treats the
                     string as an expression, skipping quoting and correlation names.
                 </para>
 
@@ -362,9 +367,9 @@ $select = $db->select()
             </example>
 
             <para>
-                In the cases above, <classname>Zend_Db_Select</classname> does not alter the string to apply correlation
-                names or identifier quoting. If those changes are necessary to resolve ambiguity,
-                you must make the changes manually in the string.
+                In the cases above, <classname>Zend_Db_Select</classname> does not alter the string
+                to apply correlation names or identifier quoting. If those changes are necessary to
+                resolve ambiguity, you must make the changes manually in the string.
             </para>
 
             <para>
@@ -414,10 +419,10 @@ $select = $db->select()
                 There may be cases where you wish to add columns to an existing FROM or JOIN table
                 after those methods have been called. The <code>columns()</code> 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.
+                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">
@@ -453,9 +458,10 @@ $select = $db->select()
 
             <para>
                 Many useful queries involve using a <code>JOIN</code> to combine rows from multiple
-                tables. You can add tables to a <classname>Zend_Db_Select</classname> query using the <code>join()</code>
-                method. Using this method is similar to the <code>from()</code> method, except you
-                can also specify a join condition in most cases.
+                tables. You can add tables to a <classname>Zend_Db_Select</classname> query using
+                the <code>join()</code> method. Using this method is similar to the
+                <code>from()</code> method, except you can also specify a join condition in most
+                cases.
             </para>
 
             <example id="zend.db.select.building.join.example">
@@ -496,8 +502,8 @@ $select = $db->select()
             <para>
                 The third argument to <code>join()</code> is an array of column names, like that
                 used in the <code>from()</code> 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 <code>from()</code> method.
+                correlation names, expressions, and <classname>Zend_Db_Expr</classname> in the same
+                way as the array of column names in the <code>from()</code> method.
             </para>
 
             <para>
@@ -656,8 +662,8 @@ $select = $db->select()
             <para>
                 In addition to these join methods, you can simplify your queries by using the
                 JoinUsing methods. Instead of supplying a full condition to your join, you simply
-                pass the column name on which to join and the <classname>Zend_Db_Select</classname> object completes the
-                condition for you.
+                pass the column name on which to join and the <classname>Zend_Db_Select</classname>
+                object completes the condition for you.
             </para>
 
             <example id="zend.db.select.building.joinusing.example">
@@ -681,8 +687,8 @@ $select = $db->select()
             </example>
 
             <para>
-                Each of the applicable join methods in the <classname>Zend_Db_Select</classname> component has a
-                corresponding 'using' method.
+                Each of the applicable join methods in the <classname>Zend_Db_Select</classname>
+                component has a corresponding 'using' method.
             </para>
 
             <itemizedlist>
@@ -755,8 +761,9 @@ $select = $db->select()
 
             <para>
                 The second argument to the <code>where()</code> 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.
+                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>
@@ -787,8 +794,8 @@ $select = $db->select()
 
             <para>
                 You can invoke the <code>where()</code> method multiple times on the same
-                <classname>Zend_Db_Select</classname> object. The resulting query combines the multiple terms together
-                using <code>AND</code> between them.
+                <classname>Zend_Db_Select</classname> object. The resulting query combines the
+                multiple terms together using <code>AND</code> between them.
             </para>
 
             <example id="zend.db.select.building.where.example-and">
@@ -845,9 +852,10 @@ $select = $db->select()
             </example>
 
             <para>
-                <classname>Zend_Db_Select</classname> automatically puts parentheses around each expression you specify
-                using the <code>where()</code> or <code>orWhere()</code> methods. This helps to
-                ensure that Boolean operator precedence does not cause unexpected results.
+                <classname>Zend_Db_Select</classname> automatically puts parentheses around each
+                expression you specify using the <code>where()</code> or <code>orWhere()</code>
+                methods. This helps to ensure that Boolean operator precedence does not cause
+                unexpected results.
             </para>
 
             <example id="zend.db.select.building.where.example-parens">
@@ -876,10 +884,10 @@ $select = $db->select()
 
             <para>
                 In the example above, the results would be quite different without the parentheses,
-                because <code>AND</code> has higher precedence than <code>OR</code>. <classname>Zend_Db_Select</classname>
-                applies the parentheses so the effect is that each expression in successive calls
-                to the <code>where()</code> bind more tightly than the <code>AND</code> that
-                combines the expressions.
+                because <code>AND</code> has higher precedence than <code>OR</code>.
+                <classname>Zend_Db_Select</classname> applies the parentheses so the effect is that
+                each expression in successive calls to the <code>where()</code> bind more tightly
+                than the <code>AND</code> that combines the expressions.
             </para>
 
         </sect3>
@@ -895,9 +903,10 @@ $select = $db->select()
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can specify the column(s) to use for calculating the groups
-                of rows using the <code>group()</code> method. The argument to this method is a
-                column or an array of columns to use in the <code>GROUP BY</code> clause.
+                In <classname>Zend_Db_Select</classname>, you can specify the column(s) to use for
+                calculating the groups of rows using the <code>group()</code> method. The argument
+                to this method is a column or an array of columns to use in the
+                <code>GROUP BY</code> clause.
             </para>
 
             <example id="zend.db.select.building.group.example">
@@ -925,7 +934,8 @@ $select = $db->select()
             <para>
                 Like the columns array in the <code>from()</code> 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>.
+                the string contains parentheses or is an object of type
+                <classname>Zend_Db_Expr</classname>.
             </para>
 
         </sect3>
@@ -943,8 +953,8 @@ $select = $db->select()
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can specify conditions for restricting groups using the
-                <code>having()</code> method. Its usage is similar to that of the
+                In <classname>Zend_Db_Select</classname>, you can specify conditions for restricting
+                groups using the <code>having()</code> method. Its usage is similar to that of the
                 <code>where()</code> method. The first argument is a string containing a SQL
                 expression. The optional second argument is a value that is used to replace a
                 positional parameter placeholder in the SQL expression. Expressions given in
@@ -1005,10 +1015,10 @@ $select = $db->select()
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can use the <code>order()</code> 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 <code>ASC</code> <code>DESC</code> keyword
-                following it, separated by a space.
+                In <classname>Zend_Db_Select</classname>, you can use the <code>order()</code>
+                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 <code>ASC</code>
+                <code>DESC</code> keyword following it, separated by a space.
             </para>
 
             <para>
@@ -1057,9 +1067,10 @@ $select = $db->select()
             </para>
 
             <para>
-                In <classname>Zend_Db_Select</classname>, you can use the <code>limit()</code> 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 <code>limit()</code>
+                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">
@@ -1085,8 +1096,8 @@ $select = $db->select()
                 <para>
                     The <code>LIMIT</code> syntax is not supported by all RDBMS brands. Some RDBMS
                     require different syntax to support similar functionality. Each
-                    <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to produce SQL appropriate for
-                    that RDBMS.
+                    <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to
+                    produce SQL appropriate for that RDBMS.
                 </para>
 
             </note>
@@ -1182,7 +1193,8 @@ $select = $db->select()
         <title>Executing Select Queries</title>
 
         <para>
-            This section describes how to execute the query represented by a <classname>Zend_Db_Select</classname> object.
+            This section describes how to execute the query represented by a
+            <classname>Zend_Db_Select</classname> object.
         </para>
 
         <sect3 id="zend.db.select.execute.query-adapter">
@@ -1190,14 +1202,16 @@ $select = $db->select()
             <title>Executing Select Queries from the Db Adapter</title>
 
             <para>
-                You can execute the query represented by the <classname>Zend_Db_Select</classname> object by passing it as
-                the first argument to the <code>query()</code> method of a <classname>Zend_Db_Adapter_Abstract</classname>
-                object. Use the <classname>Zend_Db_Select</classname> objects instead of a string query.
+                You can execute the query represented by the <classname>Zend_Db_Select</classname>
+                object by passing it as the first argument to the <code>query()</code> method of a
+                <classname>Zend_Db_Adapter_Abstract</classname> object. Use the
+                <classname>Zend_Db_Select</classname> objects instead of a string query.
             </para>
 
             <para>
-                The <code>query()</code> method returns an object of type <classname>Zend_Db_Statement</classname> or
-                PDOStatement, depending on the adapter type.
+                The <code>query()</code> method returns an object of type
+                <classname>Zend_Db_Statement</classname> or PDOStatement, depending on the adapter
+                type.
             </para>
 
             <example id="zend.db.select.execute.query-adapter.example">
@@ -1222,9 +1236,10 @@ $result = $stmt->fetchAll();
 
             <para>
                 As an alternative to using the <code>query()</code> method of the adapter object,
-                you can use the <code>query()</code> 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.
+                you can use the <code>query()</code> 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.
             </para>
 
             <example id="zend.db.select.execute.query-select.example">
@@ -1249,7 +1264,8 @@ $result = $stmt->fetchAll();
 
             <para>
                 If you need access to a string representation of the SQL query corresponding to the
-                <classname>Zend_Db_Select</classname> object, use the <code>__toString()</code> method.
+                <classname>Zend_Db_Select</classname> object, use the <code>__toString()</code>
+                method.
             </para>
 
             <example id="zend.db.select.execute.tostring.example">
@@ -1278,8 +1294,8 @@ echo "$sql\n";
         <title>Other methods</title>
 
         <para>
-            This section describes other methods of the <classname>Zend_Db_Select</classname> class that are not covered
-            above: <code>getPart()</code> and <code>reset()</code>.
+            This section describes other methods of the <classname>Zend_Db_Select</classname> class
+            that are not covered above: <code>getPart()</code> and <code>reset()</code>.
         </para>
 
         <sect3 id="zend.db.select.other.get-part">
@@ -1310,8 +1326,9 @@ echo "$sql\n";
             </para>
 
             <para>
-                The <classname>Zend_Db_Select</classname> class defines constants you can use for parts of the SQL query.
-                You can use these constant definitions, or you can the literal strings.
+                The <classname>Zend_Db_Select</classname> class defines constants you can use for
+                parts of the SQL query. You can use these constant definitions, or you can the
+                literal strings.
             </para>
 
             <table id="zend.db.select.other.get-part.table">
@@ -1421,8 +1438,8 @@ print_r( $orderData );
 
             <para>
                 If you omit the parameter, <code>reset()</code> 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.
+                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">

+ 12 - 7
documentation/manual/en/module_specs/Zend_Db_Statement.xml

@@ -134,8 +134,8 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
             EXPLAIN are examples of statements that produce a result set.
             INSERT, UPDATE, and DELETE are examples of statements that don't
             produce a result set. You can execute the latter SQL statements
-            using <classname>Zend_Db_Statement</classname>, but you cannot call methods to fetch rows
-            of results from them.
+            using <classname>Zend_Db_Statement</classname>, but you cannot call methods to fetch
+            rows of results from them.
         </para>
 
         <sect3 id="zend.db.statement.fetching.fetch">
@@ -199,7 +199,8 @@ while ($row = $stmt->fetch()) {
             </example>
 
             <para>
-                See also <ulink url="http://www.php.net/PDOStatement-fetch">PDOStatement::fetch()</ulink>.
+                See also <ulink
+                   url="http://www.php.net/PDOStatement-fetch">PDOStatement::fetch()</ulink>.
             </para>
 
         </sect3>
@@ -230,7 +231,8 @@ echo $rows[0]['bug_description'];
             </example>
 
             <para>
-                See also <ulink url="http://www.php.net/PDOStatement-fetchAll">PDOStatement::fetchAll()</ulink>.
+                See also <ulink
+                    url="http://www.php.net/PDOStatement-fetchAll">PDOStatement::fetchAll()</ulink>.
             </para>
 
         </sect3>
@@ -268,7 +270,8 @@ echo $rows[0][0];
             </example>
 
             <para>
-                See also <ulink url="http://www.php.net/PDOStatement-setFetchMode">PDOStatement::setFetchMode()</ulink>.
+                See also <ulink
+                    url="http://www.php.net/PDOStatement-setFetchMode">PDOStatement::setFetchMode()</ulink>.
             </para>
 
         </sect3>
@@ -305,7 +308,8 @@ $bug_status = $stmt->fetchColumn(2);
             </example>
 
             <para>
-                See also <ulink url="http://www.php.net/PDOStatement-fetchColumn">PDOStatement::fetchColumn()</ulink>.
+                See also <ulink
+                    url="http://www.php.net/PDOStatement-fetchColumn">PDOStatement::fetchColumn()</ulink>.
             </para>
 
         </sect3>
@@ -335,7 +339,8 @@ echo $obj->bug_description;
             </example>
 
             <para>
-                See also <ulink url="http://www.php.net/PDOStatement-fetchObject">PDOStatement::fetchObject()</ulink>.
+                See also <ulink
+                    url="http://www.php.net/PDOStatement-fetchObject">PDOStatement::fetchObject()</ulink>.
             </para>
 
         </sect3>

+ 91 - 88
documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -15,7 +15,8 @@
         </para>
 
         <para>
-            The <classname>Zend_Db_Table_Row</classname> class has methods for querying related rows in other tables.
+            The <classname>Zend_Db_Table_Row</classname> class has methods for querying related rows
+            in other tables.
         </para>
 
     </sect2>
@@ -26,7 +27,8 @@
 
         <para>
             Define classes for each of your tables, extending the abstract class
-            <classname>Zend_Db_Table_Abstract</classname>, as described in <xref linkend="zend.db.table.defining" />. Also
+            <classname>Zend_Db_Table_Abstract</classname>, as described in
+            <xref linkend="zend.db.table.defining" />. Also
             see <xref linkend="zend.db.adapter.example-database" /> for a description of the
             example database for which the following example code is designed.
         </para>
@@ -94,34 +96,34 @@ class BugsProducts extends Zend_Db_Table_Abstract
 ]]></programlisting>
 
         <para>
-            If you use <classname>Zend_Db_Table</classname> to emulate cascading UPDATE and DELETE operations, declare the
-            <varname>$_dependentTables</varname> array in the class for the parent table. List the class
-            name for each dependent table. Use the class name, not the physical name of the SQL
-            table.
+            If you use <classname>Zend_Db_Table</classname> to emulate cascading UPDATE and DELETE
+            operations, declare the <varname>$_dependentTables</varname> array in the class for the
+            parent table. List the class name for each dependent table. Use the class name, not the
+            physical name of the SQL table.
         </para>
 
         <note>
 
             <para>
-                Skip declaration of <varname>$_dependentTables</varname> if you use referential integrity
-                constraints in the RDBMS server to implement cascading operations. See
+                Skip declaration of <varname>$_dependentTables</varname> if you use referential
+                integrity constraints in the RDBMS server to implement cascading operations. See
                 <xref linkend="zend.db.table.relationships.cascading" /> for more information.
             </para>
 
         </note>
 
         <para>
-            Declare the <varname>$_referenceMap</varname> array in the class for each dependent table.
-            This is an associative array of reference "rules". A reference rule identifies which
-            table is the parent table in the relationship, and also lists which columns in the
+            Declare the <varname>$_referenceMap</varname> array in the class for each dependent
+            table. This is an associative array of reference "rules". A reference rule identifies
+            which table is the parent table in the relationship, and also lists which columns in the
             dependent table reference which columns in the parent table.
         </para>
 
         <para>
-            The rule key is a string used as an index to the <varname>$_referenceMap</varname> array.
-            This rule key is used to identify each reference relationship. Choose a descriptive
-            name for this rule key. It's best to use a string that can be part of a PHP method
-            name, as you will see later.
+            The rule key is a string used as an index to the <varname>$_referenceMap</varname>
+            array. This rule key is used to identify each reference relationship. Choose a
+            descriptive name for this rule key. It's best to use a string that can be part of a PHP
+            method name, as you will see later.
         </para>
 
         <para>
@@ -217,15 +219,15 @@ $row->findDependentRowset($table, [$rule]);
 ]]></programlisting>
 
         <para>
-            This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> object, containing a set of rows
-            from the dependent table <varname>$table</varname> that refer to the row identified by the
-            <varname>$row</varname> object.
+            This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> object,
+            containing a set of rows from the dependent table <varname>$table</varname> that refer
+            to the row identified by the <varname>$row</varname> object.
         </para>
 
         <para>
-            The first argument <varname>$table</varname> can be a string that specifies the dependent
-            table by its class name. You can also specify the dependent table by using an object of
-            that table class.
+            The first argument <varname>$table</varname> can be a string that specifies the
+            dependent table by its class name. You can also specify the dependent table by using an
+            object of that table class.
         </para>
 
         <example id="zend.db.table.relationships.fetching.dependent.example">
@@ -248,10 +250,10 @@ $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
         </example>
 
         <para>
-            The second argument <varname>$rule</varname> is optional. It is a string that names the rule
-            key in the <varname>$_referenceMap</varname> array of the dependent table class. If you don't
-            specify a rule, the first rule in the array that references the parent table is used.
-            If you need to use a rule other than the first, you need to specify the key.
+            The second argument <varname>$rule</varname> is optional. It is a string that names the
+            rule key in the <varname>$_referenceMap</varname> array of the dependent table class. If
+            you don't specify a rule, the first rule in the array that references the parent table
+            is used. If you need to use a rule other than the first, you need to specify the key.
         </para>
 
         <para>
@@ -313,9 +315,9 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
             </example>
 
             Alternatively, you can query rows from a dependent table using a special mechanism
-            called a "magic method". <classname>Zend_Db_Table_Row_Abstract</classname> invokes the method:
-            <code>findDependentRowset('&lt;TableClass&gt;', '&lt;Rule&gt;')</code> if you invoke a method on
-            the Row object matching either of the following patterns:
+            called a "magic method". <classname>Zend_Db_Table_Row_Abstract</classname> invokes the
+            method: <code>findDependentRowset('&lt;TableClass&gt;', '&lt;Rule&gt;')</code> if you
+            invoke a method on the Row object matching either of the following patterns:
         </para>
 
         <itemizedlist>
@@ -333,9 +335,9 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
         </itemizedlist>
 
         <para>
-            In the patterns above, <code>&lt;TableClass&gt;</code> and <code>&lt;Rule&gt;</code> are strings
-            that correspond to the class name of the dependent table, and the dependent table's
-            rule key that references the parent table.
+            In the patterns above, <code>&lt;TableClass&gt;</code> and <code>&lt;Rule&gt;</code> are
+            strings that correspond to the class name of the dependent table, and the dependent
+            table's rule key that references the parent table.
         </para>
 
         <note>
@@ -343,9 +345,9 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
             <para>
                 Some application frameworks, such as Ruby on Rails, use a mechanism called
                 "inflection" to allow the spelling of identifiers to change depending on usage. For
-                simplicity, <classname>Zend_Db_Table_Row</classname> does not provide any inflection mechanism. The table
-                identity and the rule key named in the method call must match the spelling of the
-                class and rule key exactly.
+                simplicity, <classname>Zend_Db_Table_Row</classname> does not provide any inflection
+                mechanism. The table identity and the rule key named in the method call must match
+                the spelling of the class and rule key exactly.
             </para>
 
         </note>
@@ -395,9 +397,9 @@ $row->findParentRow($table, [$rule]);
         </para>
 
         <para>
-            The first argument <varname>$table</varname> can be a string that specifies the parent table
-            by its class name. You can also specify the parent table by using an object of that
-            table class.
+            The first argument <varname>$table</varname> can be a string that specifies the parent
+            table by its class name. You can also specify the parent table by using an object of
+            that table class.
         </para>
 
         <example id="zend.db.table.relationships.fetching.parent.example">
@@ -421,10 +423,10 @@ $reporter = $bug1->findParentRow('Accounts');
         </example>
 
         <para>
-            The second argument <varname>$rule</varname> is optional. It is a string that names the rule
-            key in the <varname>$_referenceMap</varname> array of the dependent table class. If you don't
-            specify a rule, the first rule in the array that references the parent table is used.
-            If you need to use a rule other than the first, you need to specify the key.
+            The second argument <varname>$rule</varname> is optional. It is a string that names the
+            rule key in the <varname>$_referenceMap</varname> array of the dependent table class. If
+            you don't specify a rule, the first rule in the array that references the parent table
+            is used. If you need to use a rule other than the first, you need to specify the key.
         </para>
 
         <para>
@@ -538,22 +540,22 @@ $row->findManyToManyRowset($table,
 ]]></programlisting>
 
         <para>
-            This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> containing rows from the table
-            <varname>$table</varname>, satisfying the many-to-many relationship. The current Row object
-            <varname>$row</varname> from the origin table is used to find rows in the intersection table,
-            and that is joined to the destination table.
+            This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> containing
+            rows from the table <varname>$table</varname>, satisfying the many-to-many relationship.
+            The current Row object <varname>$row</varname> from the origin table is used to find
+            rows in the intersection table, and that is joined to the destination table.
         </para>
 
         <para>
-            The first argument <varname>$table</varname> can be a string that specifies the destination
-            table in the many-to-many relationship by its class name. You can also specify the
-            destination table by using an object of that table class.
+            The first argument <varname>$table</varname> can be a string that specifies the
+            destination table in the many-to-many relationship by its class name. You can also
+            specify the destination table by using an object of that table class.
         </para>
 
         <para>
-            The second argument <varname>$intersectionTable</varname> can be a string that specifies the
-            intersection table between the two tables in the the many-to-many relationship by its
-            class name. You can also specify the intersection table by using an object of that
+            The second argument <varname>$intersectionTable</varname> can be a string that specifies
+            the intersection table between the two tables in the the many-to-many relationship by
+            its class name. You can also specify the intersection table by using an object of that
             table class.
         </para>
 
@@ -579,21 +581,21 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
         </example>
 
         <para>
-            The third and fourth arguments <varname>$rule1</varname> and <varname>$rule2</varname> are
-            optional. These are strings that name the rule keys in the <varname>$_referenceMap</varname>
-            array of the intersection table.
+            The third and fourth arguments <varname>$rule1</varname> and <varname>$rule2</varname>
+            are optional. These are strings that name the rule keys in the
+            <varname>$_referenceMap</varname> array of the intersection table.
         </para>
 
         <para>
-            The <varname>$rule1</varname> key names the rule for the relationship from the intersection
-            table to the origin table. In this example, this is the relationship from
+            The <varname>$rule1</varname> key names the rule for the relationship from the
+            intersection table to the origin table. In this example, this is the relationship from
             <code>BugsProducts</code> to <code>Bugs</code>.
         </para>
 
         <para>
-            The <varname>$rule2</varname> key names the rule for the relationship from the intersection
-            table to the destination table. In this example, this is the relationship from
-            <code>Bugs</code> to <code>Products</code>.
+            The <varname>$rule2</varname> key names the rule for the relationship from the
+            intersection table to the destination table. In this example, this is the relationship
+            from <code>Bugs</code> to <code>Products</code>.
         </para>
 
         <para>
@@ -633,10 +635,10 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
 
         <para>
             Alternatively, you can query rows from the destination table in a many-to-many
-            relationship using a "magic method." <classname>Zend_Db_Table_Row_Abstract</classname> invokes the method:
-            <code>findManyToManyRowset('&lt;TableClass&gt;', '&lt;IntersectionTableClass&gt;',
-            '&lt;Rule1&gt;', '&lt;Rule2&gt;')</code> if you invoke a method matching any of the
-            following patterns:
+            relationship using a "magic method." <classname>Zend_Db_Table_Row_Abstract</classname>
+            invokes the method: <code>findManyToManyRowset('&lt;TableClass&gt;',
+            '&lt;IntersectionTableClass&gt;', '&lt;Rule1&gt;', '&lt;Rule2&gt;')</code> if you invoke
+            a method matching any of the following patterns:
         </para>
 
         <itemizedlist>
@@ -650,14 +652,14 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
             <listitem>
                 <para>
                     <code>$row->find&lt;TableClass&gt;Via&lt;IntersectionTableClass&gt;By&lt;Rule1&gt;
-                    ([Zend_Db_Table_Select $select])</code>
+                        ([Zend_Db_Table_Select $select])</code>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
                     <code>$row->find&lt;TableClass&gt;Via&lt;IntersectionTableClass&gt;By&lt;Rule1&gt;And&lt;Rule2&gt;
-                    ([Zend_Db_Table_Select $select])</code>
+                        ([Zend_Db_Table_Select $select])</code>
                 </para>
             </listitem>
         </itemizedlist>
@@ -728,9 +730,9 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
             <para>
                 If your RDBMS implements DRI and the <code>ON DELETE</code> and
                 <code>ON UPDATE</code> clauses, you should declare these clauses in your database
-                schema, instead of using the cascading feature in <classname>Zend_Db_Table</classname>. Declaring
-                cascading DRI rules in the RDBMS is better for database performance, consistency,
-                and integrity.
+                schema, instead of using the cascading feature in
+                <classname>Zend_Db_Table</classname>. Declaring cascading DRI rules in the RDBMS is
+                better for database performance, consistency, and integrity.
             </para>
 
             <para>
@@ -780,12 +782,12 @@ $product1234->delete();
         </para>
 
         <para>
-            To declare a cascading relationship in the <classname>Zend_Db_Table</classname>, edit the rules in the
-            <varname>$_referenceMap</varname>. Set the associative array keys <code>'onDelete'</code> and
-            <code>'onUpdate'</code> to the string 'cascade' (or the constant
-            <code>self::CASCADE</code>). Before a row is deleted from the parent table, or its
-            primary key values updated, any rows in the dependent table that refer to the parent's
-            row are deleted or updated first.
+            To declare a cascading relationship in the <classname>Zend_Db_Table</classname>, edit
+            the rules in the <varname>$_referenceMap</varname>. Set the associative array keys
+            <code>'onDelete'</code> and <code>'onUpdate'</code> to the string 'cascade' (or the
+            constant <code>self::CASCADE</code>). Before a row is deleted from the parent table, or
+            its primary key values updated, any rows in the dependent table that refer to the
+            parent's row are deleted or updated first.
         </para>
 
         <example id="zend.db.table.relationships.cascading.example-declaration">
@@ -830,15 +832,16 @@ class BugsProducts extends Zend_Db_Table_Abstract
             <title>Notes Regarding Cascading Operations</title>
 
             <para>
-                <emphasis>Cascading operations invoked by <classname>Zend_Db_Table</classname> are not
-                atomic.</emphasis>
+                <emphasis>Cascading operations invoked by <classname>Zend_Db_Table</classname> are
+                not atomic.</emphasis>
             </para>
 
             <para>
                 This means that if your database implements and enforces referential integrity
-                constraints, a cascading <code>UPDATE</code> executed by a <classname>Zend_Db_Table</classname> class
-                conflicts with the constraint, and results in a referential integrity violation.
-                You can use cascading <code>UPDATE</code> in <classname>Zend_Db_Table</classname>
+                constraints, a cascading <code>UPDATE</code> executed by a
+                <classname>Zend_Db_Table</classname> class conflicts with the constraint, and
+                results in a referential integrity violation. You can use cascading
+                <code>UPDATE</code> in <classname>Zend_Db_Table</classname>
                 <emphasis>only</emphasis> if your database does not enforce that referential
                 integrity constraint.
             </para>
@@ -867,18 +870,18 @@ class BugsProducts extends Zend_Db_Table_Abstract
             </para>
 
             <para>
-                <emphasis>Cascading operations in <classname>Zend_Db_Table</classname> are invoked only by
-                <classname>Zend_Db_Table</classname>.</emphasis>
+                <emphasis>Cascading operations in <classname>Zend_Db_Table</classname> are invoked
+                only by <classname>Zend_Db_Table</classname>.</emphasis>
             </para>
 
             <para>
-                Cascading deletes and updates defined in your <classname>Zend_Db_Table</classname> classes are applied if
-                you execute the <code>save()</code> or <code>delete()</code> methods on the Row
-                class. However, if you update or delete data using another interface, such as a
-                query tool or another application, the cascading operations are not applied. Even
-                when using <code>update()</code> and <code>delete()</code> methods in the
-                <classname>Zend_Db_Adapter</classname> class, cascading operations defined in your <classname>Zend_Db_Table</classname> classes
-                are not executed.
+                Cascading deletes and updates defined in your <classname>Zend_Db_Table</classname>
+                classes are applied if you execute the <code>save()</code> or <code>delete()</code>
+                methods on the Row class. However, if you update or delete data using another
+                interface, such as a query tool or another application, the cascading operations are
+                not applied. Even when using <code>update()</code> and <code>delete()</code> methods
+                in the <classname>Zend_Db_Adapter</classname> class, cascading operations defined in
+                your <classname>Zend_Db_Table</classname> classes are not executed.
             </para>
 
             <para>

+ 106 - 94
documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -9,9 +9,9 @@
         <title>Introduction</title>
 
         <para>
-            The <classname>Zend_Db_Table</classname> class is an object-oriented interface to database tables. It provides
-            methods for many common operations on tables. The base class is extensible, so you can
-            add custom logic.
+            The <classname>Zend_Db_Table</classname> class is an object-oriented interface to
+            database tables. It provides methods for many common operations on tables. The base
+            class is extensible, so you can add custom logic.
         </para>
 
         <para>
@@ -39,8 +39,8 @@
 
             <para>
                 Declare the database table for which this class is defined, using the protected
-                variable <varname>$_name</varname>. This is a string, and must contain the name of the
-                table spelled as it appears in the database.
+                variable <varname>$_name</varname>. This is a string, and must contain the name of
+                the table spelled as it appears in the database.
             </para>
 
             <example id="zend.db.table.defining.table-schema.example1">
@@ -78,10 +78,10 @@ class bugs extends Zend_Db_Table_Abstract
             <para>
                 You can also declare the schema for the table, either with the protected variable
                 <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 RDBMS brands, the term for schema is "database" or "tablespace,"
-                but it is used similarly.
+                <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 RDBMS brands, the term for schema is
+                "database" or "tablespace," but it is used similarly.
             </para>
 
             <example id="zend.db.table.defining.table-schema.example3">
@@ -117,9 +117,9 @@ class Bugs extends Zend_Db_Table_Abstract
             <para>
                 The schema and table names may also be specified via constructor configuration
                 directives, which override any default values specified with the
-                <varname>$_name</varname> and <varname>$_schema</varname> properties. A schema specification
-                given with the <code>name</code> directive overrides any value provided with the
-                <code>schema</code> option.
+                <varname>$_name</varname> and <varname>$_schema</varname> properties. A schema
+                specification given with the <code>name</code> directive overrides any value
+                provided with the <code>schema</code> option.
             </para>
 
             <example id="zend.db.table.defining.table-schema.example.constructor">
@@ -161,9 +161,9 @@ $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
 
             <para>
                 Every table must have a primary key. You can declare the column for the primary key
-                using the protected variable <varname>$_primary</varname>. This is either a string that
-                names the single column for the primary key, or else it is an array of column names
-                if your primary key is a compound key.
+                using the protected variable <varname>$_primary</varname>. This is either a string
+                that names the single column for the primary key, or else it is an array of column
+                names if your primary key is a compound key.
             </para>
 
             <example id="zend.db.table.defining.primary-key.example">
@@ -181,9 +181,9 @@ class Bugs extends Zend_Db_Table_Abstract
             </example>
 
             <para>
-                If you don't specify the primary key, <classname>Zend_Db_Table_Abstract</classname> tries to discover the
-                primary key based on the information provided by the <code>describeTable()</code>´
-                method.
+                If you don't specify the primary key, <classname>Zend_Db_Table_Abstract</classname>
+                tries to discover the primary key based on the information provided by the
+                <code>describeTable()</code>´ method.
             </para>
 
             <note>
@@ -253,9 +253,9 @@ class Bugs extends Zend_Db_Table_Abstract
                     <para>
                         <code>_setupMetadata()</code> sets the schema if the table name contains
                         the pattern "schema.table"; calls <code>describeTable()</code> to get
-                        metadata information; defaults the <varname>$_cols</varname> array to the columns
-                        reported by <code>describeTable()</code>. By overriding this method, you
-                        can specify the columns.
+                        metadata information; defaults the <varname>$_cols</varname> array to the
+                        columns reported by <code>describeTable()</code>. By overriding this method,
+                        you can specify the columns.
                     </para>
                 </listitem>
 
@@ -263,8 +263,8 @@ class Bugs extends Zend_Db_Table_Abstract
                     <para>
                         <code>_setupPrimaryKey()</code> defaults the primary key columns to those
                         reported by <code>describeTable()</code>; 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.
+                        columns are included in the <varname>$_cols</varname> array. By overriding
+                        this method, you can specify the primary key columns.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -323,8 +323,8 @@ class Bugs extends Zend_Db_Table_Abstract
 
             <para>
                 The first way to provide a database adapter to a Table class is by passing it as an
-                object of type <classname>Zend_Db_Adapter_Abstract</classname> in the options array, identified by the key
-                <code>'db'</code>.
+                object of type <classname>Zend_Db_Adapter_Abstract</classname> in the options array,
+                identified by the key <code>'db'</code>.
             </para>
 
             <example id="zend.db.table.constructing.adapter.example">
@@ -347,10 +347,11 @@ $table = new Bugs(array('db' => $db));
 
             <para>
                 The second way to provide a database adapter to a Table class is by declaring an
-                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 <classname>Zend_Db_Table_Abstract::setDefaultAdapter()</classname>. The argument is an
-                object of type <classname>Zend_Db_Adapter_Abstract</classname>.
+                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
+                <classname>Zend_Db_Table_Abstract::setDefaultAdapter()</classname>. The argument is
+                an object of type <classname>Zend_Db_Adapter_Abstract</classname>.
             </para>
 
             <example id="zend.db.table.constructing.default-adapter.example">
@@ -385,8 +386,9 @@ $table = new Bugs();
             <para>
                 The third way to provide a database adapter to a Table class is by passing a string
                 in the options array, also identified by the <code>'db'</code> key. The string is
-                used as a key to the static <classname>Zend_Registry</classname> instance, where the entry at that key is
-                an object of type <classname>Zend_Db_Adapter_Abstract</classname>.
+                used as a key to the static <classname>Zend_Registry</classname> instance, where the
+                entry at that key is an object of type
+                <classname>Zend_Db_Adapter_Abstract</classname>.
             </para>
 
             <example id="zend.db.table.constructing.registry.example">
@@ -448,7 +450,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 SQL expressions, you must make sure they
-            are distinct from plain strings. Use an object of type <classname>Zend_Db_Expr</classname> to do this.
+            are distinct from plain strings. Use an object of type
+            <classname>Zend_Db_Expr</classname> to do this.
         </para>
 
         <example id="zend.db.table.insert.example-expr">
@@ -469,9 +472,9 @@ $data = array(
 
         <para>
             In the examples of inserting rows above, it is assumed that the table has an
-            auto-incrementing primary key. This is the default behavior of <classname>Zend_Db_Table_Abstract</classname>,
-            but there are other types of primary keys as well. The following sections describe how
-            to support different types of primary keys.
+            auto-incrementing primary key. This is the default behavior of
+            <classname>Zend_Db_Table_Abstract</classname>, but there are other types of primary keys
+            as well. The following sections describe how to support different types of primary keys.
         </para>
 
         <sect3 id="zend.db.table.insert.key-auto">
@@ -484,9 +487,10 @@ $data = array(
             </para>
 
             <para>
-                In <classname>Zend_Db_Table_Abstract</classname>, if you define the protected variable
-                <varname>$_sequence</varname> to be the Boolean value <constant>TRUE</constant>, then the class
-                assumes that the table has an auto-incrementing primary key.
+                In <classname>Zend_Db_Table_Abstract</classname>, if you define the protected
+                variable <varname>$_sequence</varname> to be the Boolean value
+                <constant>TRUE</constant>, then the class assumes that the table has an
+                auto-incrementing primary key.
             </para>
 
             <example id="zend.db.table.insert.key-auto.example">
@@ -515,9 +519,10 @@ class Bugs extends Zend_Db_Table_Abstract
                 PostgreSQL has a <code>SERIAL</code> 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 <code>IDENTITY</code> 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>.
+                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>.
             </para>
 
         </sect3>
@@ -532,10 +537,10 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
 
             <para>
-                If you define <varname>$_sequence</varname> to be a string, then <classname>Zend_Db_Table_Abstract</classname>
-                assumes the string to name a sequence object in the database. The sequence is
-                invoked to generate a new value, and this value is used in the <code>INSERT</code>
-                operation.
+                If you define <varname>$_sequence</varname> to be a string, then
+                <classname>Zend_Db_Table_Abstract</classname> assumes the string to name a sequence
+                object in the database. The sequence is invoked to generate a new value, and this
+                value is used in the <code>INSERT</code> operation.
             </para>
 
             <example id="zend.db.table.insert.key-sequence.example">
@@ -579,10 +584,10 @@ class Bugs extends Zend_Db_Table_Abstract
 
             <para>
                 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 <code>insert()</code> method, or else this method throws a
-                <classname>Zend_Db_Table_Exception</classname>.
+                <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 <code>insert()</code> method, or
+                else this method throws a <classname>Zend_Db_Table_Exception</classname>.
             </para>
 
             <example id="zend.db.table.insert.key-natural.example">
@@ -813,9 +818,9 @@ $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
 
                     <para>
                         The API 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 <code>fetchRow()</code> and <code>fetchAll()</code>
-                        methods will continue to work without modification.
+                        <classname>Zend_Db_Table_Select</classname> object to modify the query.
+                        However, the deprecated usage of the <code>fetchRow()</code> and
+                        <code>fetchAll()</code> methods will continue to work without modification.
                     </para>
 
                     <para>
@@ -882,9 +887,9 @@ $row = $table->fetchRow($table->select()->where('bug_status = ?', 'NEW')
                     <para>
                         You <emphasis>can not</emphasis> specify columns from a JOINed tabled to be
                         returned in a row/rowset. Doing so will trigger a PHP 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.
+                        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>
@@ -1001,8 +1006,9 @@ $rows = $table->fetchAll($select);
                 For more specific and optimized requests, you may wish to limit the number of
                 columns returned in a row/rowset. This can be achieved by passing a FROM clause to
                 the select object. The first argument in the FROM clause is identical to that of a
-                <classname>Zend_Db_Select</classname> object with the addition of being able to pass an instance of
-                <classname>Zend_Db_Table_Abstract</classname> and have it automatically determine the table name.
+                <classname>Zend_Db_Select</classname> object with the addition of being able to pass
+                an instance of <classname>Zend_Db_Table_Abstract</classname> and have it
+                automatically determine the table name.
             </para>
 
             <para>
@@ -1096,16 +1102,19 @@ $rows = $table->fetchAll($select);
                 The <classname>Zend_Db_Table_Select</classname> is primarily used to constrain and
                 validate so that it may enforce the criteria for a legal SELECT query. However
                 there may be certain cases where you require the flexibility of the
-                <classname>Zend_Db_Table_Row</classname> component and do not require a writable or deletable row. For
-                this specific user case, it is possible to retrieve a row/rowset by passing a false
-                value to setIntegrityCheck. The resulting row/rowset will be returned as a 'locked'
-                row (meaning the save(), delete() and any field-setting methods will throw an
+                <classname>Zend_Db_Table_Row</classname> component and do not require a writable or
+                deletable row. for this specific user case, it is possible to retrieve a row/rowset
+                by passing a false value to setIntegrityCheck. The resulting row/rowset will be
+                returned as a 'locked' row (meaning the save(), delete() and any field-setting
+                methods will throw an
                 exception).
             </para>
 
             <example id="zend.db.table.qry.rows.set.integrity.example">
 
-                <title>Removing the integrity check on Zend_Db_Table_Select to allow JOINed rows</title>
+                <title>
+                    Removing the integrity check on Zend_Db_Table_Select to allow JOINed rows
+                </title>
 
                 <programlisting language="php"><![CDATA[
 $table = new Bugs();
@@ -1151,8 +1160,8 @@ $row = $table->fetchRow($select);
         </example>
 
         <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
+            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
             <code>fetchRow()</code> returns PHP's <constant>NULL</constant> value.
         </para>
 
@@ -1163,9 +1172,9 @@ $row = $table->fetchRow($select);
         <title>Retrieving Table Metadata Information</title>
 
         <para>
-            The <classname>Zend_Db_Table_Abstract</classname> class provides some information about its metadata. The
-            <code>info()</code> method returns an array structure with information about the table,
-            its columns and primary key, and other metadata.
+            The <classname>Zend_Db_Table_Abstract</classname> class provides some information about
+            its metadata. The <code>info()</code> 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">
@@ -1293,26 +1302,27 @@ echo "The table name is " . $info['name'] . "\n";
                 <listitem>
                     <para>
                         <emphasis>Call
-                        <classname>Zend_Db_Table_Abstract::setDefaultMetadataCache()</classname></emphasis> - This allows
-                        a developer to once set the default cache object to be used for all table
-                        classes.
+                        <classname>Zend_Db_Table_Abstract::setDefaultMetadataCache()</classname></emphasis>
+                        - This allows a developer to once set the default cache object to be used
+                        for all table classes.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
                         <emphasis>Configure
-                        <classname>Zend_Db_Table_Abstract::__construct()</classname></emphasis> - This allows a developer
-                        to set the cache object to be used for a particular table class instance.
+                        <classname>Zend_Db_Table_Abstract::__construct()</classname></emphasis> -
+                        This allows a developer to set the cache object to be used for a particular
+                        table class instance.
                     </para>
                 </listitem>
             </itemizedlist>
 
-            In both cases, the cache specification must be either <constant>NULL</constant> (i.e., no cache
-            used) or an instance of
-            <link linkend="zend.cache.frontends.core"><classname>Zend_Cache_Core</classname></link>. The
-            methods may be used in conjunction when it is desirable to have both a default metadata
-            cache and the ability to change the cache for individual table objects.
+            In both cases, the cache specification must be either <constant>NULL</constant> (i.e.,
+            no cache used) or an instance of
+            <link linkend="zend.cache.frontends.core"><classname>Zend_Cache_Core</classname></link>.
+            The methods may be used in conjunction when it is desirable to have both a default
+            metadata cache and the ability to change the cache for individual table objects.
         </para>
 
         <example id="zend.db.table.metadata.caching-default">
@@ -1403,8 +1413,8 @@ $bugs = new Bugs(array('metadataCache' => $cache));
         </note>
 
         <para>
-            Though the above examples use <classname>Zend_Cache_Backend_File</classname>, developers may use
-            whatever cache backend is appropriate for the situation. Please see
+            Though the above examples use <classname>Zend_Cache_Backend_File</classname>, developers
+            may use whatever cache backend is appropriate for the situation. Please see
             <link linkend="zend.cache">Zend_Cache</link> for more information.
         </para>
 
@@ -1481,10 +1491,11 @@ $bugs->setMetadataCacheInClass(false);
 
             <para>
                 By default, methods of the Table class return a Rowset in instances of the concrete
-                class <classname>Zend_Db_Table_Rowset</classname>, and Rowsets contain a collection of instances of the
-                concrete class <classname>Zend_Db_Table_Row</classname> You can specify an alternative class to use for
-                either of these, but they must be classes that extend <classname>Zend_Db_Table_Rowset_Abstract</classname>
-                and <classname>Zend_Db_Table_Row_Abstract</classname>, respectively.
+                class <classname>Zend_Db_Table_Rowset</classname>, and Rowsets contain a collection
+                of instances of the concrete class <classname>Zend_Db_Table_Row</classname> You can
+                specify an alternative class to use for either of these, but they must be classes
+                that extend <classname>Zend_Db_Table_Rowset_Abstract</classname> and
+                <classname>Zend_Db_Table_Row_Abstract</classname>, respectively.
             </para>
 
             <para>
@@ -1657,36 +1668,37 @@ class Bugs extends Zend_Db_Table_Abstract
             <para>
                 For example, if your table class name is "<code>BugsProducts</code>", it would
                 match the physical table in the database called "<code>bugs_products</code>," if
-                you omit the explicit declaration of the <varname>$_name</varname> class property. In
-                this inflection mapping, the class name spelled in "CamelCase" format would be
+                you omit the explicit declaration of the <varname>$_name</varname> class property.
+                In this inflection mapping, the class name spelled in "CamelCase" format would be
                 transformed to lower case, and words are separated with an underscore.
             </para>
 
             <para>
                 You can specify the database table name independently from the class name by
-                declaring the table name with the <varname>$_name</varname> class property in each of
-                your table classes.
+                declaring the table name with the <varname>$_name</varname> class property in each
+                of your table classes.
             </para>
 
             <para>
-                <classname>Zend_Db_Table_Abstract</classname> performs no inflection to map the class name to the table
-                name. If you omit the declaration of <varname>$_name</varname> in your table class, the
-                class maps to a database table that matches the spelling of the class name exactly.
+                <classname>Zend_Db_Table_Abstract</classname> performs no inflection to map the
+                class name to the table name. If you omit the declaration of
+                <varname>$_name</varname> in your table class, the class maps to a database table
+                that matches the spelling of the class name exactly.
             </para>
 
             <para>
                 It is inappropriate to transform identifiers from the database, because this can
                 lead to ambiguity or make some identifiers inaccessible. Using the SQL identifiers
-                exactly as they appear in the database makes <classname>Zend_Db_Table_Abstract</classname> both simpler
-                and more flexible.
+                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 <code>_setupTableName()</code> 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.
+                <classname>Zend_Db_Table_Abstract</classname>, and then the rest of your tables
+                extend your new abstract class.
             </para>
 
             <example id="zend.db.table.extending.inflection.example">

+ 48 - 42
documentation/manual/en/module_specs/Zend_Db_Table_Row.xml

@@ -9,16 +9,16 @@
         <title>Introduction</title>
 
         <para>
-            <classname>Zend_Db_Table_Row</classname> is a class that contains an individual row of a <classname>Zend_Db_Table</classname> object.
-            When you run a query against a Table class, the result is returned in a set of
-            <classname>Zend_Db_Table_Row</classname> objects. You can also use this object to create new rows and add them
-            to the database table.
+            <classname>Zend_Db_Table_Row</classname> is a class that contains an individual row of a
+            <classname>Zend_Db_Table</classname> object. When you run a query against a Table class,
+            the result is returned in a set of <classname>Zend_Db_Table_Row</classname> objects. You
+            can also use this object to create new rows and add them to the database table.
         </para>
 
         <para>
             <classname>Zend_Db_Table_Row</classname> is an implementation of the <ulink
-            url="http://www.martinfowler.com/eaaCatalog/rowDataGateway.html">Row Data Gateway</ulink>
-            pattern.
+                url="http://www.martinfowler.com/eaaCatalog/rowDataGateway.html">Row Data
+                Gateway</ulink> pattern.
         </para>
 
     </sect2>
@@ -29,8 +29,9 @@
 
         <para>
             <classname>Zend_Db_Table_Abstract</classname> provides methods <code>find()</code> and
-            <code>fetchAll()</code>, which each return an object of type <classname>Zend_Db_Table_Rowset</classname>, and
-            the method <code>fetchRow()</code>, which returns an object of type <classname>Zend_Db_Table_Row</classname>.
+            <code>fetchAll()</code>, which each return an object of type
+            <classname>Zend_Db_Table_Rowset</classname>, and the method <code>fetchRow()</code>,
+            which returns an object of type <classname>Zend_Db_Table_Row</classname>.
         </para>
 
         <example id="zend.db.table.row.read.example">
@@ -45,8 +46,9 @@ $row = $bugs->fetchRow($bugs->select()->where('bug_id = ?', 1));
         </example>
 
         <para>
-            A <classname>Zend_Db_Table_Rowset</classname> object contains a collection of <classname>Zend_Db_Table_Row</classname> objects. See
-            <xref linkend="zend.db.table.rowset" />.
+            A <classname>Zend_Db_Table_Rowset</classname> object contains a collection of
+            <classname>Zend_Db_Table_Row</classname> objects. See <xref
+                linkend="zend.db.table.rowset" />.
         </para>
 
         <example id="zend.db.table.row.read.example-rowset">
@@ -66,8 +68,8 @@ $row = $rowset->current();
             <title>Reading column values from a row</title>
 
             <para>
-                <classname>Zend_Db_Table_Row_Abstract</classname> provides accessor methods so you can reference columns
-                in the row as object properties.
+                <classname>Zend_Db_Table_Row_Abstract</classname> provides accessor methods so you
+                can reference columns in the row as object properties.
             </para>
 
             <example id="zend.db.table.row.read.get.example">
@@ -87,15 +89,15 @@ echo $row->bug_description;
             <note>
 
                 <para>
-                    Earlier versions of <classname>Zend_Db_Table_Row</classname> mapped these column accessors to the
-                    database column names using a string transformation called
+                    Earlier versions of <classname>Zend_Db_Table_Row</classname> mapped these column
+                    accessors to the database column names using a string transformation called
                     <emphasis>inflection</emphasis>.
                 </para>
 
                 <para>
-                    Currently, <classname>Zend_Db_Table_Row</classname> does not implement inflection. Accessed property
-                    names need to match the spelling of the column names as they appear in your
-                    database.
+                    Currently, <classname>Zend_Db_Table_Row</classname> does not implement
+                    inflection. Accessed property names need to match the spelling of the column
+                    names as they appear in your database.
                 </para>
 
             </note>
@@ -145,9 +147,10 @@ foreach ($rowArray as $column => $value) {
             <title>Fetching data from related tables</title>
 
             <para>
-                The <classname>Zend_Db_Table_Row_Abstract</classname> class provides methods for fetching rows and rowsets
-                from related tables. See <xref linkend="zend.db.table.relationships" /> for more
-                information on table relationships.
+                The <classname>Zend_Db_Table_Row_Abstract</classname> class provides methods for
+                fetching rows and rowsets from related tables. See <xref
+                    linkend="zend.db.table.relationships" /> for more information on table
+                relationships.
             </para>
 
         </sect3>
@@ -249,9 +252,9 @@ $newRow->save();
 
                 <para>
                     The <code>createRow()</code> method was called <code>fetchNew()</code> 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.
+                    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>
@@ -263,10 +266,11 @@ $newRow->save();
             <title>Changing values in multiple columns</title>
 
             <para>
-                <classname>Zend_Db_Table_Row_Abstract</classname> provides the <code>setFromArray()</code> 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.
+                <classname>Zend_Db_Table_Row_Abstract</classname> provides the
+                <code>setFromArray()</code> 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">
@@ -417,11 +421,11 @@ echo $rowClone->bug_description;
 
             <para>
                 You can reactivate a disconnected Row, using the <code>setTable()</code> 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 values in the Row object and save the changes to the
-                database.
+                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
+                values in the Row object and save the changes to the database.
             </para>
 
             <example id="zend.db.table.row.serialize.set-table.example">
@@ -454,11 +458,12 @@ $rowClone->save();
 
         <para>
             <classname>Zend_Db_Table_Row</classname> is the default concrete class that extends
-            <classname>Zend_Db_Table_Row_Abstract</classname>. You can define your own concrete class for instances of Row
-            by extending <classname>Zend_Db_Table_Row_Abstract</classname>. To use your new Row class to store results of
-            Table queries, specify the custom Row class by name either in the
-            <varname>$_rowClass</varname> protected member of a Table class, or in the array argument of
-            the constructor of a Table object.
+            <classname>Zend_Db_Table_Row_Abstract</classname>. You can define your own concrete
+            class for instances of Row by extending
+            <classname>Zend_Db_Table_Row_Abstract</classname>. To use your new Row class to store
+            results of Table queries, specify the custom Row class by name either in the
+            <varname>$_rowClass</varname> protected member of a Table class, or in the array
+            argument of the constructor of a Table object.
         </para>
 
         <example id="zend.db.table.row.extending.example">
@@ -557,8 +562,8 @@ class MyApplicationRow extends Zend_Db_Table_Row_Abstract
 
                 <para>
                     You need data operations on this table to record the operation to a
-                    <classname>Zend_Log</classname> object, but only if the application configuration has enabled this
-                    behavior.
+                    <classname>Zend_Log</classname> object, but only if the application
+                    configuration has enabled this behavior.
                 </para>
 
                 <programlisting language="php"><![CDATA[
@@ -646,9 +651,10 @@ class Products extends Zend_Db_Table_Abstract
             </para>
 
             <para>
-                If you prefer to use inflection, then you must implement the transformation yourself,
-                by overriding the <code>_transformColumn()</code> method in a custom Row class, and
-                using that custom Row class when you perform queries against your Table class.
+                If you prefer to use inflection, then you must implement the transformation
+                yourself, by overriding the <code>_transformColumn()</code> 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">

+ 71 - 57
documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml

@@ -9,10 +9,12 @@
         <title>Introduction</title>
 
         <para>
-            When you run a query against a Table class using the <code>find()</code> or <code>fetchAll()</code>
-            methods, the result is returned in an object of type <classname>Zend_Db_Table_Rowset_Abstract</classname>. A Rowset
-            contains a collection of objects descending from <classname>Zend_Db_Table_Row_Abstract</classname>. You can iterate
-            through the Rowset and access individual Row objects, reading or modifying data in the Rows.
+            When you run a query against a Table class using the <code>find()</code> or
+            <code>fetchAll()</code> methods, the result is returned in an object of type
+            <classname>Zend_Db_Table_Rowset_Abstract</classname>. A Rowset contains a collection of
+            objects descending from <classname>Zend_Db_Table_Row_Abstract</classname>. You can
+            iterate through the Rowset and access individual Row objects, reading or modifying data
+            in the Rows.
         </para>
 
     </sect2>
@@ -22,8 +24,9 @@
         <title>Fetching a Rowset</title>
 
         <para>
-            <classname>Zend_Db_Table_Abstract</classname> provides methods <code>find()</code> and <code>fetchAll()</code>, each
-            of which returns an object of type <classname>Zend_Db_Table_Rowset_Abstract</classname>.
+            <classname>Zend_Db_Table_Abstract</classname> provides methods <code>find()</code> and
+            <code>fetchAll()</code>, each of which returns an object of type
+            <classname>Zend_Db_Table_Rowset_Abstract</classname>.
         </para>
 
         <example id="zend.db.table.rowset.fetch.example">
@@ -44,15 +47,16 @@ $rowset = $bugs->fetchAll("bug_status = 'NEW'");
         <title>Retrieving Rows from a Rowset</title>
 
         <para>
-            The Rowset itself is usually less interesting than the Rows that it contains. This section illustrates how
-            to get the Rows that comprise the Rowset.
+            The Rowset itself is usually less interesting than the Rows that it contains. This
+            section illustrates how to get the Rows that comprise the Rowset.
         </para>
 
         <para>
-            A legitimate query returns zero rows when no rows in the database match the query conditions. Therefore, a
-            Rowset object might contain zero Row objects. Since <classname>Zend_Db_Table_Rowset_Abstract</classname> implements
-            the <code>Countable</code> interface, you can use <code>count()</code> to determine the number of Rows in
-            the Rowset.
+            A legitimate query returns zero rows when no rows in the database match the query
+            conditions. Therefore, a Rowset object might contain zero Row objects. Since
+            <classname>Zend_Db_Table_Rowset_Abstract</classname> implements the
+            <code>Countable</code> interface, you can use <code>count()</code> to determine the
+            number of Rows in the Rowset.
         </para>
 
         <example id="zend.db.table.rowset.rows.counting.example">
@@ -78,8 +82,8 @@ if ($rowCount > 0) {
             <title>Reading a Single Row from a Rowset</title>
 
             <para>
-                The simplest way to access a Row from a Rowset is to use the <code>current()</code> method. This is
-                particularly appropriate when the Rowset contains exactly one Row.
+                The simplest way to access a Row from a Rowset is to use the <code>current()</code>
+                method. This is particularly appropriate when the Rowset contains exactly one Row.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -100,10 +104,11 @@ $row    = $rowset->current();
             <title>Iterating through a Rowset</title>
 
             <para>
-                Objects descending from <classname>Zend_Db_Table_Rowset_Abstract</classname> implement the <code>SeekableIterator</code>
-                interface, which means you can loop through them using the <code>foreach</code> construct. Each value
-                you retrieve this way is a <classname>Zend_Db_Table_Row_Abstract</classname> object that corresponds to one
-                record from the table.
+                Objects descending from <classname>Zend_Db_Table_Rowset_Abstract</classname>
+                implement the <code>SeekableIterator</code> interface, which means you can loop
+                through them using the <code>foreach</code> construct. Each value you retrieve this
+                way is a <classname>Zend_Db_Table_Row_Abstract</classname> object that corresponds
+                to one record from the table.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -135,11 +140,12 @@ foreach ($rowset as $row) {
             <title>Seeking to a known position into a Rowset</title>
 
             <para>
-                <code>SeekableIterator</code> allows you to seek to a position that you would like the iterator to jump to.
-                Simply use the <code>seek()</code> method for that. Pass it an integer representing the number of the Row
-                you would like your Rowset to point to next, don't forget that it starts with index 0. If the index is wrong,
-                ie doesn't exist, an exception will be thrown. You should use <code>count()</code> to check the number of
-                results before seeking to a position.
+                <code>SeekableIterator</code> allows you to seek to a position that you would like
+                the iterator to jump to. Simply use the <code>seek()</code> method for that. Pass it
+                an integer representing the number of the Row you would like your Rowset to point to
+                next, don't forget that it starts with index 0. If the index is wrong, ie doesn't
+                exist, an exception will be thrown. You should use <code>count()</code> to check the
+                number of results before seeking to a position.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -162,11 +168,13 @@ $row9->save();
         </example>
 
             <para>
-                <code>getRow()</code> allows you to get a specific row in the Rowset, knowing its position; don't forget
-                however that positions start with index zero. The first parameter for <code>getRow()</code> is an integer
-                for the position asked. The second optional parameter is a boolean; it tells the Rowset iterator if it must
-                seek to that position in the same time, or not (default is false). This method returns a <classname>Zend_Db_Table_Row</classname>
-                object by default. If the position requested does not exist, an exception will be thrown. Here is an example :
+                <code>getRow()</code> allows you to get a specific row in the Rowset, knowing its
+                position; don't forget however that positions start with index zero. The first
+                parameter for <code>getRow()</code> is an integer for the position asked. The second
+                optional parameter is a boolean; it tells the Rowset iterator if it must seek to
+                that position in the same time, or not (default is false). This method returns a
+                <classname>Zend_Db_Table_Row</classname> object by default. If the position
+                requested does not exist, an exception will be thrown. Here is an example :
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -184,8 +192,8 @@ $row9->save();
 ]]></programlisting>
 
         <para>
-            After you have access to an individual Row object, you can manipulate the Row using methods described in
-            <xref linkend="zend.db.table.row" />.
+            After you have access to an individual Row object, you can manipulate the Row using
+            methods described in <xref linkend="zend.db.table.row" />.
         </para>
 
     </sect2>
@@ -195,9 +203,10 @@ $row9->save();
         <title>Retrieving a Rowset as an Array</title>
 
         <para>
-            You can access all the data in the Rowset as an array using the <code>toArray()</code> method of the Rowset
-            object. This returns an array containing one entry per Row. Each entry is an associative array having keys
-            that correspond to column names and elements that correspond to the respective column values.
+            You can access all the data in the Rowset as an array using the <code>toArray()</code>
+            method of the Rowset object. This returns an array containing one entry per Row. Each
+            entry is an associative array having keys that correspond to column names and elements
+            that correspond to the respective column values.
         </para>
 
         <example id="zend.db.table.rowset.to-array.example">
@@ -223,8 +232,9 @@ foreach ($rowsetArray as $rowArray) {
         </example>
 
         <para>
-            The array returned from <code>toArray()</code> is not updateable. That is, you can modify values in the
-            array as you can with any array, but changes to the array data are not propagated to the database.
+            The array returned from <code>toArray()</code> is not updateable. That is, you can
+            modify values in the array as you can with any array, but changes to the array data are
+            not propagated to the database.
         </para>
 
     </sect2>
@@ -234,8 +244,9 @@ foreach ($rowsetArray as $rowArray) {
         <title>Serializing and Unserializing a Rowset</title>
 
         <para>
-            Objects of type <classname>Zend_Db_Table_Rowset_Abstract</classname> are serializable. In a similar fashion to
-            serializing an individual Row object, you can serialize a Rowset and unserialize it later.
+            Objects of type <classname>Zend_Db_Table_Rowset_Abstract</classname> are serializable.
+            In a similar fashion to serializing an individual Row object, you can serialize a Rowset
+            and unserialize it later.
         </para>
 
         <example id="zend.db.table.rowset.serialize.example.serialize">
@@ -243,8 +254,8 @@ foreach ($rowsetArray as $rowArray) {
             <title>Serializing a Rowset</title>
 
             <para>
-                Simply use PHP's <code>serialize()</code> function to create a string containing a byte-stream
-                representation of the Rowset object argument.
+                Simply use PHP's <code>serialize()</code> function to create a string containing a
+                byte-stream representation of the Rowset object argument.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -264,15 +275,15 @@ $serializedRowset = serialize($rowset);
             <title>Unserializing a Serialized Rowset</title>
 
             <para>
-                Use PHP's <code>unserialize()</code> function to restore a string containing a byte-stream
-                representation of an object. The function returns the original object.
+                Use PHP's <code>unserialize()</code> function to restore a string containing a
+                byte-stream representation of an object. The function returns the original object.
             </para>
 
             <para>
-                Note that the Rowset object returned is in a <emphasis>disconnected</emphasis> state. You can iterate
-                through the Rowset and read the Row objects and their properties, but you cannot change values in the
-                Rows or execute other methods that require a database connection (for example, queries against related
-                tables).
+                Note that the Rowset object returned is in a <emphasis>disconnected</emphasis>
+                state. You can iterate through the Rowset and read the Row objects and their
+                properties, but you cannot change values in the Rows or execute other methods that
+                require a database connection (for example, queries against related tables).
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -288,20 +299,23 @@ echo $row->bug_description;
         <note>
             <title>Why do Rowsets unserialize in a disconnected state?</title>
             <para>
-                A serialized object is a string that is readable to anyone who possesses it. It could be a security
-                risk to store parameters such as database account and password in plain, unencrypted text in the
-                serialized string. You would not want to store such data to a text file that is not protected, or send
-                it in an email or other medium that is easily read by potential attackers. The reader of the serialized
-                object should not be able to use it to gain access to your database without knowing valid credentials.
+                A serialized object is a string that is readable to anyone who possesses it. It
+                could be a security risk to store parameters such as database account and password
+                in plain, unencrypted text in the serialized string. You would not want to store
+                such data to a text file that is not protected, or send it in an email or other
+                medium that is easily read by potential attackers. The reader of the serialized
+                object should not be able to use it to gain access to your database without knowing
+                valid credentials.
             </para>
         </note>
 
         <para>
-            You can reactivate a disconnected Rowset using the <code>setTable()</code> 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 Rowset, the
-            Rowset gains access to the database. Subsequently, you can change values in the Row objects contained in
-            the Rowset and save the changes to the database.
+            You can reactivate a disconnected Rowset using the <code>setTable()</code> 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
+            Rowset, the Rowset gains access to the database. Subsequently, you can change values in
+            the Row objects contained in the Rowset and save the changes to the database.
         </para>
 
         <example id="zend.db.table.rowset.serialize.example.set-table">
@@ -327,8 +341,8 @@ $row->save();
         </example>
 
         <para>
-            Reactivating a Rowset with <code>setTable()</code> also reactivates all the Row objects contained in that
-            Rowset.
+            Reactivating a Rowset with <code>setTable()</code> also reactivates all the Row objects
+            contained in that Rowset.
         </para>
 
     </sect2>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Dojo-Data.xml

@@ -83,8 +83,8 @@ $data->addItems($someMoreItems);
 
             <para>
                 Every dojo.data data store requires that the identifier column
-                be provided as metadata, including <classname>Zend_Dojo_Data</classname>. In fact, if you attempt to add items without an
-                identifier, it will raise an exception.
+                be provided as metadata, including <classname>Zend_Dojo_Data</classname>. In fact,
+                if you attempt to add items without an identifier, it will raise an exception.
             </para>
         </note>
 

+ 15 - 6
documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml

@@ -491,8 +491,9 @@ $form->addElement(
         <para>
             Editor provides a WYSIWYG editor that can be used to both create and
             edit rich HTML content. dijit.Editor is pluggable and may be
-            extended with custom plugins if desired; see <ulink url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
-            dijit.Editor documentation</ulink> for more details.
+            extended with custom plugins if desired; see <ulink
+                url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
+                dijit.Editor documentation</ulink> for more details.
         </para>
 
         <para>
@@ -619,8 +620,12 @@ $form->addElement(
 
                 <itemizedlist>
                     <listitem><para><code>addStyleSheet($styleSheet)</code></para></listitem>
-                    <listitem><para><code>addStyleSheets(array $styleSheets)</code></para></listitem>
-                    <listitem><para><code>setStyleSheets(array $styleSheets)</code></para></listitem>
+                    <listitem>
+                        <para><code>addStyleSheets(array $styleSheets)</code></para>
+                    </listitem>
+                    <listitem>
+                        <para><code>setStyleSheets(array $styleSheets)</code></para>
+                    </listitem>
                     <listitem><para><code>getStyleSheets()</code></para></listitem>
                     <listitem><para><code>hasStyleSheet($styleSheet)</code></para></listitem>
                     <listitem><para><code>removeStyleSheet($styleSheet)</code></para></listitem>
@@ -1167,7 +1172,8 @@ $form->addElement(
             </para></listitem>
 
             <listitem><para>
-                <code>setUppercase($flag)</code> and <code>getUppercase()</code>: set and retrieve the flag indicating whether or not the input should be cast to UPPERCASE.
+                <code>setUppercase($flag)</code> and <code>getUppercase()</code>: set and retrieve
+                the flag indicating whether or not the input should be cast to UPPERCASE.
             </para></listitem>
 
             <listitem><para>
@@ -1306,7 +1312,10 @@ $form->addElement(
         <title>ValidationTextBox</title>
 
         <para>
-            ValidationTextBox provides the ability to add validations and constraints to a text input. Internally, it derives from <link linkend="zend.dojo.form.elements.textBox">TextBox</link>, and adds the following accessors and mutators for manipulating dijit parameters:
+            ValidationTextBox provides the ability to add validations and constraints to a text
+            input. Internally, it derives from <link
+                linkend="zend.dojo.form.elements.textBox">TextBox</link>, and adds the following
+            accessors and mutators for manipulating dijit parameters:
         </para>
 
         <itemizedlist>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml

@@ -269,7 +269,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
         <para>
             For more information on creating custom builds, please <ulink
                 url="http://dojotoolkit.org/book/dojo-book-0-9/part-4-meta-dojo/package-system-and-custom-builds">refer
-            to the Dojo build documentation</ulink>.
+                to the Dojo build documentation</ulink>.
         </para>
     </sect3>
 

+ 5 - 5
documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml

@@ -327,8 +327,8 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>captureStart($id, array $params = array(), array $attribs = array())</code>:
-                    begin capturing content to include in a container.
+                    <code>captureStart($id, array $params = array(), array $attribs =
+                        array())</code>: begin capturing content to include in a container.
                     <code>$params</code> refers to the dijit params to use with
                     the container, while <code>$attribs</code> refer to any
                     general HTML attributes to use.
@@ -649,9 +649,9 @@ echo $view->dateTextBox(
                     <emphasis>Editor</emphasis>: dijit.Editor. Provides a
                     WYSIWYG editor via which users may create or edit content.
                     <code>dijit.Editor</code> is a pluggable, extensible editor
-                    with a variety of parameters you can utilize for
-                    customization; see <ulink url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
-                    dijit.Editor documentation</ulink> for more details.
+                    with a variety of parameters you can utilize for customization; see <ulink
+                        url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
+                        dijit.Editor documentation</ulink> for more details.
                 </para>
 
                 <programlisting language="php"><![CDATA[

+ 3 - 1
documentation/manual/en/module_specs/Zend_Dojo.xml

@@ -15,7 +15,9 @@
         <listitem><para>dojo.data compatibility</para></listitem>
         <listitem><para>View helper to help setup the Dojo environment</para></listitem>
         <listitem><para>Dijit-specific <classname>Zend_View</classname> helpers</para></listitem>
-        <listitem><para>Dijit-specific <classname>Zend_Form</classname> elements and decorators</para></listitem>
+        <listitem>
+            <para>Dijit-specific <classname>Zend_Form</classname> elements and decorators</para>
+        </listitem>
     </itemizedlist>
 
     <para>