Browse Source

[DOCUMENTATION] English:

- docu fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16396 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
ef04e272c6

+ 1 - 1
documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-Redirector.xml

@@ -281,7 +281,7 @@ $router->addRoute('blogArchive', $route);
             <para>
             <para>
                 Given an array with year set to 2006, month to 4, day to 24, and
                 Given an array with year set to 2006, month to 4, day to 24, and
                 id to 42, it would then build the URL
                 id to 42, it would then build the URL
-                <code>/blog/2006/4/24/42</code>.
+                <filename>/blog/2006/4/24/42</filename>.
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[

+ 2 - 2
documentation/manual/en/module_specs/Zend_Controller-Basics.xml

@@ -44,7 +44,7 @@
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <classname>Zend_Controller_Request_Abstract</classname> (often
                     <classname>Zend_Controller_Request_Abstract</classname> (often
-                    referred to as the <code>Request Object</code>) represents
+                    referred to as the <emphasis>Request Object</emphasis>) represents
                     the request environment and provides methods for setting and
                     the request environment and provides methods for setting and
                     retrieving the controller and action names and any request
                     retrieving the controller and action names and any request
                     parameters. Additionally it keeps track of whether or not
                     parameters. Additionally it keeps track of whether or not
@@ -83,7 +83,7 @@
                     <classname>Zend_Controller_Request_Http</classname> and decomposes it
                     <classname>Zend_Controller_Request_Http</classname> and decomposes it
                     into a controller, action, and parameters based on the path
                     into a controller, action, and parameters based on the path
                     information in the url. As an example, the URL
                     information in the url. As an example, the URL
-                    <code>http://localhost/foo/bar/key/value</code> would be
+                    <filename>http://localhost/foo/bar/key/value</filename> would be
                     decoded to use the <code>foo</code> controller,
                     decoded to use the <code>foo</code> controller,
                     <code>bar</code> action, and specify a parameter
                     <code>bar</code> action, and specify a parameter
                     <code>key</code> with a value of <code>value</code>.
                     <code>key</code> with a value of <code>value</code>.

+ 1 - 1
documentation/manual/en/module_specs/Zend_Controller-Migration.xml

@@ -641,7 +641,7 @@ echo $response;
                         The constructor now accepts exactly three arguments,
                         The constructor now accepts exactly three arguments,
                         <classname>Zend_Controller_Request_Abstract $request</classname>,
                         <classname>Zend_Controller_Request_Abstract $request</classname>,
                         <classname>Zend_Controller_Response_Abstract $response</classname>,
                         <classname>Zend_Controller_Response_Abstract $response</classname>,
-                        and <code>array $params (optional)</code>.
+                        and <command>array $params (optional)</command>.
                         <classname>Zend_Controller_Action::__construct()</classname> uses
                         <classname>Zend_Controller_Action::__construct()</classname> uses
                         these to set the request, response, and invokeArgs
                         these to set the request, response, and invokeArgs
                         properties of the object, and if overriding the
                         properties of the object, and if overriding the

+ 1 - 1
documentation/manual/en/module_specs/Zend_Controller-Request.xml

@@ -145,7 +145,7 @@
                     In order to do some of its work, <methodname>getParam()</methodname> actually
                     In order to do some of its work, <methodname>getParam()</methodname> actually
                     retrieves from several sources. In order of priority, these
                     retrieves from several sources. In order of priority, these
                     include: user parameters set via <methodname>setParam()</methodname>,
                     include: user parameters set via <methodname>setParam()</methodname>,
-                    <code>GET</code> parameters, and finally <code>POST</code>
+                    <constant>GET</constant> parameters, and finally <constant>POST</constant>
                     parameters. Be aware of this when pulling data via this
                     parameters. Be aware of this when pulling data via this
                     method.
                     method.
                 </para>
                 </para>

+ 15 - 14
documentation/manual/en/module_specs/Zend_Db_Adapter.xml

@@ -182,7 +182,7 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
                 If you create your own class that extends
                 If you create your own class that extends
                 <classname>Zend_Db_Adapter_Abstract_Adapter</classname>, but you do not name your
                 <classname>Zend_Db_Adapter_Abstract_Adapter</classname>, but you do not name your
                 class with the "Zend_Db_Adapter" package prefix, you can use the
                 class with the "Zend_Db_Adapter" package prefix, you can use the
-                <code>factory()</code> method to load your adapter if you
+                <methodname>factory()</methodname> method to load your adapter if you
                 specify the leading portion of the adapter class with the
                 specify the leading portion of the adapter class with the
                 'adapterNamespace' key in the parameters array.
                 'adapterNamespace' key in the parameters array.
             </para>
             </para>
@@ -213,7 +213,7 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
 
 
             <para>
             <para>
                 Optionally, you may specify either argument of the
                 Optionally, you may specify either argument of the
-                <code>factory()</code> method as an object of type
+                <methodname>factory()</methodname> method as an object of type
                 <link linkend="zend.config">Zend_Config</link>.
                 <link linkend="zend.config">Zend_Config</link>.
             </para>
             </para>
 
 
@@ -224,7 +224,7 @@ $db = Zend_Db::factory('Pdo_Mysql', array(
                 may contain a property named <code>params</code>, with
                 may contain a property named <code>params</code>, with
                 subproperties corresponding to adapter parameter names.
                 subproperties corresponding to adapter parameter names.
                 This is used only if the second argument of the
                 This is used only if the second argument of the
-                <code>factory()</code> method is absent.
+                <methodname>factory()</methodname> method is absent.
             </para>
             </para>
 
 
             <example id="zend.db.adapter.connecting.factory.example1">
             <example id="zend.db.adapter.connecting.factory.example1">
@@ -255,7 +255,7 @@ $db = Zend_Db::factory($config->database);
             </example>
             </example>
 
 
             <para>
             <para>
-                The second argument of the <code>factory()</code> method may be
+                The second argument of the <methodname>factory()</methodname> method may be
                 an associative array containing entries corresponding to
                 an associative array containing entries corresponding to
                 adapter parameters. This argument is optional. If the first
                 adapter parameters. This argument is optional. If the first
                 argument is of type <classname>Zend_Config</classname>, it is assumed to contain all
                 argument is of type <classname>Zend_Config</classname>, it is assumed to contain all
@@ -334,7 +334,7 @@ $db = Zend_Db::factory($config->database);
                         <emphasis>adapterNamespace</emphasis>:
                         <emphasis>adapterNamespace</emphasis>:
                         names the initial part of the class name for the
                         names the initial part of the class name for the
                         adapter, instead of 'Zend_Db_Adapter'. Use this if
                         adapter, instead of 'Zend_Db_Adapter'. Use this if
-                        you need to use the <code>factory()</code> method to
+                        you need to use the <methodname>factory()</methodname> method to
                         load a non-Zend database adapter class.
                         load a non-Zend database adapter class.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
@@ -381,7 +381,7 @@ $db = Zend_Db::factory('Db2', $params);
                     special characters. If the value is <constant>FALSE</constant>,
                     special characters. If the value is <constant>FALSE</constant>,
                     identifiers are not delimited automatically. If you need
                     identifiers are not delimited automatically. If you need
                     to delimit identifiers, you must do so yourself using the
                     to delimit identifiers, you must do so yourself using the
-                    <code>quoteIdentifier()</code> method.
+                    <methodname>quoteIdentifier()</methodname> method.
                 </para>
                 </para>
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $options = array(
 $options = array(
@@ -459,11 +459,11 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
 
 
             <para>
             <para>
                 If you need to force the Adapter to connect to the RDBMS, use
                 If you need to force the Adapter to connect to the RDBMS, use
-                the <code>getConnection()</code> method. This method returns
+                the <methodname>getConnection()</methodname> method. This method returns
                 an object for the connection as represented by the respective
                 an object for the connection as represented by the respective
                 PHP database extension. For example, if you use any of the
                 PHP database extension. For example, if you use any of the
                 Adapter classes for PDO drivers, then
                 Adapter classes for PDO drivers, then
-                <code>getConnection()</code> returns the PDO object, after
+                <methodname>getConnection()</methodname> returns the PDO object, after
                 initiating it as a live connection to the specific database.
                 initiating it as a live connection to the specific database.
             </para>
             </para>
 
 
@@ -485,8 +485,9 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
                 to be serialized, if you don't want it, you should consider passing the
                 to be serialized, if you don't want it, you should consider passing the
                 <classname>Zend_Db::ALLOW_SERIALIZATION=false</classname> option, see the example
                 <classname>Zend_Db::ALLOW_SERIALIZATION=false</classname> option, see the example
                 above. To respect lazy connections principle, the adapter won't reconnect itself
                 above. To respect lazy connections principle, the adapter won't reconnect itself
-                after being unserialized. You must then call <code>getConnection()
-                </code> yourself. You can make the adapter auto-reconnect by passing the
+                after being unserialized. You must then call
+                <methodname>getConnection()</methodname>
+                yourself. You can make the adapter auto-reconnect by passing the
                 <classname>Zend_Db::AUTO_RECONNECT_ON_UNSERIALIZE=true</classname> as an adapter
                 <classname>Zend_Db::AUTO_RECONNECT_ON_UNSERIALIZE=true</classname> as an adapter
                 option.
                 option.
             </para>
             </para>
@@ -620,7 +621,7 @@ CREATE TABLE bugs_products (
 
 
             <para>
             <para>
                 You can run a SQL SELECT query and retrieve its results in one
                 You can run a SQL SELECT query and retrieve its results in one
-                step using the <code>fetchAll()</code> method.
+                step using the <methodname>fetchAll()</methodname> method.
             </para>
             </para>
 
 
             <para>
             <para>
@@ -632,7 +633,7 @@ CREATE TABLE bugs_products (
             </para>
             </para>
 
 
             <para>
             <para>
-                The second argument to <code>fetchAll()</code> is an array of
+                The second argument to <methodname>fetchAll()</methodname> is an array of
                 values to substitute for parameter placeholders in the SQL
                 values to substitute for parameter placeholders in the SQL
                 statement.
                 statement.
             </para>
             </para>
@@ -653,7 +654,7 @@ $result = $db->fetchAll($sql, 2);
             <title>Changing the Fetch Mode</title>
             <title>Changing the Fetch Mode</title>
 
 
             <para>
             <para>
-                By default, <code>fetchAll()</code> returns an array of
+                By default, <methodname>fetchAll()</methodname> returns an array of
                 rows, each of which is an associative array. The keys of the
                 rows, each of which is an associative array. The keys of the
                 associative array are the columns or column aliases named in
                 associative array are the columns or column aliases named in
                 the select query.
                 the select query.
@@ -661,7 +662,7 @@ $result = $db->fetchAll($sql, 2);
 
 
             <para>
             <para>
                 You can specify a different style of fetching results using the
                 You can specify a different style of fetching results using the
-                <code>setFetchMode()</code> method. The modes supported are
+                <methodname>setFetchMode()</methodname> method. The modes supported are
                 identified by constants:
                 identified by constants:
             </para>
             </para>