[MANUAL] English:

- several manual fixes

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

documentation/manual/en/module_specs/Zend_Json-Server.xml

@@ -234,8 +234,8 @@ $server->handle();
 
                 <listitem>
                     <para>
-                        <code>fault($fault = null, $code = 404, $data = null)</code>: Create and
-                        return a <classname>Zend_Json_Server_Error</classname> object.
+                        <methodname>fault($fault = null, $code = 404, $data = null)</methodname>:
+                        Create and return a <classname>Zend_Json_Server_Error</classname> object.
                     </para>
                 </listitem>
 
@@ -257,8 +257,8 @@ $server->handle();
 
                 <listitem>
                     <para>
-                        <code>setRequest(Zend_Json_Server_Request $request)</code>: Specify a
-                        request object for the server to utilize.
+                        <methodname>setRequest(Zend_Json_Server_Request $request)</methodname>:
+                        Specify a request object for the server to utilize.
                     </para>
                 </listitem>
 
@@ -271,8 +271,8 @@ $server->handle();
 
                 <listitem>
                     <para>
-                        <code>setResponse(Zend_Json_Server_Response $response)</code>: Set the
-                        response object for the server to utilize.
+                        <methodname>setResponse(Zend_Json_Server_Response $response)</methodname>:
+                        Set the response object for the server to utilize.
                     </para>
                 </listitem>
 
@@ -440,8 +440,8 @@ $server->handle();
             <para>
                 An <acronym>HTTP</acronym> specific version is available via
                 <classname>Zend_Json_Server_Request_Http</classname>. This class will
-                retrieve the request via <code>php://input</code>, and allows access to the raw
-                <acronym>JSON</acronym> via the <methodname>getRawJson()</methodname> method.
+                retrieve the request via <filename>php://input</filename>, and allows access to the
+                raw <acronym>JSON</acronym> via the <methodname>getRawJson()</methodname> method.
             </para>
         </sect3>
 
@@ -476,8 +476,8 @@ $server->handle();
 
                 <listitem>
                     <para>
-                        <code>setError(Zend_Json_Server_Error $error)</code>: Set an error object.
-                        If set, this will be used as the response when serializing to
+                        <methodname>setError(Zend_Json_Server_Error $error)</methodname>: Set an
+                        error object. If set, this will be used as the response when serializing to
                         <acronym>JSON</acronym>.
                     </para>
                 </listitem>
@@ -933,10 +933,9 @@ $server->handle();
 
                 <listitem>
                     <para>
-                        <code>addParam($type, array $options = array(),
-                            $order = null)</code>: Add a parameter to the
-                        service. By default, only the parameter type is
-                        necessary. However, you may also specify the order, as
+                        <methodname>addParam($type, array $options = array(), $order =
+                            null)</methodname>: Add a parameter to the service. By default, only the
+                        parameter type is necessary. However, you may also specify the order, as
                         well as options such as:
                     </para>
 

documentation/manual/en/module_specs/Zend_Loader-PluginLoader.xml

@@ -6,14 +6,14 @@
     <para>
         A number of Zend Framework components are pluggable, and allow loading
         of dynamic functionality by specifying a class prefix and path to class
-        files that are not necessarily on the <code>include_path</code> or do
+        files that are not necessarily on the <property>include_path</property> or do
         not necessarily follow traditional naming conventions.
         <classname>Zend_Loader_PluginLoader</classname> provides common functionality for
         this process.
     </para>
 
     <para>
-        The basic usage of the <code>PluginLoader</code> follows Zend Framework
+        The basic usage of the <classname>PluginLoader</classname> follows Zend Framework
         naming conventions of one class per file, using the underscore as a
         directory separator when resolving paths. It allows passing an optional
         class prefix to prepend when determining if a particular plugin class is
@@ -128,7 +128,7 @@ $loader = new Zend_Loader_PluginLoader(array(), 'foobar');
 ]]></programlisting>
 
         <para>
-            Other components that instantiate the <code>PluginLoader</code>
+            Other components that instantiate the <classname>PluginLoader</classname>
             using the same registry name will then have access to already loaded
             paths and plugins.
         </para>
@@ -185,7 +185,7 @@ $loader = new Zend_Loader_PluginLoader(array(), 'foobar');
         </para>
 
         <para>
-            Another common use case for the <code>PluginLoader</code> is to
+            Another common use case for the <classname>PluginLoader</classname> is to
             determine fully qualified plugin class names of loaded classes;
             <methodname>getClassName()</methodname> provides this functionality. Typically,
             this would be used in conjunction with <methodname>isLoaded()</methodname>:

documentation/manual/en/module_specs/Zend_Loader.xml

@@ -53,9 +53,9 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
 
         <para>
             The <varname>$dirs</varname> argument specifies which directories to search for the
-            file in. If the value is <constant>NULL</constant>, only the <code>include_path</code>
+            file in. If the value is <constant>NULL</constant>, only the include_path
             is searched; if the value is a string or an array, the directory or directories
-            specified will be searched, followed by the <code>include_path</code>.
+            specified will be searched, followed by the <property>include_path</property>.
         </para>
 
         <para>
@@ -101,7 +101,8 @@ Zend_Loader::loadClass('Container_Tree',
             <methodname>Zend_Loader::loadClass()</methodname> searches the directories in
             the order supplied. The first matching file is loaded. If the file
             does not exist in the specified <varname>$dirs</varname>, then the
-            <code>include_path</code> for the <acronym>PHP</acronym> environment is searched.
+            <property>include_path</property> for the <acronym>PHP</acronym> environment is
+            searched.
         </para>
 
         <para>
@@ -208,8 +209,9 @@ if (Zend_Loader::isReadable($filename)) {
             check. This may contain path information.
             This method is a wrapper for the <acronym>PHP</acronym> function
             <ulink url="http://php.net/is_readable"><methodname>is_readable()</methodname></ulink>.
-            The <acronym>PHP</acronym> function does not search the <code>include_path</code>,
-            while <methodname>Zend_Loader::isReadable()</methodname> does.
+            The <acronym>PHP</acronym> function does not search the
+            <property>include_path</property>, while
+            <methodname>Zend_Loader::isReadable()</methodname> does.
         </para>
     </sect2>
 
@@ -221,7 +223,7 @@ if (Zend_Loader::isReadable($filename)) {
             <acronym>PHP</acronym> SPL autoloader. <methodname>Zend_Loader::autoload()</methodname>
             is the callback method. As a convenience, <classname>Zend_Loader</classname> provides
             the <methodname>registerAutoload()</methodname> function to register its
-            <methodname>autoload()</methodname> method. If the <code>spl_autoload</code>
+            <methodname>autoload()</methodname> method. If the <property>spl_autoload</property>
             extension is not present in your <acronym>PHP</acronym> environment, then the
             <methodname>registerAutoload()</methodname> method throws a
             <classname>Zend_Exception</classname>.

documentation/manual/en/module_specs/Zend_Locale-DatesTimes.xml

@@ -210,12 +210,12 @@ Array
         <para>
             Since <methodname>getDate()</methodname> is "locale-aware", specifying the
             <varname>$locale</varname> is sufficient for date strings adhering to that locale's
-            format. The option '<code>fix_date</code>' uses simple tests to determine if the day or
-            month is not valid, and then applies heuristics to try and correct any detected
+            format. The option '<property>fix_date</property>' uses simple tests to determine if the
+            day or month is not valid, and then applies heuristics to try and correct any detected
             problems. Note the use of '<constant>Zend_Locale_Format::STANDARD</constant>' as the
-            value for '<code>date_format</code>' to prevent the use of a class-wide default date
-            format set using <methodname>setOptions()</methodname>. This forces getDate to use the
-            default date format for <varname>$locale</varname>.
+            value for '<property>date_format</property>' to prevent the use of a class-wide default
+            date format set using <methodname>setOptions()</methodname>. This forces getDate to use
+            the default date format for <varname>$locale</varname>.
         </para>
 
         <example id="zend.locale.date.normalize.example-2">
@@ -374,10 +374,10 @@ print_r ($date);
         </note>
 
         <para>
-            The option '<code>fix_date</code>' uses simple tests to determine if the day or month is
-            not valid, and then applies heuristics to try and correct any detected problems.
-            <methodname>getDate()</methodname> automatically detects and corrects some kinds of
-            problems with input, such as misplacing the year:
+            The option '<property>fix_date</property>' uses simple tests to determine if the day or
+            month is not valid, and then applies heuristics to try and correct any detected
+            problems. <methodname>getDate()</methodname> automatically detects and corrects some
+            kinds of problems with input, such as misplacing the year:
         </para>
 
         <example id="zend.locale.date.normalize.example-5">
@@ -402,11 +402,11 @@ print_r ($date);
             Use <methodname>checkDateFormat($inputString, array('date_format' => $format,
                 $locale))</methodname> to check if a given string contains all expected date parts.
             The <methodname>checkDateFormat()</methodname> method uses
-            <methodname>getDate()</methodname>, but without the option <code>'fixdate'</code> to
-            avoid returning <constant>TRUE</constant> when the input fails to conform to the date
-            format. If errors are detected in the input, such as swapped values for months and days,
-            the option <code>'fixdate'</code> method will apply heuristics to "correct" dates before
-            determining their validity.
+            <methodname>getDate()</methodname>, but without the option
+            '<property>fixdate</property>' to avoid returning <constant>TRUE</constant> when the
+            input fails to conform to the date format. If errors are detected in the input, such as
+            swapped values for months and days, the option '<property>fixdate</property>' method
+            will apply heuristics to "correct" dates before determining their validity.
         </para>
 
         <example id="zend.locale.date.test.example-1">
@@ -461,7 +461,7 @@ if (Zend_Locale_Format::getTime('13:44:42',
         <para>
             Use <methodname>checkDateFormat()</methodname> to check if a given string contains a
             proper time. The usage is exact the same as with checking Dates, only
-            <code>date_format</code> should contain the parts which you expect to have.
+            <property>date_format</property> should contain the parts which you expect to have.
         </para>
 
         <example id="zend.locale.time.test.example-1">