[MANUAL] English:

- several manual fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22761 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/en/module_specs/Zend_Tag_Cloud.xml

@@ -20,31 +20,31 @@
     <itemizedlist>
         <listitem>
             <para>
-                <code>cloudDecorator</code>: defines the decorator for the
+                <property>cloudDecorator</property>: defines the decorator for the
                 cloud. Can either be the name of the class which should be
                 loaded by the pluginloader, an instance of
                 <classname>Zend_Tag_Cloud_Decorator_Cloud</classname> or an array
-                containing the string <code>decorator</code> and optionally
-                an array <code>options</code>, which will be passed to the
+                containing the string 'decorator' and optionally
+                an array 'options', which will be passed to the
                 decorators constructor.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>tagDecorator</code>: defines the decorator for individual
+                <property>tagDecorator</property>: defines the decorator for individual
                 tags. This can either be the name of the class which should be
                 loaded by the pluginloader, an instance of
                 <classname>Zend_Tag_Cloud_Decorator_Tag</classname> or an array
-                containing the string <code>decorator</code> and optionally
-                an array <code>options</code>, which will be passed to the
+                containing the string 'decorator' and optionally
+                an array 'options', which will be passed to the
                 decorators constructor.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>pluginLoader</code>: a different plugin loader to use.
+                <property>pluginLoader</property>: a different plugin loader to use.
                 Must be an instance of
                 <classname>Zend_Loader_PluginLoader_Interface</classname>.
             </para>
@@ -52,7 +52,7 @@
 
         <listitem>
             <para>
-                <code>prefixPath</code>: prefix paths to add to the plugin
+                <property>prefixPath</property>: prefix paths to add to the plugin
                 loader. Must be an array containing the keys prefix and path or
                 multiple arrays containing the keys prefix and path. Invalid
                 elements will be skipped.
@@ -61,14 +61,14 @@
 
         <listitem>
             <para>
-                <code>itemList</code>: a different item list to use. Must be an
+                <property>itemList</property>: a different item list to use. Must be an
                 instance of <classname>Zend_Tag_ItemList</classname>.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>tags</code>: a list of tags to assign to the cloud. Each
+                <property>tags</property>: a list of tags to assign to the cloud. Each
                 tag must either implement <classname>Zend_Tag_Taggable</classname> or be
                 an array which can be used to instantiate
                 <classname>Zend_Tag_Item</classname>.
@@ -150,7 +150,7 @@ echo $cloud;
             <itemizedlist>
                 <listitem>
                     <para>
-                        <code>fontSizeUnit</code>: defines the font-size unit
+                        <property>fontSizeUnit</property>: defines the font-size unit
                         used for all font-sizes. The possible values are:
                         em, ex, px, in, cm, mm, pt, pc and &#37;.
                     </para>
@@ -158,29 +158,29 @@ echo $cloud;
 
                 <listitem>
                     <para>
-                        <code>minFontSize</code>: the minimum font-size
+                        <property>minFontSize</property>: the minimum font-size
                         distributed through the tags (must be an integer).
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <code>maxFontSize</code>: the maximum font-size
+                        <property>maxFontSize</property>: the maximum font-size
                         distributed through the tags (must be an integer).
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <code>classList</code>: an arry of classes distributed
+                        <property>classList</property>: an arry of classes distributed
                         through the tags.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <code>htmlTags</code>: an array of <acronym>HTML</acronym> tags surounding
-                        the anchor. Each element can either be a string, which
+                        <property>htmlTags</property>: an array of <acronym>HTML</acronym> tags
+                        surounding the anchor. Each element can either be a string, which
                         is used as element type then, or an array containing
                         an attribute list for the element, defined as key/value
                         pair. In this case, the array key is used as element
@@ -203,15 +203,15 @@ echo $cloud;
             <itemizedlist>
                 <listitem>
                     <para>
-                        <code>separator</code>: defines the separator which
+                        <property>separator</property>: defines the separator which
                         is placed between all tags.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <code>htmlTags</code>: an array of <acronym>HTML</acronym> tags surounding
-                        all tags. Each element can either be a string, which
+                        <property>htmlTags</property>: an array of <acronym>HTML</acronym> tags
+                        surounding all tags. Each element can either be a string, which
                         is used as element type then, or an array containing
                         an attribute list for the element, defined as key/value
                         pair. In this case, the array key is used as element type.

documentation/manual/en/module_specs/Zend_Test-PHPUnit-Assertions.xml

@@ -36,7 +36,7 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <methodname>assertQuery($path, $message = '')</methodname>: assert that
+                    <methodname>assertQuery($path, $message)</methodname>: assert that
                     one or more DOM elements matching the given <acronym>CSS</acronym> selector are
                     present. If a <varname>$message</varname> is present, it will be
                     prepended to any failed assertion message.
@@ -45,43 +45,39 @@
 
             <listitem>
                 <para>
-                    <code>assertQueryContentContains($path, $match, $message =
-                        '')</code>: assert that one or more DOM elements matching
-                    the given <acronym>CSS</acronym> selector are present, and that at least one
-                    contains the content provided in <varname>$match</varname>. If a
-                    <varname>$message</varname> is present, it will be prepended to any
-                    failed assertion message.
+                    <methodname>assertQueryContentContains($path, $match, $message)</methodname>:
+                    assert that one or more DOM elements matching the given <acronym>CSS</acronym>
+                    selector are present, and that at least one contains the content provided in
+                    <varname>$match</varname>. If a <varname>$message</varname> is present, it will
+                    be prepended to any failed assertion message.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>assertQueryContentRegex($path, $pattern, $message =
-                        '')</code>: assert that one or more DOM elements matching
-                    the given <acronym>CSS</acronym> selector are present, and that at least one
-                    matches the regular expression provided in
-                    <varname>$pattern</varname>. If a <varname>$message</varname> is present,
-                    it will be prepended to any failed assertion message.
+                    <methodname>assertQueryContentRegex($path, $pattern, $message)</methodname>:
+                    assert that one or more DOM elements matching the given <acronym>CSS</acronym>
+                    selector are present, and that at least one matches the regular expression
+                    provided in <varname>$pattern</varname>. If a <varname>$message</varname> is
+                    present, it will be prepended to any failed assertion message.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>assertQueryCount($path, $count, $message =
-                        '')</code>: assert that there are exactly
-                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                    selector present. If a <varname>$message</varname> is present, it
-                    will be prepended to any failed assertion message.
+                    <methodname>assertQueryCount($path, $count, $message)</methodname>: assert that
+                    there are exactly <varname>$count</varname> DOM elements matching the given
+                    <acronym>CSS</acronym> selector present. If a <varname>$message</varname> is
+                    present, it will be prepended to any failed assertion message.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>assertQueryCountMin($path, $count, $message =
-                        '')</code>: assert that there are at least
-                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                    selector present. If a <varname>$message</varname> is present, it
-                    will be prepended to any failed assertion message.
+                    <methodname>assertQueryCountMin($path, $count, $message)</methodname>: assert
+                    that there are at least <varname>$count</varname> DOM elements matching the
+                    given <acronym>CSS</acronym> selector present. If a <varname>$message</varname>
+                    is present, it will be prepended to any failed assertion message.
                     <emphasis>Note:</emphasis> specifying a value of 1 for
                     <varname>$count</varname> is the same as simply using
                     <methodname>assertQuery()</methodname>.
@@ -90,11 +86,10 @@
 
             <listitem>
                 <para>
-                    <code>assertQueryCountMax($path, $count, $message =
-                        '')</code>: assert that there are no more than
-                    <varname>$count</varname> DOM elements matching the given <acronym>CSS</acronym>
-                    selector present. If a <varname>$message</varname> is present, it
-                    will be prepended to any failed assertion message.
+                    <methodname>assertQueryCountMax($path, $count, $message)</methodname>: assert
+                    that there are no more than <varname>$count</varname> DOM elements matching the
+                    given <acronym>CSS</acronym> selector present. If a <varname>$message</varname>
+                    is present, it will be prepended to any failed assertion message.
                     <emphasis>Note:</emphasis> specifying a value of 1 for
                     <varname>$count</varname> is the same as simply using
                     <methodname>assertQuery()</methodname>.
@@ -277,17 +272,17 @@
 
             <listitem>
                 <para>
-                    <code>assertHeaderContains($header, $match, $message = '')</code>: assert that
-                    the response contains the given header and that its content contains the given
-                    string.
+                    <methodname>assertHeaderContains($header, $match, $message)</methodname>: assert
+                    that the response contains the given header and that its content contains the
+                    given string.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>assertHeaderRegex($header, $pattern, $message = '')</code>: assert that
-                    the response contains the given header and that its content matches the given
-                    regex.
+                    <methodname>assertHeaderRegex($header, $pattern, $message)</methodname>: assert
+                    that the response contains the given header and that its content matches the
+                    given regex.
                 </para>
             </listitem>
         </itemizedlist>

documentation/manual/en/module_specs/Zend_Uri.xml

@@ -18,10 +18,10 @@
             construction of the many different schemes varies significantly. The
             <classname>Zend_Uri</classname> class provides a factory that returns a subclass
             of itself which specializes in each scheme. The subclass will be named
-            <classname>Zend_Uri_&lt;scheme&gt;</classname>, where <code>&lt;scheme&gt;</code>
-            is the scheme, lowercased with the first letter capitalized. An exception to this
-            rule is <acronym>HTTPS</acronym>, which is also handled by
-            <classname>Zend_Uri_Http</classname>.
+            <classname>Zend_Uri_&lt;scheme&gt;</classname>, where
+            <emphasis>&lt;scheme&gt;</emphasis> is the scheme, lowercased with the first letter
+            capitalized. An exception to this rule is <acronym>HTTPS</acronym>, which is also
+            handled by <classname>Zend_Uri_Http</classname>.
         </para>
     </sect2>
 
@@ -151,8 +151,8 @@ $valid = Zend_Uri::check('http://uri.in.question');
 
             <para>
                 By default, <classname>Zend_Uri</classname> will not accept the following
-                characters: <code>"{", "}", "|", "\", "^", "`"</code>. These characters are defined
-                by the <acronym>RFC</acronym> as "unwise" and invalid; however, many
+                characters: <emphasis>"{", "}", "|", "\", "^", "`"</emphasis>. These characters are
+                defined by the <acronym>RFC</acronym> as "unwise" and invalid; however, many
                 implementations do accept these characters as valid.
             </para>
 
@@ -207,7 +207,7 @@ Zend_Uri::setConfig(array('allow_unwise' => false));
             <para>
                 The scheme of the <acronym>URI</acronym> is the part of the <acronym>URI</acronym>
                 that precedes the colon. For example, the scheme of
-                <code>http://www.zend.com</code> is <code>http</code>.
+                <filename>http://www.zend.com</filename> is 'http'.
             </para>
 
             <example id="zend.uri.instance-methods.getscheme.example-1">