[DOCUMENTATION] English:

- manual fixes

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

documentation/manual/en/module_specs/Zend_Application-AvailableResources-Session.xml

@@ -17,13 +17,13 @@
 
     <itemizedlist>
         <listitem><para>
-            <emphasis>string</emphasis>: A string indicating a class implementing
+            <type>String</type>: A string indicating a class implementing
             <classname>Zend_Session_SaveHandler_Interface</classname> that should be
             instantiated.
         </para></listitem>
 
         <listitem><para>
-            <emphasis>array</emphasis>: An array with the keys "class" and, optionally,
+            <type>Array</type>: An array with the keys "class" and, optionally,
             "options", indicating a class implementing
             <classname>Zend_Session_SaveHandler_Interface</classname> that should be
             instantiated and an array of options to provide to its constructor.

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Application.xml

@@ -84,8 +84,10 @@
             </thead>
             <tbody>
                 <row>
-                    <entry><methodname>__construct($environment, $options = null)</methodname></entry>
-                    <entry><code>void</code></entry>
+                    <entry>
+                        <methodname>__construct($environment, $options = null)</methodname>
+                    </entry>
+                    <entry><type>Void</type></entry>
                     <entry><itemizedlist>
                             <listitem><para>
                                 <varname>$environment</varname>: <emphasis>required</emphasis>,.
@@ -103,7 +105,7 @@
                             </para>
                             <itemizedlist>
                                 <listitem><para>
-                                    <emphasis>String</emphasis>: path to
+                                    <emphasis><type>String</type></emphasis>: path to
                                     a <classname>Zend_Config</classname> file to load
                                     as configuration for your application.
                                     <varname>$environment</varname> will be used
@@ -112,7 +114,7 @@
                                 </para></listitem>
 
                                 <listitem><para>
-                                    <emphasis>Array</emphasis>: associative
+                                    <emphasis><type>Array</type></emphasis>: associative
                                     array of configuration data for your
                                     application.
                                 </para></listitem>
@@ -135,7 +137,7 @@
 
                 <row>
                     <entry><methodname>getEnvironment()</methodname></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve the environment string passed to the
@@ -175,7 +177,7 @@
 
                 <row>
                     <entry><methodname>getOptions()</methodname></entry>
-                    <entry><code>array</code></entry>
+                    <entry><type>Array</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve all options used to initialize the object;
@@ -186,7 +188,7 @@
 
                 <row>
                     <entry><methodname>hasOption($key)</methodname></entry>
-                    <entry><code>boolean</code></entry>
+                    <entry><type>Boolean</type></entry>
                     <entry>
                     <itemizedlist>
                         <listitem><para>
@@ -203,7 +205,9 @@
 
                 <row>
                     <entry><methodname>getOption($key)</methodname></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry>
+                        <type>Mixed</type>
+                    </entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$key</varname>: String option key to lookup
@@ -216,7 +220,9 @@
                 </row>
 
                 <row>
-                    <entry><methodname>setPhpSettings(array $settings, $prefix = '')</methodname></entry>
+                    <entry>
+                        <methodname>setPhpSettings(array $settings, $prefix = '')</methodname>
+                    </entry>
                     <entry><classname>Zend_Application</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
@@ -228,12 +234,12 @@
                             <varname>$prefix</varname>: <emphasis>optional</emphasis>.
                             String prefix with which to prepend option keys.
                             Used internally to allow mapping nested arrays
-                            to dot-separated php.ini keys. In normal usage,
+                            to dot-separated <filename>php.ini</filename> keys. In normal usage,
                             this argument should never be passed by a user.
                         </para></listitem>
                     </itemizedlist></entry>
                     <entry><para>
-                        Set run-time php.ini settings. Dot-separated
+                        Set run-time <filename>php.ini</filename> settings. Dot-separated
                         settings may be nested hierarchically (which may
                         occur with INI <classname>Zend_Config</classname> files) via
                         an array-of-arrays, and will still resolve
@@ -242,7 +248,9 @@
                 </row>
 
                 <row>
-                    <entry><methodname>setAutoloaderNamespaces(array $namespaces)</methodname></entry>
+                    <entry>
+                        <methodname>setAutoloaderNamespaces(array $namespaces)</methodname>
+                    </entry>
                     <entry><classname>Zend_Application</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
@@ -284,7 +292,7 @@
                 <row>
                     <entry><methodname>getBootstrap()</methodname></entry>
                     <entry>
-                        <code>null</code> |
+                        <constant>NULL</constant> |
                         <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                     </entry>
                     <entry>N/A</entry>
@@ -295,7 +303,7 @@
 
                 <row>
                     <entry><methodname>bootstrap()</methodname></entry>
-                    <entry><code>void</code></entry>
+                    <entry><type>Void</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Call the bootstrap's <methodname>bootstrap()</methodname>
@@ -305,7 +313,7 @@
 
                 <row>
                     <entry><methodname>run()</methodname></entry>
-                    <entry><code>void</code></entry>
+                    <entry><type>Void</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Call the bootstrap's <methodname>run()</methodname>

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_BootstrapAbstract.xml

@@ -26,7 +26,7 @@
             <tbody>
                 <row>
                     <entry><methodname>__construct($application)</methodname></entry>
-                    <entry><code>void</code></entry>
+                    <entry><type>Void</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$application</varname>: <emphasis>required</emphasis>.
@@ -73,7 +73,7 @@
 
                 <row>
                     <entry><methodname>getOption()</methodname></entry>
-                    <entry><code>array</code></entry>
+                    <entry><type>Array</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Returns all options registered via
@@ -83,7 +83,7 @@
 
                 <row>
                     <entry><methodname>hasOption($key)</methodname></entry>
-                    <entry><code>boolean</code></entry>
+                    <entry><type>Boolean</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$key</varname>: <emphasis>required</emphasis>.
@@ -95,7 +95,7 @@
 
                 <row>
                     <entry><methodname>getOption($key)</methodname></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry><type>Mixed</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$key</varname>: <emphasis>required</emphasis>.
@@ -141,7 +141,7 @@
 
                 <row>
                     <entry><methodname>getEnvironment()</methodname></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve the environment string registered with the
@@ -151,7 +151,7 @@
 
                 <row>
                     <entry><methodname>getClassResources()</methodname></entry>
-                    <entry><code>array</code></entry>
+                    <entry><type>Array</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve a list of available resource initializer names
@@ -162,7 +162,7 @@
 
                 <row>
                     <entry><methodname>getContainer()</methodname></entry>
-                    <entry><code>object</code></entry>
+                    <entry><type>Object</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieves the container that stores resources. If no
@@ -192,7 +192,7 @@
 
                 <row>
                     <entry><methodname>hasResource($name)</methodname></entry>
-                    <entry><code>boolean</code></entry>
+                    <entry><type>Boolean</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$name</varname>, <emphasis>required</emphasis>.
@@ -210,7 +210,7 @@
 
                 <row>
                     <entry><methodname>getResource($name)</methodname></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry><type>Mixed</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$name</varname>, <emphasis>required</emphasis>.
@@ -228,7 +228,7 @@
 
                 <row>
                     <entry><methodname>bootstrap($resource = null)</methodname></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry><type>Mixed</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$resource</varname>: <emphasis>optional</emphasis>.
@@ -254,7 +254,7 @@
 
                 <row>
                     <entry><methodname>run()</methodname></entry>
-                    <entry><code>void</code></entry>
+                    <entry><type>Void</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Defines what application logic to run after
@@ -264,7 +264,7 @@
 
                 <row>
                     <entry><methodname>__call($method, $args)</methodname></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry><type>Mixed</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$method</varname>: <emphasis>required</emphasis>.

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_Bootstrapper.xml

@@ -27,8 +27,8 @@
             </thead>
             <tbody>
                 <row>
-                    <entry><code>__construct($application)</code></entry>
-                    <entry><code>void</code></entry>
+                    <entry><methodname>__construct($application)</methodname></entry>
+                    <entry><type>Void</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$application</varname>: <emphasis>required</emphasis>.
@@ -45,7 +45,7 @@
                 </row>
 
                 <row>
-                    <entry><code>setOptions(array $options)</code></entry>
+                    <entry><methodname>setOptions(array $options)</methodname></entry>
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
@@ -61,31 +61,31 @@
                 </row>
 
                 <row>
-                    <entry><code>getApplication()</code></entry>
+                    <entry><methodname>getApplication()</methodname></entry>
                     <entry>
-                        <classname>Zend_Application |
-                        Zend_Application_Bootstrap_Bootstrapper</classname>
+                        <classname>Zend_Application</classname> |
+                        <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                     </entry>
                     <entry>N/A</entry>
                     <entry><para>
-                        Retrieve the application/bootstrap object passed via the
+                        Retrieve the application or bootstrap object passed via the
                         constructor.
                     </para></entry>
                 </row>
 
                 <row>
-                    <entry><code>getEnvironment()</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><methodname>getEnvironment()</methodname></entry>
+                    <entry><type>String</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve the environment string registered with the
-                        parent application/bootstrap object.
+                        parent application or bootstrap object.
                     </para></entry>
                 </row>
 
                 <row>
-                    <entry><code>getClassResources()</code></entry>
-                    <entry><code>array</code></entry>
+                    <entry><methodname>getClassResources()</methodname></entry>
+                    <entry><type>Array</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve a list of available resource initializer names
@@ -95,8 +95,10 @@
                 </row>
 
                 <row>
-                    <entry><code>bootstrap($resource = null)</code></entry>
-                    <entry><code>mixed</code></entry>
+                    <entry><methodname>bootstrap($resource = null)</methodname></entry>
+                    <entry>
+                        <type>Mixed</type>
+                    </entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$resource</varname>: <emphasis>optional</emphasis>.
@@ -111,8 +113,8 @@
                 </row>
 
                 <row>
-                    <entry><code>run()</code></entry>
-                    <entry><code>void</code></entry>
+                    <entry><methodname>run()</methodname></entry>
+                    <entry><type>Void</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Defines what application logic to run after

documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_ResourceBootstrapper.xml

@@ -7,9 +7,10 @@
         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname> is an
         interface to use when a bootstrap class will be loading external
         resources -- i.e., one or more resources will not be defined directly in
-        the class, but rather via plugins. It should be used in conjunction with
-        <link linkend="zend.application.core-functionality.bootstrap-bootstrapper">Zend_Application_Bootstrap_Bootstrapper</link>;
-        <link linkend="zend.application.core-functionality.bootstrap-bootstrapabstract">Zend_Application_Bootstrap_BootstrapAbstract</link>
+        the class, but rather via plugins. It should be used in conjunction with <link
+            linkend="zend.application.core-functionality.bootstrap-bootstrapper">Zend_Application_Bootstrap_Bootstrapper</link>;
+        <link
+            linkend="zend.application.core-functionality.bootstrap-bootstrapabstract">Zend_Application_Bootstrap_BootstrapAbstract</link>
         implements this functionality.
     </para>
 
@@ -30,8 +31,9 @@
             </thead>
             <tbody>
                 <row>
-                    <entry><code>registerPluginResource($resource, $options =
-                            null)</code></entry>
+                    <entry>
+                        <methodname>registerPluginResource($resource, $options = null)</methodname>
+                    </entry>
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
@@ -56,7 +58,7 @@
                 </row>
 
                 <row>
-                    <entry><code>unregisterPluginResource($resource)</code></entry>
+                    <entry><methodname>unregisterPluginResource($resource)</methodname></entry>
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
@@ -72,8 +74,8 @@
                 </row>
 
                 <row>
-                    <entry><code>hasPluginResource($resource)</code></entry>
-                    <entry><code>boolean</code></entry>
+                    <entry><methodname>hasPluginResource($resource)</methodname></entry>
+                    <entry><type>Boolean</type></entry>
                     <entry><itemizedlist>
                         <listitem><para>
                             <varname>$resource</varname>: <emphasis>required</emphasis>.
@@ -87,7 +89,7 @@
                 </row>
 
                 <row>
-                    <entry><code>getPluginResource($resource)</code></entry>
+                    <entry><methodname>getPluginResource($resource)</methodname></entry>
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
@@ -101,8 +103,8 @@
                 </row>
 
                 <row>
-                    <entry><code>getPluginResourceNames()</code></entry>
-                    <entry><code>array</code></entry>
+                    <entry><methodname>getPluginResourceNames()</methodname></entry>
+                    <entry><type>Array</type></entry>
                     <entry>N/A</entry>
                     <entry><para>
                         Retrieve a list of all registered plugin resource names.
@@ -110,8 +112,10 @@
                 </row>
 
                 <row>
-                    <entry><code>setPluginLoader(Zend_Loader_PluginLoader_Interface
-                            $loader)</code></entry>
+                    <entry>
+                        <methodname>setPluginLoader(Zend_Loader_PluginLoader_Interface
+                            $loader)</methodname>
+                    </entry>
                     <entry>
                         <classname>Zend_Application_Bootstrap_ResourceBootstrapper</classname>
                     </entry>
@@ -129,7 +133,7 @@
                 </row>
 
                 <row>
-                    <entry><code>getPluginLoader()</code></entry>
+                    <entry><methodname>getPluginLoader()</methodname></entry>
                     <entry><classname>Zend_Loader_PluginLoader_Interface</classname></entry>
                     <entry>N/A</entry>
                     <entry><para>