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

[MANUAL] English:

- structural fixes (no translations needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20766 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas пре 16 година
родитељ
комит
7c725d19b4
23 измењених фајлова са 1697 додато и 1390 уклоњено
  1. 6 0
      documentation/manual/en/module_specs/Zend_Date-Additional.xml
  2. 7 16
      documentation/manual/en/module_specs/Zend_Date-Basic.xml
  3. 170 5
      documentation/manual/en/module_specs/Zend_Date-Constants.xml
  4. 6 32
      documentation/manual/en/module_specs/Zend_Date-Creation.xml
  5. 104 1
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  6. 103 41
      documentation/manual/en/module_specs/Zend_Db_Adapter.xml
  7. 19 13
      documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml
  8. 8 6
      documentation/manual/en/module_specs/Zend_Db_Profiler.xml
  9. 6 123
      documentation/manual/en/module_specs/Zend_Db_Select.xml
  10. 11 18
      documentation/manual/en/module_specs/Zend_Db_Statement.xml
  11. 0 51
      documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml
  12. 0 163
      documentation/manual/en/module_specs/Zend_Db_Table.xml
  13. 0 14
      documentation/manual/en/module_specs/Zend_Db_Table_Definition.xml
  14. 0 58
      documentation/manual/en/module_specs/Zend_Db_Table_Row.xml
  15. 15 41
      documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml
  16. 3 1
      documentation/manual/en/module_specs/Zend_Debug.xml
  17. 132 109
      documentation/manual/en/module_specs/Zend_Dojo-Data.xml
  18. 498 361
      documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml
  19. 262 94
      documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml
  20. 202 137
      documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml
  21. 7 5
      documentation/manual/en/module_specs/Zend_Dojo-View.xml
  22. 1 0
      documentation/manual/en/module_specs/Zend_Dojo.xml
  23. 137 101
      documentation/manual/en/module_specs/Zend_Dom-Query.xml

+ 6 - 0
documentation/manual/en/module_specs/Zend_Date-Additional.xml

@@ -139,25 +139,30 @@ print_r (Zend_Date_Cities::getCityList());
                         <entry>Usage</entry>
                         <entry>Usage</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>effective</entry>
                         <entry>effective</entry>
                         <entry>Standard horizon</entry>
                         <entry>Standard horizon</entry>
+
                         <entry>
                         <entry>
                             Expects the world to be a ball. This horizon is always used if non is
                             Expects the world to be a ball. This horizon is always used if non is
                             defined.
                             defined.
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>civil</entry>
                         <entry>civil</entry>
                         <entry>Common horizon</entry>
                         <entry>Common horizon</entry>
                         <entry>Often used in common medias like TV or radio</entry>
                         <entry>Often used in common medias like TV or radio</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>nautic</entry>
                         <entry>nautic</entry>
                         <entry>Nautic horizon</entry>
                         <entry>Nautic horizon</entry>
                         <entry>Often used in sea navigation</entry>
                         <entry>Often used in sea navigation</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>astronomic</entry>
                         <entry>astronomic</entry>
                         <entry>Astronomic horizon</entry>
                         <entry>Astronomic horizon</entry>
@@ -200,6 +205,7 @@ $mylocation = array('latitude' => 41.5, 'longitude' => 13.2446);
 
 
         <example id="zend.date.additional.sunrise-sunset.example-3">
         <example id="zend.date.additional.sunrise-sunset.example-3">
             <title>Calculating Sun Information</title>
             <title>Calculating Sun Information</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 // Get the location for a defined city
 // Get the location for a defined city
 $city = Zend_Date_Cities::city('Vienna');
 $city = Zend_Date_Cities::city('Vienna');

+ 7 - 16
documentation/manual/en/module_specs/Zend_Date-Basic.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.date.basic">
 <sect1 id="zend.date.basic">
-
     <title>Basic Methods</title>
     <title>Basic Methods</title>
 
 
     <para>
     <para>
@@ -23,7 +22,6 @@
     </para>
     </para>
 
 
     <sect2 id="zend.date.basic.creation">
     <sect2 id="zend.date.basic.creation">
-
         <title>Current Date</title>
         <title>Current Date</title>
 
 
         <para>
         <para>
@@ -32,12 +30,12 @@
             <methodname>time()</methodname> function to obtain the <ulink
             <methodname>time()</methodname> function to obtain the <ulink
                 url="http://en.wikipedia.org/wiki/Unix_Time">UNIX timestamp</ulink>
                 url="http://en.wikipedia.org/wiki/Unix_Time">UNIX timestamp</ulink>
             for the object. Make sure your <acronym>PHP</acronym> environment has the correct
             for the object. Make sure your <acronym>PHP</acronym> environment has the correct
-            <link linkend="zend.date.setdefaulttimezone">default timezone</link>
-            .
+            <link linkend="zend.date.setdefaulttimezone">default timezone</link>.
         </para>
         </para>
 
 
         <example id="zend.date.basic.creation.example-1">
         <example id="zend.date.basic.creation.example-1">
             <title>Creating the Current Date</title>
             <title>Creating the Current Date</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -45,11 +43,9 @@ $date = new Zend_Date();
 print $date;
 print $date;
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.date.basic.functions">
     <sect2 id="zend.date.basic.functions">
-
         <title>Zend_Date by Example</title>
         <title>Zend_Date by Example</title>
 
 
         <para>
         <para>
@@ -59,7 +55,6 @@ print $date;
         </para>
         </para>
 
 
         <sect3 id="zend.date.simple.functions.get">
         <sect3 id="zend.date.simple.functions.get">
-
             <title>Output a Date</title>
             <title>Output a Date</title>
 
 
             <para>
             <para>
@@ -70,6 +65,7 @@ print $date;
 
 
             <example id="zend.date.simple.functions.get.example-1">
             <example id="zend.date.simple.functions.get.example-1">
                 <title>get() - Output a Date</title>
                 <title>get() - Output a Date</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -77,11 +73,9 @@ $date = new Zend_Date();
 print $date->get();
 print $date->get();
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.date.simple.functions.set">
         <sect3 id="zend.date.simple.functions.set">
-
             <title>Setting a Date</title>
             <title>Setting a Date</title>
 
 
             <para>
             <para>
@@ -92,6 +86,7 @@ print $date->get();
 
 
             <example id="zend.date.simple.functions.set.example-1">
             <example id="zend.date.simple.functions.set.example-1">
                 <title>set() - Set a Date</title>
                 <title>set() - Set a Date</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -100,11 +95,9 @@ $date->set('13:00:00',Zend_Date::TIMES);
 print $date->get(Zend_Date::W3C);
 print $date->get(Zend_Date::W3C);
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.date.simple.functions.add">
         <sect3 id="zend.date.simple.functions.add">
-
             <title>Adding and Subtracting Dates</title>
             <title>Adding and Subtracting Dates</title>
 
 
             <para>
             <para>
@@ -117,6 +110,7 @@ print $date->get(Zend_Date::W3C);
 
 
             <example id="zend.date.simple.functions.add.example-1">
             <example id="zend.date.simple.functions.add.example-1">
                 <title>add() - Adding Dates</title>
                 <title>add() - Adding Dates</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -129,11 +123,9 @@ echo "Date via get() = ", $date->get(Zend_Date::W3C), "\n";
 echo "Date via toString() = ", $date, "\n";
 echo "Date via toString() = ", $date, "\n";
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.date.simple.functions.compare">
         <sect3 id="zend.date.simple.functions.compare">
-
             <title>Comparison of Dates</title>
             <title>Comparison of Dates</title>
 
 
             <para>
             <para>
@@ -146,6 +138,7 @@ echo "Date via toString() = ", $date, "\n";
 
 
             <example id="zend.date.simple.functions.compare.example-1">
             <example id="zend.date.simple.functions.compare.example-1">
                 <title>compare() - Compare Dates</title>
                 <title>compare() - Compare Dates</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -165,6 +158,7 @@ if ($date->compare(10, Zend_Date::MINUTE) == -1) {
 
 
             <example id="zend.date.simple.functions.compare.example-2">
             <example id="zend.date.simple.functions.compare.example-2">
                 <title>equals() - Identify a Date or Date Part</title>
                 <title>equals() - Identify a Date or Date Part</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 
 
@@ -176,11 +170,8 @@ if ($date->equals(10, Zend_Date::HOUR)) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

Разлика између датотеке није приказан због своје велике величине
+ 170 - 5
documentation/manual/en/module_specs/Zend_Date-Constants.xml


+ 6 - 32
documentation/manual/en/module_specs/Zend_Date-Creation.xml

@@ -32,7 +32,6 @@
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $date = new Zend_Date();
 $date = new Zend_Date();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <example id="zend.date.creation.actual.example-2">
         <example id="zend.date.creation.actual.example-2">
@@ -124,41 +123,16 @@ $date = new Zend_Date($datecolumn, Zend_Date::ISO_8601);
         </para>
         </para>
 
 
         <itemizedlist mark='opencircle'>
         <itemizedlist mark='opencircle'>
-            <listitem>
-                <para>
-                    <emphasis>day</emphasis>: day of the date as number
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <emphasis>month</emphasis>: month of the date as number
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <emphasis>year</emphasis>: full year of the date
-                </para>
-            </listitem>
+            <listitem><para><emphasis>day</emphasis>: day of the date as number</para></listitem>
 
 
             <listitem>
             <listitem>
-                <para>
-                    <emphasis>hour</emphasis>: hour of the date
-                </para>
+                <para><emphasis>month</emphasis>: month of the date as number</para>
             </listitem>
             </listitem>
 
 
-            <listitem>
-                <para>
-                    <emphasis>minute</emphasis>: minute of the date
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <emphasis>second</emphasis>: second of the date
-                </para>
-            </listitem>
+            <listitem><para><emphasis>year</emphasis>: full year of the date</para></listitem>
+            <listitem><para><emphasis>hour</emphasis>: hour of the date</para></listitem>
+            <listitem><para><emphasis>minute</emphasis>: minute of the date</para></listitem>
+            <listitem><para><emphasis>second</emphasis>: second of the date</para></listitem>
         </itemizedlist>
         </itemizedlist>
 
 
         <example id="zend.date.creation.array.example">
         <example id="zend.date.creation.array.example">

+ 104 - 1
documentation/manual/en/module_specs/Zend_Date-Overview.xml

@@ -27,7 +27,7 @@
                 switch back to the default mode of supporting only <acronym>ISO</acronym> date
                 switch back to the default mode of supporting only <acronym>ISO</acronym> date
                 format tokens. For a list of supported format codes, see
                 format tokens. For a list of supported format codes, see
                 <link linkend="zend.date.constants.phpformats">Self-Defined OUTPUT Formats
                 <link linkend="zend.date.constants.phpformats">Self-Defined OUTPUT Formats
-        Using PHP's date() Format Specifiers</link>
+                    Using PHP's date() Format Specifiers</link>
             </para>
             </para>
         </sect3>
         </sect3>
 
 
@@ -166,6 +166,7 @@
 
 
         <example id="zend.date.values.example-1">
         <example id="zend.date.values.example-1">
             <title>User-Specified Input Date Format</title>
             <title>User-Specified Input Date Format</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $date1 = new Zend_Date('Feb 31, 2007', null, 'en_US');
 $date1 = new Zend_Date('Feb 31, 2007', null, 'en_US');
 echo $date1, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
 echo $date1, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
@@ -239,6 +240,7 @@ $date = new Zend_Date('31.Feb.2007');
 
 
         <example id="zend.date.basic.example-1">
         <example id="zend.date.basic.example-1">
             <title>Operating on Parts of Dates</title>
             <title>Operating on Parts of Dates</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $date = new Zend_Date(); // $date's timestamp === time()
 $date = new Zend_Date(); // $date's timestamp === time()
 
 
@@ -273,6 +275,7 @@ print $date;
 
 
             <table id="id.date.basic.parts.table">
             <table id="id.date.basic.parts.table">
                 <title>Date Parts</title>
                 <title>Date Parts</title>
+
                 <tgroup cols="2">
                 <tgroup cols="2">
                     <thead>
                     <thead>
                         <row>
                         <row>
@@ -280,67 +283,81 @@ print $date;
                             <entry>Explanation</entry>
                             <entry>Explanation</entry>
                         </row>
                         </row>
                     </thead>
                     </thead>
+
                     <tbody>
                     <tbody>
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink
                                 <ulink
                                     url="http://en.wikipedia.org/wiki/Unix_Time">Timestamp</ulink>
                                     url="http://en.wikipedia.org/wiki/Unix_Time">Timestamp</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 UNIX timestamp, expressed in seconds elapsed since January 1st, 1970
                                 UNIX timestamp, expressed in seconds elapsed since January 1st, 1970
                                 00:00:00 <acronym>GMT</acronym>.
                                 00:00:00 <acronym>GMT</acronym>.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink
                                 <ulink
                                     url="http://en.wikipedia.org/wiki/Gregorian_calendar">Year</ulink>
                                     url="http://en.wikipedia.org/wiki/Gregorian_calendar">Year</ulink>
                             </entry>
                             </entry>
+
                             <entry>Gregorian calendar year (e.g. 2006)</entry>
                             <entry>Gregorian calendar year (e.g. 2006)</entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink
                                 <ulink
                                     url="http://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars">Month</ulink>
                                     url="http://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars">Month</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Gregorian calendar month (1-12, localized names supported)
                                 Gregorian calendar month (1-12, localized names supported)
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink
                                 <ulink
                                     url="http://en.wikipedia.org/wiki/24-hour_clock">24 hour
                                     url="http://en.wikipedia.org/wiki/24-hour_clock">24 hour
                                     clock</ulink>
                                     clock</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Hours of the day (0-23) denote the hours elapsed, since the start of
                                 Hours of the day (0-23) denote the hours elapsed, since the start of
                                 the day.
                                 the day.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Minute">minute</ulink>
                                 <ulink url="http://en.wikipedia.org/wiki/Minute">minute</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Minutes of the hour (0-59) denote minutes elapsed, since the start
                                 Minutes of the hour (0-59) denote minutes elapsed, since the start
                                 of the hour.
                                 of the hour.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Second">Second</ulink>
                                 <ulink url="http://en.wikipedia.org/wiki/Second">Second</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Seconds of the minute (0-59) denote the elapsed seconds, since the
                                 Seconds of the minute (0-59) denote the elapsed seconds, since the
                                 start of the minute.
                                 start of the minute.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink
                                 <ulink
                                     url="http://en.wikipedia.org/wiki/Millisecond">millisecond</ulink>
                                     url="http://en.wikipedia.org/wiki/Millisecond">millisecond</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Milliseconds denote thousandths of a second (0-999).
                                 Milliseconds denote thousandths of a second (0-999).
                                 <classname>Zend_Date</classname> supports two additional methods
                                 <classname>Zend_Date</classname> supports two additional methods
@@ -355,10 +372,12 @@ print $date;
                                     url="http://php.net/microtime">microtime()</ulink>.
                                     url="http://php.net/microtime">microtime()</ulink>.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Day">Day</ulink>
                                 <ulink url="http://en.wikipedia.org/wiki/Day">Day</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 <constant>Zend_Date::DAY_SHORT</constant> is extracted from
                                 <constant>Zend_Date::DAY_SHORT</constant> is extracted from
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
@@ -372,10 +391,12 @@ print $date;
                                 assumed)
                                 assumed)
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Week">Week</ulink>
                                 <ulink url="http://en.wikipedia.org/wiki/Week">Week</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 <constant>Zend_Date::WEEK</constant> is extracted from
                                 <constant>Zend_Date::WEEK</constant> is extracted from
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
@@ -383,8 +404,10 @@ print $date;
                                 Otherwise an exception is raised. (Gregorian calendar assumed)
                                 Otherwise an exception is raised. (Gregorian calendar assumed)
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>Date</entry>
                             <entry>Date</entry>
+
                             <entry>
                             <entry>
                                 <constant>Zend_Date::DAY_MEDIUM</constant> is extracted from
                                 <constant>Zend_Date::DAY_MEDIUM</constant> is extracted from
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
                                 <varname>$date</varname> if the <varname>$date</varname> operand is
@@ -395,8 +418,10 @@ print $date;
                                 the object's locale.
                                 the object's locale.
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>Weekday</entry>
                             <entry>Weekday</entry>
+
                             <entry>
                             <entry>
                                 Weekdays are represented numerically as 0 (for Sunday) through 6
                                 Weekdays are represented numerically as 0 (for Sunday) through 6
                                 (for Saturday). <constant>Zend_Date::WEEKDAY_DIGIT</constant> is
                                 (for Saturday). <constant>Zend_Date::WEEKDAY_DIGIT</constant> is
@@ -412,8 +437,10 @@ print $date;
                                 assumed)
                                 assumed)
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>DayOfYear</entry>
                             <entry>DayOfYear</entry>
+
                             <entry>
                             <entry>
                                 In <classname>Zend_Date</classname>, the day of the year represents
                                 In <classname>Zend_Date</classname>, the day of the year represents
                                 the number of calendar days elapsed since the start of the year
                                 the number of calendar days elapsed since the start of the year
@@ -421,10 +448,12 @@ print $date;
                                 the nearest whole number. (Gregorian calendar assumed)
                                 the nearest whole number. (Gregorian calendar assumed)
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://www.faqs.org/rfcs/rfc822.html">Arpa</ulink>
                                 <ulink url="http://www.faqs.org/rfcs/rfc822.html">Arpa</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Arpa dates (i.e. <acronym>RFC</acronym> 822 formatted dates) are
                                 Arpa dates (i.e. <acronym>RFC</acronym> 822 formatted dates) are
                                 supported. Output uses either a "GMT" or "Local differential
                                 supported. Output uses either a "GMT" or "Local differential
@@ -437,10 +466,12 @@ print $date;
                                 correct. Example: Mon, 31 Dec 06 23:59:59 <acronym>GMT</acronym>
                                 correct. Example: Mon, 31 Dec 06 23:59:59 <acronym>GMT</acronym>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/ISO_8601">Iso</ulink>
                                 <ulink url="http://en.wikipedia.org/wiki/ISO_8601">Iso</ulink>
                             </entry>
                             </entry>
+
                             <entry>
                             <entry>
                                 Only complete <acronym>ISO</acronym> 8601 dates are supported for
                                 Only complete <acronym>ISO</acronym> 8601 dates are supported for
                                 output. Example: 2009-02-14T00:31:30+01:00
                                 output. Example: 2009-02-14T00:31:30+01:00
@@ -463,6 +494,7 @@ print $date;
 
 
             <table id="id.date.basic.operations.table">
             <table id="id.date.basic.operations.table">
                 <title>Basic Operations</title>
                 <title>Basic Operations</title>
+
                 <tgroup cols="2">
                 <tgroup cols="2">
                     <thead>
                     <thead>
                         <row>
                         <row>
@@ -470,14 +502,17 @@ print $date;
                             <entry>Explanation</entry>
                             <entry>Explanation</entry>
                         </row>
                         </row>
                     </thead>
                     </thead>
+
                     <tbody>
                     <tbody>
                         <row>
                         <row>
                             <entry><methodname>get()</methodname></entry>
                             <entry><methodname>get()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>get($part = null, $locale =
                                     <emphasis><methodname>get($part = null, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     Use <methodname>get($part)</methodname> to retrieve the date
                                     Use <methodname>get($part)</methodname> to retrieve the date
                                     <varname>$part</varname> of this object's date localized to
                                     <varname>$part</varname> of this object's date localized to
@@ -498,13 +533,16 @@ print $date;
                                 </note>
                                 </note>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry><methodname>set()</methodname></entry>
                             <entry><methodname>set()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>set($date, $part = null, $locale =
                                     <emphasis><methodname>set($date, $part = null, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     Sets the <varname>$part</varname> of the current object to the
                                     Sets the <varname>$part</varname> of the current object to the
                                     corresponding value for that part found in the input
                                     corresponding value for that part found in the input
@@ -513,13 +551,16 @@ print $date;
                                 </para>
                                 </para>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry><methodname>add()</methodname></entry>
                             <entry><methodname>add()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>add($date, $part = null, $locale =
                                     <emphasis><methodname>add($date, $part = null, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     Adds the <varname>$part</varname> of <varname>$date</varname>
                                     Adds the <varname>$part</varname> of <varname>$date</varname>
                                     having a locale <varname>$locale</varname> to the current
                                     having a locale <varname>$locale</varname> to the current
@@ -527,13 +568,16 @@ print $date;
                                 </para>
                                 </para>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry><methodname>sub()</methodname></entry>
                             <entry><methodname>sub()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>sub($date, $part = null, $locale =
                                     <emphasis><methodname>sub($date, $part = null, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     Subtracts the <varname>$part</varname> of
                                     Subtracts the <varname>$part</varname> of
                                     <varname>$date</varname> having a locale
                                     <varname>$date</varname> having a locale
@@ -541,13 +585,16 @@ print $date;
                                 </para>
                                 </para>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry><methodname>copyPart()</methodname></entry>
                             <entry><methodname>copyPart()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>copyPart($part, $locale =
                                     <emphasis><methodname>copyPart($part, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     Returns a cloned object, with only <varname>$part</varname> of
                                     Returns a cloned object, with only <varname>$part</varname> of
                                     the object's date copied to the clone, with the clone have its
                                     the object's date copied to the clone, with the clone have its
@@ -556,13 +603,16 @@ print $date;
                                 </para>
                                 </para>
                             </entry>
                             </entry>
                         </row>
                         </row>
+
                         <row>
                         <row>
                             <entry><methodname>compare()</methodname></entry>
                             <entry><methodname>compare()</methodname></entry>
+
                             <entry>
                             <entry>
                                 <para>
                                 <para>
                                     <emphasis><methodname>compare($date, $part = null, $locale =
                                     <emphasis><methodname>compare($date, $part = null, $locale =
                                         null)</methodname></emphasis>
                                         null)</methodname></emphasis>
                                 </para>
                                 </para>
+
                                 <para>
                                 <para>
                                     compares <varname>$part</varname> of <varname>$date</varname> to
                                     compares <varname>$part</varname> of <varname>$date</varname> to
                                     this object's timestamp, returning 0 if they are equal, 1 if
                                     this object's timestamp, returning 0 if they are equal, 1 if
@@ -587,6 +637,7 @@ print $date;
 
 
         <table id="zend.date.others.comparison.table">
         <table id="zend.date.others.comparison.table">
             <title>Date Comparison Methods</title>
             <title>Date Comparison Methods</title>
+
             <tgroup cols="2">
             <tgroup cols="2">
                 <thead>
                 <thead>
                     <row>
                     <row>
@@ -594,14 +645,17 @@ print $date;
                         <entry>Explanation</entry>
                         <entry>Explanation</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry><methodname>equals()</methodname></entry>
                         <entry><methodname>equals()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>equals($date, $part = null, $locale =
                                 <emphasis><methodname>equals($date, $part = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 <varname>$date</varname> having locale <varname>$locale</varname> is
                                 <varname>$date</varname> having locale <varname>$locale</varname> is
@@ -610,13 +664,16 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isEarlier()</methodname></entry>
                         <entry><methodname>isEarlier()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isEarlier($date, $part = null, $locale =
                                 <emphasis><methodname>isEarlier($date, $part = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 this object's date is earlier than <varname>$part</varname> of
                                 this object's date is earlier than <varname>$part</varname> of
@@ -624,13 +681,16 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isLater()</methodname></entry>
                         <entry><methodname>isLater()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isLater($date, $part = null, $locale =
                                 <emphasis><methodname>isLater($date, $part = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 returns <constant>TRUE</constant>, if <varname>$part</varname> of
                                 this object's date is later than <varname>$part</varname> of
                                 this object's date is later than <varname>$part</varname> of
@@ -638,48 +698,60 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isToday()</methodname></entry>
                         <entry><methodname>isToday()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isToday()</methodname></emphasis>
                                 <emphasis><methodname>isToday()</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Tests if today's year, month, and day match this object's date
                                 Tests if today's year, month, and day match this object's date
                                 value, using this object's timezone.
                                 value, using this object's timezone.
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isTomorrow()</methodname></entry>
                         <entry><methodname>isTomorrow()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isTomorrow()</methodname></emphasis>
                                 <emphasis><methodname>isTomorrow()</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Tests if tomorrow's year, month, and day match this object's date
                                 Tests if tomorrow's year, month, and day match this object's date
                                 value, using this object's timezone.
                                 value, using this object's timezone.
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isYesterday()</methodname></entry>
                         <entry><methodname>isYesterday()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isYesterday()</methodname></emphasis>
                                 <emphasis><methodname>isYesterday()</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Tests if yesterday's year, month, and day match this object's date
                                 Tests if yesterday's year, month, and day match this object's date
                                 value, using this object's timezone.
                                 value, using this object's timezone.
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isLeapYear()</methodname></entry>
                         <entry><methodname>isLeapYear()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isLeapYear()</methodname></emphasis>
                                 <emphasis><methodname>isLeapYear()</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Use <methodname>isLeapYear()</methodname> to determine if the
                                 Use <methodname>isLeapYear()</methodname> to determine if the
                                 current object is a leap year, or use
                                 current object is a leap year, or use
@@ -690,13 +762,16 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>isDate()</methodname></entry>
                         <entry><methodname>isDate()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>isDate($date, $format = null, $locale =
                                 <emphasis><methodname>isDate($date, $format = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 This method checks if a given date is a real date and returns
                                 This method checks if a given date is a real date and returns
                                 <constant>TRUE</constant> if all checks are ok. It works like
                                 <constant>TRUE</constant> if all checks are ok. It works like
@@ -721,6 +796,7 @@ print $date;
 
 
         <table id="zend.date.others.gettingparts.table">
         <table id="zend.date.others.gettingparts.table">
             <title>Date Output Methods</title>
             <title>Date Output Methods</title>
+
             <tgroup cols="2">
             <tgroup cols="2">
                 <thead>
                 <thead>
                     <row>
                     <row>
@@ -728,14 +804,17 @@ print $date;
                         <entry>Explanation</entry>
                         <entry>Explanation</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry><methodname>toString()</methodname></entry>
                         <entry><methodname>toString()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>toString($format = null, $locale =
                                 <emphasis><methodname>toString($format = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Invoke directly or via the magic method
                                 Invoke directly or via the magic method
                                 <methodname>__toString()</methodname>. The
                                 <methodname>__toString()</methodname>. The
@@ -749,12 +828,15 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>toArray()</methodname></entry>
                         <entry><methodname>toArray()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>toArray()</methodname></emphasis>
                                 <emphasis><methodname>toArray()</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Returns an array representation of the selected date according to
                                 Returns an array representation of the selected date according to
                                 the conventions of the object's locale. The returned array is
                                 the conventions of the object's locale. The returned array is
@@ -851,12 +933,15 @@ print $date;
                             </itemizedlist>
                             </itemizedlist>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>toValue()</methodname></entry>
                         <entry><methodname>toValue()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>toValue($part = null)</methodname></emphasis>
                                 <emphasis><methodname>toValue($part = null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 Returns an integer representation of the selected date
                                 Returns an integer representation of the selected date
                                 <varname>$part</varname> according to the conventions of the
                                 <varname>$part</varname> according to the conventions of the
@@ -881,15 +966,18 @@ print $date;
                             </note>
                             </note>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>
                         <entry>
                             <link linkend="id.date.basic.operations">get()</link>
                             <link linkend="id.date.basic.operations">get()</link>
                         </entry>
                         </entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>get($part = null, $locale =
                                 <emphasis><methodname>get($part = null, $locale =
                                     null)</methodname></emphasis>
                                     null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 This method returns the <varname>$part</varname> of object's date
                                 This method returns the <varname>$part</varname> of object's date
                                 localized to <varname>$locale</varname> as a formatted string or
                                 localized to <varname>$locale</varname> as a formatted string or
@@ -898,12 +986,15 @@ print $date;
                             </para>
                             </para>
                         </entry>
                         </entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry><methodname>now()</methodname></entry>
                         <entry><methodname>now()</methodname></entry>
+
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>now($locale = null)</methodname></emphasis>
                                 <emphasis><methodname>now($locale = null)</methodname></emphasis>
                             </para>
                             </para>
+
                             <para>
                             <para>
                                 This convenience function is equivalent to <command>new
                                 This convenience function is equivalent to <command>new
                                 Zend_Date()</command>. It returns the current date as a
                                 Zend_Date()</command>. It returns the current date as a
@@ -927,6 +1018,7 @@ print $date;
 
 
         <table id="zend.date.others.fractions.table">
         <table id="zend.date.others.fractions.table">
             <title>Date Output Methods</title>
             <title>Date Output Methods</title>
+
             <tgroup cols="2">
             <tgroup cols="2">
                 <thead>
                 <thead>
                     <row>
                     <row>
@@ -934,6 +1026,7 @@ print $date;
                         <entry>Explanation</entry>
                         <entry>Explanation</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>
                         <entry>
@@ -941,14 +1034,17 @@ print $date;
                                 <emphasis><methodname>getFractionalPrecision()</methodname></emphasis>
                                 <emphasis><methodname>getFractionalPrecision()</methodname></emphasis>
                             </para>
                             </para>
                         </entry>
                         </entry>
+
                         <entry>Return the precision of the part seconds</entry>
                         <entry>Return the precision of the part seconds</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>setFractionalPrecision()</methodname></emphasis>
                                 <emphasis><methodname>setFractionalPrecision()</methodname></emphasis>
                             </para>
                             </para>
                         </entry>
                         </entry>
+
                         <entry>Set the precision of the part seconds</entry>
                         <entry>Set the precision of the part seconds</entry>
                     </row>
                     </row>
                 </tbody>
                 </tbody>
@@ -966,6 +1062,7 @@ print $date;
 
 
         <table id="zend.date.other.sun.table">
         <table id="zend.date.other.sun.table">
             <title>Miscellaneous Methods</title>
             <title>Miscellaneous Methods</title>
+
             <tgroup cols="2">
             <tgroup cols="2">
                 <thead>
                 <thead>
                     <row>
                     <row>
@@ -973,6 +1070,7 @@ print $date;
                         <entry>Explanation</entry>
                         <entry>Explanation</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
+
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>
                         <entry>
@@ -980,22 +1078,27 @@ print $date;
                                 <emphasis><methodname>getSunrise($location)</methodname></emphasis>
                                 <emphasis><methodname>getSunrise($location)</methodname></emphasis>
                             </para>
                             </para>
                         </entry>
                         </entry>
+
                         <entry>Return the date's time of sunrise</entry>
                         <entry>Return the date's time of sunrise</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>getSunset($location)</methodname></emphasis>
                                 <emphasis><methodname>getSunset($location)</methodname></emphasis>
                             </para>
                             </para>
                         </entry>
                         </entry>
+
                         <entry>Return the date's time of sunset</entry>
                         <entry>Return the date's time of sunset</entry>
                     </row>
                     </row>
+
                     <row>
                     <row>
                         <entry>
                         <entry>
                             <para>
                             <para>
                                 <emphasis><methodname>getSunInfo($location)</methodname></emphasis>
                                 <emphasis><methodname>getSunInfo($location)</methodname></emphasis>
                             </para>
                             </para>
                         </entry>
                         </entry>
+
                         <entry>Return an array with the date's sun dates</entry>
                         <entry>Return an array with the date's sun dates</entry>
                     </row>
                     </row>
                 </tbody>
                 </tbody>

Разлика између датотеке није приказан због своје велике величине
+ 103 - 41
documentation/manual/en/module_specs/Zend_Db_Adapter.xml


+ 19 - 13
documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml

@@ -21,19 +21,25 @@
     </para>
     </para>
 
 
     <itemizedlist>
     <itemizedlist>
-        <listitem><para>
-            Firefox Browser ideally version 3 but version 2 is also supported.
-        </para></listitem>
-
-        <listitem> <para>
-            Firebug Firefox Extension which you can download from <ulink
-                url="https://addons.mozilla.org/en-US/firefox/addon/1843">https://addons.mozilla.org/en-US/firefox/addon/1843</ulink>.
-        </para></listitem>
-
-        <listitem><para>
-            FirePHP Firefox Extension which you can download from <ulink
-                url="https://addons.mozilla.org/en-US/firefox/addon/6149">https://addons.mozilla.org/en-US/firefox/addon/6149</ulink>.
-        </para></listitem>
+        <listitem>
+            <para>
+                Firefox Browser ideally version 3 but version 2 is also supported.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                Firebug Firefox Extension which you can download from <ulink
+                    url="https://addons.mozilla.org/en-US/firefox/addon/1843">https://addons.mozilla.org/en-US/firefox/addon/1843</ulink>.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                FirePHP Firefox Extension which you can download from <ulink
+                    url="https://addons.mozilla.org/en-US/firefox/addon/6149">https://addons.mozilla.org/en-US/firefox/addon/6149</ulink>.
+            </para>
+        </listitem>
     </itemizedlist>
     </itemizedlist>
 
 
     <example id="zend.db.profiler.profilers.firebug.example.with_front_controller">
     <example id="zend.db.profiler.profilers.firebug.example.with_front_controller">

+ 8 - 6
documentation/manual/en/module_specs/Zend_Db_Profiler.xml

@@ -200,6 +200,7 @@ $profiler = $db->getProfiler();
                     statement is executed.
                     statement is executed.
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>getQueryParams()</methodname> returns an array of
                     <methodname>getQueryParams()</methodname> returns an array of
@@ -210,6 +211,7 @@ $profiler = $db->getProfiler();
                     parameter indices.
                     parameter indices.
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>getElapsedSecs()</methodname> returns the number of
                     <methodname>getElapsedSecs()</methodname> returns the number of
@@ -258,11 +260,9 @@ echo 'Queries per second: ' . $queryCount / $totalTime . "\n";
 echo 'Longest query length: ' . $longestTime . "\n";
 echo 'Longest query length: ' . $longestTime . "\n";
 echo "Longest query: \n" . $longestQuery . "\n";
 echo "Longest query: \n" . $longestQuery . "\n";
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.profiler.advanced">
     <sect2 id="zend.db.profiler.advanced">
-
         <title>Advanced Profiler Usage</title>
         <title>Advanced Profiler Usage</title>
 
 
         <para>
         <para>
@@ -306,12 +306,14 @@ $profiler->setFilterElapsedSecs(null);
                         operations, or selecting a database.
                         operations, or selecting a database.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::QUERY</constant>: general database
                         <constant>Zend_Db_Profiler::QUERY</constant>: general database
                         queries that do not match other types.
                         queries that do not match other types.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::INSERT</constant>: any query that
                         <constant>Zend_Db_Profiler::INSERT</constant>: any query that
@@ -319,6 +321,7 @@ $profiler->setFilterElapsedSecs(null);
                         <acronym>INSERT</acronym>.
                         <acronym>INSERT</acronym>.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::UPDATE</constant>: any query that
                         <constant>Zend_Db_Profiler::UPDATE</constant>: any query that
@@ -326,6 +329,7 @@ $profiler->setFilterElapsedSecs(null);
                         <acronym>UPDATE</acronym>.
                         <acronym>UPDATE</acronym>.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::DELETE</constant>: any query that
                         <constant>Zend_Db_Profiler::DELETE</constant>: any query that
@@ -333,6 +337,7 @@ $profiler->setFilterElapsedSecs(null);
                         <constant>DELETE</constant>.
                         <constant>DELETE</constant>.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::SELECT</constant>: any query that
                         <constant>Zend_Db_Profiler::SELECT</constant>: any query that
@@ -340,6 +345,7 @@ $profiler->setFilterElapsedSecs(null);
                         <acronym>SELECT</acronym>.
                         <acronym>SELECT</acronym>.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>Zend_Db_Profiler::TRANSACTION</constant>: any
                         <constant>Zend_Db_Profiler::TRANSACTION</constant>: any
@@ -370,7 +376,6 @@ $profiler->setFilterQueryType(Zend_Db_Profiler::DELETE);
 // Remove all filters
 // Remove all filters
 $profiler->setFilterQueryType(null);
 $profiler->setFilterQueryType(null);
 ]]></programlisting>
 ]]></programlisting>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.profiler.advanced.getbytype">
         <sect3 id="zend.db.profiler.advanced.getbytype">
@@ -399,9 +404,7 @@ $profiles = $profiler->getQueryProfiles(Zend_Db_Profiler::SELECT |
 // Retrieve DELETE query profiles
 // Retrieve DELETE query profiles
 $profiles = $profiler->getQueryProfiles(Zend_Db_Profiler::DELETE);
 $profiles = $profiler->getQueryProfiles(Zend_Db_Profiler::DELETE);
 ]]></programlisting>
 ]]></programlisting>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.profiler.profilers">
     <sect2 id="zend.db.profiler.profilers">
@@ -414,7 +417,6 @@ $profiles = $profiler->getQueryProfiles(Zend_Db_Profiler::DELETE);
         </para>
         </para>
 
 
         <xi:include href="Zend_Db_Profiler-Firebug.xml" />
         <xi:include href="Zend_Db_Profiler-Firebug.xml" />
-
     </sect2>
     </sect2>
 </sect1>
 </sect1>
 <!--
 <!--

+ 6 - 123
documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -57,11 +57,9 @@
             <classname>Zend_Db_Select</classname> is helpful if you need to assemble a SELECT query
             <classname>Zend_Db_Select</classname> is helpful if you need to assemble a SELECT query
             procedurally, or based on conditional logic in your application.
             procedurally, or based on conditional logic in your application.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.select.creating">
     <sect2 id="zend.db.select.creating">
-
         <title>Creating a Select Object</title>
         <title>Creating a Select Object</title>
 
 
         <para>
         <para>
@@ -71,14 +69,12 @@
         </para>
         </para>
 
 
         <example id="zend.db.select.creating.example-db">
         <example id="zend.db.select.creating.example-db">
-
             <title>Example of the database adapter's select() method</title>
             <title>Example of the database adapter's select() method</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory( ...options... );
 $db = Zend_Db::factory( ...options... );
 $select = $db->select();
 $select = $db->select();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -87,20 +83,16 @@ $select = $db->select();
         </para>
         </para>
 
 
         <example id="zend.db.select.creating.example-new">
         <example id="zend.db.select.creating.example-new">
-
             <title>Example of creating a new Select object</title>
             <title>Example of creating a new Select object</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $db = Zend_Db::factory( ...options... );
 $db = Zend_Db::factory( ...options... );
 $select = new Zend_Db_Select($db);
 $select = new Zend_Db_Select($db);
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.select.building">
     <sect2 id="zend.db.select.building">
-
         <title>Building Select queries</title>
         <title>Building Select queries</title>
 
 
         <para>
         <para>
@@ -109,7 +101,6 @@ $select = new Zend_Db_Select($db);
         </para>
         </para>
 
 
         <example id="zend.db.select.building.example">
         <example id="zend.db.select.building.example">
-
             <title>Example of the using methods to add clauses</title>
             <title>Example of the using methods to add clauses</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -125,7 +116,6 @@ $select->where( ...specify search criteria... )
 // Add an ORDER BY clause
 // Add an ORDER BY clause
 $select->order( ...specify sorting criteria... );
 $select->order( ...specify sorting criteria... );
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -136,7 +126,6 @@ $select->order( ...specify sorting criteria... );
         </para>
         </para>
 
 
         <example id="zend.db.select.building.example-fluent">
         <example id="zend.db.select.building.example-fluent">
-
             <title>Example of the using the fluent interface</title>
             <title>Example of the using the fluent interface</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -145,7 +134,6 @@ $select = $db->select()
     ->where( ...specify search criteria... )
     ->where( ...specify search criteria... )
     ->order( ...specify sorting criteria... );
     ->order( ...specify sorting criteria... );
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -156,7 +144,6 @@ $select = $db->select()
         </para>
         </para>
 
 
         <sect3 id="zend.db.select.building.from">
         <sect3 id="zend.db.select.building.from">
-
             <title>Adding a FROM clause</title>
             <title>Adding a FROM clause</title>
 
 
             <para>
             <para>
@@ -167,7 +154,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.from.example">
             <example id="zend.db.select.building.from.example">
-
                 <title>Example of the from() method</title>
                 <title>Example of the from() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -178,7 +164,6 @@ $select = $db->select()
 $select = $db->select()
 $select = $db->select()
              ->from( 'products' );
              ->from( 'products' );
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -191,7 +176,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.from.example-cname">
             <example id="zend.db.select.building.from.example-cname">
-
                 <title>Example of specifying a table correlation name</title>
                 <title>Example of specifying a table correlation name</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -202,7 +186,6 @@ $select = $db->select()
 $select = $db->select()
 $select = $db->select()
              ->from( array('p' => 'products') );
              ->from( array('p' => 'products') );
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -214,7 +197,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.from.example-schema">
             <example id="zend.db.select.building.from.example-schema">
-
                 <title>Example of specifying a schema name</title>
                 <title>Example of specifying a schema name</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -230,13 +212,10 @@ $select = $db->select()
 $select = $db->select()
 $select = $db->select()
              ->from('products', '*', 'myschema');
              ->from('products', '*', 'myschema');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.columns">
         <sect3 id="zend.db.select.building.columns">
-
             <title>Adding Columns</title>
             <title>Adding Columns</title>
 
 
             <para>
             <para>
@@ -268,7 +247,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.columns.example">
             <example id="zend.db.select.building.columns.example">
-
                 <title>Examples of specifying columns</title>
                 <title>Examples of specifying columns</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -296,13 +274,10 @@ $select = $db->select()
              ->from(array('p' => 'products'),
              ->from(array('p' => 'products'),
                     array('prodno' => 'product_id', 'product_name'));
                     array('prodno' => 'product_id', 'product_name'));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.columns-expr">
         <sect3 id="zend.db.select.building.columns-expr">
-
             <title>Adding Expression Columns</title>
             <title>Adding Expression Columns</title>
 
 
             <para>
             <para>
@@ -322,18 +297,15 @@ $select = $db->select()
             </para>
             </para>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     Using <classname>Zend_Db_Expr</classname> for column names is not necessary if
                     Using <classname>Zend_Db_Expr</classname> for column names is not necessary if
                     your column expression contains parentheses;
                     your column expression contains parentheses;
                     <classname>Zend_Db_Select</classname> recognizes parentheses and treats the
                     <classname>Zend_Db_Select</classname> recognizes parentheses and treats the
                     string as an expression, skipping quoting and correlation names.
                     string as an expression, skipping quoting and correlation names.
                 </para>
                 </para>
-
             </note>
             </note>
 
 
             <example id="zend.db.select.building.columns-expr.example">
             <example id="zend.db.select.building.columns-expr.example">
-
                 <title>Examples of specifying columns containing expressions</title>
                 <title>Examples of specifying columns containing expressions</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -368,7 +340,6 @@ $select = $db->select()
                               new Zend_Db_Expr('p.cost * 1.08'))
                               new Zend_Db_Expr('p.cost * 1.08'))
                     );
                     );
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -397,7 +368,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.columns-quoteid.example">
             <example id="zend.db.select.building.columns-quoteid.example">
-
                 <title>Examples of quoting columns in an expression</title>
                 <title>Examples of quoting columns in an expression</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -412,13 +382,10 @@ $select = $db->select()
                               '(p.' . $db->quoteIdentifier('from') . ' + 10)')
                               '(p.' . $db->quoteIdentifier('from') . ' + 10)')
                    );
                    );
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.columns-atomic">
         <sect3 id="zend.db.select.building.columns-atomic">
-
             <title>Adding columns to an existing FROM or JOIN table</title>
             <title>Adding columns to an existing FROM or JOIN table</title>
 
 
             <para>
             <para>
@@ -432,7 +399,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.columns-atomic.example">
             <example id="zend.db.select.building.columns-atomic.example">
-
                 <title>Examples of adding columns with the columns() method</title>
                 <title>Examples of adding columns with the columns() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -453,13 +419,10 @@ $select = $db->select()
              ->columns('product_name', 'p');
              ->columns('product_name', 'p');
              // Alternatively use columns('p.product_name')
              // Alternatively use columns('p.product_name')
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.join">
         <sect3 id="zend.db.select.building.join">
-
             <title>Adding Another Table to the Query with JOIN</title>
             <title>Adding Another Table to the Query with JOIN</title>
 
 
             <para>
             <para>
@@ -471,7 +434,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.join.example">
             <example id="zend.db.select.building.join.example">
-
                 <title>Example of the join() method</title>
                 <title>Example of the join() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -486,7 +448,6 @@ $select = $db->select()
              ->join(array('l' => 'line_items'),
              ->join(array('l' => 'line_items'),
                     'p.product_id = l.product_id');
                     'p.product_id = l.product_id');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -497,14 +458,12 @@ $select = $db->select()
             </para>
             </para>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     No quoting is applied to the expression you specify for the join condition; if
                     No quoting is applied to the expression you specify for the join condition; if
                     you have column names that need to be quoted, you must use
                     you have column names that need to be quoted, you must use
                     <methodname>quoteIdentifier()</methodname> as you form the string for the join
                     <methodname>quoteIdentifier()</methodname> as you form the string for the join
                     condition.
                     condition.
                 </para>
                 </para>
-
             </note>
             </note>
 
 
             <para>
             <para>
@@ -523,7 +482,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.join.example-no-columns">
             <example id="zend.db.select.building.join.example-no-columns">
-
                 <title>Example of specifying no columns</title>
                 <title>Example of specifying no columns</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -544,7 +502,6 @@ $select = $db->select()
                     Note the empty <methodname>array()</methodname> in the above example in place of
                     Note the empty <methodname>array()</methodname> in the above example in place of
                     a list of columns from the joined table.
                     a list of columns from the joined table.
                 </para>
                 </para>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -679,7 +636,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.joinusing.example">
             <example id="zend.db.select.building.joinusing.example">
-
                 <title>Example of the joinUsing() method</title>
                 <title>Example of the joinUsing() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -695,7 +651,6 @@ $select = $db->select()
              ->joinUsing('table2', 'column1')
              ->joinUsing('table2', 'column1')
              ->where('column2 = ?', 'foo');
              ->where('column2 = ?', 'foo');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -729,11 +684,9 @@ $select = $db->select()
                     </para>
                     </para>
                 </listitem>
                 </listitem>
             </itemizedlist>
             </itemizedlist>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.where">
         <sect3 id="zend.db.select.building.where">
-
             <title>Adding a WHERE Clause</title>
             <title>Adding a WHERE Clause</title>
 
 
             <para>
             <para>
@@ -744,7 +697,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example">
             <example id="zend.db.select.building.where.example">
-
                 <title>Example of the where() method</title>
                 <title>Example of the where() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -758,11 +710,9 @@ $select = $db->select()
                     array('product_id', 'product_name', 'price'))
                     array('product_id', 'product_name', 'price'))
              ->where('price > 100.00');
              ->where('price > 100.00');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     No quoting is applied to expressions given to the
                     No quoting is applied to expressions given to the
                     <methodname>where()</methodname> or <methodname>orWhere()</methodname> methods.
                     <methodname>where()</methodname> or <methodname>orWhere()</methodname> methods.
@@ -770,7 +720,6 @@ $select = $db->select()
                     <methodname>quoteIdentifier()</methodname> as you form the string for the
                     <methodname>quoteIdentifier()</methodname> as you form the string for the
                     condition.
                     condition.
                 </para>
                 </para>
-
             </note>
             </note>
 
 
             <para>
             <para>
@@ -781,7 +730,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example-param">
             <example id="zend.db.select.building.where.example-param">
-
                 <title>Example of a parameter in the where() method</title>
                 <title>Example of a parameter in the where() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -797,7 +745,6 @@ $select = $db->select()
                     array('product_id', 'product_name', 'price'))
                     array('product_id', 'product_name', 'price'))
              ->where('price > ?', $minimumPrice);
              ->where('price > ?', $minimumPrice);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -806,7 +753,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example-array">
             <example id="zend.db.select.building.where.example-array">
-
                 <title>Example of an array parameter in the where() method</title>
                 <title>Example of an array parameter in the where() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -822,7 +768,6 @@ $select = $db->select()
                     array('product_id', 'product_name', 'price'))
                     array('product_id', 'product_name', 'price'))
              ->where('product_id IN (?)', $productIds);
              ->where('product_id IN (?)', $productIds);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -832,7 +777,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example-and">
             <example id="zend.db.select.building.where.example-and">
-
                 <title>Example of multiple where() methods</title>
                 <title>Example of multiple where() methods</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -851,7 +795,6 @@ $select = $db->select()
              ->where('price > ?', $minimumPrice)
              ->where('price > ?', $minimumPrice)
              ->where('price < ?', $maximumPrice);
              ->where('price < ?', $maximumPrice);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -862,7 +805,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example-or">
             <example id="zend.db.select.building.where.example-or">
-
                 <title>Example of the orWhere() method</title>
                 <title>Example of the orWhere() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -881,7 +823,6 @@ $select = $db->select()
              ->where('price < ?', $minimumPrice)
              ->where('price < ?', $minimumPrice)
              ->orWhere('price > ?', $maximumPrice);
              ->orWhere('price > ?', $maximumPrice);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -892,7 +833,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.where.example-parens">
             <example id="zend.db.select.building.where.example-parens">
-
                 <title>Example of parenthesizing Boolean expressions</title>
                 <title>Example of parenthesizing Boolean expressions</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -912,7 +852,6 @@ $select = $db->select()
              ->where("price < $minimumPrice OR price > $maximumPrice")
              ->where("price < $minimumPrice OR price > $maximumPrice")
              ->where('product_name = ?', $prod);
              ->where('product_name = ?', $prod);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -922,11 +861,9 @@ $select = $db->select()
                 each expression in successive calls to the <methodname>where()</methodname> bind
                 each expression in successive calls to the <methodname>where()</methodname> bind
                 more tightly than the <acronym>AND</acronym> that combines the expressions.
                 more tightly than the <acronym>AND</acronym> that combines the expressions.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.group">
         <sect3 id="zend.db.select.building.group">
-
             <title>Adding a GROUP BY Clause</title>
             <title>Adding a GROUP BY Clause</title>
 
 
             <para>
             <para>
@@ -943,7 +880,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.group.example">
             <example id="zend.db.select.building.group.example">
-
                 <title>Example of the group() method</title>
                 <title>Example of the group() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -961,7 +897,6 @@ $select = $db->select()
                     array('line_items_per_product' => 'COUNT(*)'))
                     array('line_items_per_product' => 'COUNT(*)'))
              ->group('p.product_id');
              ->group('p.product_id');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -970,11 +905,9 @@ $select = $db->select()
                 identifier unless the string contains parentheses or is an object of type
                 identifier unless the string contains parentheses or is an object of type
                 <classname>Zend_Db_Expr</classname>.
                 <classname>Zend_Db_Expr</classname>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.having">
         <sect3 id="zend.db.select.building.having">
-
             <title>Adding a HAVING Clause</title>
             <title>Adding a HAVING Clause</title>
 
 
             <para>
             <para>
@@ -999,7 +932,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.having.example">
             <example id="zend.db.select.building.having.example">
-
                 <title>Example of the having() method</title>
                 <title>Example of the having() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1019,11 +951,9 @@ $select = $db->select()
              ->group('p.product_id')
              ->group('p.product_id')
              ->having('line_items_per_product > 10');
              ->having('line_items_per_product > 10');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     No quoting is applied to expressions given to the
                     No quoting is applied to expressions given to the
                     <methodname>having()</methodname> or <methodname>orHaving()</methodname>
                     <methodname>having()</methodname> or <methodname>orHaving()</methodname>
@@ -1031,13 +961,10 @@ $select = $db->select()
                     <methodname>quoteIdentifier()</methodname> as you form the string for the
                     <methodname>quoteIdentifier()</methodname> as you form the string for the
                     condition.
                     condition.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.order">
         <sect3 id="zend.db.select.building.order">
-
             <title>Adding an ORDER BY Clause</title>
             <title>Adding an ORDER BY Clause</title>
 
 
             <para>
             <para>
@@ -1065,7 +992,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.order.example">
             <example id="zend.db.select.building.order.example">
-
                 <title>Example of the order() method</title>
                 <title>Example of the order() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1086,13 +1012,10 @@ $select = $db->select()
              ->order(array('line_items_per_product DESC',
              ->order(array('line_items_per_product DESC',
                            'product_id'));
                            'product_id'));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.limit">
         <sect3 id="zend.db.select.building.limit">
-
             <title>Adding a LIMIT Clause</title>
             <title>Adding a LIMIT Clause</title>
 
 
             <para>
             <para>
@@ -1113,7 +1036,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.limit.example">
             <example id="zend.db.select.building.limit.example">
-
                 <title>Example of the limit() method</title>
                 <title>Example of the limit() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1131,11 +1053,9 @@ $select = $db->select()
                     array('product_id', 'product_name'))
                     array('product_id', 'product_name'))
              ->limit(20, 10);
              ->limit(20, 10);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     The <constant>LIMIT</constant> syntax is not supported by all
                     The <constant>LIMIT</constant> syntax is not supported by all
                     <acronym>RDBMS</acronym> brands. Some <acronym>RDBMS</acronym> require different
                     <acronym>RDBMS</acronym> brands. Some <acronym>RDBMS</acronym> require different
@@ -1143,7 +1063,6 @@ $select = $db->select()
                     <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to
                     <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to
                     produce <acronym>SQL</acronym> appropriate for that <acronym>RDBMS</acronym>.
                     produce <acronym>SQL</acronym> appropriate for that <acronym>RDBMS</acronym>.
                 </para>
                 </para>
-
             </note>
             </note>
 
 
             <para>
             <para>
@@ -1158,7 +1077,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.limit.example2">
             <example id="zend.db.select.building.limit.example2">
-
                 <title>Example of the limitPage() method</title>
                 <title>Example of the limitPage() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1172,13 +1090,10 @@ $select = $db->select()
                     array('product_id', 'product_name'))
                     array('product_id', 'product_name'))
              ->limitPage(2, 10);
              ->limitPage(2, 10);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.distinct">
         <sect3 id="zend.db.select.building.distinct">
-
             <title>Adding the DISTINCT Query Modifier</title>
             <title>Adding the DISTINCT Query Modifier</title>
 
 
             <para>
             <para>
@@ -1187,7 +1102,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.distinct.example">
             <example id="zend.db.select.building.distinct.example">
-
                 <title>Example of the distinct() method</title>
                 <title>Example of the distinct() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1199,13 +1113,10 @@ $select = $db->select()
              ->distinct()
              ->distinct()
              ->from(array('p' => 'products'), 'product_name');
              ->from(array('p' => 'products'), 'product_name');
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.for-update">
         <sect3 id="zend.db.select.building.for-update">
-
             <title>Adding the FOR UPDATE Query Modifier</title>
             <title>Adding the FOR UPDATE Query Modifier</title>
 
 
             <para>
             <para>
@@ -1214,7 +1125,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.building.for-update.example">
             <example id="zend.db.select.building.for-update.example">
-
                 <title>Example of forUpdate() method</title>
                 <title>Example of forUpdate() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1226,20 +1136,19 @@ $select = $db->select()
              ->forUpdate()
              ->forUpdate()
              ->from(array('p' => 'products'));
              ->from(array('p' => 'products'));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.building.union">
         <sect3 id="zend.db.select.building.union">
             <title>Building a UNION Query</title>
             <title>Building a UNION Query</title>
 
 
             <para>
             <para>
-                You can build union queries with <classname>Zend_Db_Select</classname> by passing an array
-                of <classname>Zend_Db_Select</classname> or SQL Query strings into the <methodname>union()</methodname>
-                method. As second parameter you can pass the <constant>Zend_Db_Select::SQL_UNION</constant> or
-                <constant>Zend_Db_Select::SQL_UNION_ALL</constant> constants to specify which type of union you
-                want to perform.
+                You can build union queries with <classname>Zend_Db_Select</classname> by passing an
+                array of <classname>Zend_Db_Select</classname> or SQL Query strings into the
+                <methodname>union()</methodname> method. As second parameter you can pass the
+                <constant>Zend_Db_Select::SQL_UNION</constant> or
+                <constant>Zend_Db_Select::SQL_UNION_ALL</constant> constants to specify which type
+                of union you want to perform.
             </para>
             </para>
 
 
             <example id="zend.db.select.building.union.example">
             <example id="zend.db.select.building.union.example">
@@ -1255,11 +1164,9 @@ $select = $db->select()
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.select.execute">
     <sect2 id="zend.db.select.execute">
-
         <title>Executing Select Queries</title>
         <title>Executing Select Queries</title>
 
 
         <para>
         <para>
@@ -1268,7 +1175,6 @@ $select = $db->select()
         </para>
         </para>
 
 
         <sect3 id="zend.db.select.execute.query-adapter">
         <sect3 id="zend.db.select.execute.query-adapter">
-
             <title>Executing Select Queries from the Db Adapter</title>
             <title>Executing Select Queries from the Db Adapter</title>
 
 
             <para>
             <para>
@@ -1285,7 +1191,6 @@ $select = $db->select()
             </para>
             </para>
 
 
             <example id="zend.db.select.execute.query-adapter.example">
             <example id="zend.db.select.execute.query-adapter.example">
-
                 <title>Example using the Db adapter's query() method</title>
                 <title>Example using the Db adapter's query() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1295,13 +1200,10 @@ $select = $db->select()
 $stmt = $db->query($select);
 $stmt = $db->query($select);
 $result = $stmt->fetchAll();
 $result = $stmt->fetchAll();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.execute.query-select">
         <sect3 id="zend.db.select.execute.query-select">
-
             <title>Executing Select Queries from the Object</title>
             <title>Executing Select Queries from the Object</title>
 
 
             <para>
             <para>
@@ -1313,7 +1215,6 @@ $result = $stmt->fetchAll();
             </para>
             </para>
 
 
             <example id="zend.db.select.execute.query-select.example">
             <example id="zend.db.select.execute.query-select.example">
-
                 <title>Example using the Select object's query method</title>
                 <title>Example using the Select object's query method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1323,13 +1224,10 @@ $select = $db->select()
 $stmt = $select->query();
 $stmt = $select->query();
 $result = $stmt->fetchAll();
 $result = $stmt->fetchAll();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.execute.tostring">
         <sect3 id="zend.db.select.execute.tostring">
-
             <title>Converting a Select Object to a SQL String</title>
             <title>Converting a Select Object to a SQL String</title>
 
 
             <para>
             <para>
@@ -1339,7 +1237,6 @@ $result = $stmt->fetchAll();
             </para>
             </para>
 
 
             <example id="zend.db.select.execute.tostring.example">
             <example id="zend.db.select.execute.tostring.example">
-
                 <title>Example of the __toString() method</title>
                 <title>Example of the __toString() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1352,15 +1249,11 @@ echo "$sql\n";
 // The output is the string:
 // The output is the string:
 //   SELECT * FROM "products"
 //   SELECT * FROM "products"
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.select.other">
     <sect2 id="zend.db.select.other">
-
         <title>Other methods</title>
         <title>Other methods</title>
 
 
         <para>
         <para>
@@ -1370,7 +1263,6 @@ echo "$sql\n";
         </para>
         </para>
 
 
         <sect3 id="zend.db.select.other.get-part">
         <sect3 id="zend.db.select.other.get-part">
-
             <title>Retrieving Parts of the Select Object</title>
             <title>Retrieving Parts of the Select Object</title>
 
 
             <para>
             <para>
@@ -1403,7 +1295,6 @@ echo "$sql\n";
             </para>
             </para>
 
 
             <table id="zend.db.select.other.get-part.table">
             <table id="zend.db.select.other.get-part.table">
-
                 <title>Constants used by getPart() and reset()</title>
                 <title>Constants used by getPart() and reset()</title>
 
 
                 <tgroup cols="2">
                 <tgroup cols="2">
@@ -1469,7 +1360,6 @@ echo "$sql\n";
             </table>
             </table>
 
 
             <example id="zend.db.select.other.get-part.example">
             <example id="zend.db.select.other.get-part.example">
-
                 <title>Example of the getPart() method</title>
                 <title>Example of the getPart() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1487,13 +1377,10 @@ $orderData = $select->getPart( Zend_Db_Select::ORDER );
 // Each part has a different structure.
 // Each part has a different structure.
 print_r( $orderData );
 print_r( $orderData );
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.select.other.reset">
         <sect3 id="zend.db.select.other.reset">
-
             <title>Resetting Parts of the Select Object</title>
             <title>Resetting Parts of the Select Object</title>
 
 
             <para>
             <para>
@@ -1516,7 +1403,6 @@ print_r( $orderData );
             </para>
             </para>
 
 
             <example id="zend.db.select.other.reset.example">
             <example id="zend.db.select.other.reset.example">
-
                 <title>Example of the reset() method</title>
                 <title>Example of the reset() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1543,13 +1429,10 @@ $select->order('product_id');
 // Clear all parts of the query
 // Clear all parts of the query
 $select->reset();
 $select->reset();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 11 - 18
documentation/manual/en/module_specs/Zend_Db_Statement.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.db.statement">
 <sect1 id="zend.db.statement">
-
     <title>Zend_Db_Statement</title>
     <title>Zend_Db_Statement</title>
 
 
     <para>
     <para>
@@ -18,7 +17,6 @@
     </para>
     </para>
 
 
     <sect2 id="zend.db.statement.creating">
     <sect2 id="zend.db.statement.creating">
-
         <title>Creating a Statement</title>
         <title>Creating a Statement</title>
 
 
         <para>
         <para>
@@ -32,6 +30,7 @@
 
 
         <example id="zend.db.statement.creating.example1">
         <example id="zend.db.statement.creating.example1">
             <title>Creating a SQL statement object with query()</title>
             <title>Creating a SQL statement object with query()</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $stmt = $db->query(
 $stmt = $db->query(
             'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?',
             'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?',
@@ -58,17 +57,16 @@ $stmt = $db->query(
 
 
         <example id="zend.db.statement.creating.example2">
         <example id="zend.db.statement.creating.example2">
             <title>Using a SQL statement constructor</title>
             <title>Using a SQL statement constructor</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 
 
 $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
 $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.statement.executing">
     <sect2 id="zend.db.statement.executing">
-
         <title>Executing a Statement</title>
         <title>Executing a Statement</title>
 
 
         <para>
         <para>
@@ -87,6 +85,7 @@ $stmt = new Zend_Db_Statement_Mysqli($db, $sql);
 
 
         <example id="zend.db.statement.executing.example1">
         <example id="zend.db.statement.executing.example1">
             <title>Executing a statement with positional parameters</title>
             <title>Executing a statement with positional parameters</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 $sql = 'SELECT * FROM bugs WHERE reported_by = ? AND bug_status = ?';
 
 
@@ -105,6 +104,7 @@ $stmt->execute(array('goofy', 'FIXED'));
 
 
         <example id="zend.db.statement.executing.example2">
         <example id="zend.db.statement.executing.example2">
             <title>Executing a statement with named parameters</title>
             <title>Executing a statement with named parameters</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $sql = 'SELECT * FROM bugs WHERE ' .
 $sql = 'SELECT * FROM bugs WHERE ' .
        'reported_by = :reporter AND bug_status = :status';
        'reported_by = :reporter AND bug_status = :status';
@@ -121,11 +121,9 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
             the <classname>Zend_Db_Statement</classname> classes for non-PDO extensions may support
             the <classname>Zend_Db_Statement</classname> classes for non-PDO extensions may support
             only one type of parameter or the other.
             only one type of parameter or the other.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.statement.fetching">
     <sect2 id="zend.db.statement.fetching">
-
         <title>Fetching Results from a SELECT Statement</title>
         <title>Fetching Results from a SELECT Statement</title>
 
 
         <para>
         <para>
@@ -139,7 +137,6 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
         </para>
         </para>
 
 
         <sect3 id="zend.db.statement.fetching.fetch">
         <sect3 id="zend.db.statement.fetching.fetch">
-
             <title>Fetching a Single Row from a Result Set</title>
             <title>Fetching a Single Row from a Result Set</title>
 
 
             <para>
             <para>
@@ -159,6 +156,7 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
                         corresponding data formats.
                         corresponding data formats.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <emphasis>Cursor orientation</emphasis>
                         <emphasis>Cursor orientation</emphasis>
@@ -168,6 +166,7 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
                         the result set, in the order returned by the <acronym>RDBMS</acronym>.
                         the result set, in the order returned by the <acronym>RDBMS</acronym>.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <emphasis>Offset</emphasis> is the third
                         <emphasis>Offset</emphasis> is the third
@@ -189,6 +188,7 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
 
 
             <example id="zend.db.statement.fetching.fetch.example">
             <example id="zend.db.statement.fetching.fetch.example">
                 <title>Using fetch() in a loop</title>
                 <title>Using fetch() in a loop</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 $stmt = $db->query('SELECT * FROM bugs');
 
 
@@ -202,11 +202,9 @@ while ($row = $stmt->fetch()) {
                 See also <ulink
                 See also <ulink
                    url="http://www.php.net/PDOStatement-fetch">PDOStatement::fetch()</ulink>.
                    url="http://www.php.net/PDOStatement-fetch">PDOStatement::fetch()</ulink>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.statement.fetching.fetchall">
         <sect3 id="zend.db.statement.fetching.fetchall">
-
             <title>Fetching a Complete Result Set</title>
             <title>Fetching a Complete Result Set</title>
 
 
             <para>
             <para>
@@ -221,6 +219,7 @@ while ($row = $stmt->fetch()) {
 
 
             <example id="zend.db.statement.fetching.fetchall.example">
             <example id="zend.db.statement.fetching.fetchall.example">
                 <title>Using fetchAll()</title>
                 <title>Using fetchAll()</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 $stmt = $db->query('SELECT * FROM bugs');
 
 
@@ -234,11 +233,9 @@ echo $rows[0]['bug_description'];
                 See also <ulink
                 See also <ulink
                     url="http://www.php.net/PDOStatement-fetchAll">PDOStatement::fetchAll()</ulink>.
                     url="http://www.php.net/PDOStatement-fetchAll">PDOStatement::fetchAll()</ulink>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.statement.fetching.fetch-mode">
         <sect3 id="zend.db.statement.fetching.fetch-mode">
-
             <title>Changing the Fetch Mode</title>
             <title>Changing the Fetch Mode</title>
 
 
             <para>
             <para>
@@ -258,6 +255,7 @@ echo $rows[0]['bug_description'];
 
 
             <example id="zend.db.statement.fetching.fetch-mode.example">
             <example id="zend.db.statement.fetching.fetch-mode.example">
                 <title>Setting the fetch mode</title>
                 <title>Setting the fetch mode</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT * FROM bugs');
 $stmt = $db->query('SELECT * FROM bugs');
 
 
@@ -273,11 +271,9 @@ echo $rows[0][0];
                 See also <ulink
                 See also <ulink
                     url="http://www.php.net/PDOStatement-setFetchMode">PDOStatement::setFetchMode()</ulink>.
                     url="http://www.php.net/PDOStatement-setFetchMode">PDOStatement::setFetchMode()</ulink>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.statement.fetching.fetchcolumn">
         <sect3 id="zend.db.statement.fetching.fetchcolumn">
-
             <title>Fetching a Single Column from a Result Set</title>
             <title>Fetching a Single Column from a Result Set</title>
 
 
             <para>
             <para>
@@ -300,6 +296,7 @@ echo $rows[0][0];
 
 
             <example id="zend.db.statement.fetching.fetchcolumn.example">
             <example id="zend.db.statement.fetching.fetchcolumn.example">
                 <title>Using fetchColumn()</title>
                 <title>Using fetchColumn()</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 
 
@@ -311,11 +308,9 @@ $bug_status = $stmt->fetchColumn(2);
                 See also <ulink
                 See also <ulink
                     url="http://www.php.net/PDOStatement-fetchColumn">PDOStatement::fetchColumn()</ulink>.
                     url="http://www.php.net/PDOStatement-fetchColumn">PDOStatement::fetchColumn()</ulink>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.statement.fetching.fetchobject">
         <sect3 id="zend.db.statement.fetching.fetchobject">
-
             <title>Fetching a Row as an Object</title>
             <title>Fetching a Row as an Object</title>
 
 
             <para>
             <para>
@@ -329,6 +324,7 @@ $bug_status = $stmt->fetchColumn(2);
 
 
             <example id="zend.db.statement.fetching.fetchobject.example">
             <example id="zend.db.statement.fetching.fetchobject.example">
                 <title>Using fetchObject()</title>
                 <title>Using fetchObject()</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 $stmt = $db->query('SELECT bug_id, bug_description, bug_status FROM bugs');
 
 
@@ -342,9 +338,7 @@ echo $obj->bug_description;
                 See also <ulink
                 See also <ulink
                     url="http://www.php.net/PDOStatement-fetchObject">PDOStatement::fetchObject()</ulink>.
                     url="http://www.php.net/PDOStatement-fetchObject">PDOStatement::fetchObject()</ulink>.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <!--
     <!--
@@ -391,5 +385,4 @@ echo $obj->bug_description;
 
 
     </sect2>
     </sect2>
     -->
     -->
-
 </sect1>
 </sect1>

+ 0 - 51
documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.db.table.relationships">
 <sect1 id="zend.db.table.relationships">
-
     <title>Zend_Db_Table Relationships</title>
     <title>Zend_Db_Table Relationships</title>
 
 
     <sect2 id="zend.db.table.relationships.introduction">
     <sect2 id="zend.db.table.relationships.introduction">
-
         <title>Introduction</title>
         <title>Introduction</title>
 
 
         <para>
         <para>
@@ -18,11 +16,9 @@
             The <classname>Zend_Db_Table_Row</classname> class has methods for querying related rows
             The <classname>Zend_Db_Table_Row</classname> class has methods for querying related rows
             in other tables.
             in other tables.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.relationships.defining">
     <sect2 id="zend.db.table.relationships.defining">
-
         <title>Defining Relationships</title>
         <title>Defining Relationships</title>
 
 
         <para>
         <para>
@@ -103,14 +99,12 @@ class BugsProducts extends Zend_Db_Table_Abstract
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 Skip declaration of <varname>$_dependentTables</varname> if you use referential
                 Skip declaration of <varname>$_dependentTables</varname> if you use referential
                 integrity constraints in the <acronym>RDBMS</acronym> server to implement cascading
                 integrity constraints in the <acronym>RDBMS</acronym> server to implement cascading
                 operations. See <xref linkend="zend.db.table.relationships.cascading" /> for more
                 operations. See <xref linkend="zend.db.table.relationships.cascading" /> for more
                 information.
                 information.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <para>
         <para>
@@ -203,11 +197,9 @@ class BugsProducts extends Zend_Db_Table_Abstract
                 </para>
                 </para>
             </listitem>
             </listitem>
         </itemizedlist>
         </itemizedlist>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.relationships.fetching.dependent">
     <sect2 id="zend.db.table.relationships.fetching.dependent">
-
         <title>Fetching a Dependent Rowset</title>
         <title>Fetching a Dependent Rowset</title>
 
 
         <para>
         <para>
@@ -232,7 +224,6 @@ $row->findDependentRowset($table, [$rule]);
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.dependent.example">
         <example id="zend.db.table.relationships.fetching.dependent.example">
-
             <title>Fetching a Dependent Rowset</title>
             <title>Fetching a Dependent Rowset</title>
 
 
             <para>
             <para>
@@ -247,7 +238,6 @@ $user1234 = $accountsRowset->current();
 
 
 $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
 $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -264,7 +254,6 @@ $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.dependent.example-by">
         <example id="zend.db.table.relationships.fetching.dependent.example-by">
-
             <title>Fetching a Dependent Rowset By a Specific Rule</title>
             <title>Fetching a Dependent Rowset By a Specific Rule</title>
 
 
             <para>
             <para>
@@ -281,7 +270,6 @@ $user1234 = $accountsRowset->current();
 
 
 $bugsAssignedToUser = $user1234->findDependentRowset('Bugs', 'Engineer');
 $bugsAssignedToUser = $user1234->findDependentRowset('Bugs', 'Engineer');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -290,9 +278,7 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs', 'Engineer');
         </para>
         </para>
 
 
         <para>
         <para>
-
             <example id="zend.db.table.relationships.fetching.dependent.example-by-select">
             <example id="zend.db.table.relationships.fetching.dependent.example-by-select">
-
                 <title>Fetching a Dependent Rowset using a Zend_Db_Table_Select</title>
                 <title>Fetching a Dependent Rowset using a Zend_Db_Table_Select</title>
 
 
                 <para>
                 <para>
@@ -312,7 +298,6 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
                                                      'Engineer',
                                                      'Engineer',
                                                      $select);
                                                      $select);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             Alternatively, you can query rows from a dependent table using a special mechanism
             Alternatively, you can query rows from a dependent table using a special mechanism
@@ -343,7 +328,6 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 Some application frameworks, such as Ruby on Rails, use a mechanism called
                 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
                 "inflection" to allow the spelling of identifiers to change depending on usage. For
@@ -351,11 +335,9 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
                 mechanism. The table identity and the rule key named in the method call must match
                 mechanism. The table identity and the rule key named in the method call must match
                 the spelling of the class and rule key exactly.
                 the spelling of the class and rule key exactly.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <example id="zend.db.table.relationships.fetching.dependent.example-magic">
         <example id="zend.db.table.relationships.fetching.dependent.example-magic">
-
             <title>Fetching Dependent Rowsets using the Magic Method</title>
             <title>Fetching Dependent Rowsets using the Magic Method</title>
 
 
             <para>
             <para>
@@ -375,13 +357,10 @@ $bugsReportedBy = $user1234->findBugs();
 // Specify the reference rule
 // Specify the reference rule
 $bugsAssignedTo = $user1234->findBugsByEngineer();
 $bugsAssignedTo = $user1234->findBugsByEngineer();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.relationships.fetching.parent">
     <sect2 id="zend.db.table.relationships.fetching.parent">
-
         <title>Fetching a Parent Row</title>
         <title>Fetching a Parent Row</title>
 
 
         <para>
         <para>
@@ -405,7 +384,6 @@ $row->findParentRow($table, [$rule]);
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.parent.example">
         <example id="zend.db.table.relationships.fetching.parent.example">
-
             <title>Fetching the Parent Row</title>
             <title>Fetching the Parent Row</title>
 
 
             <para>
             <para>
@@ -421,7 +399,6 @@ $bug1 = $bugsRowset->current();
 
 
 $reporter = $bug1->findParentRow('Accounts');
 $reporter = $bug1->findParentRow('Accounts');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -437,7 +414,6 @@ $reporter = $bug1->findParentRow('Accounts');
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.parent.example-by">
         <example id="zend.db.table.relationships.fetching.parent.example-by">
-
             <title>Fetching a Parent Row By a Specific Rule</title>
             <title>Fetching a Parent Row By a Specific Rule</title>
 
 
             <para>
             <para>
@@ -454,7 +430,6 @@ $bug1 = $bugsRowset->current();
 
 
 $engineer = $bug1->findParentRow('Accounts', 'Engineer');
 $engineer = $bug1->findParentRow('Accounts', 'Engineer');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -486,16 +461,13 @@ $engineer = $bug1->findParentRow('Accounts', 'Engineer');
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 The table identity and the rule key named in the method call must match the
                 The table identity and the rule key named in the method call must match the
                 spelling of the class and rule key exactly.
                 spelling of the class and rule key exactly.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <example id="zend.db.table.relationships.fetching.parent.example-magic">
         <example id="zend.db.table.relationships.fetching.parent.example-magic">
-
             <title>Fetching the Parent Row using the Magic Method</title>
             <title>Fetching the Parent Row using the Magic Method</title>
 
 
             <para>
             <para>
@@ -515,13 +487,10 @@ $reporter = $bug1->findParentAccounts();
 // Specify the reference rule
 // Specify the reference rule
 $engineer = $bug1->findParentAccountsByEngineer();
 $engineer = $bug1->findParentAccountsByEngineer();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.relationships.fetching.many-to-many">
     <sect2 id="zend.db.table.relationships.fetching.many-to-many">
-
         <title>Fetching a Rowset via a Many-to-many Relationship</title>
         <title>Fetching a Rowset via a Many-to-many Relationship</title>
 
 
         <para>
         <para>
@@ -562,7 +531,6 @@ $row->findManyToManyRowset($table,
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.many-to-many.example">
         <example id="zend.db.table.relationships.fetching.many-to-many.example">
-
             <title>Fetching a Rowset with the Many-to-many Method</title>
             <title>Fetching a Rowset with the Many-to-many Method</title>
 
 
             <para>
             <para>
@@ -579,7 +547,6 @@ $bug1234 = $bugsRowset->current();
 $productsRowset = $bug1234->findManyToManyRowset('Products',
 $productsRowset = $bug1234->findManyToManyRowset('Products',
                                                  'BugsProducts');
                                                  'BugsProducts');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -614,7 +581,6 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.fetching.many-to-many.example-by">
         <example id="zend.db.table.relationships.fetching.many-to-many.example-by">
-
             <title>Fetching a Rowset with the Many-to-many Method By a Specific Rule</title>
             <title>Fetching a Rowset with the Many-to-many Method By a Specific Rule</title>
 
 
             <para>
             <para>
@@ -632,7 +598,6 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
                                                  'BugsProducts',
                                                  'BugsProducts',
                                                  'Bug');
                                                  'Bug');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -676,16 +641,13 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 The table identities and the rule keys named in the method call must match the
                 The table identities and the rule keys named in the method call must match the
                 spelling of the class and rule key exactly.
                 spelling of the class and rule key exactly.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <example id="zend.db.table.relationships.fetching.many-to-many.example-magic">
         <example id="zend.db.table.relationships.fetching.many-to-many.example-magic">
-
             <title>Fetching Rowsets using the Magic Many-to-many Method</title>
             <title>Fetching Rowsets using the Magic Many-to-many Method</title>
 
 
             <para>
             <para>
@@ -704,17 +666,13 @@ $products = $bug1234->findProductsViaBugsProducts();
 // Specify the reference rule
 // Specify the reference rule
 $products = $bug1234->findProductsViaBugsProductsByBug();
 $products = $bug1234->findProductsViaBugsProductsByBug();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.relationships.cascading">
     <sect2 id="zend.db.table.relationships.cascading">
-
         <title>Cascading Write Operations</title>
         <title>Cascading Write Operations</title>
 
 
         <note>
         <note>
-
             <title>Declare DRI in the database:</title>
             <title>Declare DRI in the database:</title>
 
 
             <para>
             <para>
@@ -742,7 +700,6 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
                 Most importantly, do not declare cascading operations both in the
                 Most importantly, do not declare cascading operations both in the
                 <acronym>RDBMS</acronym> and in your <classname>Zend_Db_Table</classname> class.
                 <acronym>RDBMS</acronym> and in your <classname>Zend_Db_Table</classname> class.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <para>
         <para>
@@ -752,7 +709,6 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.cascading.example-delete">
         <example id="zend.db.table.relationships.cascading.example-delete">
-
             <title>Example of a Cascading Delete</title>
             <title>Example of a Cascading Delete</title>
 
 
             <para>
             <para>
@@ -769,7 +725,6 @@ $product1234->delete();
 // Automatically cascades to Bugs table
 // Automatically cascades to Bugs table
 // and deletes dependent rows.
 // and deletes dependent rows.
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -796,7 +751,6 @@ $product1234->delete();
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.cascading.example-declaration">
         <example id="zend.db.table.relationships.cascading.example-declaration">
-
             <title>Example Declaration of Cascading Operations</title>
             <title>Example Declaration of Cascading Operations</title>
 
 
             <para>
             <para>
@@ -829,11 +783,9 @@ class BugsProducts extends Zend_Db_Table_Abstract
     );
     );
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <sect3 id="zend.db.table.relationships.cascading.notes">
         <sect3 id="zend.db.table.relationships.cascading.notes">
-
             <title>Notes Regarding Cascading Operations</title>
             <title>Notes Regarding Cascading Operations</title>
 
 
             <para>
             <para>
@@ -899,11 +851,8 @@ class BugsProducts extends Zend_Db_Table_Abstract
                 row to a parent table in one operation, and insert row(s) to a dependent table in a
                 row to a parent table in one operation, and insert row(s) to a dependent table in a
                 separate operation.
                 separate operation.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 0 - 163
documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.db.table">
 <sect1 id="zend.db.table">
-
     <title>Zend_Db_Table</title>
     <title>Zend_Db_Table</title>
 
 
     <sect2 id="zend.db.table.introduction">
     <sect2 id="zend.db.table.introduction">
-
         <title>Introduction</title>
         <title>Introduction</title>
 
 
         <para>
         <para>
@@ -21,7 +19,6 @@
             <ulink url="http://www.martinfowler.com/eaaCatalog/rowDataGateway.html">Row Data
             <ulink url="http://www.martinfowler.com/eaaCatalog/rowDataGateway.html">Row Data
             Gateway</ulink> pattern.
             Gateway</ulink> pattern.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.concrete">
     <sect2 id="zend.db.table.concrete">
@@ -35,14 +32,12 @@
         </para>
         </para>
 
 
         <example id="zend.db.table.defining.concrete-instantiation.example1">
         <example id="zend.db.table.defining.concrete-instantiation.example1">
-
             <title>Declaring a table class with just the string name</title>
             <title>Declaring a table class with just the string name</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 Zend_Db_Table::setDefaultAdapter($dbAdapter);
 Zend_Db_Table::setDefaultAdapter($dbAdapter);
 $bugTable = new Zend_Db_Table('bug');
 $bugTable = new Zend_Db_Table('bug');
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -52,11 +47,9 @@ $bugTable = new Zend_Db_Table('bug');
             relationhip features, see the <classname>Zend_Db_Table_Definition</classname>
             relationhip features, see the <classname>Zend_Db_Table_Definition</classname>
             documentation.
             documentation.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.defining">
     <sect2 id="zend.db.table.defining">
-
         <title>Defining a Table Class</title>
         <title>Defining a Table Class</title>
 
 
         <para>
         <para>
@@ -65,7 +58,6 @@ $bugTable = new Zend_Db_Table('bug');
         </para>
         </para>
 
 
         <sect3 id="zend.db.table.defining.table-schema">
         <sect3 id="zend.db.table.defining.table-schema">
-
             <title>Defining the Table Name and Schema</title>
             <title>Defining the Table Name and Schema</title>
 
 
             <para>
             <para>
@@ -75,7 +67,6 @@ $bugTable = new Zend_Db_Table('bug');
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.table-schema.example1">
             <example id="zend.db.table.defining.table-schema.example1">
-
                 <title>Declaring a table class with explicit table name</title>
                 <title>Declaring a table class with explicit table name</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -84,7 +75,6 @@ class Bugs extends Zend_Db_Table_Abstract
     protected $_name = 'bugs';
     protected $_name = 'bugs';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -94,7 +84,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.table-schema.example">
             <example id="zend.db.table.defining.table-schema.example">
-
                 <title>Declaring a table class with implicit table name</title>
                 <title>Declaring a table class with implicit table name</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -103,7 +92,6 @@ class bugs extends Zend_Db_Table_Abstract
     // table name matches class name
     // table name matches class name
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -116,7 +104,6 @@ class bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.table-schema.example3">
             <example id="zend.db.table.defining.table-schema.example3">
-
                 <title>Declaring a table class with schema</title>
                 <title>Declaring a table class with schema</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -142,7 +129,6 @@ class Bugs extends Zend_Db_Table_Abstract
     protected $_schema = 'ignored';
     protected $_schema = 'ignored';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -154,7 +140,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.table-schema.example.constructor">
             <example id="zend.db.table.defining.table-schema.example.constructor">
-
                 <title>Declaring table and schema names upon instantiation</title>
                 <title>Declaring table and schema names upon instantiation</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -176,18 +161,15 @@ $tableBugs = new Bugs(array('name' => 'bug_db.bugs'));
 $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
 $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
                             'schema' => 'ignored'));
                             'schema' => 'ignored'));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 If you don't specify the schema name, it defaults to the schema to which your
                 If you don't specify the schema name, it defaults to the schema to which your
                 database adapter instance is connected.
                 database adapter instance is connected.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.defining.primary-key">
         <sect3 id="zend.db.table.defining.primary-key">
-
             <title>Defining the Table Primary Key</title>
             <title>Defining the Table Primary Key</title>
 
 
             <para>
             <para>
@@ -198,7 +180,6 @@ $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.primary-key.example">
             <example id="zend.db.table.defining.primary-key.example">
-
                 <title>Example of specifying the primary key</title>
                 <title>Example of specifying the primary key</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -208,7 +189,6 @@ class Bugs extends Zend_Db_Table_Abstract
     protected $_primary = 'bug_id';
     protected $_primary = 'bug_id';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -218,7 +198,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     Every table class must know which column(s) can be used to address rows
                     Every table class must know which column(s) can be used to address rows
                     uniquely. If no primary key column(s) are specified in the table class
                     uniquely. If no primary key column(s) are specified in the table class
@@ -226,13 +205,10 @@ class Bugs extends Zend_Db_Table_Abstract
                     metadata provided by <methodname>describeTable()</methodname>, then the table
                     metadata provided by <methodname>describeTable()</methodname>, then the table
                     cannot be used with <classname>Zend_Db_Table</classname>.
                     cannot be used with <classname>Zend_Db_Table</classname>.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.defining.setup">
         <sect3 id="zend.db.table.defining.setup">
-
             <title>Overriding Table Setup Methods</title>
             <title>Overriding Table Setup Methods</title>
 
 
             <para>
             <para>
@@ -243,7 +219,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.setup.example">
             <example id="zend.db.table.defining.setup.example">
-
                 <title>Example of overriding the _setupTableName() method</title>
                 <title>Example of overriding the _setupTableName() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -256,7 +231,6 @@ class Bugs extends Zend_Db_Table_Abstract
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -301,11 +275,9 @@ class Bugs extends Zend_Db_Table_Abstract
                     </para>
                     </para>
                 </listitem>
                 </listitem>
             </itemizedlist>
             </itemizedlist>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.initialization">
         <sect3 id="zend.db.table.initialization">
-
             <title>Table initialization</title>
             <title>Table initialization</title>
 
 
             <para>
             <para>
@@ -317,7 +289,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.defining.init.usage.example">
             <example id="zend.db.table.defining.init.usage.example">
-
                 <title>Example usage of init() method</title>
                 <title>Example usage of init() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -331,15 +302,11 @@ class Bugs extends Zend_Db_Table_Abstract
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.constructing">
     <sect2 id="zend.db.table.constructing">
-
         <title>Creating an Instance of a Table</title>
         <title>Creating an Instance of a Table</title>
 
 
         <para>
         <para>
@@ -351,7 +318,6 @@ class Bugs extends Zend_Db_Table_Abstract
         </para>
         </para>
 
 
         <sect3 id="zend.db.table.constructing.adapter">
         <sect3 id="zend.db.table.constructing.adapter">
-
             <title>Specifying a Database Adapter</title>
             <title>Specifying a Database Adapter</title>
 
 
             <para>
             <para>
@@ -361,7 +327,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.constructing.adapter.example">
             <example id="zend.db.table.constructing.adapter.example">
-
                 <title>Example of constructing a Table using an Adapter object</title>
                 <title>Example of constructing a Table using an Adapter object</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -369,13 +334,10 @@ $db = Zend_Db::factory('PDO_MYSQL', $options);
 
 
 $table = new Bugs(array('db' => $db));
 $table = new Bugs(array('db' => $db));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.constructing.default-adapter">
         <sect3 id="zend.db.table.constructing.default-adapter">
-
             <title>Setting a Default Database Adapter</title>
             <title>Setting a Default Database Adapter</title>
 
 
             <para>
             <para>
@@ -388,7 +350,6 @@ $table = new Bugs(array('db' => $db));
             </para>
             </para>
 
 
             <example id="zend.db.table.constructing.default-adapter.example">
             <example id="zend.db.table.constructing.default-adapter.example">
-
                 <title>Example of constructing a Table using a the Default Adapter</title>
                 <title>Example of constructing a Table using a the Default Adapter</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -399,7 +360,6 @@ Zend_Db_Table_Abstract::setDefaultAdapter($db);
 
 
 $table = new Bugs();
 $table = new Bugs();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -409,11 +369,9 @@ $table = new Bugs();
                 your application. However, setting a default adapter is limited to a single adapter
                 your application. However, setting a default adapter is limited to a single adapter
                 instance.
                 instance.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.constructing.registry">
         <sect3 id="zend.db.table.constructing.registry">
-
             <title>Storing a Database Adapter in the Registry</title>
             <title>Storing a Database Adapter in the Registry</title>
 
 
             <para>
             <para>
@@ -425,7 +383,6 @@ $table = new Bugs();
             </para>
             </para>
 
 
             <example id="zend.db.table.constructing.registry.example">
             <example id="zend.db.table.constructing.registry.example">
-
                 <title>Example of constructing a Table using a Registry key</title>
                 <title>Example of constructing a Table using a Registry key</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -436,7 +393,6 @@ Zend_Registry::set('my_db', $db);
 
 
 $table = new Bugs(array('db' => 'my_db'));
 $table = new Bugs(array('db' => 'my_db'));
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -447,13 +403,10 @@ $table = new Bugs(array('db' => 'my_db'));
                 instance. If your application needs access to multiple databases or even multiple
                 instance. If your application needs access to multiple databases or even multiple
                 database brands, then you need to use multiple adapters.
                 database brands, then you need to use multiple adapters.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.insert">
     <sect2 id="zend.db.table.insert">
-
         <title>Inserting Rows to a Table</title>
         <title>Inserting Rows to a Table</title>
 
 
         <para>
         <para>
@@ -463,7 +416,6 @@ $table = new Bugs(array('db' => 'my_db'));
         </para>
         </para>
 
 
         <example id="zend.db.table.insert.example">
         <example id="zend.db.table.insert.example">
-
             <title>Example of inserting to a Table</title>
             <title>Example of inserting to a Table</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -477,7 +429,6 @@ $data = array(
 
 
 $table->insert($data);
 $table->insert($data);
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -488,7 +439,6 @@ $table->insert($data);
         </para>
         </para>
 
 
         <example id="zend.db.table.insert.example-expr">
         <example id="zend.db.table.insert.example-expr">
-
             <title>Example of inserting expressions to a Table</title>
             <title>Example of inserting expressions to a Table</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -500,7 +450,6 @@ $data = array(
     'bug_status'      => 'NEW'
     'bug_status'      => 'NEW'
 );
 );
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -511,7 +460,6 @@ $data = array(
         </para>
         </para>
 
 
         <sect3 id="zend.db.table.insert.key-auto">
         <sect3 id="zend.db.table.insert.key-auto">
-
             <title>Using a Table with an Auto-incrementing Key</title>
             <title>Using a Table with an Auto-incrementing Key</title>
 
 
             <para>
             <para>
@@ -528,7 +476,6 @@ $data = array(
             </para>
             </para>
 
 
             <example id="zend.db.table.insert.key-auto.example">
             <example id="zend.db.table.insert.key-auto.example">
-
                 <title>Example of declaring a Table with auto-incrementing primary key</title>
                 <title>Example of declaring a Table with auto-incrementing primary key</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -541,7 +488,6 @@ class Bugs extends Zend_Db_Table_Abstract
     protected $_sequence = true;
     protected $_sequence = true;
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -558,11 +504,9 @@ class Bugs extends Zend_Db_Table_Abstract
                 with respect to declaring the <varname>$_sequence</varname> member as
                 with respect to declaring the <varname>$_sequence</varname> member as
                 <constant>TRUE</constant>.
                 <constant>TRUE</constant>.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.insert.key-sequence">
         <sect3 id="zend.db.table.insert.key-sequence">
-
             <title>Using a Table with a Sequence</title>
             <title>Using a Table with a Sequence</title>
 
 
             <para>
             <para>
@@ -578,7 +522,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.insert.key-sequence.example">
             <example id="zend.db.table.insert.key-sequence.example">
-
                 <title>Example of declaring a Table with a sequence</title>
                 <title>Example of declaring a Table with a sequence</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -589,7 +532,6 @@ class Bugs extends Zend_Db_Table_Abstract
     protected $_sequence = 'bug_sequence';
     protected $_sequence = 'bug_sequence';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -603,11 +545,9 @@ class Bugs extends Zend_Db_Table_Abstract
                 auto-incrementing key column. Define the sequence name as a string only in cases
                 auto-incrementing key column. Define the sequence name as a string only in cases
                 where you would invoke the sequence explicitly to get the next key value.
                 where you would invoke the sequence explicitly to get the next key value.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.insert.key-natural">
         <sect3 id="zend.db.table.insert.key-natural">
-
             <title>Using a Table with a Natural Key</title>
             <title>Using a Table with a Natural Key</title>
 
 
             <para>
             <para>
@@ -625,7 +565,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.insert.key-natural.example">
             <example id="zend.db.table.insert.key-natural.example">
-
                 <title>Example of declaring a Table with a natural key</title>
                 <title>Example of declaring a Table with a natural key</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -636,26 +575,20 @@ class BugStatus extends Zend_Db_Table_Abstract
     protected $_sequence = false;
     protected $_sequence = false;
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     All <acronym>RDBMS</acronym> brands support tables with natural keys. Examples
                     All <acronym>RDBMS</acronym> brands support tables with natural keys. Examples
                     of tables that are often declared as having natural keys are lookup tables,
                     of tables that are often declared as having natural keys are lookup tables,
                     intersection tables in many-to-many relationships, or most tables with compound
                     intersection tables in many-to-many relationships, or most tables with compound
                     primary keys.
                     primary keys.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.update">
     <sect2 id="zend.db.table.update">
-
         <title>Updating Rows in a Table</title>
         <title>Updating Rows in a Table</title>
 
 
         <para>
         <para>
@@ -667,7 +600,6 @@ class BugStatus extends Zend_Db_Table_Abstract
         </para>
         </para>
 
 
         <example id="zend.db.table.update.example">
         <example id="zend.db.table.update.example">
-
             <title>Example of updating rows in a Table</title>
             <title>Example of updating rows in a Table</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -682,7 +614,6 @@ $where = $table->getAdapter()->quoteInto('bug_id = ?', 1234);
 
 
 $table->update($data, $where);
 $table->update($data, $where);
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -693,7 +624,6 @@ $table->update($data, $where);
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
                 The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
                 for you. If you have values or identifiers that require quoting, you are responsible
                 for you. If you have values or identifiers that require quoting, you are responsible
@@ -701,13 +631,10 @@ $table->update($data, $where);
                 <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
                 <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
                 methods of the database adapter.
                 methods of the database adapter.
             </para>
             </para>
-
         </note>
         </note>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.delete">
     <sect2 id="zend.db.table.delete">
-
         <title>Deleting Rows from a Table</title>
         <title>Deleting Rows from a Table</title>
 
 
         <para>
         <para>
@@ -717,7 +644,6 @@ $table->update($data, $where);
         </para>
         </para>
 
 
         <example id="zend.db.table.delete.example">
         <example id="zend.db.table.delete.example">
-
             <title>Example of deleting rows from a Table</title>
             <title>Example of deleting rows from a Table</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -727,7 +653,6 @@ $where = $table->getAdapter()->quoteInto('bug_id = ?', 1235);
 
 
 $table->delete($where);
 $table->delete($where);
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -738,7 +663,6 @@ $table->delete($where);
         </para>
         </para>
 
 
         <note>
         <note>
-
             <para>
             <para>
                 The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
                 The values and identifiers in the <acronym>SQL</acronym> expression are not quoted
                 for you. If you have values or identifiers that require quoting, you are responsible
                 for you. If you have values or identifiers that require quoting, you are responsible
@@ -746,13 +670,10 @@ $table->delete($where);
                 <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
                 <methodname>quoteInto()</methodname>, and <methodname>quoteIdentifier()</methodname>
                 methods of the database adapter.
                 methods of the database adapter.
             </para>
             </para>
-
         </note>
         </note>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.find">
     <sect2 id="zend.db.table.find">
-
         <title>Finding Rows by Primary Key</title>
         <title>Finding Rows by Primary Key</title>
 
 
         <para>
         <para>
@@ -763,7 +684,6 @@ $table->delete($where);
         </para>
         </para>
 
 
         <example id="zend.db.table.find.example">
         <example id="zend.db.table.find.example">
-
             <title>Example of finding rows by primary key values</title>
             <title>Example of finding rows by primary key values</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -777,7 +697,6 @@ $rows = $table->find(1234);
 // Also returns a Rowset
 // Also returns a Rowset
 $rows = $table->find(array(1234, 5678));
 $rows = $table->find(array(1234, 5678));
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -811,7 +730,6 @@ $rows = $table->find(array(1234, 5678));
         </para>
         </para>
 
 
         <example id="zend.db.table.find.example-compound">
         <example id="zend.db.table.find.example-compound">
-
             <title>Example of finding rows by compound primary key values</title>
             <title>Example of finding rows by compound primary key values</title>
 
 
             <para>
             <para>
@@ -837,23 +755,17 @@ $rows = $table->find(1234, 'ABC');
 // Also returns a Rowset
 // Also returns a Rowset
 $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
 $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.fetch-all">
     <sect2 id="zend.db.table.fetch-all">
-
         <title>Querying for a Set of Rows</title>
         <title>Querying for a Set of Rows</title>
 
 
         <sect3 id="zend.db.table.fetch-all.select">
         <sect3 id="zend.db.table.fetch-all.select">
-
             <title>Select API</title>
             <title>Select API</title>
 
 
             <para>
             <para>
-
                 <warning>
                 <warning>
-
                     <para>
                     <para>
                         The <acronym>API</acronym> for fetch operations has been superseded to allow
                         The <acronym>API</acronym> for fetch operations has been superseded to allow
                         a <classname>Zend_Db_Table_Select</classname> object to modify the query.
                         a <classname>Zend_Db_Table_Select</classname> object to modify the query.
@@ -869,7 +781,6 @@ $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
                     </para>
                     </para>
 
 
                     <para>
                     <para>
-
                         <programlisting language="php"><![CDATA[
                         <programlisting language="php"><![CDATA[
 /**
 /**
  * Fetching a rowset
  * Fetching a rowset
@@ -915,11 +826,8 @@ $row = $table->fetchRow(
         ->order('bug_id ASC')
         ->order('bug_id ASC')
     );
     );
 ]]></programlisting>
 ]]></programlisting>
-
                     </para>
                     </para>
-
                 </warning>
                 </warning>
-
             </para>
             </para>
 
 
             <para>
             <para>
@@ -968,9 +876,7 @@ $row = $table->fetchRow(
             </itemizedlist>
             </itemizedlist>
 
 
             <para>
             <para>
-
                 <example id="zend.db.table.qry.rows.set.simple.usage.example">
                 <example id="zend.db.table.qry.rows.set.simple.usage.example">
-
                     <title>Simple usage</title>
                     <title>Simple usage</title>
 
 
                     <programlisting language="php"><![CDATA[
                     <programlisting language="php"><![CDATA[
@@ -981,9 +887,7 @@ $select->where('bug_status = ?', 'NEW');
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
                 </example>
                 </example>
-
             </para>
             </para>
 
 
             <para>
             <para>
@@ -994,7 +898,6 @@ $rows = $table->fetchAll($select);
             <para>
             <para>
 
 
                 <example id="zend.db.table.qry.rows.set.fluent.interface.example">
                 <example id="zend.db.table.qry.rows.set.fluent.interface.example">
-
                     <title>Example of fluent interface</title>
                     <title>Example of fluent interface</title>
 
 
                     <programlisting language="php"><![CDATA[
                     <programlisting language="php"><![CDATA[
@@ -1003,15 +906,11 @@ $table = new Bugs();
 $rows =
 $rows =
     $table->fetchAll($table->select()->where('bug_status = ?', 'NEW'));
     $table->fetchAll($table->select()->where('bug_status = ?', 'NEW'));
 ]]></programlisting>
 ]]></programlisting>
-
                 </example>
                 </example>
-
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.fetch-all.usage">
         <sect3 id="zend.db.table.fetch-all.usage">
-
             <title>Fetching a rowset</title>
             <title>Fetching a rowset</title>
 
 
             <para>
             <para>
@@ -1022,7 +921,6 @@ $rows =
             </para>
             </para>
 
 
             <example id="zend.db.table.qry.rows.set.finding.row.example">
             <example id="zend.db.table.qry.rows.set.finding.row.example">
-
                 <title>Example of finding rows by an expression</title>
                 <title>Example of finding rows by an expression</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1032,7 +930,6 @@ $select = $table->select()->where('bug_status = ?', 'NEW');
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -1044,7 +941,6 @@ $rows = $table->fetchAll($select);
             </para>
             </para>
 
 
             <example id="zend.db.table.fetch-all.example2">
             <example id="zend.db.table.fetch-all.example2">
-
                 <title>Example of finding rows by an expression</title>
                 <title>Example of finding rows by an expression</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1062,7 +958,6 @@ $select = $table->select()->where('bug_status = ?', 'NEW')
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -1070,11 +965,9 @@ $rows = $table->fetchAll($select);
                 set includes rows from the table in an unpredictable order. If no LIMIT clause is
                 set includes rows from the table in an unpredictable order. If no LIMIT clause is
                 set, you retrieve every row in the table that matches the WHERE clause.
                 set, you retrieve every row in the table that matches the WHERE clause.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.advanced.usage">
         <sect3 id="zend.db.table.advanced.usage">
-
             <title>Advanced usage</title>
             <title>Advanced usage</title>
 
 
             <para>
             <para>
@@ -1087,9 +980,7 @@ $rows = $table->fetchAll($select);
             </para>
             </para>
 
 
             <para>
             <para>
-
                 <example id="zend.db.table.qry.rows.set.retrieving.a.example">
                 <example id="zend.db.table.qry.rows.set.retrieving.a.example">
-
                     <title>Retrieving specific columns</title>
                     <title>Retrieving specific columns</title>
 
 
                     <programlisting language="php"><![CDATA[
                     <programlisting language="php"><![CDATA[
@@ -1101,21 +992,16 @@ $select->from($table, array('bug_id', 'bug_description'))
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
                 </example>
                 </example>
-
             </para>
             </para>
 
 
             <para>
             <para>
-
                 <important>
                 <important>
-
                     <para>
                     <para>
                         The rowset contains rows that are still 'valid' - they simply contain a
                         The rowset contains rows that are still 'valid' - they simply contain a
                         subset of the columns of a table. If a save() method is called on a partial
                         subset of the columns of a table. If a save() method is called on a partial
                         row then only the fields available will be modified.
                         row then only the fields available will be modified.
                     </para>
                     </para>
-
                 </important>
                 </important>
 
 
                 You can also specify expressions within a FROM clause and have these returned as a
                 You can also specify expressions within a FROM clause and have these returned as a
@@ -1126,9 +1012,7 @@ $rows = $table->fetchAll($select);
             </para>
             </para>
 
 
             <para>
             <para>
-
                 <example id="zend.db.table.qry.rows.set.retrieving.b.example">
                 <example id="zend.db.table.qry.rows.set.retrieving.b.example">
-
                     <title>Retrieving expressions as columns</title>
                     <title>Retrieving expressions as columns</title>
 
 
                     <programlisting language="php"><![CDATA[
                     <programlisting language="php"><![CDATA[
@@ -1142,7 +1026,6 @@ $select->from($table,
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
                 </example>
                 </example>
 
 
                 You can also use a lookup as part of your query to further refine your fetch
                 You can also use a lookup as part of your query to further refine your fetch
@@ -1151,9 +1034,7 @@ $rows = $table->fetchAll($select);
             </para>
             </para>
 
 
             <para>
             <para>
-
                 <example id="zend.db.table.qry.rows.set.refine.example">
                 <example id="zend.db.table.qry.rows.set.refine.example">
-
                     <title>Using a lookup table to refine the results of fetchAll()</title>
                     <title>Using a lookup table to refine the results of fetchAll()</title>
 
 
                     <programlisting language="php"><![CDATA[
                     <programlisting language="php"><![CDATA[
@@ -1168,9 +1049,7 @@ $select->setIntegrityCheck(false)
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
                 </example>
                 </example>
-
             </para>
             </para>
 
 
             <para>
             <para>
@@ -1185,7 +1064,6 @@ $rows = $table->fetchAll($select);
             </para>
             </para>
 
 
             <example id="zend.db.table.qry.rows.set.integrity.example">
             <example id="zend.db.table.qry.rows.set.integrity.example">
-
                 <title>
                 <title>
                     Removing the integrity check on Zend_Db_Table_Select to allow JOINed rows
                     Removing the integrity check on Zend_Db_Table_Select to allow JOINed rows
                 </title>
                 </title>
@@ -1203,15 +1081,11 @@ $select->where('bug_status = ?', 'NEW')
 
 
 $rows = $table->fetchAll($select);
 $rows = $table->fetchAll($select);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.fetch-row">
     <sect2 id="zend.db.table.fetch-row">
-
         <title>Querying for a Single Row</title>
         <title>Querying for a Single Row</title>
 
 
         <para>
         <para>
@@ -1220,7 +1094,6 @@ $rows = $table->fetchAll($select);
         </para>
         </para>
 
 
         <example id="zend.db.table.fetch-row.example1">
         <example id="zend.db.table.fetch-row.example1">
-
             <title>Example of finding a single row by an expression</title>
             <title>Example of finding a single row by an expression</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -1231,7 +1104,6 @@ $select  = $table->select()->where('bug_status = ?', 'NEW')
 
 
 $row = $table->fetchRow($select);
 $row = $table->fetchRow($select);
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -1240,11 +1112,9 @@ $row = $table->fetchRow($select);
             <methodname>fetchRow()</methodname> returns <acronym>PHP</acronym>'s
             <methodname>fetchRow()</methodname> returns <acronym>PHP</acronym>'s
             <constant>NULL</constant> value.
             <constant>NULL</constant> value.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.info">
     <sect2 id="zend.db.table.info">
-
         <title>Retrieving Table Metadata Information</title>
         <title>Retrieving Table Metadata Information</title>
 
 
         <para>
         <para>
@@ -1254,7 +1124,6 @@ $row = $table->fetchRow($select);
         </para>
         </para>
 
 
         <example id="zend.db.table.info.example">
         <example id="zend.db.table.info.example">
-
             <title>Example of getting the table name</title>
             <title>Example of getting the table name</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -1264,7 +1133,6 @@ $info = $table->info();
 
 
 echo "The table name is " . $info['name'] . "\n";
 echo "The table name is " . $info['name'] . "\n";
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -1340,11 +1208,9 @@ echo "The table name is " . $info['name'] . "\n";
                 </para>
                 </para>
             </listitem>
             </listitem>
         </itemizedlist>
         </itemizedlist>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.metadata.caching">
     <sect2 id="zend.db.table.metadata.caching">
-
         <title>Caching Table Metadata</title>
         <title>Caching Table Metadata</title>
 
 
         <para>
         <para>
@@ -1358,9 +1224,7 @@ echo "The table name is " . $info['name'] . "\n";
 
 
         <itemizedlist>
         <itemizedlist>
             <listitem><para><methodname>insert()</methodname></para></listitem>
             <listitem><para><methodname>insert()</methodname></para></listitem>
-
             <listitem><para><methodname>find()</methodname></para></listitem>
             <listitem><para><methodname>find()</methodname></para></listitem>
-
             <listitem><para><methodname>info()</methodname></para></listitem>
             <listitem><para><methodname>info()</methodname></para></listitem>
         </itemizedlist>
         </itemizedlist>
 
 
@@ -1403,7 +1267,6 @@ echo "The table name is " . $info['name'] . "\n";
         </para>
         </para>
 
 
         <example id="zend.db.table.metadata.caching-default">
         <example id="zend.db.table.metadata.caching-default">
-
             <title>Using a Default Metadata Cache for all Table Objects</title>
             <title>Using a Default Metadata Cache for all Table Objects</title>
 
 
             <para>
             <para>
@@ -1438,11 +1301,9 @@ class Bugs extends Zend_Db_Table_Abstract
 // Each instance of Bugs now uses the default metadata cache
 // Each instance of Bugs now uses the default metadata cache
 $bugs = new Bugs();
 $bugs = new Bugs();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <example id="zend.db.table.metadata.caching-instance">
         <example id="zend.db.table.metadata.caching-instance">
-
             <title>Using a Metadata Cache for a Specific Table Object</title>
             <title>Using a Metadata Cache for a Specific Table Object</title>
 
 
             <para>
             <para>
@@ -1474,11 +1335,9 @@ class Bugs extends Zend_Db_Table_Abstract
 // Configure an instance upon instantiation
 // Configure an instance upon instantiation
 $bugs = new Bugs(array('metadataCache' => $cache));
 $bugs = new Bugs(array('metadataCache' => $cache));
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <note>
         <note>
-
             <title>Automatic Serialization with the Cache Frontend</title>
             <title>Automatic Serialization with the Cache Frontend</title>
 
 
             <para>
             <para>
@@ -1486,7 +1345,6 @@ $bugs = new Bugs(array('metadataCache' => $cache));
                 array, ensure that the <code>automatic_serialization</code> option is set to
                 array, ensure that the <code>automatic_serialization</code> option is set to
                 <constant>TRUE</constant> for the <classname>Zend_Cache_Core</classname> frontend.
                 <constant>TRUE</constant> for the <classname>Zend_Cache_Core</classname> frontend.
             </para>
             </para>
-
         </note>
         </note>
 
 
         <para>
         <para>
@@ -1559,11 +1417,9 @@ $bugs->setMetadataCacheInClass(false);
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.extending">
     <sect2 id="zend.db.table.extending">
-
         <title>Customizing and Extending a Table Class</title>
         <title>Customizing and Extending a Table Class</title>
 
 
         <sect3 id="zend.db.table.extending.row-rowset">
         <sect3 id="zend.db.table.extending.row-rowset">
-
             <title>Using Custom Row or Rowset Classes</title>
             <title>Using Custom Row or Rowset Classes</title>
 
 
             <para>
             <para>
@@ -1582,7 +1438,6 @@ $bugs->setMetadataCacheInClass(false);
             </para>
             </para>
 
 
             <example id="zend.db.table.extending.row-rowset.example">
             <example id="zend.db.table.extending.row-rowset.example">
-
                 <title>Example of specifying the Row and Rowset classes</title>
                 <title>Example of specifying the Row and Rowset classes</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1609,7 +1464,6 @@ $where = $table->getAdapter()->quoteInto('bug_status = ?', 'NEW')
 // containing an array of objects of type My_Row.
 // containing an array of objects of type My_Row.
 $rows = $table->fetchAll($where);
 $rows = $table->fetchAll($where);
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -1620,7 +1474,6 @@ $rows = $table->fetchAll($where);
             </para>
             </para>
 
 
             <example id="zend.db.table.extending.row-rowset.example2">
             <example id="zend.db.table.extending.row-rowset.example2">
-
                 <title>Example of changing the Row and Rowset classes</title>
                 <title>Example of changing the Row and Rowset classes</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1641,18 +1494,15 @@ $rowsCustom = $table->fetchAll($where);
 
 
 // The $rowsStandard object still exists, and it is unchanged.
 // The $rowsStandard object still exists, and it is unchanged.
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 For more information on the Row and Rowset classes, see
                 For more information on the Row and Rowset classes, see
                 <xref linkend="zend.db.table.row" /> and <xref linkend="zend.db.table.rowset" />.
                 <xref linkend="zend.db.table.row" /> and <xref linkend="zend.db.table.rowset" />.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.extending.insert-update">
         <sect3 id="zend.db.table.extending.insert-update">
-
             <title>Defining Custom Logic for Insert, Update, and Delete</title>
             <title>Defining Custom Logic for Insert, Update, and Delete</title>
 
 
             <para>
             <para>
@@ -1663,7 +1513,6 @@ $rowsCustom = $table->fetchAll($where);
             </para>
             </para>
 
 
             <example id="zend.db.table.extending.insert-update.example">
             <example id="zend.db.table.extending.insert-update.example">
-
                 <title>Custom logic to manage timestamps</title>
                 <title>Custom logic to manage timestamps</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1690,17 +1539,14 @@ class Bugs extends Zend_Db_Table_Abstract
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 You can also override the <methodname>delete()</methodname> method.
                 You can also override the <methodname>delete()</methodname> method.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.extending.finders">
         <sect3 id="zend.db.table.extending.finders">
-
             <title>Define Custom Search Methods in Zend_Db_Table</title>
             <title>Define Custom Search Methods in Zend_Db_Table</title>
 
 
             <para>
             <para>
@@ -1713,7 +1559,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.extending.finders.example">
             <example id="zend.db.table.extending.finders.example">
-
                 <title>Custom method to find bugs by status</title>
                 <title>Custom method to find bugs by status</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1728,13 +1573,10 @@ class Bugs extends Zend_Db_Table_Abstract
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.extending.inflection">
         <sect3 id="zend.db.table.extending.inflection">
-
             <title>Define Inflection in Zend_Db_Table</title>
             <title>Define Inflection in Zend_Db_Table</title>
 
 
             <para>
             <para>
@@ -1780,7 +1622,6 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.extending.inflection.example">
             <example id="zend.db.table.extending.inflection.example">
-
                 <title>Example of an abstract table class that implements inflection</title>
                 <title>Example of an abstract table class that implements inflection</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1799,18 +1640,14 @@ class BugsProducts extends MyAbstractTable
 {
 {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 You are responsible for writing the functions to perform inflection transformation.
                 You are responsible for writing the functions to perform inflection transformation.
                 Zend Framework does not provide such a function.
                 Zend Framework does not provide such a function.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 0 - 14
documentation/manual/en/module_specs/Zend_Db_Table_Definition.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.db.table.definition">
 <sect1 id="zend.db.table.definition">
-
     <title>Zend_Db_Table_Definition</title>
     <title>Zend_Db_Table_Definition</title>
 
 
     <sect2 id="zend.db.table.definition.introduction">
     <sect2 id="zend.db.table.definition.introduction">
-
         <title>Introduction</title>
         <title>Introduction</title>
 
 
         <para>
         <para>
@@ -13,11 +11,9 @@
             describe the relationships and configuration options that should be used when
             describe the relationships and configuration options that should be used when
             <classname>Zend_Db_Table</classname> is used via concrete instantiation.
             <classname>Zend_Db_Table</classname> is used via concrete instantiation.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.definition.usage">
     <sect2 id="zend.db.table.definition.usage">
-
         <title>Basic Usage</title>
         <title>Basic Usage</title>
 
 
         <para>
         <para>
@@ -36,7 +32,6 @@
         </para>
         </para>
 
 
         <example id="zend.db.table.definition.example1">
         <example id="zend.db.table.definition.example1">
-
             <title>Describing the Definition of a Database Data Model</title>
             <title>Describing the Definition of a Database Data Model</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -72,7 +67,6 @@ $definition = new Zend_Db_Table_Definition(array(
         )
         )
     ));
     ));
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -91,7 +85,6 @@ $definition = new Zend_Db_Table_Definition(array(
         </para>
         </para>
 
 
         <example id="zend.db.table.definition.example2">
         <example id="zend.db.table.definition.example2">
-
             <title>Interacting with the described definition</title>
             <title>Interacting with the described definition</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -117,13 +110,10 @@ foreach ($authors as $author) {
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.definition.advanced-usage">
     <sect2 id="zend.db.table.definition.advanced-usage">
-
         <title>Advanced Usage</title>
         <title>Advanced Usage</title>
 
 
         <para>
         <para>
@@ -142,7 +132,6 @@ foreach ($authors as $author) {
         </para>
         </para>
 
 
         <example id="zend.db.table.definition.example3">
         <example id="zend.db.table.definition.example3">
-
             <title>Interacting A Mixed Use Zend_Db_Table Definition</title>
             <title>Interacting A Mixed Use Zend_Db_Table Definition</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -202,9 +191,6 @@ foreach ($authors as $author) {
     }
     }
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>

+ 0 - 58
documentation/manual/en/module_specs/Zend_Db_Table_Row.xml

@@ -88,13 +88,10 @@ echo $row->bug_description;
                     inflection. Accessed property names need to match the spelling of the column
                     inflection. Accessed property names need to match the spelling of the column
                     names as they appear in your database.
                     names as they appear in your database.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.read.to-array">
         <sect3 id="zend.db.table.row.read.to-array">
-
             <title>Retrieving Row Data as an Array</title>
             <title>Retrieving Row Data as an Array</title>
 
 
             <para>
             <para>
@@ -104,7 +101,6 @@ echo $row->bug_description;
             </para>
             </para>
 
 
             <example id="zend.db.table.row.read.to-array.example">
             <example id="zend.db.table.row.read.to-array.example">
-
                 <title>Example of using the toArray() method</title>
                 <title>Example of using the toArray() method</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -120,7 +116,6 @@ foreach ($rowArray as $column => $value) {
     echo "Value:  $value\n";
     echo "Value:  $value\n";
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -128,11 +123,9 @@ foreach ($rowArray as $column => $value) {
                 can modify values in the array as you can with any array, but you cannot save
                 can modify values in the array as you can with any array, but you cannot save
                 changes to this array to the database directly.
                 changes to this array to the database directly.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.read.relationships">
         <sect3 id="zend.db.table.row.read.relationships">
-
             <title>Fetching data from related tables</title>
             <title>Fetching data from related tables</title>
 
 
             <para>
             <para>
@@ -162,7 +155,6 @@ foreach ($rowArray as $column => $value) {
             </para>
             </para>
 
 
             <example id="zend.db.table.row.write.set.example">
             <example id="zend.db.table.row.write.set.example">
-
                 <title>Example of changing a column in a row</title>
                 <title>Example of changing a column in a row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -175,13 +167,10 @@ $row->bug_status = 'FIXED';
 // UPDATE the row in the database with new values
 // UPDATE the row in the database with new values
 $row->save();
 $row->save();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.write.insert">
         <sect3 id="zend.db.table.row.write.insert">
-
             <title>Inserting a new row</title>
             <title>Inserting a new row</title>
 
 
             <para>
             <para>
@@ -192,7 +181,6 @@ $row->save();
             </para>
             </para>
 
 
             <example id="zend.db.table.row.write.insert.example">
             <example id="zend.db.table.row.write.insert.example">
-
                 <title>Example of creating a new row for a table</title>
                 <title>Example of creating a new row for a table</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -206,7 +194,6 @@ $newRow->bug_status = 'NEW';
 // INSERT the new row to the database
 // INSERT the new row to the database
 $newRow->save();
 $newRow->save();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
@@ -215,7 +202,6 @@ $newRow->save();
             </para>
             </para>
 
 
             <example id="zend.db.table.row.write.insert.example2">
             <example id="zend.db.table.row.write.insert.example2">
-
                 <title>Example of populating a new row for a table</title>
                 <title>Example of populating a new row for a table</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -230,11 +216,9 @@ $newRow = $bugs->createRow($data);
 // INSERT the new row to the database
 // INSERT the new row to the database
 $newRow->save();
 $newRow->save();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <para>
                 <para>
                     The <methodname>createRow()</methodname> method was called
                     The <methodname>createRow()</methodname> method was called
                     <methodname>fetchNew()</methodname> in earlier releases of
                     <methodname>fetchNew()</methodname> in earlier releases of
@@ -242,13 +226,10 @@ $newRow->save();
                     name, even though the old name continues to work for the sake of backward
                     name, even though the old name continues to work for the sake of backward
                     compatibility.
                     compatibility.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.write.set-from-array">
         <sect3 id="zend.db.table.row.write.set-from-array">
-
             <title>Changing values in multiple columns</title>
             <title>Changing values in multiple columns</title>
 
 
             <para>
             <para>
@@ -260,7 +241,6 @@ $newRow->save();
             </para>
             </para>
 
 
             <example id="zend.db.table.row.write.set-from-array.example">
             <example id="zend.db.table.row.write.set-from-array.example">
-
                 <title>Example of using setFromArray() to set values in a new Row</title>
                 <title>Example of using setFromArray() to set values in a new Row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -279,13 +259,10 @@ $newRow->setFromArray($data);
 // INSERT the new row to the database
 // INSERT the new row to the database
 $newRow->save();
 $newRow->save();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.write.delete">
         <sect3 id="zend.db.table.row.write.delete">
-
             <title>Deleting a row</title>
             <title>Deleting a row</title>
 
 
             <para>
             <para>
@@ -294,7 +271,6 @@ $newRow->save();
             </para>
             </para>
 
 
             <example id="zend.db.table.row.write.delete.example">
             <example id="zend.db.table.row.write.delete.example">
-
                 <title>Example of deleting a row</title>
                 <title>Example of deleting a row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -304,20 +280,16 @@ $row = $bugs->fetchRow('bug_id = 1');
 // DELETE this row
 // DELETE this row
 $row->delete();
 $row->delete();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 You do not have to call <methodname>save()</methodname> to apply the delete; it is
                 You do not have to call <methodname>save()</methodname> to apply the delete; it is
                 executed against the database immediately.
                 executed against the database immediately.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.row.serialize">
     <sect2 id="zend.db.table.row.serialize">
-
         <title>Serializing and unserializing rows</title>
         <title>Serializing and unserializing rows</title>
 
 
         <para>
         <para>
@@ -328,7 +300,6 @@ $row->delete();
         </para>
         </para>
 
 
         <sect3 id="zend.db.table.row.serialize.serializing">
         <sect3 id="zend.db.table.row.serialize.serializing">
-
             <title>Serializing a Row</title>
             <title>Serializing a Row</title>
 
 
             <para>
             <para>
@@ -337,7 +308,6 @@ $row->delete();
             </para>
             </para>
 
 
             <example id="zend.db.table.row.serialize.serializing.example">
             <example id="zend.db.table.row.serialize.serializing.example">
-
                 <title>Example of serializing a row</title>
                 <title>Example of serializing a row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -349,13 +319,10 @@ $serializedRow = serialize($row);
 
 
 // Now you can write $serializedRow to a file, etc.
 // Now you can write $serializedRow to a file, etc.
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.serialize.unserializing">
         <sect3 id="zend.db.table.row.serialize.unserializing">
-
             <title>Unserializing Row Data</title>
             <title>Unserializing Row Data</title>
 
 
             <para>
             <para>
@@ -372,7 +339,6 @@ $serializedRow = serialize($row);
             </para>
             </para>
 
 
             <example id="zend.db.table.row.serialize.unserializing.example">
             <example id="zend.db.table.row.serialize.unserializing.example">
-
                 <title>Example of unserializing a serialized row</title>
                 <title>Example of unserializing a serialized row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -381,11 +347,9 @@ $rowClone = unserialize($serializedRow);
 // Now you can use object properties, but read-only
 // Now you can use object properties, but read-only
 echo $rowClone->bug_description;
 echo $rowClone->bug_description;
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <note>
             <note>
-
                 <title>Why do Rows unserialize in a disconnected state?</title>
                 <title>Why do Rows unserialize in a disconnected state?</title>
 
 
                 <para>
                 <para>
@@ -397,13 +361,10 @@ echo $rowClone->bug_description;
                     the serialized object should not be able to use it to gain access to your
                     the serialized object should not be able to use it to gain access to your
                     database without knowing valid credentials.
                     database without knowing valid credentials.
                 </para>
                 </para>
-
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.serialize.set-table">
         <sect3 id="zend.db.table.row.serialize.set-table">
-
             <title>Reactivating a Row as Live Data</title>
             <title>Reactivating a Row as Live Data</title>
 
 
             <para>
             <para>
@@ -416,7 +377,6 @@ echo $rowClone->bug_description;
             </para>
             </para>
 
 
             <example id="zend.db.table.row.serialize.set-table.example">
             <example id="zend.db.table.row.serialize.set-table.example">
-
                 <title>Example of reactivating a row</title>
                 <title>Example of reactivating a row</title>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -432,15 +392,11 @@ $rowClone->setTable($bugs);
 $rowClone->bug_status = 'FIXED';
 $rowClone->bug_status = 'FIXED';
 $rowClone->save();
 $rowClone->save();
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.row.extending">
     <sect2 id="zend.db.table.row.extending">
-
         <title>Extending the Row class</title>
         <title>Extending the Row class</title>
 
 
         <para>
         <para>
@@ -454,7 +410,6 @@ $rowClone->save();
         </para>
         </para>
 
 
         <example id="zend.db.table.row.extending.example">
         <example id="zend.db.table.row.extending.example">
-
             <title>Specifying a custom Row class</title>
             <title>Specifying a custom Row class</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -475,7 +430,6 @@ class Products extends Zend_Db_Table_Abstract
 // instance of a Table class.
 // instance of a Table class.
 $bugs = new Bugs(array('rowClass' => 'MyRow'));
 $bugs = new Bugs(array('rowClass' => 'MyRow'));
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <sect3 id="zend.db.table.row.extending.overriding">
         <sect3 id="zend.db.table.row.extending.overriding">
@@ -507,7 +461,6 @@ class MyApplicationRow extends Zend_Db_Table_Row_Abstract
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.extending.insert-update">
         <sect3 id="zend.db.table.row.extending.insert-update">
-
             <title>Defining Custom Logic for Insert, Update, and Delete in Zend_Db_Table_Row</title>
             <title>Defining Custom Logic for Insert, Update, and Delete in Zend_Db_Table_Row</title>
 
 
             <para>
             <para>
@@ -532,7 +485,6 @@ class MyApplicationRow extends Zend_Db_Table_Row_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.row.extending.overriding-example1">
             <example id="zend.db.table.row.extending.overriding-example1">
-
                 <title>Example of custom logic in a Row class</title>
                 <title>Example of custom logic in a Row class</title>
 
 
                 <para>
                 <para>
@@ -569,11 +521,9 @@ if ($loggingEnabled) {
     $bugs = new Bugs();
     $bugs = new Bugs();
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <example id="zend.db.table.row.extending.overriding-example2">
             <example id="zend.db.table.row.extending.overriding-example2">
-
                 <title>Example of a Row class that logs insert data for multiple tables</title>
                 <title>Example of a Row class that logs insert data for multiple tables</title>
 
 
                 <para>
                 <para>
@@ -612,13 +562,10 @@ class Products extends Zend_Db_Table_Abstract
     protected $_rowClass = 'MyLoggingRow';
     protected $_rowClass = 'MyLoggingRow';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.db.table.row.extending.inflection">
         <sect3 id="zend.db.table.row.extending.inflection">
-
             <title>Define Inflection in Zend_Db_Table_Row</title>
             <title>Define Inflection in Zend_Db_Table_Row</title>
 
 
             <para>
             <para>
@@ -641,7 +588,6 @@ class Products extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <example id="zend.db.table.row.extending.inflection.example">
             <example id="zend.db.table.row.extending.inflection.example">
-
                 <title>Example of defining an inflection transformation</title>
                 <title>Example of defining an inflection transformation</title>
 
 
                 <para>
                 <para>
@@ -675,18 +621,14 @@ $row = $bugs->fetchNew();
 // native representation.
 // native representation.
 $row->bugDescription = 'New description';
 $row->bugDescription = 'New description';
 ]]></programlisting>
 ]]></programlisting>
-
             </example>
             </example>
 
 
             <para>
             <para>
                 You are responsible for writing the functions to perform inflection transformation.
                 You are responsible for writing the functions to perform inflection transformation.
                 Zend Framework does not provide such a function.
                 Zend Framework does not provide such a function.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 15 - 41
documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml

@@ -14,11 +14,9 @@
             iterate through the Rowset and access individual Row objects, reading or modifying data
             iterate through the Rowset and access individual Row objects, reading or modifying data
             in the Rows.
             in the Rows.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.rowset.fetch">
     <sect2 id="zend.db.table.rowset.fetch">
-
         <title>Fetching a Rowset</title>
         <title>Fetching a Rowset</title>
 
 
         <para>
         <para>
@@ -28,20 +26,16 @@
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.fetch.example">
         <example id="zend.db.table.rowset.fetch.example">
-
             <title>Example of fetching a rowset</title>
             <title>Example of fetching a rowset</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $bugs   = new Bugs();
 $bugs   = new Bugs();
 $rowset = $bugs->fetchAll("bug_status = 'NEW'");
 $rowset = $bugs->fetchAll("bug_status = 'NEW'");
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.rowset.rows">
     <sect2 id="zend.db.table.rowset.rows">
-
         <title>Retrieving Rows from a Rowset</title>
         <title>Retrieving Rows from a Rowset</title>
 
 
         <para>
         <para>
@@ -58,7 +52,6 @@ $rowset = $bugs->fetchAll("bug_status = 'NEW'");
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.rows.counting.example">
         <example id="zend.db.table.rowset.rows.counting.example">
-
             <title>Counting the Rows in a Rowset</title>
             <title>Counting the Rows in a Rowset</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -72,11 +65,9 @@ if ($rowCount > 0) {
     echo 'no rows matched the query';
     echo 'no rows matched the query';
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <example id="zend.db.table.rowset.rows.current.example">
         <example id="zend.db.table.rowset.rows.current.example">
-
             <title>Reading a Single Row from a Rowset</title>
             <title>Reading a Single Row from a Rowset</title>
 
 
             <para>
             <para>
@@ -90,7 +81,6 @@ $bugs   = new Bugs();
 $rowset = $bugs->fetchAll("bug_id = 1");
 $rowset = $bugs->fetchAll("bug_id = 1");
 $row    = $rowset->current();
 $row    = $rowset->current();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
@@ -99,7 +89,6 @@ $row    = $rowset->current();
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.rows.iterate.example">
         <example id="zend.db.table.rowset.rows.iterate.example">
-
             <title>Iterating through a Rowset</title>
             <title>Iterating through a Rowset</title>
 
 
             <para>
             <para>
@@ -131,11 +120,9 @@ foreach ($rowset as $row) {
     $row->save();
     $row->save();
 }
 }
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
-         <example id="zend.db.table.rowset.rows.seek.example">
-
+        <example id="zend.db.table.rowset.rows.seek.example">
             <title>Seeking to a known position into a Rowset</title>
             <title>Seeking to a known position into a Rowset</title>
 
 
             <para>
             <para>
@@ -164,21 +151,20 @@ $row9 = $rowset->current();
 $row9->assigned_to = 'mmouse';
 $row9->assigned_to = 'mmouse';
 $row9->save();
 $row9->save();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
-            <para>
-                <methodname>getRow()</methodname> 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 <methodname>getRow()</methodname> 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
-                <constant>FALSE</constant>). 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>
+        <para>
+            <methodname>getRow()</methodname> 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 <methodname>getRow()</methodname> 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
+            <constant>FALSE</constant>). 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[
+        <programlisting language="php"><![CDATA[
 $bugs = new Bugs();
 $bugs = new Bugs();
 
 
 // fetch all records from the table
 // fetch all records from the table
@@ -196,11 +182,9 @@ $row9->save();
             After you have access to an individual Row object, you can manipulate the Row using
             After you have access to an individual Row object, you can manipulate the Row using
             methods described in <link linkend="zend.db.table.row">Zend_Db_Table_Row</link>.
             methods described in <link linkend="zend.db.table.row">Zend_Db_Table_Row</link>.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.rowset.to-array">
     <sect2 id="zend.db.table.rowset.to-array">
-
         <title>Retrieving a Rowset as an Array</title>
         <title>Retrieving a Rowset as an Array</title>
 
 
         <para>
         <para>
@@ -211,7 +195,6 @@ $row9->save();
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.to-array.example">
         <example id="zend.db.table.rowset.to-array.example">
-
             <title>Using toArray()</title>
             <title>Using toArray()</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -237,11 +220,9 @@ foreach ($rowsetArray as $rowArray) {
             you can modify values in the array as you can with any array, but changes to the array
             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.
             data are not propagated to the database.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.rowset.serialize">
     <sect2 id="zend.db.table.rowset.serialize">
-
         <title>Serializing and Unserializing a Rowset</title>
         <title>Serializing and Unserializing a Rowset</title>
 
 
         <para>
         <para>
@@ -251,7 +232,6 @@ foreach ($rowsetArray as $rowArray) {
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.serialize.example.serialize">
         <example id="zend.db.table.rowset.serialize.example.serialize">
-
             <title>Serializing a Rowset</title>
             <title>Serializing a Rowset</title>
 
 
             <para>
             <para>
@@ -269,11 +249,9 @@ $serializedRowset = serialize($rowset);
 
 
 // Now you can write $serializedRowset to a file, etc.
 // Now you can write $serializedRowset to a file, etc.
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <example id="zend.db.table.rowset.serialize.example.unserialize">
         <example id="zend.db.table.rowset.serialize.example.unserialize">
-
             <title>Unserializing a Serialized Rowset</title>
             <title>Unserializing a Serialized Rowset</title>
 
 
             <para>
             <para>
@@ -296,11 +274,11 @@ $rowsetDisconnected = unserialize($serializedRowset);
 $row = $rowsetDisconnected->current();
 $row = $rowsetDisconnected->current();
 echo $row->bug_description;
 echo $row->bug_description;
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <note>
         <note>
             <title>Why do Rowsets unserialize in a disconnected state?</title>
             <title>Why do Rowsets unserialize in a disconnected state?</title>
+
             <para>
             <para>
                 A serialized object is a string that is readable to anyone who possesses it. It
                 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
                 could be a security risk to store parameters such as database account and password
@@ -322,7 +300,6 @@ echo $row->bug_description;
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.serialize.example.set-table">
         <example id="zend.db.table.rowset.serialize.example.set-table">
-
             <title>Reactivating a Rowset as Live Data</title>
             <title>Reactivating a Rowset as Live Data</title>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -340,18 +317,15 @@ $row = $rowset->current();
 $row->bug_status = 'FIXED';
 $row->bug_status = 'FIXED';
 $row->save();
 $row->save();
 ]]></programlisting>
 ]]></programlisting>
-
         </example>
         </example>
 
 
         <para>
         <para>
             Reactivating a Rowset with <methodname>setTable()</methodname> also reactivates all the
             Reactivating a Rowset with <methodname>setTable()</methodname> also reactivates all the
             Row objects contained in that Rowset.
             Row objects contained in that Rowset.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.db.table.rowset.extending">
     <sect2 id="zend.db.table.rowset.extending">
-
         <title>Extending the Rowset class</title>
         <title>Extending the Rowset class</title>
 
 
         <para>
         <para>
@@ -364,6 +338,7 @@ $row->save();
 
 
         <example id="zend.db.table.rowset.extending.example">
         <example id="zend.db.table.rowset.extending.example">
             <title>Specifying a custom Rowset class</title>
             <title>Specifying a custom Rowset class</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 class MyRowset extends Zend_Db_Table_Rowset_Abstract
 class MyRowset extends Zend_Db_Table_Rowset_Abstract
 {
 {
@@ -394,6 +369,7 @@ $bugs = new Bugs(array('rowsetClass' => 'MyRowset'));
 
 
         <example id="zend.db.table.rowset.extending.example-aggregate">
         <example id="zend.db.table.rowset.extending.example-aggregate">
             <title>Example of Rowset class with a new method</title>
             <title>Example of Rowset class with a new method</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 class MyBugsRowset extends Zend_Db_Table_Rowset_Abstract
 class MyBugsRowset extends Zend_Db_Table_Rowset_Abstract
 {
 {
@@ -421,9 +397,7 @@ class Bugs extends Zend_Db_Table_Abstract
 }
 }
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

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

@@ -13,6 +13,7 @@
 
 
     <example id="zend.debug.dumping.example">
     <example id="zend.debug.dumping.example">
         <title>Example of dump() method</title>
         <title>Example of dump() method</title>
+
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 Zend_Debug::dump($var, $label = null, $echo = true);
 Zend_Debug::dump($var, $label = null, $echo = true);
 ]]></programlisting>
 ]]></programlisting>
@@ -51,11 +52,13 @@ Zend_Debug::dump($var, $label = null, $echo = true);
 
 
     <tip>
     <tip>
         <title>Debugging with Zend_Log</title>
         <title>Debugging with Zend_Log</title>
+
         <para>
         <para>
             Using <methodname>Zend_Debug::dump()</methodname> is best for ad hoc
             Using <methodname>Zend_Debug::dump()</methodname> is best for ad hoc
             debugging during software development. You can add code to dump
             debugging during software development. You can add code to dump
             a variable and then remove the code very quickly.
             a variable and then remove the code very quickly.
         </para>
         </para>
+
         <para>
         <para>
             Also consider the <link linkend="zend.log.overview">Zend_Log</link>
             Also consider the <link linkend="zend.log.overview">Zend_Log</link>
             component when writing more permanent debugging code. For example,
             component when writing more permanent debugging code. For example,
@@ -64,7 +67,6 @@ Zend_Debug::dump($var, $label = null, $echo = true);
             output the string returned by <methodname>Zend_Debug::dump()</methodname>.
             output the string returned by <methodname>Zend_Debug::dump()</methodname>.
         </para>
         </para>
     </tip>
     </tip>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 132 - 109
documentation/manual/en/module_specs/Zend_Dojo-Data.xml

@@ -93,17 +93,15 @@ $data->addItems($someMoreItems);
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
-            <listitem><para>
-                Associative arrays
-            </para></listitem>
+            <listitem><para>Associative arrays</para></listitem>
 
 
-            <listitem><para>
-                Objects implementing a <methodname>toArray()</methodname> method
-            </para></listitem>
+            <listitem>
+                <para>Objects implementing a <methodname>toArray()</methodname> method</para>
+            </listitem>
 
 
-            <listitem><para>
-                Any other objects (will serialize via get_object_vars())
-            </para></listitem>
+            <listitem>
+                <para>Any other objects (will serialize via get_object_vars())</para>
+            </listitem>
         </itemizedlist>
         </itemizedlist>
 
 
         <para>
         <para>
@@ -113,15 +111,15 @@ $data->addItems($someMoreItems);
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
-            <listitem><para>
-                Arrays
-            </para></listitem>
-
-            <listitem><para>
-                Objects implementing the <classname>Traversable</classname> interface
-                ,which includes the interfaces <classname>Iterator</classname> and
-                <classname>ArrayAccess</classname>.
-            </para></listitem>
+            <listitem><para>Arrays</para></listitem>
+
+            <listitem>
+                <para>
+                    Objects implementing the <classname>Traversable</classname> interface
+                    ,which includes the interfaces <classname>Iterator</classname> and
+                    <classname>ArrayAccess</classname>.
+                </para>
+            </listitem>
         </itemizedlist>
         </itemizedlist>
 
 
         <para>
         <para>
@@ -285,97 +283,122 @@ $json = (string) $data; // cast to string == cast to JSON
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
-                    <methodname>setItems($items)</methodname>: set multiple items at once,
-                    overwriting any items that were previously set in the
-                    object. <varname>$items</varname> should be an array or a
-                    <classname>Traversable</classname> object.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setItem($item, $id = null)</methodname>: set an individual
-                    item, optionally passing an explicit identifier. Overwrites
-                    the item if it is already in the collection. Valid items
-                    include associative arrays, objects implementing
-                    <methodname>toArray()</methodname>, or any object with public
-                    properties.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>addItem($item, $id = null)</methodname>: add an individual
-                    item, optionally passing an explicit identifier. Will raise
-                    an exception if the item already exists in the collection.
-                    Valid items include associative arrays, objects implementing
-                    <methodname>toArray()</methodname>, or any object with public
-                    properties.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>addItems($items)</methodname>: add multiple items at once,
-                    appending them to any current items. Will raise an exception
-                    if any of the new items have an identifier matching an
-                    identifier already in the collection. <varname>$items</varname>
-                    should be an array or a <classname>Traversable</classname> object.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getItems()</methodname>: retrieve all items as an array of
-                    arrays.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>hasItem($id)</methodname>: determine whether an item with
-                    the given identifier exists in the collection.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getItem($id)</methodname>: retrieve an item with the given
-                    identifier from the collection; the item returned will be an
-                    associative array. If no item matches, a <constant>NULL</constant> value is
-                    returned.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>removeItem($id)</methodname>: remove an item with the given
-                    identifier from the collection.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>clearItems()</methodname>: remove all items from the
-                    collection.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setIdentifier($identifier)</methodname>: set the name of the
-                    field that represents the unique identifier for each item in
-                    the collection.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getIdentifier()</methodname>: retrieve the name of the
-                    identifier field.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setLabel($label)</methodname>: set the name of a field
-                    to be used as a display label for an item.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getLabel()</methodname>: retrieve the label field name.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>toArray()</methodname>: cast the object to an array. At a minimum,
-                    the array will contain the keys 'identifier',
-                    'items', and 'label' if a label field has been set
-                    in the object.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>toJson()</methodname>: cast the object to a <acronym>JSON</acronym>
-                    representation.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <methodname>setItems($items)</methodname>: set multiple items at once,
+                        overwriting any items that were previously set in the
+                        object. <varname>$items</varname> should be an array or a
+                        <classname>Traversable</classname> object.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setItem($item, $id = null)</methodname>: set an individual
+                        item, optionally passing an explicit identifier. Overwrites
+                        the item if it is already in the collection. Valid items
+                        include associative arrays, objects implementing
+                        <methodname>toArray()</methodname>, or any object with public properties.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>addItem($item, $id = null)</methodname>: add an individual
+                        item, optionally passing an explicit identifier. Will raise
+                        an exception if the item already exists in the collection.
+                        Valid items include associative arrays, objects implementing
+                        <methodname>toArray()</methodname>, or any object with public properties.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>addItems($items)</methodname>: add multiple items at once,
+                        appending them to any current items. Will raise an exception
+                        if any of the new items have an identifier matching an
+                        identifier already in the collection. <varname>$items</varname>
+                        should be an array or a <classname>Traversable</classname> object.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getItems()</methodname>: retrieve all items as an array of
+                        arrays.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>hasItem($id)</methodname>: determine whether an item with
+                        the given identifier exists in the collection.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getItem($id)</methodname>: retrieve an item with the given
+                        identifier from the collection; the item returned will be an associative
+                        array. If no item matches, a <constant>NULL</constant> value is returned.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>removeItem($id)</methodname>: remove an item with the given
+                        identifier from the collection.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>clearItems()</methodname>: remove all items from the collection.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setIdentifier($identifier)</methodname>: set the name of the
+                        field that represents the unique identifier for each item in
+                        the collection.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getIdentifier()</methodname>: retrieve the name of the
+                        identifier field.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setLabel($label)</methodname>: set the name of a field
+                        to be used as a display label for an item.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getLabel()</methodname>: retrieve the label field name.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>toArray()</methodname>: cast the object to an array. At a
+                        minimum, the array will contain the keys 'identifier',
+                        'items', and 'label' if a label field has been set in the object.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>toJson()</methodname>: cast the object to a
+                        <acronym>JSON</acronym> representation.
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
         </sect3>
         </sect3>
     </sect2>
     </sect2>

Разлика између датотеке није приказан због своје велике величине
+ 498 - 361
documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml


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

@@ -9,8 +9,7 @@
     </para>
     </para>
 
 
     <itemizedlist>
     <itemizedlist>
-        <listitem><para>Specifying either a CDN or a local path to a Dojo
-                install.</para></listitem>
+        <listitem><para>Specifying either a CDN or a local path to a Dojo install.</para></listitem>
         <listitem><para>Specifying paths to custom Dojo modules.</para></listitem>
         <listitem><para>Specifying paths to custom Dojo modules.</para></listitem>
         <listitem><para>Specifying dojo.require statements.</para></listitem>
         <listitem><para>Specifying dojo.require statements.</para></listitem>
         <listitem><para>Specifying dijit stylesheet themes to use.</para></listitem>
         <listitem><para>Specifying dijit stylesheet themes to use.</para></listitem>
@@ -254,22 +253,28 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
-            <listitem><para>
-                Groups required files into <emphasis>layers</emphasis>; a layer
-                lumps all required files into a single JS file. (Hence the name
-                of this section.)
-            </para></listitem>
-
-            <listitem><para>
-                "Interns" non-javascript files used by dijits (typically,
-                template files). These are also grouped in the same JS file as
-                the layer.
-            </para></listitem>
-
-            <listitem><para>
-                Passes the file through ShrinkSafe, which strips whitespace and
-                comments, as well as shortens variable names.
-            </para></listitem>
+            <listitem>
+                <para>
+                    Groups required files into <emphasis>layers</emphasis>; a layer
+                    lumps all required files into a single JS file. (Hence the name
+                    of this section.)
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    "Interns" non-javascript files used by dijits (typically,
+                    template files). These are also grouped in the same JS file as
+                    the layer.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    Passes the file through ShrinkSafe, which strips whitespace and
+                    comments, as well as shortens variable names.
+                </para>
+            </listitem>
         </itemizedlist>
         </itemizedlist>
 
 
         <para>
         <para>
@@ -305,29 +310,77 @@ $view->dojo()->addLayer('/js/foo/foo.js');
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
-            <listitem><para><methodname>setView(Zend_View_Interface $view)</methodname>: set
-                    a view instance in the container.</para></listitem>
-            <listitem><para><methodname>enable()</methodname>: explicitly enable Dojo
-                    integration.</para></listitem>
-            <listitem><para><methodname>disable()</methodname>: disable Dojo
-                    integration.</para></listitem>
-            <listitem><para><methodname>isEnabled()</methodname>: determine whether or not
-                    Dojo integration is enabled.</para></listitem>
-            <listitem><para><methodname>requireModule($module)</methodname>: setup a
-                    <property>dojo.require</property> statement.</para></listitem>
-            <listitem><para><methodname>getModules()</methodname>: determine what modules
-                    have been required.</para></listitem>
-            <listitem><para><methodname>registerModulePath($module, $path)</methodname>:
-                    register a custom Dojo module path.</para></listitem>
-            <listitem><para><methodname>getModulePaths()</methodname>: get list of
-                    registered module paths.</para></listitem>
-            <listitem><para><methodname>addLayer($path)</methodname>: add a layer (custom
-                    build) path to use.</para></listitem>
-            <listitem><para><methodname>getLayers()</methodname>: get a list of all
-                    registered layer paths (custom builds).</para></listitem>
-            <listitem><para><methodname>removeLayer($path)</methodname>: remove the layer
+            <listitem>
+                <para>
+                    <methodname>setView(Zend_View_Interface $view)</methodname>: set a view instance
+                    in the container.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para><methodname>enable()</methodname>: explicitly enable Dojo integration.</para>
+            </listitem>
+
+            <listitem>
+                <para><methodname>disable()</methodname>: disable Dojo integration.</para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>isEnabled()</methodname>: determine whether or not Dojo integration
+                    is enabled.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>requireModule($module)</methodname>: setup a
+                    <property>dojo.require</property> statement.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getModules()</methodname>: determine what modules have been
+                    required.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>registerModulePath($module, $path)</methodname>:
+                    register a custom Dojo module path.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getModulePaths()</methodname>: get list of registered module paths.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>addLayer($path)</methodname>: add a layer (custom build) path to
+                    use.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getLayers()</methodname>: get a list of all registered layer paths
+                    (custom builds).
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>removeLayer($path)</methodname>: remove the layer
                     that matches <varname>$path</varname> from the list of registered
                     that matches <varname>$path</varname> from the list of registered
-                    layers (custom builds).</para></listitem>
+                    layers (custom builds).
+                </para>
+            </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym>
                     <methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym>
@@ -336,75 +389,190 @@ $view->dojo()->addLayer('/js/foo/foo.js');
                     to be the <acronym>URL</acronym> string prior to the version number.
                     to be the <acronym>URL</acronym> string prior to the version number.
                 </para>
                 </para>
             </listitem>
             </listitem>
-            <listitem><para><methodname>getCdnBase()</methodname>: retrieve the base CDN url
-                    to utilize.</para></listitem>
-            <listitem><para><methodname>setCdnVersion($version = null)</methodname>: set
-                    which version of Dojo to utilize from the CDN.</para></listitem>
-            <listitem><para><methodname>getCdnVersion()</methodname>: retrieve what
-                    version of Dojo from the CDN will be used.</para></listitem>
-            <listitem><para><methodname>setCdnDojoPath($path)</methodname>: set the relative
+
+            <listitem>
+                <para>
+                    <methodname>getCdnBase()</methodname>: retrieve the base CDN url to utilize.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>setCdnVersion($version = null)</methodname>: set
+                    which version of Dojo to utilize from the CDN.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getCdnVersion()</methodname>: retrieve what
+                    version of Dojo from the CDN will be used.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>setCdnDojoPath($path)</methodname>: set the relative
                     path to the dojo.js or dojo.xd.js file on a CDN; typically,
                     path to the dojo.js or dojo.xd.js file on a CDN; typically,
                     one of the <constant>Zend_Dojo::CDN_DOJO_PATH_AOL</constant> or
                     one of the <constant>Zend_Dojo::CDN_DOJO_PATH_AOL</constant> or
                     <constant>Zend_Dojo::CDN_DOJO_PATH_GOOGLE</constant>, but it only
                     <constant>Zend_Dojo::CDN_DOJO_PATH_GOOGLE</constant>, but it only
-                    needs to be the path string following the version
-                    number.</para></listitem>
-            <listitem><para><methodname>getCdnDojoPath()</methodname>: retrieve the last
-                    path segment of the CDN url pointing to the dojo.js
-                    file.</para></listitem>
-            <listitem><para><methodname>useCdn()</methodname>: tell the container to
-                    utilize the CDN; implicitly enables integration.</para></listitem>
-            <listitem><para><methodname>setLocalPath($path)</methodname>: tell the container
+                    needs to be the path string following the version number.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getCdnDojoPath()</methodname>: retrieve the last
+                    path segment of the CDN url pointing to the dojo.js file.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>useCdn()</methodname>: tell the container to
+                    utilize the CDN; implicitly enables integration.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>setLocalPath($path)</methodname>: tell the container
                     the path to a local Dojo install (should be a path relative
                     the path to a local Dojo install (should be a path relative
                     to the server, and contain the dojo.js file itself);
                     to the server, and contain the dojo.js file itself);
-                    implicitly enables integration.</para></listitem>
-            <listitem><para><methodname>getLocalPath()</methodname>: determine what local
-                    path to Dojo is being used.</para></listitem>
-            <listitem><para><methodname>useLocalPath()</methodname>: is the integration
-                    utilizing a Dojo local path?</para></listitem>
-            <listitem><para><methodname>setDjConfig(array $config)</methodname>: set
-                    dojo/dijit configuration values (expects assoc
-                    array).</para></listitem>
-            <listitem><para><methodname>setDjConfigOption($option, $value)</methodname>: set
-                    a single dojo/dijit configuration value.</para></listitem>
-            <listitem><para><methodname>getDjConfig()</methodname>: get all dojo/dijit
-                    configuration values.</para></listitem>
-            <listitem><para><methodname>getDjConfigOption($option, $default =
-                    null)</methodname>: get a single dojo/dijit configuration
-                    value.</para></listitem>
-            <listitem><para><methodname>addStylesheetModule($module)</methodname>: add a
-                    stylesheet based on a module theme.</para></listitem>
-            <listitem><para><methodname>getStylesheetModules()</methodname>: get stylesheets
-                    registered as module themes.</para></listitem>
-            <listitem><para><methodname>addStylesheet($path)</methodname>: add a local
-                    stylesheet for use with Dojo.</para></listitem>
-            <listitem><para><methodname>getStylesheets()</methodname>: get local Dojo
-                    stylesheets.</para></listitem>
-            <listitem><para><methodname>addOnLoad($spec, $function = null)</methodname>: add
+                    implicitly enables integration.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getLocalPath()</methodname>: determine what local
+                    path to Dojo is being used.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>useLocalPath()</methodname>: is the integration
+                    utilizing a Dojo local path?
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>setDjConfig(array $config)</methodname>: set
+                    dojo/dijit configuration values (expects assoc array).
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>setDjConfigOption($option, $value)</methodname>: set
+                    a single dojo/dijit configuration value.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getDjConfig()</methodname>: get all dojo/dijit configuration values.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getDjConfigOption($option, $default = null)</methodname>: get a
+                    single dojo/dijit configuration value.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>addStylesheetModule($module)</methodname>: add a
+                    stylesheet based on a module theme.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getStylesheetModules()</methodname>: get stylesheets
+                    registered as module themes.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>addStylesheet($path)</methodname>: add a local
+                    stylesheet for use with Dojo.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para><methodname>getStylesheets()</methodname>: get local Dojo stylesheets.</para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>addOnLoad($spec, $function = null)</methodname>: add
                     a lambda for dojo.onLoad to call. If one argument is passed,
                     a lambda for dojo.onLoad to call. If one argument is passed,
                     it is assumed to be either a function name or a javascript
                     it is assumed to be either a function name or a javascript
                     closure. If two arguments are passed, the first is assumed
                     closure. If two arguments are passed, the first is assumed
                     to be the name of an object instance variable and the second
                     to be the name of an object instance variable and the second
                     either a method name in that object or a closure to utilize
                     either a method name in that object or a closure to utilize
-                    with that object.</para></listitem>
-            <listitem><para><methodname>prependOnLoad($spec, $function = null)</methodname>:
+                    with that object.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>prependOnLoad($spec, $function = null)</methodname>:
                     exactly like <methodname>addOnLoad()</methodname>, excepts prepends to
                     exactly like <methodname>addOnLoad()</methodname>, excepts prepends to
-                    beginning of onLoad stack.</para></listitem>
-            <listitem><para><methodname>getOnLoadActions()</methodname>: retrieve all
+                    beginning of onLoad stack.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>getOnLoadActions()</methodname>: retrieve all
                     dojo.onLoad actions registered with the container. This will
                     dojo.onLoad actions registered with the container. This will
-                    be an array of arrays.</para></listitem>
-            <listitem><para><methodname>onLoadCaptureStart($obj = null)</methodname>:
+                    be an array of arrays.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>onLoadCaptureStart($obj = null)</methodname>:
                     capture data to be used as a lambda for dojo.onLoad(). If
                     capture data to be used as a lambda for dojo.onLoad(). If
                     $obj is provided, the captured JS code will be considered a
                     $obj is provided, the captured JS code will be considered a
-                    closure to use with that Javascript object.</para></listitem>
-            <listitem><para><methodname>onLoadCaptureEnd($obj = null)</methodname>: finish
-                    capturing data for use with dojo.onLoad().</para></listitem>
-            <listitem><para><methodname>javascriptCaptureStart()</methodname>:
+                    closure to use with that Javascript object.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>onLoadCaptureEnd($obj = null)</methodname>: finish
+                    capturing data for use with dojo.onLoad().
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>javascriptCaptureStart()</methodname>:
                     capture arbitrary javascript to be included with Dojo JS
                     capture arbitrary javascript to be included with Dojo JS
-                    (onLoad, require, etc. statements).</para></listitem>
-            <listitem><para><methodname>javascriptCaptureEnd()</methodname>: finish
-                    capturing javascript.</para></listitem>
-            <listitem><para><methodname>__toString()</methodname>: cast the container to a
-                    string; renders all HTML style and script elements.</para></listitem>
+                    (onLoad, require, etc. statements).
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>javascriptCaptureEnd()</methodname>: finish capturing javascript.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <methodname>__toString()</methodname>: cast the container to a
+                    string; renders all HTML style and script elements.
+                </para>
+            </listitem>
         </itemizedlist>
         </itemizedlist>
     </sect3>
     </sect3>
 </sect2>
 </sect2>

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

@@ -27,28 +27,36 @@
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$id</varname>: the container name or DOM ID.
                         <varname>$id</varname>: the container name or DOM ID.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$content</varname>: the content to wrap in the
                         <varname>$content</varname>: the content to wrap in the
                         layout container.
                         layout container.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$params</varname> (optional): dijit-specific
                         <varname>$params</varname> (optional): dijit-specific
                         parameters. Basically, any non-HTML attribute that can
                         parameters. Basically, any non-HTML attribute that can
                         be used to configure the dijit layout container.
                         be used to configure the dijit layout container.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$attribs</varname> (optional): any additional HTML
                         <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the container
                         attributes that should be used to render the container
                         div. If the key 'id' is passed in this array, it will
                         div. If the key 'id' is passed in this array, it will
                         be used for the form element DOM id, and
                         be used for the form element DOM id, and
                         <varname>$id</varname> will be used for its name.
                         <varname>$id</varname> will be used for its name.
-                </para></listitem>
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
 
 
             <para>
             <para>
@@ -71,21 +79,27 @@
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$id</varname>: the container name or DOM ID.
                         <varname>$id</varname>: the container name or DOM ID.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$attribs</varname> (optional): any additional HTML
                         <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the container
                         attributes that should be used to render the container
                         div.
                         div.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$content</varname> (optional): the content to wrap
                         <varname>$content</varname> (optional): the content to wrap
                         in the form. If none is passed, an empty string will be
                         in the form. If none is passed, an empty string will be
                         used.
                         used.
-                </para></listitem>
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
 
 
             <para>
             <para>
@@ -104,28 +118,35 @@
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$id</varname>: the element name or DOM ID.
                         <varname>$id</varname>: the element name or DOM ID.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
-                        <varname>$value</varname> (optional): the current value of
-                        the element.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <varname>$value</varname> (optional): the current value of the element.
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$params</varname> (optional): dijit-specific
                         <varname>$params</varname> (optional): dijit-specific
                         parameters. Basically, any non-HTML attribute that can
                         parameters. Basically, any non-HTML attribute that can
                         be used to configure a dijit.
                         be used to configure a dijit.
-                </para></listitem>
+                    </para>
+                </listitem>
 
 
-                <listitem><para>
+                <listitem>
+                    <para>
                         <varname>$attribs</varname> (optional): any additional HTML
                         <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the dijit. If
                         attributes that should be used to render the dijit. If
                         the key 'id' is passed in this array, it will be used
                         the key 'id' is passed in this array, it will be used
                         for the form element DOM id, and <varname>$id</varname> will
                         for the form element DOM id, and <varname>$id</varname> will
                         be used for its name.
                         be used for its name.
-                </para></listitem>
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
 
 
             <para>
             <para>
@@ -441,15 +462,19 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para>
+                    <listitem>
+                        <para>
                             an indexed array with two values, a checked value
                             an indexed array with two values, a checked value
                             and unchecked value, in that order; or
                             and unchecked value, in that order; or
-                    </para></listitem>
+                        </para>
+                    </listitem>
 
 
-                    <listitem><para>
+                    <listitem>
+                        <para>
                             an associative array with the keys 'checkedValue'
                             an associative array with the keys 'checkedValue'
                             and 'unCheckedValue'.
                             and 'unCheckedValue'.
-                    </para></listitem>
+                        </para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
 
 
                 <para>
                 <para>
@@ -503,24 +528,30 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                         </para>
                         </para>
 
 
                         <itemizedlist>
                         <itemizedlist>
-                            <listitem><para>
-                                <emphasis>store</emphasis>: the name of the
-                                javascript variable representing the datastore
-                                (this could be the name you would like for it
-                                to use).
-                            </para></listitem>
-
-                            <listitem><para>
-                                <emphasis>type</emphasis>: the datastore type
-                                to use; e.g., 'dojo.data.ItemFileReadStore'.
-                            </para></listitem>
-
-                            <listitem><para>
-                                <emphasis>params</emphasis> (optional): an
-                                associative array of key/value pairs to use to
-                                configure the datastore. The 'url' param is a
-                                typical example.
-                            </para></listitem>
+                            <listitem>
+                                <para>
+                                    <emphasis>store</emphasis>: the name of the
+                                    javascript variable representing the datastore
+                                    (this could be the name you would like for it
+                                    to use).
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <emphasis>type</emphasis>: the datastore type
+                                    to use; e.g., 'dojo.data.ItemFileReadStore'.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <emphasis>params</emphasis> (optional): an
+                                    associative array of key/value pairs to use to
+                                    configure the datastore. The 'url' param is a
+                                    typical example.
+                                </para>
+                            </listitem>
                         </itemizedlist>
                         </itemizedlist>
                     </listitem>
                     </listitem>
 
 
@@ -530,22 +561,28 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                         </para>
                         </para>
 
 
                         <itemizedlist>
                         <itemizedlist>
-                            <listitem><para>
-                                <emphasis>store</emphasis>: a string indicating
-                                the datastore name to use.
-                            </para></listitem>
-
-                            <listitem><para>
-                                <emphasis>storeType</emphasis>: a string indicating
-                                the datastore dojo.data type to use (e.g.,
-                                'dojo.data.ItemFileReadStore').
-                            </para></listitem>
-
-                            <listitem><para>
-                                <emphasis>storeParams</emphasis>: an
-                                associative array of key/value pairs with which
-                                to configure the datastore.
-                            </para></listitem>
+                            <listitem>
+                                <para>
+                                    <emphasis>store</emphasis>: a string indicating
+                                    the datastore name to use.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <emphasis>storeType</emphasis>: a string indicating
+                                    the datastore dojo.data type to use (e.g.,
+                                    'dojo.data.ItemFileReadStore').
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <emphasis>storeParams</emphasis>: an
+                                    associative array of key/value pairs with which
+                                    to configure the datastore.
+                                </para>
+                            </listitem>
                         </itemizedlist>
                         </itemizedlist>
                     </listitem>
                     </listitem>
                 </itemizedlist>
                 </itemizedlist>
@@ -713,25 +750,33 @@ echo $view->editor('foo');
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para>
-                        'intermediateChanges' can be set to indicate whether or not
-                        to fire onChange events while the handle is being dragged.
-                    </para></listitem>
-
-                    <listitem><para>
-                        'clickSelect' can be set to allow clicking a location
-                        on the slider to set the value.
-                    </para></listitem>
-
-                    <listitem><para>
-                        'pageIncrement' can specify the value by which to
-                        increase/decrease when pageUp and pageDown are used.
-                    </para></listitem>
-
-                    <listitem><para>
-                        'showButtons' can be set to allow displaying buttons on
-                        either end of the slider for manipulating the value.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            'intermediateChanges' can be set to indicate whether or not
+                            to fire onChange events while the handle is being dragged.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            'clickSelect' can be set to allow clicking a location
+                            on the slider to set the value.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            'pageIncrement' can specify the value by which to
+                            increase/decrease when pageUp and pageDown are used.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            'showButtons' can be set to allow displaying buttons on
+                            either end of the slider for manipulating the value.
+                        </para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
 
 
                 <para>
                 <para>
@@ -749,22 +794,28 @@ echo $view->editor('foo');
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para>
-                        <emphasis>container</emphasis>: name of the container.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>labels</emphasis> (optional): an array of
-                        labels to utilize. Use empty strings on either end to
-                        provide labels for inner values only. Required when
-                        specifying one of the 'Labels' dijit variants.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>dijit</emphasis> (optional): one of
-                        HorizontalRule, HorizontalRuleLabels, VerticalRule, or
-                        VerticalRuleLabels, Defaults to one of the Rule dijits.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            <emphasis>container</emphasis>: name of the container.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>labels</emphasis> (optional): an array of
+                            labels to utilize. Use empty strings on either end to
+                            provide labels for inner values only. Required when
+                            specifying one of the 'Labels' dijit variants.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>dijit</emphasis> (optional): one of
+                            HorizontalRule, HorizontalRuleLabels, VerticalRule, or
+                            VerticalRuleLabels, Defaults to one of the Rule dijits.
+                        </para>
+                    </listitem>
 
 
                     <listitem>
                     <listitem>
                         <para>
                         <para>
@@ -774,27 +825,33 @@ echo $view->editor('foo');
                         </para>
                         </para>
 
 
                         <itemizedlist>
                         <itemizedlist>
-                            <listitem><para>
-                                <emphasis>container</emphasis> (optional):
-                                array of parameters and attributes for the rule
-                                container.
-                            </para></listitem>
-
-                            <listitem><para>
-                                <emphasis>labels</emphasis> (optional):
-                                array of parameters and attributes for the
-                                labels list container.
-                            </para></listitem>
+                            <listitem>
+                                <para>
+                                    <emphasis>container</emphasis> (optional):
+                                    array of parameters and attributes for the rule
+                                    container.
+                                </para>
+                            </listitem>
+
+                            <listitem>
+                                <para>
+                                    <emphasis>labels</emphasis> (optional):
+                                    array of parameters and attributes for the
+                                    labels list container.
+                                </para>
+                            </listitem>
                         </itemizedlist>
                         </itemizedlist>
                     </listitem>
                     </listitem>
 
 
-                    <listitem><para>
-                        <emphasis>attribs</emphasis> (optional): HTML
-                        attributes to use with the rules/labels. This should
-                        follow the <property>params</property> option format and be an
-                        associative array with the keys 'container' and
-                        'labels'.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            <emphasis>attribs</emphasis> (optional): HTML
+                            attributes to use with the rules/labels. This should
+                            follow the <property>params</property> option format and be an
+                            associative array with the keys 'container' and
+                            'labels'.
+                        </para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -1075,28 +1132,36 @@ echo $view->timeTextBox(
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para>
-                        <emphasis>invalidMessage</emphasis>: a message to
-                        display when an invalid entry is detected.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>promptMessage</emphasis>: a tooltip help
-                        message to use.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>regExp</emphasis>: a regular expression to
-                        use to validate the text. Regular expression does not
-                        require boundary markers.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>required</emphasis>: whether or not the
-                        element is required. If so, and the element is embedded
-                        in a dijit.form.Form, it will be flagged as invalid and
-                        prevent submission.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            <emphasis>invalidMessage</emphasis>: a message to
+                            display when an invalid entry is detected.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>promptMessage</emphasis>: a tooltip help
+                            message to use.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>regExp</emphasis>: a regular expression to
+                            use to validate the text. Regular expression does not
+                            require boundary markers.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>required</emphasis>: whether or not the
+                            element is required. If so, and the element is embedded
+                            in a dijit.form.Form, it will be flagged as invalid and
+                            prevent submission.
+                        </para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[

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

@@ -8,11 +8,13 @@
     </para>
     </para>
 
 
     <itemizedlist>
     <itemizedlist>
-        <listitem><para>
-            <emphasis>dojo():</emphasis> setup the Dojo environment
-            for your page, including dojo configuration values, custom module
-            paths, module require statements, theme stylesheets, CDN usage, and more.
-        </para></listitem>
+        <listitem>
+            <para>
+                <emphasis>dojo():</emphasis> setup the Dojo environment
+                for your page, including dojo configuration values, custom module
+                paths, module require statements, theme stylesheets, CDN usage, and more.
+            </para>
+        </listitem>
     </itemizedlist>
     </itemizedlist>
 
 
     <example id="zend.dojo.view.setup">
     <example id="zend.dojo.view.setup">

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

@@ -15,6 +15,7 @@
         <listitem><para>dojo.data compatibility</para></listitem>
         <listitem><para>dojo.data compatibility</para></listitem>
         <listitem><para>View helper to help setup the Dojo environment</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_View</classname> helpers</para></listitem>
+
         <listitem>
         <listitem>
             <para>Dijit-specific <classname>Zend_Form</classname> elements and decorators</para>
             <para>Dijit-specific <classname>Zend_Form</classname> elements and decorators</para>
         </listitem>
         </listitem>

+ 137 - 101
documentation/manual/en/module_specs/Zend_Dom-Query.xml

@@ -42,22 +42,28 @@
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
-            <listitem><para>
-                <emphasis>element types</emphasis>: provide an element type to
-                match: 'div', 'a', 'span', 'h2', etc.
-            </para></listitem>
-
-            <listitem><para>
-                <emphasis>style attributes</emphasis>: <acronym>CSS</acronym> style attributes to
-                match: '.error', 'div.error', 'label.required', etc. If an
-                element defines more than one style, this will match as long as
-                the named style is present anywhere in the style declaration.
-            </para></listitem>
-
-            <listitem><para>
-                <emphasis>id attributes</emphasis>: element ID attributes to
-                match: '#content', 'div#nav', etc.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <emphasis>element types</emphasis>: provide an element type to
+                    match: 'div', 'a', 'span', 'h2', etc.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <emphasis>style attributes</emphasis>: <acronym>CSS</acronym> style attributes
+                    to match: '.error', 'div.error', 'label.required', etc. If an
+                    element defines more than one style, this will match as long as
+                    the named style is present anywhere in the style declaration.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <emphasis>id attributes</emphasis>: element ID attributes to
+                    match: '#content', 'div#nav', etc.
+                </para>
+            </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
@@ -67,36 +73,44 @@
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para>
-                        <emphasis>exact match</emphasis>: the attribute exactly
-                        matches the string: 'div[bar="baz"]' would match a div
-                        element with a "bar" attribute that exactly matches the
-                        value "baz".
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>word match</emphasis>: the attribute contains
-                        a word matching the string: 'div[bar~="baz"]' would match a div
-                        element with a "bar" attribute that contains the
-                        word "baz". '&lt;div bar="foo baz"&gt;' would match, but '&lt;div
-                                bar="foo bazbat"&gt;' would not.
-                    </para></listitem>
-
-                    <listitem><para>
-                        <emphasis>substring match</emphasis>: the attribute contains
-                        the string: 'div[bar*="baz"]' would match a div
-                        element with a "bar" attribute that contains the
-                        string "baz" anywhere within it.
-                    </para></listitem>
+                    <listitem>
+                        <para>
+                            <emphasis>exact match</emphasis>: the attribute exactly
+                            matches the string: 'div[bar="baz"]' would match a div
+                            element with a "bar" attribute that exactly matches the
+                            value "baz".
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>word match</emphasis>: the attribute contains
+                            a word matching the string: 'div[bar~="baz"]' would match a div
+                            element with a "bar" attribute that contains the
+                            word "baz". '&lt;div bar="foo baz"&gt;' would match, but '&lt;div
+                            bar="foo bazbat"&gt;' would not.
+                        </para>
+                    </listitem>
+
+                    <listitem>
+                        <para>
+                            <emphasis>substring match</emphasis>: the attribute contains
+                            the string: 'div[bar*="baz"]' would match a div
+                            element with a "bar" attribute that contains the
+                            string "baz" anywhere within it.
+                        </para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
             </listitem>
             </listitem>
 
 
-            <listitem><para>
-                <emphasis>direct descendents</emphasis>: utilize '&gt;' between
-                selectors to denote direct descendents. 'div > span' would
-                select only 'span' elements that are direct descendents of a
-                'div'. Can also be used with any of the selectors above.
-            </para></listitem>
+            <listitem>
+                <para>
+                    <emphasis>direct descendents</emphasis>: utilize '&gt;' between
+                    selectors to denote direct descendents. 'div > span' would
+                    select only 'span' elements that are direct descendents of a
+                    'div'. Can also be used with any of the selectors above.
+                </para>
+            </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
@@ -177,48 +191,64 @@ foreach ($results as $result) {
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
-                    <methodname>setDocumentXml($document)</methodname>: specify an
-                    <acronym>XML</acronym> string to query against.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setDocumentXhtml($document)</methodname>: specify an
-                    <acronym>XHTML</acronym> string to query against.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setDocumentHtml($document)</methodname>: specify an HTML
-                    string to query against.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>setDocument($document)</methodname>: specify a
-                    string to query against; <classname>Zend_Dom_Query</classname> will
-                    then attempt to autodetect the document type.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getDocument()</methodname>: retrieve the original document
-                    string provided to the object.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getDocumentType()</methodname>: retrieve the document
-                    type of the document provided to the object; will be one of
-                    the <constant>DOC_XML</constant>, <constant>DOC_XHTML</constant>, or
-                    <constant>DOC_HTML</constant> class constants.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>query($query)</methodname>: query the document using
-                    <acronym>CSS</acronym> selector notation.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>queryXpath($xPathQuery)</methodname>: query the document
-                    using XPath notation.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <methodname>setDocumentXml($document)</methodname>: specify an
+                        <acronym>XML</acronym> string to query against.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setDocumentXhtml($document)</methodname>: specify an
+                        <acronym>XHTML</acronym> string to query against.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setDocumentHtml($document)</methodname>: specify an HTML
+                        string to query against.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>setDocument($document)</methodname>: specify a
+                        string to query against; <classname>Zend_Dom_Query</classname> will
+                        then attempt to autodetect the document type.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getDocument()</methodname>: retrieve the original document
+                        string provided to the object.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getDocumentType()</methodname>: retrieve the document
+                        type of the document provided to the object; will be one of
+                        the <constant>DOC_XML</constant>, <constant>DOC_XHTML</constant>, or
+                        <constant>DOC_HTML</constant> class constants.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>query($query)</methodname>: query the document using
+                        <acronym>CSS</acronym> selector notation.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>queryXpath($xPathQuery)</methodname>: query the document
+                        using XPath notation.
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
         </sect3>
         </sect3>
 
 
@@ -235,22 +265,28 @@ foreach ($results as $result) {
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
-                <listitem><para>
-                    <methodname>getCssQuery()</methodname>: return the <acronym>CSS</acronym>
-                    selector query used to produce the result (if any).
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getXpathQuery()</methodname>: return the XPath query
-                    used to produce the result. Internally,
-                    <classname>Zend_Dom_Query</classname> converts <acronym>CSS</acronym> selector
-                    queries to XPath, so this value will always be populated.
-                </para></listitem>
-
-                <listitem><para>
-                    <methodname>getDocument()</methodname>: retrieve the DOMDocument the
-                    selection was made against.
-                </para></listitem>
+                <listitem>
+                    <para>
+                        <methodname>getCssQuery()</methodname>: return the <acronym>CSS</acronym>
+                        selector query used to produce the result (if any).
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getXpathQuery()</methodname>: return the XPath query
+                        used to produce the result. Internally,
+                        <classname>Zend_Dom_Query</classname> converts <acronym>CSS</acronym>
+                        selector queries to XPath, so this value will always be populated.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>getDocument()</methodname>: retrieve the DOMDocument the
+                        selection was made against.
+                    </para>
+                </listitem>
             </itemizedlist>
             </itemizedlist>
         </sect3>
         </sect3>
     </sect2>
     </sect2>

Неке датотеке нису приказане због велике количине промена