Browse Source

[DOCUMENTATION] English:

- manual fixes (only line length)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17598 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 năm trước cách đây
mục cha
commit
8b45a28d21

+ 8 - 8
documentation/manual/en/module_specs/Zend_Date-Theory.xml

@@ -40,10 +40,10 @@
                         00:00:00 <acronym>GMT</acronym>/UTC. This was only possible, because
                         00:00:00 <acronym>GMT</acronym>/UTC. This was only possible, because
                         <classname>Zend_Date</classname> is not limited to UNIX timestamps nor
                         <classname>Zend_Date</classname> is not limited to UNIX timestamps nor
                         integer values. The BCMath extension is required to support extremely large
                         integer values. The BCMath extension is required to support extremely large
-                        dates outside of the range Fri, 13 Dec 1901 20:45:54 <acronym>GMT</acronym> to Tue, 19 Jan 2038
-                        03:14:07 <acronym>GMT</acronym>. Additional, tiny math errors may arise due to the inherent
-                        limitations of float data types and rounding, unless using the BCMath
-                        extension.
+                        dates outside of the range Fri, 13 Dec 1901 20:45:54 <acronym>GMT</acronym>
+                        to Tue, 19 Jan 2038 03:14:07 <acronym>GMT</acronym>. Additional, tiny math
+                        errors may arise due to the inherent limitations of float data types and
+                        rounding, unless using the BCMath extension.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
                 <listitem>
                 <listitem>
@@ -52,8 +52,8 @@
                     </para>
                     </para>
                     <para>
                     <para>
                         Thus, an instance object representing three hours would be expressed as
                         Thus, an instance object representing three hours would be expressed as
-                        three hours after January 1st, 1970 00:00:00 <acronym>GMT</acronym>/UTC -i.e. 0 + 3 * 60 * 60 =
-                        10800.
+                        three hours after January 1st, 1970 00:00:00 <acronym>GMT</acronym>/UTC
+                        -i.e. 0 + 3 * 60 * 60 = 10800.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
                 <listitem>
                 <listitem>
@@ -61,8 +61,8 @@
                         <acronym>PHP</acronym> functions
                         <acronym>PHP</acronym> functions
                     </para>
                     </para>
                     <para>
                     <para>
-                        Where possible, <classname>Zend_Date</classname> usually uses <acronym>PHP</acronym> functions
-                        to improve performance.
+                        Where possible, <classname>Zend_Date</classname> usually uses
+                        <acronym>PHP</acronym> functions to improve performance.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
             </itemizedlist>
             </itemizedlist>

+ 48 - 42
documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -106,8 +106,9 @@ class BugsProducts extends Zend_Db_Table_Abstract
 
 
             <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 operations. See
-                <xref linkend="zend.db.table.relationships.cascading" /> for more information.
+                integrity constraints in the <acronym>RDBMS</acronym> server to implement cascading
+                operations. See <xref linkend="zend.db.table.relationships.cascading" /> for more
+                information.
             </para>
             </para>
 
 
         </note>
         </note>
@@ -122,13 +123,13 @@ class BugsProducts extends Zend_Db_Table_Abstract
         <para>
         <para>
             The rule key is a string used as an index to the <varname>$_referenceMap</varname>
             The rule key is a string used as an index to the <varname>$_referenceMap</varname>
             array. This rule key is used to identify each reference relationship. Choose a
             array. This rule key is used to identify each reference relationship. Choose a
-            descriptive name for this rule key. It's best to use a string that can be part of a <acronym>PHP</acronym>
-            method name, as you will see later.
+            descriptive name for this rule key. It's best to use a string that can be part of a
+            <acronym>PHP</acronym> method name, as you will see later.
         </para>
         </para>
 
 
         <para>
         <para>
-            In the example <acronym>PHP</acronym> code above, the rule keys in the Bugs table class are:
-            <code>'Reporter'</code>, <code>'Engineer'</code>, <code>'Verifier'</code>, and
+            In the example <acronym>PHP</acronym> code above, the rule keys in the Bugs table class
+            are: <code>'Reporter'</code>, <code>'Engineer'</code>, <code>'Verifier'</code>, and
             <code>'Product'</code>.
             <code>'Product'</code>.
         </para>
         </para>
 
 
@@ -152,8 +153,8 @@ class BugsProducts extends Zend_Db_Table_Abstract
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>refTableClass</emphasis> => The class name of the
-                    parent table. Use the class name, not the physical name of the <acronym>SQL</acronym> table.
+                    <emphasis>refTableClass</emphasis> => The class name of the parent table. Use
+                    the class name, not the physical name of the <acronym>SQL</acronym> table.
                 </para>
                 </para>
 
 
                 <para>
                 <para>
@@ -316,8 +317,9 @@ $bugsAssignedToUser = $user1234->findDependentRowset('Bugs',
 
 
             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
             called a "magic method". <classname>Zend_Db_Table_Row_Abstract</classname> invokes the
             called a "magic method". <classname>Zend_Db_Table_Row_Abstract</classname> invokes the
-            method: <methodname>findDependentRowset('&lt;TableClass&gt;', '&lt;Rule&gt;')</methodname> if you
-            invoke a method on the Row object matching either of the following patterns:
+            method: <methodname>findDependentRowset('&lt;TableClass&gt;',
+                '&lt;Rule&gt;')</methodname> if you invoke a method on the Row object matching
+            either of the following patterns:
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
@@ -458,8 +460,8 @@ $engineer = $bug1->findParentRow('Accounts', 'Engineer');
         <para>
         <para>
             Alternatively, you can query rows from a parent table using a "magic method".
             Alternatively, you can query rows from a parent table using a "magic method".
             <classname>Zend_Db_Table_Row_Abstract</classname> invokes the method:
             <classname>Zend_Db_Table_Row_Abstract</classname> invokes the method:
-            <methodname>findParentRow('&lt;TableClass&gt;', '&lt;Rule&gt;')</methodname> if you invoke a method
-            on the Row object matching either of the following patterns:
+            <methodname>findParentRow('&lt;TableClass&gt;', '&lt;Rule&gt;')</methodname> if you
+            invoke a method on the Row object matching either of the following patterns:
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
@@ -731,20 +733,22 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
                 If your <acronym>RDBMS</acronym> implements DRI and the <code>ON DELETE</code> and
                 If your <acronym>RDBMS</acronym> implements DRI and the <code>ON DELETE</code> and
                 <code>ON UPDATE</code> clauses, you should declare these clauses in your database
                 <code>ON UPDATE</code> clauses, you should declare these clauses in your database
                 schema, instead of using the cascading feature in
                 schema, instead of using the cascading feature in
-                <classname>Zend_Db_Table</classname>. Declaring cascading DRI rules in the <acronym>RDBMS</acronym> is
-                better for database performance, consistency, and integrity.
+                <classname>Zend_Db_Table</classname>. Declaring cascading DRI rules in the
+                <acronym>RDBMS</acronym> is better for database performance, consistency, and
+                integrity.
             </para>
             </para>
 
 
             <para>
             <para>
-                Most importantly, do not declare cascading operations both in the <acronym>RDBMS</acronym> and in your
-                <classname>Zend_Db_Table</classname> class.
+                Most importantly, do not declare cascading operations both in the
+                <acronym>RDBMS</acronym> and in your <classname>Zend_Db_Table</classname> class.
             </para>
             </para>
 
 
         </note>
         </note>
 
 
         <para>
         <para>
             You can declare cascading operations to execute against a dependent table when you
             You can declare cascading operations to execute against a dependent table when you
-            apply an <constant>UPDATE</constant> or a <constant>DELETE</constant> to a row in a parent table.
+            apply an <constant>UPDATE</constant> or a <constant>DELETE</constant> to a row in a
+            parent table.
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.cascading.example-delete">
         <example id="zend.db.table.relationships.cascading.example-delete">
@@ -769,9 +773,10 @@ $product1234->delete();
         </example>
         </example>
 
 
         <para>
         <para>
-            Similarly, if you use <constant>UPDATE</constant> to change the value of a primary key in a
-            parent table, you may want the value in foreign keys of dependent tables to be updated
-            automatically to match the new value, so that such references are kept up to date.
+            Similarly, if you use <constant>UPDATE</constant> to change the value of a primary key
+            in a parent table, you may want the value in foreign keys of dependent tables to be
+            updated automatically to match the new value, so that such references are kept up to
+            date.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -785,9 +790,9 @@ $product1234->delete();
             To declare a cascading relationship in the <classname>Zend_Db_Table</classname>, edit
             To declare a cascading relationship in the <classname>Zend_Db_Table</classname>, edit
             the rules in the <varname>$_referenceMap</varname>. Set the associative array keys
             the rules in the <varname>$_referenceMap</varname>. Set the associative array keys
             <code>'onDelete'</code> and <code>'onUpdate'</code> to the string 'cascade' (or the
             <code>'onDelete'</code> and <code>'onUpdate'</code> to the string 'cascade' (or the
-            constant <constant>self::CASCADE</constant>). Before a row is deleted from the parent table, or
-            its primary key values updated, any rows in the dependent table that refer to the
-            parent's row are deleted or updated first.
+            constant <constant>self::CASCADE</constant>). Before a row is deleted from the parent
+            table, or its primary key values updated, any rows in the dependent table that refer to
+            the parent's row are deleted or updated first.
         </para>
         </para>
 
 
         <example id="zend.db.table.relationships.cascading.example-declaration">
         <example id="zend.db.table.relationships.cascading.example-declaration">
@@ -804,8 +809,8 @@ $product1234->delete();
             <para>
             <para>
                 No cascading update is done in the example below if the primary key value in the
                 No cascading update is done in the example below if the primary key value in the
                 parent class is changed. The <code>'onUpdate'</code> element of the reference map
                 parent class is changed. The <code>'onUpdate'</code> element of the reference map
-                entry is <constant>self::RESTRICT</constant>. You can get the same result by omitting
-                the <code>'onUpdate'</code> entry.
+                entry is <constant>self::RESTRICT</constant>. You can get the same result by
+                omitting the <code>'onUpdate'</code> entry.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -853,20 +858,20 @@ class BugsProducts extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <para>
             <para>
-                However, for both <constant>UPDATE</constant> and <constant>DELETE</constant>, changing the
-                database in a non-atomic way also creates the risk that another database user can
-                see the data in an inconsistent state. For example, if you delete a row and all its
-                dependent rows, there is a small chance that another database client program can
-                query the database after you have deleted the dependent rows, but before you delete
-                the parent row. That client program may see the parent row with no dependent rows,
-                and assume this is the intended state of the data. There is no way for that client
-                to know that its query read the database in the middle of a change.
+                However, for both <constant>UPDATE</constant> and <constant>DELETE</constant>,
+                changing the database in a non-atomic way also creates the risk that another
+                database user can see the data in an inconsistent state. For example, if you delete
+                a row and all its dependent rows, there is a small chance that another database
+                client program can query the database after you have deleted the dependent rows, but
+                before you delete the parent row. That client program may see the parent row with no
+                dependent rows, and assume this is the intended state of the data. There is no way
+                for that client to know that its query read the database in the middle of a change.
             </para>
             </para>
 
 
             <para>
             <para>
                 The issue of non-atomic change can be mitigated by using transactions to isolate
                 The issue of non-atomic change can be mitigated by using transactions to isolate
-                your change. But some <acronym>RDBMS</acronym> brands don't support transactions, or allow clients to
-                read "dirty" changes that have not been committed yet.
+                your change. But some <acronym>RDBMS</acronym> brands don't support transactions, or
+                allow clients to read "dirty" changes that have not been committed yet.
             </para>
             </para>
 
 
             <para>
             <para>
@@ -876,10 +881,11 @@ class BugsProducts extends Zend_Db_Table_Abstract
 
 
             <para>
             <para>
                 Cascading deletes and updates defined in your <classname>Zend_Db_Table</classname>
                 Cascading deletes and updates defined in your <classname>Zend_Db_Table</classname>
-                classes are applied if you execute the <methodname>save()</methodname> or <methodname>delete()</methodname>
-                methods on the Row class. However, if you update or delete data using another
-                interface, such as a query tool or another application, the cascading operations are
-                not applied. Even when using <methodname>update()</methodname> and <methodname>delete()</methodname> methods
+                classes are applied if you execute the <methodname>save()</methodname> or
+                <methodname>delete()</methodname> methods on the Row class. However, if you update
+                or delete data using another interface, such as a query tool or another application,
+                the cascading operations are not applied. Even when using
+                <methodname>update()</methodname> and <methodname>delete()</methodname> methods
                 in the <classname>Zend_Db_Adapter</classname> class, cascading operations defined in
                 in the <classname>Zend_Db_Adapter</classname> class, cascading operations defined in
                 your <classname>Zend_Db_Table</classname> classes are not executed.
                 your <classname>Zend_Db_Table</classname> classes are not executed.
             </para>
             </para>
@@ -889,9 +895,9 @@ class BugsProducts extends Zend_Db_Table_Abstract
             </para>
             </para>
 
 
             <para>
             <para>
-                There is no support for a cascading <constant>INSERT</constant>. You must insert a row to a
-                parent table in one operation, and insert row(s) to a dependent table in a separate
-                operation.
+                There is no support for a cascading <constant>INSERT</constant>. You must insert a
+                row to a parent table in one operation, and insert row(s) to a dependent table in a
+                separate operation.
             </para>
             </para>
 
 
         </sect3>
         </sect3>

+ 7 - 7
documentation/manual/en/module_specs/Zend_Db_Table_Definition.xml

@@ -22,8 +22,8 @@
 
 
         <para>
         <para>
             For all of the same options that are available when configuring an extended
             For all of the same options that are available when configuring an extended
-            <classname>Zend_Db_Table_Abstract</classname> class, those options are also available when describing
-            a definition file. This definition file should be passed to the class at
+            <classname>Zend_Db_Table_Abstract</classname> class, those options are also available
+            when describing a definition file. This definition file should be passed to the class at
             instantiation time so that it can know the full definition of all tables
             instantiation time so that it can know the full definition of all tables
             in said definition.
             in said definition.
         </para>
         </para>
@@ -129,15 +129,15 @@ foreach ($authors as $author) {
             Sometimes you want to use both paradigms for defining and using the
             Sometimes you want to use both paradigms for defining and using the
             table gateway: both by extension and concrete instantiation. To do this
             table gateway: both by extension and concrete instantiation. To do this
             simply leave out any table configurations out of the definition. This will
             simply leave out any table configurations out of the definition. This will
-            allow <classname>Zend_Db_Table</classname> to look for the actual refered class instead of the
-            definition key.
+            allow <classname>Zend_Db_Table</classname> to look for the actual refered class instead
+            of the definition key.
         </para>
         </para>
 
 
         <para>
         <para>
             Building on the example above, we will allow for one of the table configurations
             Building on the example above, we will allow for one of the table configurations
-            to be a <classname>Zend_Db_Table_Abstract</classname> extended class, while keeping the rest of the tables
-            as part of the definition. We will also show how one would interact with this
-            new definition.
+            to be a <classname>Zend_Db_Table_Abstract</classname> extended class, while keeping the
+            rest of the tables as part of the definition. We will also show how one would interact
+            with this new definition.
         </para>
         </para>
 
 
         <example id="zend.db.table.definition.example3">
         <example id="zend.db.table.definition.example3">

+ 38 - 34
documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml

@@ -24,9 +24,9 @@
         <title>Fetching a Rowset</title>
         <title>Fetching a Rowset</title>
 
 
         <para>
         <para>
-            <classname>Zend_Db_Table_Abstract</classname> provides methods <methodname>find()</methodname> and
-            <methodname>fetchAll()</methodname>, each of which returns an object of type
-            <classname>Zend_Db_Table_Rowset_Abstract</classname>.
+            <classname>Zend_Db_Table_Abstract</classname> provides methods
+            <methodname>find()</methodname> and <methodname>fetchAll()</methodname>, each of which
+            returns an object of type <classname>Zend_Db_Table_Rowset_Abstract</classname>.
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.fetch.example">
         <example id="zend.db.table.rowset.fetch.example">
@@ -55,8 +55,8 @@ $rowset = $bugs->fetchAll("bug_status = 'NEW'");
             A legitimate query returns zero rows when no rows in the database match the query
             A legitimate query returns zero rows when no rows in the database match the query
             conditions. Therefore, a Rowset object might contain zero Row objects. Since
             conditions. Therefore, a Rowset object might contain zero Row objects. Since
             <classname>Zend_Db_Table_Rowset_Abstract</classname> implements the
             <classname>Zend_Db_Table_Rowset_Abstract</classname> implements the
-            <code>Countable</code> interface, you can use <methodname>count()</methodname> to determine the
-            number of Rows in the Rowset.
+            <code>Countable</code> interface, you can use <methodname>count()</methodname> to
+            determine the number of Rows in the Rowset.
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.rows.counting.example">
         <example id="zend.db.table.rowset.rows.counting.example">
@@ -82,8 +82,9 @@ if ($rowCount > 0) {
             <title>Reading a Single Row from a Rowset</title>
             <title>Reading a Single Row from a Rowset</title>
 
 
             <para>
             <para>
-                The simplest way to access a Row from a Rowset is to use the <methodname>current()</methodname>
-                method. This is particularly appropriate when the Rowset contains exactly one Row.
+                The simplest way to access a Row from a Rowset is to use the
+                <methodname>current()</methodname> method. This is particularly appropriate when the
+                Rowset contains exactly one Row.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -141,11 +142,12 @@ foreach ($rowset as $row) {
 
 
             <para>
             <para>
                 <code>SeekableIterator</code> allows you to seek to a position that you would like
                 <code>SeekableIterator</code> allows you to seek to a position that you would like
-                the iterator to jump to. Simply use the <methodname>seek()</methodname> method for that. Pass it
-                an integer representing the number of the Row you would like your Rowset to point to
-                next, don't forget that it starts with index 0. If the index is wrong, ie doesn't
-                exist, an exception will be thrown. You should use <methodname>count()</methodname> to check the
-                number of results before seeking to a position.
+                the iterator to jump to. Simply use the <methodname>seek()</methodname> method for
+                that. Pass it an integer representing the number of the Row you would like your
+                Rowset to point to next, don't forget that it starts with index 0. If the index is
+                wrong, ie doesn't exist, an exception will be thrown. You should use
+                <methodname>count()</methodname> to check the number of results before seeking to a
+                position.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -168,13 +170,13 @@ $row9->save();
         </example>
         </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 false). This method returns a
-                <classname>Zend_Db_Table_Row</classname> object by default. If the position
-                requested does not exist, an exception will be thrown. Here is an example :
+                <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 false). This
+                method returns a <classname>Zend_Db_Table_Row</classname> object by default. If the
+                position requested does not exist, an exception will be thrown. Here is an example:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -203,10 +205,10 @@ $row9->save();
         <title>Retrieving a Rowset as an Array</title>
         <title>Retrieving a Rowset as an Array</title>
 
 
         <para>
         <para>
-            You can access all the data in the Rowset as an array using the <methodname>toArray()</methodname>
-            method of the Rowset object. This returns an array containing one entry per Row. Each
-            entry is an associative array having keys that correspond to column names and elements
-            that correspond to the respective column values.
+            You can access all the data in the Rowset as an array using the
+            <methodname>toArray()</methodname> method of the Rowset object. This returns an array
+            containing one entry per Row. Each entry is an associative array having keys that
+            correspond to column names and elements that correspond to the respective column values.
         </para>
         </para>
 
 
         <example id="zend.db.table.rowset.to-array.example">
         <example id="zend.db.table.rowset.to-array.example">
@@ -232,9 +234,9 @@ foreach ($rowsetArray as $rowArray) {
         </example>
         </example>
 
 
         <para>
         <para>
-            The array returned from <methodname>toArray()</methodname> is not updateable. That is, you can
-            modify values in the array as you can with any array, but changes to the array data are
-            not propagated to the database.
+            The array returned from <methodname>toArray()</methodname> is not updateable. That is,
+            you can modify values in the array as you can with any array, but changes to the array
+            data are not propagated to the database.
         </para>
         </para>
 
 
     </sect2>
     </sect2>
@@ -254,8 +256,9 @@ foreach ($rowsetArray as $rowArray) {
             <title>Serializing a Rowset</title>
             <title>Serializing a Rowset</title>
 
 
             <para>
             <para>
-                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to create a string containing a
-                byte-stream representation of the Rowset object argument.
+                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to
+                create a string containing a byte-stream representation of the Rowset object
+                argument.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -275,8 +278,9 @@ $serializedRowset = serialize($rowset);
             <title>Unserializing a Serialized Rowset</title>
             <title>Unserializing a Serialized Rowset</title>
 
 
             <para>
             <para>
-                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to restore a string containing a
-                byte-stream representation of an object. The function returns the original object.
+                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to
+                restore a string containing a byte-stream representation of an object. The function
+                returns the original object.
             </para>
             </para>
 
 
             <para>
             <para>
@@ -310,8 +314,8 @@ echo $row->bug_description;
         </note>
         </note>
 
 
         <para>
         <para>
-            You can reactivate a disconnected Rowset using the <methodname>setTable()</methodname> method. The
-            argument to this method is a valid object of type
+            You can reactivate a disconnected Rowset using the <methodname>setTable()</methodname>
+            method. The argument to this method is a valid object of type
             <classname>Zend_Db_Table_Abstract</classname>, which you create. Creating a Table object
             <classname>Zend_Db_Table_Abstract</classname>, which you create. Creating a Table object
             requires a live connection to the database, so by reassociating the Table with the
             requires a live connection to the database, so by reassociating the Table with the
             Rowset, the Rowset gains access to the database. Subsequently, you can change values in
             Rowset, the Rowset gains access to the database. Subsequently, you can change values in
@@ -341,8 +345,8 @@ $row->save();
         </example>
         </example>
 
 
         <para>
         <para>
-            Reactivating a Rowset with <methodname>setTable()</methodname> also reactivates all the Row objects
-            contained in that Rowset.
+            Reactivating a Rowset with <methodname>setTable()</methodname> also reactivates all the
+            Row objects contained in that Rowset.
         </para>
         </para>
 
 
     </sect2>
     </sect2>

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

@@ -108,9 +108,8 @@ $data->addItems($someMoreItems);
 
 
         <para>
         <para>
             You can attach collections of the above items via
             You can attach collections of the above items via
-            <methodname>addItems()</methodname> or <methodname>setItems()</methodname> (overwrites all
-            previously set items); when doing so, you may pass a single
-            argument:
+            <methodname>addItems()</methodname> or <methodname>setItems()</methodname> (overwrites
+            all previously set items); when doing so, you may pass a single argument:
         </para>
         </para>
 
 
         <itemizedlist>
         <itemizedlist>
@@ -140,7 +139,8 @@ $data->setLabel('name');
 
 
         <para>
         <para>
             Finally, you can also load a <classname>Zend_Dojo_Data</classname> item from a
             Finally, you can also load a <classname>Zend_Dojo_Data</classname> item from a
-            dojo.data <acronym>JSON</acronym> array, using the <methodname>fromJson()</methodname> method.
+            dojo.data <acronym>JSON</acronym> array, using the <methodname>fromJson()</methodname>
+            method.
         </para>
         </para>
 
 
         <example id="zend.dojo.data.usage.populate">
         <example id="zend.dojo.data.usage.populate">
@@ -366,8 +366,8 @@ $json = (string) $data; // cast to string == cast to JSON
                 </para></listitem>
                 </para></listitem>
 
 
                 <listitem><para>
                 <listitem><para>
-                    <methodname>toArray()</methodname>: cast the object to an array. At a minimum, the
-                    array will contain the keys 'identifier',
+                    <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
                     'items', and 'label' if a label field has been set
                     in the object.
                     in the object.
                 </para></listitem>
                 </para></listitem>

+ 69 - 40
documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml

@@ -430,8 +430,8 @@ $form->addElement(
 
 
         <itemizedlist>
         <itemizedlist>
             <listitem><para>
             <listitem><para>
-                <methodname>setAmPm($flag)</methodname> and <methodname>getAmPm()</methodname>: Whether
-                or not to use AM/PM strings in times.
+                <methodname>setAmPm($flag)</methodname> and <methodname>getAmPm()</methodname>:
+                Whether or not to use AM/PM strings in times.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
@@ -442,8 +442,9 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setLocale($locale)</methodname> and <methodname>getLocale()</methodname>:
-                Set and retrieve the locale to use with this specific element.
+                <methodname>setLocale($locale)</methodname> and
+                <methodname>getLocale()</methodname>: Set and retrieve the locale to use with this
+                specific element.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
@@ -510,13 +511,25 @@ $form->addElement(
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para><methodname>addCaptureEvent($event)</methodname></para></listitem>
-                    <listitem><para><methodname>addCaptureEvents(array $events)</methodname></para></listitem>
-                    <listitem><para><methodname>setCaptureEvents(array $events)</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>addCaptureEvent($event)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>addCaptureEvents(array $events)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>setCaptureEvents(array $events)</methodname></para>
+                    </listitem>
                     <listitem><para><methodname>getCaptureEvents()</methodname></para></listitem>
                     <listitem><para><methodname>getCaptureEvents()</methodname></para></listitem>
-                    <listitem><para><methodname>hasCaptureEvent($event)</methodname></para></listitem>
-                    <listitem><para><methodname>removeCaptureEvent($event)</methodname></para></listitem>
-                    <listitem><para><methodname>clearCaptureEvents()</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>hasCaptureEvent($event)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>removeCaptureEvent($event)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>clearCaptureEvents()</methodname></para>
+                    </listitem>
                 </itemizedlist>
                 </itemizedlist>
             </listitem>
             </listitem>
 
 
@@ -529,8 +542,12 @@ $form->addElement(
 
 
                 <itemizedlist>
                 <itemizedlist>
                     <listitem><para><methodname>addEvent($event)</methodname></para></listitem>
                     <listitem><para><methodname>addEvent($event)</methodname></para></listitem>
-                    <listitem><para><methodname>addEvents(array $events)</methodname></para></listitem>
-                    <listitem><para><methodname>setEvents(array $events)</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>addEvents(array $events)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>setEvents(array $events)</methodname></para>
+                    </listitem>
                     <listitem><para><methodname>getEvents()</methodname></para></listitem>
                     <listitem><para><methodname>getEvents()</methodname></para></listitem>
                     <listitem><para><methodname>hasEvent($event)</methodname></para></listitem>
                     <listitem><para><methodname>hasEvent($event)</methodname></para></listitem>
                     <listitem><para><methodname>removeEvent($event)</methodname></para></listitem>
                     <listitem><para><methodname>removeEvent($event)</methodname></para></listitem>
@@ -548,8 +565,12 @@ $form->addElement(
 
 
                 <itemizedlist>
                 <itemizedlist>
                     <listitem><para><methodname>addPlugin($plugin)</methodname></para></listitem>
                     <listitem><para><methodname>addPlugin($plugin)</methodname></para></listitem>
-                    <listitem><para><methodname>addPlugins(array $plugins)</methodname></para></listitem>
-                    <listitem><para><methodname>setPlugins(array $plugins)</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>addPlugins(array $plugins)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>setPlugins(array $plugins)</methodname></para>
+                    </listitem>
                     <listitem><para><methodname>getPlugins()</methodname></para></listitem>
                     <listitem><para><methodname>getPlugins()</methodname></para></listitem>
                     <listitem><para><methodname>hasPlugin($plugin)</methodname></para></listitem>
                     <listitem><para><methodname>hasPlugin($plugin)</methodname></para></listitem>
                     <listitem><para><methodname>removePlugin($plugin)</methodname></para></listitem>
                     <listitem><para><methodname>removePlugin($plugin)</methodname></para></listitem>
@@ -619,7 +640,9 @@ $form->addElement(
                 </para>
                 </para>
 
 
                 <itemizedlist>
                 <itemizedlist>
-                    <listitem><para><methodname>addStyleSheet($styleSheet)</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>addStyleSheet($styleSheet)</methodname></para>
+                    </listitem>
                     <listitem>
                     <listitem>
                         <para><methodname>addStyleSheets(array $styleSheets)</methodname></para>
                         <para><methodname>addStyleSheets(array $styleSheets)</methodname></para>
                     </listitem>
                     </listitem>
@@ -627,8 +650,12 @@ $form->addElement(
                         <para><methodname>setStyleSheets(array $styleSheets)</methodname></para>
                         <para><methodname>setStyleSheets(array $styleSheets)</methodname></para>
                     </listitem>
                     </listitem>
                     <listitem><para><methodname>getStyleSheets()</methodname></para></listitem>
                     <listitem><para><methodname>getStyleSheets()</methodname></para></listitem>
-                    <listitem><para><methodname>hasStyleSheet($styleSheet)</methodname></para></listitem>
-                    <listitem><para><methodname>removeStyleSheet($styleSheet)</methodname></para></listitem>
+                    <listitem>
+                        <para><methodname>hasStyleSheet($styleSheet)</methodname></para>
+                    </listitem>
+                    <listitem>
+                        <para><methodname>removeStyleSheet($styleSheet)</methodname></para>
+                    </listitem>
                     <listitem><para><methodname>clearStyleSheets()</methodname></para></listitem>
                     <listitem><para><methodname>clearStyleSheets()</methodname></para></listitem>
                 </itemizedlist>
                 </itemizedlist>
             </listitem>
             </listitem>
@@ -840,13 +867,13 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setMin($value)</methodname> and <methodname>getMin()</methodname>: set and
-                retrieve the minimum value possible.
+                <methodname>setMin($value)</methodname> and <methodname>getMin()</methodname>: set
+                and retrieve the minimum value possible.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setMax($value)</methodname> and <methodname>getMax()</methodname>: set and
-                retrieve the maximum value possible.
+                <methodname>setMax($value)</methodname> and <methodname>getMax()</methodname>: set
+                and retrieve the maximum value possible.
             </para></listitem>
             </para></listitem>
         </itemizedlist>
         </itemizedlist>
 
 
@@ -894,9 +921,9 @@ $form->addElement(
 
 
         <itemizedlist>
         <itemizedlist>
             <listitem><para>
             <listitem><para>
-                <methodname>setLocale($locale)</methodname> and <methodname>getLocale()</methodname>:
-                specify and retrieve a specific or alternate locale to use with
-                this dijit.
+                <methodname>setLocale($locale)</methodname> and
+                <methodname>getLocale()</methodname>: specify and retrieve a specific or alternate
+                locale to use with this dijit.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
@@ -907,19 +934,20 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setType($type)</methodname> and <methodname>getType()</methodname>: set and
-                retrieve the numeric format type to use (should be one of
+                <methodname>setType($type)</methodname> and <methodname>getType()</methodname>: set
+                and retrieve the numeric format type to use (should be one of
                 'decimal', 'percent', or 'currency').
                 'decimal', 'percent', or 'currency').
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setPlaces($places)</methodname> and <methodname>getPlaces()</methodname>:
-                set and retrieve the number of decimal places to support.
+                <methodname>setPlaces($places)</methodname> and
+                <methodname>getPlaces()</methodname>: set and retrieve the number of decimal places
+                to support.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setStrict($flag)</methodname> and <methodname>getStrict()</methodname>: set
-                and retrieve the value of the strict flag, which indicates how
+                <methodname>setStrict($flag)</methodname> and <methodname>getStrict()</methodname>:
+                set and retrieve the value of the strict flag, which indicates how
                 much leniency is allowed in relation to whitespace and
                 much leniency is allowed in relation to whitespace and
                 non-numeric characters.
                 non-numeric characters.
             </para></listitem>
             </para></listitem>
@@ -1098,13 +1126,13 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setMaximum($value)</methodname> and <methodname>getMaximum()</methodname>:
-                set the maximum value of the slider.
+                <methodname>setMaximum($value)</methodname> and
+                <methodname>getMaximum()</methodname>: set the maximum value of the slider.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setMinimum($value)</methodname> and <methodname>getMinimum()</methodname>:
-                set the minimum value of the slider.
+                <methodname>setMinimum($value)</methodname> and
+                <methodname>getMinimum()</methodname>: set the minimum value of the slider.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
@@ -1172,13 +1200,14 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setUppercase($flag)</methodname> and <methodname>getUppercase()</methodname>: set and retrieve
+                <methodname>setUppercase($flag)</methodname> and
+                <methodname>getUppercase()</methodname>: set and retrieve
                 the flag indicating whether or not the input should be cast to UPPERCASE.
                 the flag indicating whether or not the input should be cast to UPPERCASE.
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setTrim($flag)</methodname> and <methodname>getTrim()</methodname>: set and
-                retrieve the flag indicating whether or not leading or trailing
+                <methodname>setTrim($flag)</methodname> and <methodname>getTrim()</methodname>: set
+                and retrieve the flag indicating whether or not leading or trailing
                 whitespace should be stripped.
                 whitespace should be stripped.
             </para></listitem>
             </para></listitem>
 
 
@@ -1332,9 +1361,9 @@ $form->addElement(
             </para></listitem>
             </para></listitem>
 
 
             <listitem><para>
             <listitem><para>
-                <methodname>setRegExp($regexp)</methodname> and <methodname>getRegExp()</methodname>:
-                set and retrieve the regular expression to use for validating
-                the element. The regular expression does not need boundaries
+                <methodname>setRegExp($regexp)</methodname> and
+                <methodname>getRegExp()</methodname>: set and retrieve the regular expression to
+                use for validating the element. The regular expression does not need boundaries
                 (unlike <acronym>PHP</acronym>'s preg* family of functions).
                 (unlike <acronym>PHP</acronym>'s preg* family of functions).
             </para></listitem>
             </para></listitem>
 
 

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

@@ -306,11 +306,14 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem><para><methodname>removeLayer($path)</methodname>: remove the layer
             <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><para><methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym> for
-                    a CDN; typically, one of the
-                    <constant>Zend_Dojo::CDN_BASE_AOL</constant> or
+            <listitem>
+                <para>
+                    <methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym>
+                    for a CDN; typically, one of the <constant>Zend_Dojo::CDN_BASE_AOL</constant> or
                     <constant>Zend_Dojo::CDN_BASE_GOOGLE</constant>, but it only needs
                     <constant>Zend_Dojo::CDN_BASE_GOOGLE</constant>, but it only needs
-                    to be the <acronym>URL</acronym> string prior to the version number.</para></listitem>
+                    to be the <acronym>URL</acronym> string prior to the version number.
+                </para>
+            </listitem>
             <listitem><para><methodname>getCdnBase()</methodname>: retrieve the base CDN url
             <listitem><para><methodname>getCdnBase()</methodname>: retrieve the base CDN url
                     to utilize.</para></listitem>
                     to utilize.</para></listitem>
             <listitem><para><methodname>setCdnVersion($version = null)</methodname>: set
             <listitem><para><methodname>setCdnVersion($version = null)</methodname>: set