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

[MANUAL] English:

- manual fixes

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

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

@@ -1470,7 +1470,7 @@ $form->addElement(
                 <para>
                 <para>
                     <methodname>setVisibleIncrement($format)</methodname> and
                     <methodname>setVisibleIncrement($format)</methodname> and
                     <methodname>getVisibleIncrement()</methodname>: set the increment visible
                     <methodname>getVisibleIncrement()</methodname>: set the increment visible
-                    in the time chooser; must follow <acronym>ISO_8601</acronym> formats.
+                    in the time chooser; must follow <constant>ISO_8601</constant> formats.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -1479,7 +1479,7 @@ $form->addElement(
                     <methodname>setVisibleRange($format)</methodname> and
                     <methodname>setVisibleRange($format)</methodname> and
                     <methodname>getVisibleRange()</methodname>: set and retrieve the range of
                     <methodname>getVisibleRange()</methodname>: set and retrieve the range of
                     time visible in the time chooser at any given moment; must
                     time visible in the time chooser at any given moment; must
-                    follow <acronym>ISO_8601</acronym> formats.
+                    follow <constant>ISO_8601</constant> formats.
                 </para>
                 </para>
             </listitem>
             </listitem>
         </itemizedlist>
         </itemizedlist>

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

@@ -9,11 +9,19 @@
     </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 <acronym>CDN</acronym> 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 <command>dojo.require</command> statements.</para></listitem>
         <listitem><para>Specifying dijit stylesheet themes to use.</para></listitem>
         <listitem><para>Specifying dijit stylesheet themes to use.</para></listitem>
-        <listitem><para>Specifying dojo.addOnLoad() events.</para></listitem>
+
+        <listitem>
+            <para>Specifying <command>dojo.addOnLoad()</command> events.</para>
+        </listitem>
     </itemizedlist>
     </itemizedlist>
 
 
     <para>
     <para>
@@ -116,7 +124,7 @@ $this->dojo()->enable()
             By default, Zend Framework uses <acronym>UTF-8</acronym> as its default encoding, and,
             By default, Zend Framework uses <acronym>UTF-8</acronym> as its default encoding, and,
             specific to this case, <classname>Zend_View</classname> does as well. Character encoding
             specific to this case, <classname>Zend_View</classname> does as well. Character encoding
             can be set differently on the view object itself using the
             can be set differently on the view object itself using the
-            <methodname>setEncoding()</methodname> method (or the the <varname>encoding</varname>
+            <methodname>setEncoding()</methodname> method (or the <property>encoding</property>
             instantiation parameter). However, since <classname>Zend_View_Interface</classname> does
             instantiation parameter). However, since <classname>Zend_View_Interface</classname> does
             not define accessors for encoding, it's possible that if you are using a custom view
             not define accessors for encoding, it's possible that if you are using a custom view
             implementation with the Dojo view helper, you will not have a
             implementation with the Dojo view helper, you will not have a
@@ -137,7 +145,7 @@ $this->dojo()->enable()
         <para>
         <para>
             Dojo allows both <emphasis>declarative</emphasis> and
             Dojo allows both <emphasis>declarative</emphasis> and
             <emphasis>programmatic</emphasis> usage of many of its features.
             <emphasis>programmatic</emphasis> usage of many of its features.
-            <emphasis>Declarative</emphasis> usage uses standard HTML elements
+            <emphasis>Declarative</emphasis> usage uses standard <acronym>HTML</acronym> elements
             with non-standard attributes that are parsed when the page is
             with non-standard attributes that are parsed when the page is
             loaded. While this is a powerful and simple syntax to utilize, for
             loaded. While this is a powerful and simple syntax to utilize, for
             many developers this can cause issues with page validation.
             many developers this can cause issues with page validation.
@@ -147,7 +155,7 @@ $this->dojo()->enable()
             <emphasis>Programmatic</emphasis> usage allows the developer to
             <emphasis>Programmatic</emphasis> usage allows the developer to
             decorate existing elements by pulling them by ID or <acronym>CSS</acronym> selectors
             decorate existing elements by pulling them by ID or <acronym>CSS</acronym> selectors
             and passing them to the appropriate object constructors in Dojo.
             and passing them to the appropriate object constructors in Dojo.
-            Because no non-standard HTML attributes are used, pages continue to
+            Because no non-standard <acronym>HTML</acronym> attributes are used, pages continue to
             validate.
             validate.
         </para>
         </para>
 
 
@@ -223,7 +231,7 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
             directory separator and using the last value in the list as the name
             directory separator and using the last value in the list as the name
             of the <acronym>CSS</acronym> file in that theme directory to use; in the example
             of the <acronym>CSS</acronym> file in that theme directory to use; in the example
             above, Dojo will look for the theme in
             above, Dojo will look for the theme in
-            'dijit/themes/tundra/tundra.css'.
+            '<filename>dijit/themes/tundra/tundra.css</filename>'.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -241,7 +249,7 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
         <title>Using Layers (Custom Builds)</title>
         <title>Using Layers (Custom Builds)</title>
 
 
         <para>
         <para>
-            By default, when you use a dojo.require statement, dojo will make a
+            By default, when you use a <command>dojo.require</command> statement, dojo will make a
             request back to the server to grab the appropriate javascript file.
             request back to the server to grab the appropriate javascript file.
             If you have many dijits in place, this results in many requests to
             If you have many dijits in place, this results in many requests to
             the server -- which is not optimal.
             the server -- which is not optimal.
@@ -335,7 +343,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>requireModule($module)</methodname>: setup a
                     <methodname>requireModule($module)</methodname>: setup a
-                    <property>dojo.require</property> statement.
+                    <command>dojo.require</command> statement.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -384,7 +392,8 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym>
                     <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
+                    for a <acronym>CDN</acronym>; 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.
                     to be the <acronym>URL</acronym> string prior to the version number.
                 </para>
                 </para>
@@ -392,29 +401,31 @@ $view->dojo()->addLayer('/js/foo/foo.js');
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <methodname>getCdnBase()</methodname>: retrieve the base CDN url to utilize.
+                    <methodname>getCdnBase()</methodname>: retrieve the base <acronym>CDN</acronym>
+                    url to utilize.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setCdnVersion($version = null)</methodname>: set
                     <methodname>setCdnVersion($version = null)</methodname>: set
-                    which version of Dojo to utilize from the CDN.
+                    which version of Dojo to utilize from the <acronym>CDN</acronym>.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>getCdnVersion()</methodname>: retrieve what
                     <methodname>getCdnVersion()</methodname>: retrieve what
-                    version of Dojo from the CDN will be used.
+                    version of Dojo from the <acronym>CDN</acronym> will be used.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setCdnDojoPath($path)</methodname>: set the relative
                     <methodname>setCdnDojoPath($path)</methodname>: set the relative
-                    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
+                    path to the <filename>dojo.js</filename> or <filename>dojo.xd.js</filename>
+                    file on a <acronym>CDN</acronym>; typically, 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.
                     needs to be the path string following the version number.
                 </para>
                 </para>
@@ -422,15 +433,15 @@ $view->dojo()->addLayer('/js/foo/foo.js');
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <methodname>getCdnDojoPath()</methodname>: retrieve the last
-                    path segment of the CDN url pointing to the dojo.js file.
+                    <methodname>getCdnDojoPath()</methodname>: retrieve the last path segment of the
+                    <acronym>CDN</acronym> url pointing to the <filename>dojo.js</filename> file.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>useCdn()</methodname>: tell the container to
                     <methodname>useCdn()</methodname>: tell the container to
-                    utilize the CDN; implicitly enables integration.
+                    utilize the <acronym>CDN</acronym>; implicitly enables integration.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -438,7 +449,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
                 <para>
                 <para>
                     <methodname>setLocalPath($path)</methodname>: tell the container
                     <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 <filename>dojo.js</filename> file itself);
                     implicitly enables integration.
                     implicitly enables integration.
                 </para>
                 </para>
             </listitem>
             </listitem>
@@ -460,27 +471,28 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setDjConfig(array $config)</methodname>: set
                     <methodname>setDjConfig(array $config)</methodname>: set
-                    dojo/dijit configuration values (expects assoc array).
+                    dojo or dijit configuration values (expects assoc array).
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>setDjConfigOption($option, $value)</methodname>: set
                     <methodname>setDjConfigOption($option, $value)</methodname>: set
-                    a single dojo/dijit configuration value.
+                    a single dojo or dijit configuration value.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <methodname>getDjConfig()</methodname>: get all dojo/dijit configuration values.
+                    <methodname>getDjConfig()</methodname>: get all dojo or dijit configuration
+                    values.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>getDjConfigOption($option, $default = null)</methodname>: get a
                     <methodname>getDjConfigOption($option, $default = null)</methodname>: get a
-                    single dojo/dijit configuration value.
+                    single dojo or dijit configuration value.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -512,7 +524,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>addOnLoad($spec, $function = null)</methodname>: add
                     <methodname>addOnLoad($spec, $function = null)</methodname>: add
-                    a lambda for dojo.onLoad to call. If one argument is passed,
+                    a lambda for <command>dojo.onLoad</command> 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
@@ -532,7 +544,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>getOnLoadActions()</methodname>: retrieve all
                     <methodname>getOnLoadActions()</methodname>: retrieve all
-                    dojo.onLoad actions registered with the container. This will
+                    <command>dojo.onLoad</command> actions registered with the container. This will
                     be an array of arrays.
                     be an array of arrays.
                 </para>
                 </para>
             </listitem>
             </listitem>
@@ -540,16 +552,16 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>onLoadCaptureStart($obj = null)</methodname>:
                     <methodname>onLoadCaptureStart($obj = null)</methodname>:
-                    capture data to be used as a lambda for dojo.onLoad(). If
-                    $obj is provided, the captured JS code will be considered a
-                    closure to use with that Javascript object.
+                    capture data to be used as a lambda for <command>dojo.onLoad()</command>.
+                    If <varname>$obj</varname> is provided, the captured JS code will be considered
+                    a closure to use with that Javascript object.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>onLoadCaptureEnd($obj = null)</methodname>: finish
                     <methodname>onLoadCaptureEnd($obj = null)</methodname>: finish
-                    capturing data for use with dojo.onLoad().
+                    capturing data for use with <command>dojo.onLoad()</command>.
                 </para>
                 </para>
             </listitem>
             </listitem>
 
 
@@ -570,7 +582,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <methodname>__toString()</methodname>: cast the container to a
                     <methodname>__toString()</methodname>: cast the container to a
-                    string; renders all HTML style and script elements.
+                    string; renders all <acronym>HTML</acronym> style and script elements.
                 </para>
                 </para>
             </listitem>
             </listitem>
         </itemizedlist>
         </itemizedlist>

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

@@ -22,14 +22,14 @@
                 <emphasis>Layout Containers</emphasis>: these are designed to be
                 <emphasis>Layout Containers</emphasis>: these are designed to be
                 used within your view scripts or consumed by form decorators
                 used within your view scripts or consumed by form decorators
                 for forms, sub forms, and display groups. They wrap the various
                 for forms, sub forms, and display groups. They wrap the various
-                classes offerred in dijit.layout. Each dijit layout view helper
+                classes offerred in <command>dijit.layout</command>. Each dijit layout view helper
                 expects the following arguments:
                 expects the following arguments:
             </para>
             </para>
 
 
             <itemizedlist>
             <itemizedlist>
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$id</varname>: the container name or DOM ID.
+                        <varname>$id</varname>: the container name or <acronym>DOM</acronym> ID.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
@@ -50,10 +50,10 @@
 
 
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$attribs</varname> (optional): any additional HTML
-                        attributes that should be used to render the container
-                        div. If the key 'id' is passed in this array, it will
-                        be used for the form element DOM id, and
+                        <varname>$attribs</varname> (optional): any additional
+                        <acronym>HTML</acronym> attributes that should be used to render the
+                        container div. If the key 'id' is passed in this array, it will
+                        be used for the form element <acronym>DOM</acronym> id, and
                         <varname>$id</varname> will be used for its name.
                         <varname>$id</varname> will be used for its name.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
@@ -70,7 +70,7 @@
 
 
         <listitem>
         <listitem>
             <para>
             <para>
-                <emphasis>Form Dijit</emphasis>: the dijit.form.Form dijit, while
+                <emphasis>Form Dijit</emphasis>: the <command>dijit.form.Form</command> dijit, while
                 not completely necessary for use with dijit form elements, will
                 not completely necessary for use with dijit form elements, will
                 ensure that if an attempt is made to submit a form that does
                 ensure that if an attempt is made to submit a form that does
                 not validate against client-side validations, submission will
                 not validate against client-side validations, submission will
@@ -81,15 +81,15 @@
             <itemizedlist>
             <itemizedlist>
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$id</varname>: the container name or DOM ID.
+                        <varname>$id</varname>: the container name or <acronym>DOM</acronym> ID.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$attribs</varname> (optional): any additional HTML
-                        attributes that should be used to render the container
-                        div.
+                        <varname>$attribs</varname> (optional): any additional
+                        <acronym>HTML</acronym> attributes that should be used to render the
+                        container div.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
@@ -120,7 +120,7 @@
             <itemizedlist>
             <itemizedlist>
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$id</varname>: the element name or DOM ID.
+                        <varname>$id</varname>: the element name or <acronym>DOM</acronym> ID.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
@@ -140,11 +140,11 @@
 
 
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <varname>$attribs</varname> (optional): any additional HTML
-                        attributes that should be used to render the dijit. If
-                        the key 'id' is passed in this array, it will be used
-                        for the form element DOM id, and <varname>$id</varname> will
-                        be used for its name.
+                        <varname>$attribs</varname> (optional): any additional
+                        <acronym>HTML</acronym> attributes that should be used to render the dijit.
+                        If the key 'id' is passed in this array, it will be used
+                        for the form element <acronym>DOM</acronym> id, and <varname>$id</varname>
+                        will be used for its name.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
             </itemizedlist>
             </itemizedlist>
@@ -173,7 +173,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
         <title>Dijit Layout Elements</title>
         <title>Dijit Layout Elements</title>
 
 
         <para>
         <para>
-            The dijit.layout family of elements are for creating custom,
+            The <command>dijit.layout</command> family of elements are for creating custom,
             predictable layouts for your site. For any questions on general
             predictable layouts for your site. For any questions on general
             usage, <ulink
             usage, <ulink
                 url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/layout">read
                 url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/layout">read
@@ -181,10 +181,9 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
         </para>
         </para>
 
 
         <para>
         <para>
-            All dijit layout elements have the
-            signature <command>string ($id = null, $content = '', array $params =
-                array(), array $attribs = array())</command>. In all caess, if you
-            pass no arguments, the helper object itself will be returned. This
+            All dijit layout elements have the signature <command>string ($id = null, $content = '',
+                array $params = array(), array $attribs = array())</command>.
+            In all caess, if you pass no arguments, the helper object itself will be returned. This
             gives you access to the <methodname>captureStart()</methodname> and
             gives you access to the <methodname>captureStart()</methodname> and
             <methodname>captureEnd()</methodname> methods, which allow you to capture
             <methodname>captureEnd()</methodname> methods, which allow you to capture
             content instead of passing it to the layout container.
             content instead of passing it to the layout container.
@@ -194,7 +193,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>AccordionContainer</emphasis>:
                     <emphasis>AccordionContainer</emphasis>:
-                    dijit.layout.AccordionContainer. Stack all panes together
+                    <command>dijit.layout.AccordionContainer</command>. Stack all panes together
                     vertically; clicking on a pane titlebar will expand and
                     vertically; clicking on a pane titlebar will expand and
                     display that particular pane.
                     display that particular pane.
                 </para>
                 </para>
@@ -215,8 +214,9 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>AccordionPane</emphasis>: dijit.layout.AccordionPane.
-                    For use within AccordionContainer.
+                    <emphasis>AccordionPane</emphasis>:
+                    <command>dijit.layout.AccordionPane</command>. For use within
+                    AccordionContainer.
                 </para>
                 </para>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -236,7 +236,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>BorderContainer</emphasis>:
                     <emphasis>BorderContainer</emphasis>:
-                    dijit.layout.BorderContainer. Achieve layouts with
+                    <command>dijit.layout.BorderContainer</command>. Achieve layouts with
                     optionally resizable panes such as you might see in a
                     optionally resizable panes such as you might see in a
                     traditional application.
                     traditional application.
                 </para>
                 </para>
@@ -257,8 +257,8 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>ContentPane</emphasis>: dijit.layout.ContentPane. Use
-                    inside any container except AccordionContainer.
+                    <emphasis>ContentPane</emphasis>: <command>dijit.layout.ContentPane</command>.
+                    Use inside any container except AccordionContainer.
                 </para>
                 </para>
 
 
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
@@ -279,7 +279,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>SplitContainer</emphasis>:
                     <emphasis>SplitContainer</emphasis>:
-                    dijit.layout.SplitContainer. Allows resizable content
+                    <command>dijit.layout.SplitContainer</command>. Allows resizable content
                     panes; deprecated in Dojo in favor of BorderContainer.
                     panes; deprecated in Dojo in favor of BorderContainer.
                 </para>
                 </para>
 
 
@@ -302,7 +302,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>StackContainer</emphasis>:
                     <emphasis>StackContainer</emphasis>:
-                    dijit.layout.StackContainer. All panes within a
+                    <command>dijit.layout.StackContainer</command>. All panes within a
                     StackContainer are placed in a stack; build buttons or
                     StackContainer are placed in a stack; build buttons or
                     functionality to reveal one at a time.
                     functionality to reveal one at a time.
                 </para>
                 </para>
@@ -322,7 +322,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>TabContainer</emphasis>:
                     <emphasis>TabContainer</emphasis>:
-                    dijit.layout.TabContainer. All panes within a
+                    <command>dijit.layout.TabContainer</command>. All panes within a
                     TabContainer are placed in a stack, with tabs positioned on
                     TabContainer are placed in a stack, with tabs positioned on
                     one side for switching between them.
                     one side for switching between them.
                 </para>
                 </para>
@@ -352,7 +352,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                         array())</command>: begin capturing content to include in a container.
                         array())</command>: begin capturing content to include in a container.
                     <varname>$params</varname> refers to the dijit params to use with
                     <varname>$params</varname> refers to the dijit params to use with
                     the container, while <varname>$attribs</varname> refer to any
                     the container, while <varname>$attribs</varname> refer to any
-                    general HTML attributes to use.
+                    general <acronym>HTML</acronym> attributes to use.
                 </para>
                 </para>
 
 
                 <para>
                 <para>
@@ -423,7 +423,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
         <title>Dijit Form Elements</title>
         <title>Dijit Form Elements</title>
 
 
         <para>
         <para>
-            Dojo's form validation and input dijits are in the dijit.form tree.
+            Dojo's form validation and input dijits are in the <command>dijit.form</command> tree.
             For more information on general usage of these elements, as well as
             For more information on general usage of these elements, as well as
             accepted parameters, please <ulink
             accepted parameters, please <ulink
                 url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/form-validation-specialized-input">visit
                 url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/form-validation-specialized-input">visit
@@ -440,7 +440,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
         <itemizedlist>
         <itemizedlist>
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>Button</emphasis>: dijit.form.Button. Display a
+                    <emphasis>Button</emphasis>: <command>dijit.form.Button</command>. Display a
                     form button.
                     form button.
                 </para>
                 </para>
 
 
@@ -456,7 +456,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>CheckBox</emphasis>:
                     <emphasis>CheckBox</emphasis>:
-                    dijit.form.CheckBox. Display a checkbox. Accepts an
+                    <command>dijit.form.CheckBox</command>. Display a checkbox. Accepts an
                     optional fifth argument, the array
                     optional fifth argument, the array
                     <varname>$checkedOptions</varname>, which may contain either:
                     <varname>$checkedOptions</varname>, which may contain either:
                 </para>
                 </para>
@@ -496,7 +496,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>ComboBox</emphasis>:
                     <emphasis>ComboBox</emphasis>:
-                    dijit.layout.ComboBox. ComboBoxes are a hybrid between a
+                    <command>dijit.layout.ComboBox</command>. ComboBoxes are a hybrid between a
                     select and a text box with autocompletion. The key
                     select and a text box with autocompletion. The key
                     difference is that you may type an option that is not in
                     difference is that you may type an option that is not in
                     the list of available options, and it will still consider
                     the list of available options, and it will still consider
@@ -509,7 +509,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                 </para>
                 </para>
 
 
                 <para>
                 <para>
-                    Alternately, you may pass information regarding a dojo.data
+                    Alternately, you may pass information regarding a <command>dojo.data</command>
                     datastore to use with the element. If provided, the
                     datastore to use with the element. If provided, the
                     ComboBox will be rendered as a text <emphasis>input</emphasis>, and
                     ComboBox will be rendered as a text <emphasis>input</emphasis>, and
                     will pull its options via that datastore.
                     will pull its options via that datastore.
@@ -540,14 +540,14 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                             <listitem>
                             <listitem>
                                 <para>
                                 <para>
                                     <emphasis>type</emphasis>: the datastore type
                                     <emphasis>type</emphasis>: the datastore type
-                                    to use; e.g., 'dojo.data.ItemFileReadStore'.
+                                    to use; e.g., '<command>dojo.data.ItemFileReadStore</command>'.
                                 </para>
                                 </para>
                             </listitem>
                             </listitem>
 
 
                             <listitem>
                             <listitem>
                                 <para>
                                 <para>
                                     <emphasis>params</emphasis> (optional): an
                                     <emphasis>params</emphasis> (optional): an
-                                    associative array of key/value pairs to use to
+                                    associative array of key and value pairs to use to
                                     configure the datastore. The 'url' param is a
                                     configure the datastore. The 'url' param is a
                                     typical example.
                                     typical example.
                                 </para>
                                 </para>
@@ -571,15 +571,15 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                             <listitem>
                             <listitem>
                                 <para>
                                 <para>
                                     <emphasis>storeType</emphasis>: a string indicating
                                     <emphasis>storeType</emphasis>: a string indicating
-                                    the datastore dojo.data type to use (e.g.,
-                                    'dojo.data.ItemFileReadStore').
+                                    the datastore <command>dojo.data</command> type to use (e.g.,
+                                    '<command>dojo.data.ItemFileReadStore</command>').
                                 </para>
                                 </para>
                             </listitem>
                             </listitem>
 
 
                             <listitem>
                             <listitem>
                                 <para>
                                 <para>
                                     <emphasis>storeParams</emphasis>: an
                                     <emphasis>storeParams</emphasis>: an
-                                    associative array of key/value pairs with which
+                                    associative array of key and value pairs with which
                                     to configure the datastore.
                                     to configure the datastore.
                                 </para>
                                 </para>
                             </listitem>
                             </listitem>
@@ -620,7 +620,7 @@ echo $view->comboBox(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>CurrencyTextBox</emphasis>:
                     <emphasis>CurrencyTextBox</emphasis>:
-                    dijit.form.CurrencyTextBox. Inherits from
+                    <command>dijit.form.CurrencyTextBox</command>. Inherits from
                     ValidationTextBox, and provides client-side validation of
                     ValidationTextBox, and provides client-side validation of
                     currency. It expects that the dijit parameter 'currency'
                     currency. It expects that the dijit parameter 'currency'
                     will be provided with an appropriate 3-character currency
                     will be provided with an appropriate 3-character currency
@@ -665,7 +665,7 @@ $view->headMeta()->appendHttpEquiv('Content-Type',
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>DateTextBox</emphasis>:
                     <emphasis>DateTextBox</emphasis>:
-                    dijit.form.DateTextBox. Inherits from
+                    <command>dijit.form.DateTextBox</command>. Inherits from
                     ValidationTextBox, and provides both client-side validation of
                     ValidationTextBox, and provides both client-side validation of
                     dates, as well as a dropdown calendar from which to select a date.
                     dates, as well as a dropdown calendar from which to select a date.
                     You may specify any dijit parameters available to
                     You may specify any dijit parameters available to
@@ -683,8 +683,8 @@ echo $view->dateTextBox(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>Editor</emphasis>: dijit.Editor. Provides a
-                    WYSIWYG editor via which users may create or edit content.
+                    <emphasis>Editor</emphasis>: <command>dijit.Editor</command>. Provides a
+                    <acronym>WYSIWYG</acronym> editor via which users may create or edit content.
                     <command>dijit.Editor</command> is a pluggable, extensible editor
                     <command>dijit.Editor</command> is a pluggable, extensible editor
                     with a variety of parameters you can utilize for customization; see <ulink
                     with a variety of parameters you can utilize for customization; see <ulink
                         url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
                         url="http://dojotoolkit.org/book/dojo-book-0-9/part-2-dijit/advanced-editing-and-display/editor-rich-text">the
@@ -700,17 +700,17 @@ echo $view->editor('foo');
 
 
                     <para>
                     <para>
                         The Editor dijit uses an <acronym>HTML</acronym> <acronym>DIV</acronym> by
                         The Editor dijit uses an <acronym>HTML</acronym> <acronym>DIV</acronym> by
-                        default. The <classname>dijit._editor.RichText</classname> <ulink
+                        default. The <command>dijit._editor.RichText</command> <ulink
                             url="http://api.dojotoolkit.org/jsdoc/HEAD/dijit._editor.RichText">documentation</ulink>
                             url="http://api.dojotoolkit.org/jsdoc/HEAD/dijit._editor.RichText">documentation</ulink>
-                        indicates that having it built on an HTML <acronym>TEXTAREA</acronym> can
-                        potentially have security implications.
+                        indicates that having it built on an <acronym>HTML</acronym>
+                        <acronym>TEXTAREA</acronym> can potentially have security implications.
                     </para>
                     </para>
 
 
                     <para>
                     <para>
                         In order to allow graceful degradation in environments where Javascript is
                         In order to allow graceful degradation in environments where Javascript is
                         unavailable, <classname>Zend_Dojo_View_Helper_Editor</classname> also wraps
                         unavailable, <classname>Zend_Dojo_View_Helper_Editor</classname> also wraps
-                        a <acronym>textarea</acronym> within a <acronym>noscript</acronym> tag; the
-                        content of this <acronym>textarea</acronym> will be properly escaped to
+                        a <acronym>TEXTAREA</acronym> within a <acronym>NOSCRIPT</acronym> tag;
+                        the content of this <acronym>TEXTAREA</acronym> will be properly escaped to
                         avoid security vulnerability vectors.
                         avoid security vulnerability vectors.
                     </para>
                     </para>
                 </note>
                 </note>
@@ -719,9 +719,9 @@ echo $view->editor('foo');
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>FilteringSelect</emphasis>:
                     <emphasis>FilteringSelect</emphasis>:
-                    dijit.form.FilteringSelect. Similar to ComboBox, this is a
-                    select/text hybrid that can either render a provided list
-                    of options or those fetched via a dojo.data datastore.
+                    <command>dijit.form.FilteringSelect</command>. Similar to ComboBox, this is a
+                    select and text hybrid that can either render a provided list
+                    of options or those fetched via a <command>dojo.data</command> datastore.
                     Unlike ComboBox, however, FilteringSelect does not allow
                     Unlike ComboBox, however, FilteringSelect does not allow
                     typing in an option not in its list. Additionally, it
                     typing in an option not in its list. Additionally, it
                     operates like a standard select in that the option values,
                     operates like a standard select in that the option values,
@@ -738,9 +738,9 @@ echo $view->editor('foo');
                 <para>
                 <para>
                     <emphasis>HorizontalSlider</emphasis> and
                     <emphasis>HorizontalSlider</emphasis> and
                     <emphasis>VerticalSlider</emphasis>:
                     <emphasis>VerticalSlider</emphasis>:
-                    dijit.form.HorizontalSlider and dijit.form.VerticalSlider.
-                    Sliders allow are UI widgets for selecting numbers in a
-                    given range; these are horizontal and vertical variants.
+                    <command>dijit.form.HorizontalSlider</command> and
+                    <command>dijit.form.VerticalSlider</command>. Sliders allow are UI widgets for
+                    selecting numbers in a given range; these are horizontal and vertical variants.
                 </para>
                 </para>
 
 
                 <para>
                 <para>
@@ -767,7 +767,7 @@ echo $view->editor('foo');
                     <listitem>
                     <listitem>
                         <para>
                         <para>
                             'pageIncrement' can specify the value by which to
                             'pageIncrement' can specify the value by which to
-                            increase/decrease when pageUp and pageDown are used.
+                            increase or decrease when pageUp and pageDown are used.
                         </para>
                         </para>
                     </listitem>
                     </listitem>
 
 
@@ -780,7 +780,7 @@ echo $view->editor('foo');
                 </itemizedlist>
                 </itemizedlist>
 
 
                 <para>
                 <para>
-                    The Zend Framework implementation creates a hidden element
+                    The implication from Zend Framework creates a hidden element
                     to store the value of the slider.
                     to store the value of the slider.
                 </para>
                 </para>
 
 
@@ -845,8 +845,8 @@ echo $view->editor('foo');
 
 
                     <listitem>
                     <listitem>
                         <para>
                         <para>
-                            <emphasis>attribs</emphasis> (optional): HTML
-                            attributes to use with the rules/labels. This should
+                            <emphasis>attribs</emphasis> (optional): <acronym>HTML</acronym>
+                            attributes to use with the rules and labels. This should
                             follow the <property>params</property> option format and be an
                             follow the <property>params</property> option format and be an
                             associative array with the keys 'container' and
                             associative array with the keys 'container' and
                             'labels'.
                             'labels'.
@@ -908,7 +908,7 @@ echo $view->horizontalSlider(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>NumberSpinner</emphasis>:
                     <emphasis>NumberSpinner</emphasis>:
-                    dijit.form.NumberSpinner. Text box for numeric entry, with
+                    <command>dijit.form.NumberSpinner</command>. Text box for numeric entry, with
                     buttons for incrementing and decrementing.
                     buttons for incrementing and decrementing.
                 </para>
                 </para>
 
 
@@ -940,7 +940,7 @@ echo $view->numberSpinner(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>NumberTextBox</emphasis>:
                     <emphasis>NumberTextBox</emphasis>:
-                    dijit.form.NumberTextBox. NumberTextBox provides the
+                    <command>dijit.form.NumberTextBox</command>. NumberTextBox provides the
                     ability to format and display number entries in a localized
                     ability to format and display number entries in a localized
                     fashion, as well as validate numerical entries, optionally
                     fashion, as well as validate numerical entries, optionally
                     against given constraints.
                     against given constraints.
@@ -964,7 +964,7 @@ echo $view->numberTextBox(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>PasswordTextBox</emphasis>:
                     <emphasis>PasswordTextBox</emphasis>:
-                    dijit.form.ValidationTextBox tied to a password input.
+                    <command>dijit.form.ValidationTextBox</command> tied to a password input.
                     PasswordTextBox provides the
                     PasswordTextBox provides the
                     ability to create password input that adheres to the current
                     ability to create password input that adheres to the current
                     dijit theme, as well as allow for client-side validation.
                     dijit theme, as well as allow for client-side validation.
@@ -986,7 +986,7 @@ echo $view->passwordTextBox(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>RadioButton</emphasis>: dijit.form.RadioButton. A
+                    <emphasis>RadioButton</emphasis>: <command>dijit.form.RadioButton</command>. A
                     set of options from which only one may be selected. This
                     set of options from which only one may be selected. This
                     behaves in every way like a regular radio, but has a
                     behaves in every way like a regular radio, but has a
                     look-and-feel consistent with other dijits.
                     look-and-feel consistent with other dijits.
@@ -994,7 +994,7 @@ echo $view->passwordTextBox(
 
 
                 <para>
                 <para>
                     RadioButton accepts an optional fifth argument,
                     RadioButton accepts an optional fifth argument,
-                    <varname>$options</varname>, an associative array of value/label
+                    <varname>$options</varname>, an associative array of value and label
                     pairs used as the radio options. You may also pass these as
                     pairs used as the radio options. You may also pass these as
                     the <varname>$attribs</varname> key <property>options</property>.
                     the <varname>$attribs</varname> key <property>options</property>.
                 </para>
                 </para>
@@ -1016,10 +1016,10 @@ echo $view->radioButton(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>SimpleTextarea</emphasis>: dijit.form.SimpleTextarea.
-                    These act like normal textareas, but are styled using the
-                    current dijit theme. You do not need to specify either the
-                    rows or columns attributes; use <property>ems</property> or
+                    <emphasis>SimpleTextarea</emphasis>:
+                    <command>dijit.form.SimpleTextarea</command>. These act like normal textareas,
+                    but are styled using the current dijit theme. You do not need to specify either
+                    the rows or columns attributes; use <property>ems</property> or
                     percentages for the width and height, instead.
                     percentages for the width and height, instead.
                 </para>
                 </para>
 
 
@@ -1035,7 +1035,7 @@ echo $view->simpleTextarea(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>SubmitButton</emphasis>: a dijit.form.Button tied
+                    <emphasis>SubmitButton</emphasis>: a <command>dijit.form.Button</command> tied
                     to a submit input element. See the Button view helper for
                     to a submit input element. See the Button view helper for
                     more details; the key difference is that this button can
                     more details; the key difference is that this button can
                     submit a form.
                     submit a form.
@@ -1044,7 +1044,7 @@ echo $view->simpleTextarea(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>Textarea</emphasis>: dijit.form.Textarea. These
+                    <emphasis>Textarea</emphasis>: <command>dijit.form.Textarea</command>. These
                     act like normal textareas, except that instead of having a
                     act like normal textareas, except that instead of having a
                     set number of rows, they expand as the user types. The
                     set number of rows, they expand as the user types. The
                     width should be specified via a style setting.
                     width should be specified via a style setting.
@@ -1062,7 +1062,7 @@ echo $view->textarea(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>TextBox</emphasis>: dijit.form.TextBox. This
+                    <emphasis>TextBox</emphasis>: <command>dijit.form.TextBox</command>. This
                     element is primarily present to provide a common
                     element is primarily present to provide a common
                     look-and-feel between various dijit elements, and to
                     look-and-feel between various dijit elements, and to
                     provide base functionality for the other TextBox-derived
                     provide base functionality for the other TextBox-derived
@@ -1072,7 +1072,7 @@ echo $view->textarea(
 
 
                 <para>
                 <para>
                     Common dijit parameter flags include 'lowercase' (cast to
                     Common dijit parameter flags include 'lowercase' (cast to
-                    lowercase), 'uppercase' (cast to UPPERCASE), 'propercase'
+                    lowercase), 'uppercase' (cast to <acronym>UPPERCASE</acronym>), 'propercase'
                     (cast to Proper Case), and trim (trim leading and trailing
                     (cast to Proper Case), and trim (trim leading and trailing
                     whitespace); all accept boolean values. Additionally, you
                     whitespace); all accept boolean values. Additionally, you
                     may specifiy the parameters 'size' and 'maxLength'.
                     may specifiy the parameters 'size' and 'maxLength'.
@@ -1096,7 +1096,7 @@ echo $view->textBox(
 
 
             <listitem>
             <listitem>
                 <para>
                 <para>
-                    <emphasis>TimeTextBox</emphasis>: dijit.form.TimeTextBox.
+                    <emphasis>TimeTextBox</emphasis>: <command>dijit.form.TimeTextBox</command>.
                     Also in the TextBox family, TimeTextBox provides a
                     Also in the TextBox family, TimeTextBox provides a
                     scrollable drop down selection of times from which a user
                     scrollable drop down selection of times from which a user
                     may select. Dijit parameters allow you to specify the time
                     may select. Dijit parameters allow you to specify the time
@@ -1123,7 +1123,7 @@ echo $view->timeTextBox(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>ValidationTextBox</emphasis>:
                     <emphasis>ValidationTextBox</emphasis>:
-                    dijit.form.ValidateTextBox. Provide client-side validations
+                    <command>dijit.form.ValidateTextBox</command>. Provide client-side validations
                     for a text element. Inherits from TextBox.
                     for a text element. Inherits from TextBox.
                 </para>
                 </para>
 
 
@@ -1158,8 +1158,8 @@ echo $view->timeTextBox(
                         <para>
                         <para>
                             <emphasis>required</emphasis>: whether or not the
                             <emphasis>required</emphasis>: whether or not the
                             element is required. If so, and the element is embedded
                             element is required. If so, and the element is embedded
-                            in a dijit.form.Form, it will be flagged as invalid and
-                            prevent submission.
+                            in a <command>dijit.form.Form</command>, it will be flagged as invalid
+                            and prevent submission.
                         </para>
                         </para>
                     </listitem>
                     </listitem>
                 </itemizedlist>
                 </itemizedlist>

+ 13 - 12
documentation/manual/en/module_specs/Zend_Dom-Query.xml

@@ -5,7 +5,7 @@
 
 
     <para>
     <para>
         <classname>Zend_Dom_Query</classname> provides mechanisms for querying
         <classname>Zend_Dom_Query</classname> provides mechanisms for querying
-        <acronym>XML</acronym> and (X)HTML documents utilizing either XPath or
+        <acronym>XML</acronym> and (X)<acronym>HTML</acronym> documents utilizing either XPath or
         <acronym>CSS</acronym> selectors. It was developed to aid with functional testing of
         <acronym>CSS</acronym> selectors. It was developed to aid with functional testing of
         <acronym>MVC</acronym> applications, but could also be used for rapid development of screen
         <acronym>MVC</acronym> applications, but could also be used for rapid development of screen
         scrapers.
         scrapers.
@@ -52,7 +52,8 @@
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>style attributes</emphasis>: <acronym>CSS</acronym> style attributes
                     <emphasis>style attributes</emphasis>: <acronym>CSS</acronym> style attributes
-                    to match: '.error', 'div.error', 'label.required', etc. If an
+                    to match: '<command>.error</command>', '<command>div.error</command>',
+                    '<command>label.required</command>', etc. If an
                     element defines more than one style, this will match as long as
                     element defines more than one style, this will match as long as
                     the named style is present anywhere in the style declaration.
                     the named style is present anywhere in the style declaration.
                 </para>
                 </para>
@@ -116,7 +117,7 @@
                 <para>
                 <para>
                     <emphasis>descendents</emphasis>: string together
                     <emphasis>descendents</emphasis>: string together
                     multiple selectors to indicate a hierarchy along which
                     multiple selectors to indicate a hierarchy along which
-                    to search. 'div .foo span #one' would select an element
+                    to search. '<command>div .foo span #one</command>' would select an element
                     of id 'one' that is a descendent of arbitrary depth
                     of id 'one' that is a descendent of arbitrary depth
                     beneath a 'span' element, which is in turn a descendent
                     beneath a 'span' element, which is in turn a descendent
                     of arbitrary depth beneath an element with a class of
                     of arbitrary depth beneath an element with a class of
@@ -150,10 +151,10 @@
             Once you've performed your query, you can then work with the result
             Once you've performed your query, you can then work with the result
             object to determine information about the nodes, as well as to pull
             object to determine information about the nodes, as well as to pull
             them and/or their content directly for examination and manipulation.
             them and/or their content directly for examination and manipulation.
-            <classname>Zend_Dom_Query_Result</classname> implements <code>Countable</code>
-            and <code>Iterator</code>, and store the results internally as
-            DOMNodes/DOMElements. As an example, consider the following call,
-            that selects against the HTML above:
+            <classname>Zend_Dom_Query_Result</classname> implements <classname>Countable</classname>
+            and <classname>Iterator</classname>, and store the results internally as
+            DOMNodes and DOMElements. As an example, consider the following call,
+            that selects against the <acronym>HTML</acronym> above:
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -207,8 +208,8 @@ foreach ($results as $result) {
 
 
                 <listitem>
                 <listitem>
                     <para>
                     <para>
-                        <methodname>setDocumentHtml($document)</methodname>: specify an HTML
-                        string to query against.
+                        <methodname>setDocumentHtml($document)</methodname>: specify an
+                        <acronym>HTML</acronym> string to query against.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
@@ -257,9 +258,9 @@ foreach ($results as $result) {
 
 
             <para>
             <para>
                 As mentioned previously, <classname>Zend_Dom_Query_Result</classname>
                 As mentioned previously, <classname>Zend_Dom_Query_Result</classname>
-                implements both <code>Iterator</code> and
-                <code>Countable</code>, and as such can be used in a
-                <code>foreach</code> loop as well as with the
+                implements both <classname>Iterator</classname> and
+                <classname>Countable</classname>, and as such can be used in a
+                <methodname>foreach()</methodname> loop as well as with the
                 <methodname>count()</methodname> function. Additionally, it exposes the
                 <methodname>count()</methodname> function. Additionally, it exposes the
                 following methods:
                 following methods:
             </para>
             </para>