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

[DOCUMENTATION] English:

- manual fixes (varname for variables/ <code>$anyvariable</code>)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15719 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 лет назад
Родитель
Сommit
0073a8aee4
36 измененных файлов с 219 добавлено и 219 удалено
  1. 4 4
      documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_Bootstrapper.xml
  2. 6 6
      documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Bootstrap_ResourceBootstrapper.xml
  3. 3 3
      documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_Resource.xml
  4. 4 4
      documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_ResourceAbstract.xml
  5. 1 1
      documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml
  6. 2 2
      documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml
  7. 2 2
      documentation/manual/en/module_specs/Zend_Auth_Adapter_OpenId.xml
  8. 12 12
      documentation/manual/en/module_specs/Zend_Cache-Frontends.xml
  9. 2 2
      documentation/manual/en/module_specs/Zend_Cache-Theory.xml
  10. 2 2
      documentation/manual/en/module_specs/Zend_Captcha-Adapters.xml
  11. 1 1
      documentation/manual/en/module_specs/Zend_CodeGenerator-Examples.xml
  12. 1 1
      documentation/manual/en/module_specs/Zend_CodeGenerator-Reference.xml
  13. 4 4
      documentation/manual/en/module_specs/Zend_Config-TheoryOfOperation.xml
  14. 4 4
      documentation/manual/en/module_specs/Zend_Config_Ini.xml
  15. 2 2
      documentation/manual/en/module_specs/Zend_Config_Writer.xml
  16. 1 1
      documentation/manual/en/module_specs/Zend_Console_Getopt-Configuration.xml
  17. 1 1
      documentation/manual/en/module_specs/Zend_Console_Getopt-Rules.xml
  18. 7 7
      documentation/manual/en/module_specs/Zend_Controller-ActionController.xml
  19. 1 1
      documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-AutoComplete.xml
  20. 13 13
      documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ContextSwitch.xml
  21. 3 3
      documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-Redirector.xml
  22. 10 10
      documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ViewRenderer.xml
  23. 4 4
      documentation/manual/en/module_specs/Zend_Controller-ActionHelpers.xml
  24. 5 5
      documentation/manual/en/module_specs/Zend_Controller-FrontController.xml
  25. 5 5
      documentation/manual/en/module_specs/Zend_Controller-Migration.xml
  26. 5 5
      documentation/manual/en/module_specs/Zend_Controller-Request.xml
  27. 11 11
      documentation/manual/en/module_specs/Zend_Controller-Response.xml
  28. 1 1
      documentation/manual/en/module_specs/Zend_Controller-Router-Route-Hostname.xml
  29. 2 2
      documentation/manual/en/module_specs/Zend_Controller-Router.xml
  30. 2 2
      documentation/manual/en/module_specs/Zend_Date-Constants.xml
  31. 50 50
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  32. 26 26
      documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml
  33. 16 16
      documentation/manual/en/module_specs/Zend_Db_Table.xml
  34. 1 1
      documentation/manual/en/module_specs/Zend_Db_Table_Row.xml
  35. 1 1
      documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml
  36. 4 4
      documentation/manual/en/module_specs/Zend_Debug.xml

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

@@ -31,7 +31,7 @@
                     <entry><code>void</code></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$application</code>: <emphasis>required</emphasis>.
+                            <varname>$application</varname>: <emphasis>required</emphasis>.
                             Should accept a <classname>Zend_Application</classname> or a
                             <classname>Zend_Application_Bootstrap_Bootstrapper</classname>
                             object as the sole argument.
@@ -49,7 +49,7 @@
                     <entry><classname>Zend_Application_Bootstrap_Bootstrapper</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$options</code>: <emphasis>required</emphasis>.
+                            <varname>$options</varname>: <emphasis>required</emphasis>.
                             Array of options to set.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -99,11 +99,11 @@
                     <entry><code>mixed</code></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$resource</code>: <emphasis>optional</emphasis>.
+                            <varname>$resource</varname>: <emphasis>optional</emphasis>.
                         </para></listitem>
                     </itemizedlist></entry>
                     <entry><para>
-                        If <code>$resource</code> is empty, execute all
+                        If <varname>$resource</varname> is empty, execute all
                         bootstrap resources. If a string, execute that single
                         resource; if an array, execute each resource in the
                         array.

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

@@ -37,14 +37,14 @@
                     </entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$resource</code>: <emphasis>required</emphasis>.
+                            <varname>$resource</varname>: <emphasis>required</emphasis>.
                             A resource name or
                             <classname>Zend_Application_Resource_Resource</classname>
                             object.
                         </para></listitem>
 
                         <listitem><para>
-                            <code>$options</code>: <emphasis>optional</emphasis>.
+                            <varname>$options</varname>: <emphasis>optional</emphasis>.
                             An array or <classname>Zend_Config</classname> object to pass
                             to the resource on instantiation.
                         </para></listitem>
@@ -62,7 +62,7 @@
                     </entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$resource</code>: <emphasis>required</emphasis>.
+                            <varname>$resource</varname>: <emphasis>required</emphasis>.
                             Name of a resource to unregister from the class.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -76,7 +76,7 @@
                     <entry><code>boolean</code></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$resource</code>: <emphasis>required</emphasis>.
+                            <varname>$resource</varname>: <emphasis>required</emphasis>.
                             Name of the resource.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -91,7 +91,7 @@
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$resource</code>: <emphasis>required</emphasis>.
+                            <varname>$resource</varname>: <emphasis>required</emphasis>.
                             Name of a resource to retrieve (string).
                         </para></listitem>
                     </itemizedlist></entry>
@@ -117,7 +117,7 @@
                     </entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$loader</code>: <emphasis>required</emphasis>.
+                            <varname>$loader</varname>: <emphasis>required</emphasis>.
                             Plugin loader instance to use when resolving plugin
                             names to classes.
                         </para></listitem>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_Resource.xml

@@ -28,7 +28,7 @@
                     <entry><code>void</code></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$options</code>: <emphasis>optional</emphasis>.
+                            <varname>$options</varname>: <emphasis>optional</emphasis>.
                             Options with which to set resource state.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -46,7 +46,7 @@
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
                     <entry><itemizedlist>
                             <listitem><para>
-                                <code>$bootstrap</code>: <emphasis>required</emphasis>.
+                                <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
                                 Parent bootstrap initializing this resource.
                             </para></listitem>
                     </itemizedlist></entry>
@@ -69,7 +69,7 @@
                     <entry><classname>Zend_Application_Resource_Resource</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$options</code>: <emphasis>required</emphasis>.
+                            <varname>$options</varname>: <emphasis>required</emphasis>.
                             Options with which to set state.
                         </para></listitem>
                     </itemizedlist></entry>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Application-CoreFunctionality-Resource_ResourceAbstract.xml

@@ -34,7 +34,7 @@
                     <entry><code>void</code></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$options</code>: <emphasis>optional</emphasis>.
+                            <varname>$options</varname>: <emphasis>optional</emphasis>.
                             Options with which to set resource state.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -52,7 +52,7 @@
                     <entry><classname>Zend_Application_Resource_ResourceAbstract</classname></entry>
                     <entry><itemizedlist>
                             <listitem><para>
-                                <code>$bootstrap</code>: <emphasis>required</emphasis>.
+                                <varname>$bootstrap</varname>: <emphasis>required</emphasis>.
                                 Parent bootstrap initializing this resource.
                             </para></listitem>
                     </itemizedlist></entry>
@@ -75,7 +75,7 @@
                     <entry><classname>Zend_Application_Resource_ResourceAbstract</classname></entry>
                     <entry><itemizedlist>
                         <listitem><para>
-                            <code>$options</code>: <emphasis>required</emphasis>.
+                            <varname>$options</varname>: <emphasis>required</emphasis>.
                             Options with which to set state.
                         </para></listitem>
                     </itemizedlist></entry>
@@ -171,7 +171,7 @@ $view = $bootstrap->getResource('My_Resource_View');
         <para>
             This brings us to the third option. You can specify an explicit name
             that a given resource class will register as. This can be done by
-            adding a public <code>$_explicitType</code> property to the resource
+            adding a public <varname>$_explicitType</varname> property to the resource
             plugin class, with a string value; that value will then be used
             whenever you wish to reference the plugin resource via the
             bootstrap. As an example, let's define our own view class:

+ 1 - 1
documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml

@@ -488,7 +488,7 @@ class FooController extends Zend_Controller_Action
             <para>
                 As noted previously, all resources -- whether methods or plugins
                 -- are bootstrapped by calling <code>bootstrap($resource)</code>,
-                where <code>$resource</code> is the name of a resource, an array
+                where <varname>$resource</varname> is the name of a resource, an array
                 of resources, or, left empty, indicates all resources should be
                 run.
             </para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml

@@ -68,7 +68,7 @@ if ($log_path) {
 ]]></programlisting>
             Of course, the logging code is optional, but it is highly recommended that you use a logger.
             <classname>Zend_Auth_Adapter_Ldap</classname> will record just about every bit of information anyone could want in
-            <code>$messages</code> (more below), which is a nice feature in itself for something that has a history of
+            <varname>$messages</varname> (more below), which is a nice feature in itself for something that has a history of
             being notoriously difficult to debug.
         </para>
 
@@ -131,7 +131,7 @@ ldap.server2.baseDn = "CN=Users,DC=w,DC=net"
         </para>
 
         <para>
-            The <code>$options</code> parameter is required and must be an array containing one or more sets of
+            The <varname>$options</varname> parameter is required and must be an array containing one or more sets of
             options. Note that it is <emphasis>an array of arrays</emphasis> of
             <link linkend="zend.ldap"><classname>Zend_Ldap</classname></link> options. Even if you will be using only one LDAP server, the
             options must still be within another array.

+ 2 - 2
documentation/manual/en/module_specs/Zend_Auth_Adapter_OpenId.xml

@@ -65,9 +65,9 @@
             The following example shows the usage of <classname>Zend_Auth_Adapter_OpenId</classname>.
             As previously mentioned, the <classname>Zend_Auth_Adapter_OpenId::authenticate()</classname>
             must be called two times. The first time is after the user submits the HTML form with the
-            <code>$_POST['openid_action']</code> set to <code>"login"</code>,
+            <varname>$_POST['openid_action']</varname> set to <code>"login"</code>,
             and the second time is after the HTTP redirection from OpenID server with
-            <code>$_GET['openid_mode']</code> or <code>$_POST['openid_mode']</code>
+            <varname>$_GET['openid_mode']</varname> or <varname>$_POST['openid_mode']</varname>
             set.
         </para>
 

+ 12 - 12
documentation/manual/en/module_specs/Zend_Cache-Frontends.xml

@@ -558,8 +558,8 @@ $result = $cache->foobar2('1', '2');
             </para>
             <para>
                 On the other hand, the "cache id" is calculated automatically with
-                <code>$_SERVER['REQUEST_URI']</code> and (depending on options)
-                <code>$_GET</code>, <code>$_POST</code>, <code>$_SESSION</code>, <code>$_COOKIE</code>, <code>$_FILES</code>.
+                <varname>$_SERVER['REQUEST_URI']</varname> and (depending on options)
+                <varname>$_GET</varname>, <varname>$_POST</varname>, <varname>$_SESSION</varname>, <varname>$_COOKIE</varname>, <varname>$_FILES</varname>.
                 More over, you have only one method to call (<code>start()</code>) because the
                 <code>end()</code> call is fully automatic when the page is ended.
             </para>
@@ -616,70 +616,70 @@ $result = $cache->foobar2('1', '2');
                                           <para>
                                               <code>(boolean, false by default) cache_with_get_variables</code> :
                                               if true, cache is still on even if there are some variables in
-                                              <code>$_GET</code> array
+                                              <varname>$_GET</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, false by default) cache_with_post_variables</code> :
                                               if true, cache is still on even if there are some variables in
-                                              <code>$_POST</code> array
+                                              <varname>$_POST</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, false by default) cache_with_session_variables</code> :
                                               if true, cache is still on even if there are some variables in
-                                              <code>$_SESSION</code> array
+                                              <varname>$_SESSION</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, false by default) cache_with_files_variables</code> :
                                               if true, cache is still on even if there are some variables in
-                                              <code>$_FILES</code> array
+                                              <varname>$_FILES</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, false by default) cache_with_cookie_variables</code> :
                                               if true, cache is still on even if there are some variables in
-                                              <code>$_COOKIE</code> array
+                                              <varname>$_COOKIE</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, true by default) make_id_with_get_variables</code> :
                                               if true, the cache id will be dependent of the content of the
-                                              <code>$_GET</code> array
+                                              <varname>$_GET</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, true by default) make_id_with_post_variables</code> :
                                               if true, the cache id will be dependent of the content of the
-                                              <code>$_POST</code> array
+                                              <varname>$_POST</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, true by default) make_id_with_session_variables</code> :
                                               if true, the cache id will be dependent of the content of the
-                                              <code>$_SESSION</code> array
+                                              <varname>$_SESSION</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, true by default) make_id_with_files_variables</code> :
                                               if true, the cache id will be dependent of the content of the
-                                              <code>$_FILES</code> array
+                                              <varname>$_FILES</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>
                                           <para>
                                               <code>(boolean, true by default) make_id_with_cookie_variables</code> :
                                               if true, the cache id will be dependent of the content of the
-                                              <code>$_COOKIE</code> array
+                                              <varname>$_COOKIE</varname> array
                                           </para>
                                       </listitem>
                                       <listitem>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Cache-Theory.xml

@@ -50,7 +50,7 @@ $cache = Zend_Cache::factory($frontendName,
                              $backendOptions);
 ]]></programlisting>
         <para>
-            In the following examples we will assume that the <code>$cache</code> variable holds a
+            In the following examples we will assume that the <varname>$cache</varname> variable holds a
             valid, instantiated frontend as shown and that you understand how to pass parameters
             to your chosen backends.
         </para>
@@ -71,7 +71,7 @@ $cache = Zend_Cache::factory($frontendName,
 $cache->save($huge_data, 'myUniqueID', array('tagA', 'tagB', 'tagC'));
 ]]></programlisting>
         <note><para>
-            note than the <code>save()</code> method accepts an optional fourth argument : <code>$specificLifetime</code>
+            note than the <code>save()</code> method accepts an optional fourth argument : <varname>$specificLifetime</varname>
             (if != false, it sets a specific lifetime for this particular cache record)
         </para></note>
     </sect2>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Captcha-Adapters.xml

@@ -41,7 +41,7 @@
             <listitem><para>
                 <code>setTimeout($ttl)</code> and <code>getTimeout()</code>
                 allow you to specify the time-to-live of the session token, and
-                to retrieve the current value. <code>$ttl</code> should be
+                to retrieve the current value. <varname>$ttl</varname> should be
                 specified in seconds.
             </para></listitem>
 
@@ -156,7 +156,7 @@
 
             <listitem><para>
                 <code>setFont($font)</code> and <code>getFont()</code> allow
-                you to specify the font you will use. <code>$font</code>
+                you to specify the font you will use. <varname>$font</varname>
                 should be a fully qualified path to the font file.
                 This value is required; the CAPTCHA will throw an
                 exception during generation if the font file has not been specified.

+ 1 - 1
documentation/manual/en/module_specs/Zend_CodeGenerator-Examples.xml

@@ -271,7 +271,7 @@ class Foo
 
         <para>
             In the example below, we will assume you've defined
-            <code>$foo</code> per one of the class definitions in a previous
+            <varname>$foo</varname> per one of the class definitions in a previous
             example.
         </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_CodeGenerator-Reference.xml

@@ -32,7 +32,7 @@ abstract class Zend_CodeGenerator_Abstract
             <para>
                 The constructor first calls <code>_init()</code> (which is left
                 empty for the concrete extending class to implement), then
-                passes the <code>$options</code> parameter to
+                passes the <varname>$options</varname> parameter to
                 <code>setOptions()</code>, and finally calls
                 <code>_prepare()</code> (again, to be implemented by an
                 extending class).

+ 4 - 4
documentation/manual/en/module_specs/Zend_Config-TheoryOfOperation.xml

@@ -66,10 +66,10 @@
     </para>
     <para>
         If you have two <classname>Zend_Config</classname> objects, you can merge them into a single
-        object using the <code>merge()</code> function. For example, given <code>$config</code> and
-        <code>$localConfig</code>, you can merge data from <code>$localConfig</code> to <code>$config</code> using
-        <code>$config->merge($localConfig);</code>. The items in <code>$localConfig</code> will override
-        any items with the same name in <code>$config</code>.
+        object using the <code>merge()</code> function. For example, given <varname>$config</varname> and
+        <varname>$localConfig</varname>, you can merge data from <varname>$localConfig</varname> to <varname>$config</varname> using
+        <code>$config->merge($localConfig);</code>. The items in <varname>$localConfig</varname> will override
+        any items with the same name in <varname>$config</varname>.
         <note>
             <para>
                 The <classname>Zend_Config</classname> object that is performing the merge must have been constructed

+ 4 - 4
documentation/manual/en/module_specs/Zend_Config_Ini.xml

@@ -25,7 +25,7 @@
         <title>Key Separator</title>
         <para>
             By default, the key separator character is the period character (<code>.</code>). This can be changed,
-            however, by changing the <code>$options</code> key <code>'nestSeparator'</code> when constructing the
+            however, by changing the <varname>$options</varname> key <code>'nestSeparator'</code> when constructing the
             <classname>Zend_Config_Ini</classname> object. For example:
             <programlisting language="php"><![CDATA[
 $options['nestSeparator'] = ':';
@@ -86,17 +86,17 @@ echo $config->database->params->dbname; // prints "dbname"
             </thead>
             <tbody>
                 <row>
-                    <entry><code>$filename</code></entry>
+                    <entry><varname>$filename</varname></entry>
                     <entry>The INI file to load.</entry>
                 </row>
                 <row>
-                    <entry><code>$section</code></entry>
+                    <entry><varname>$section</varname></entry>
                     <entry>The [section] within the ini file that is to be loaded. Setting
                         this parameter to null will load all sections. Alternatively, an
                         array of section names may be supplied to load multiple sections.</entry>
                 </row>
                 <row>
-                    <entry><code>$options = false</code></entry>
+                    <entry><varname>$options = false</varname></entry>
                     <entry>Options array. The following keys are supported:
                         <itemizedlist>
                             <listitem><para><emphasis>allowModifications</emphasis>: Set to true to allow subsequent modification of loaded file. Defaults to false</para></listitem>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Config_Writer.xml

@@ -10,8 +10,8 @@
         work the same. You instantiate a writer with specific options, which
         can be <code>filename</code> and <code>config</code>. Then
         you call the <code>write()</code> method of the writer and the config
-        file is created. You can also give <code>$filename</code> and
-        <code>$config</code> directly to the <code>write()</code> method.
+        file is created. You can also give <varname>$filename</varname> and
+        <varname>$config</varname> directly to the <code>write()</code> method.
         Currently the following writers are shipped with
         <classname>Zend_Config_Writer</classname>:
     </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Console_Getopt-Configuration.xml

@@ -113,7 +113,7 @@ $opts->setAliases(
         <title>Adding Argument Lists</title>
         <para>
             By default, <classname>Zend_Console_Getopt</classname> uses
-            <code>$_SERVER['argv']</code> for the array of command-line
+            <varname>$_SERVER['argv']</varname> for the array of command-line
             arguments to parse. You can alternatively specify the array of
             arguments as the second constructor argument. Finally, you
             can append more arguments to those already used using the

+ 1 - 1
documentation/manual/en/module_specs/Zend_Console_Getopt-Rules.xml

@@ -12,7 +12,7 @@
     <para>
         The constructor takes two more arguments, both of which are optional.
         The second argument may contain the command-line arguments.
-        This defaults to <code>$_SERVER['argv']</code>.
+        This defaults to <varname>$_SERVER['argv']</varname>.
     </para>
     <para>
         The third argument of the constructor may contain an

+ 7 - 7
documentation/manual/en/module_specs/Zend_Controller-ActionController.xml

@@ -274,7 +274,7 @@ if ($this->_hasParam('id') {
             <classname>Zend_Controller_Action</classname> provides a rudimentary and
             flexible mechanism for view integration. Two methods accomplish
             this, <code>initView()</code> and <code>render()</code>; the former
-            method lazy-loads the <code>$view</code> public property, and the
+            method lazy-loads the <varname>$view</varname> public property, and the
             latter renders a view based on the current requested action, using
             the directory hierarchy to determine the script path.
         </para>
@@ -286,10 +286,10 @@ if ($this->_hasParam('id') {
                 <code>initView()</code> initializes the view object.
                 <code>render()</code> calls <code>initView()</code> in order to
                 retrieve the view object, but it may be initialized at any time;
-                by default it populates the <code>$view</code> property with a
+                by default it populates the <varname>$view</varname> property with a
                 <classname>Zend_View</classname> object, but any class implementing
                 <classname>Zend_View_Interface</classname> may be used. If
-                <code>$view</code> is already initialized, it simply returns
+                <varname>$view</varname> is already initialized, it simply returns
                 that property.
             </para>
 
@@ -338,16 +338,16 @@ string render(string $action = null,
                 <code>render()</code> renders a view script. If no arguments are
                 passed, it assumes that the script requested is
                 <code>[controller]/[action].phtml</code> (where
-                <code>.phtml</code> is the value of the <code>$viewSuffix</code>
-                property). Passing a value for <code>$action</code> will render
+                <code>.phtml</code> is the value of the <varname>$viewSuffix</varname>
+                property). Passing a value for <varname>$action</varname> will render
                 that template in the <code>[controller]</code> subdirectory. To
                 override using the <code>[controller]</code> subdirectory, pass
-                a true value for <code>$noController</code>. Finally, templates
+                a true value for <varname>$noController</varname>. Finally, templates
                 are rendered into the response object; if you wish to render to
                 a specific <link
                     linkend="zend.controller.response.namedsegments">named
                     segment</link> in the response object, pass a value to
-                <code>$name</code>.
+                <varname>$name</varname>.
             </para>
 
             <note><para>

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

@@ -102,7 +102,7 @@ class FooController extends Zend_Controller_Action
         <listitem><para>
                 <code>direct($data, $sendNow = true, $keepLayouts =
                     false)</code> is used when calling the helper as a method of
-                the helper broker. The <code>$sendNow</code> flag is used to
+                the helper broker. The <varname>$sendNow</varname> flag is used to
                 determine whether to call <code>sendAutoCompletion()</code> or
                 <code>prepareAutoCompletion()</code>, respectively.
         </para></listitem>

+ 13 - 13
documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ContextSwitch.xml

@@ -244,7 +244,7 @@ $this->_helper->contextSwitch()->setAutoJsonSerialization(false);
 
             <listitem><para>
                 <code>addContexts(array $contexts)</code>: add many contexts at
-                once. The <code>$contexts</code> array should be an array of
+                once. The <varname>$contexts</varname> array should be an array of
                 context/specification pairs. If any of the contexts already
                 exists, it will throw an exception.
             </para></listitem>
@@ -341,7 +341,7 @@ class FooController extends Zend_Controller_Action
 
         <para>
             Alternately, you could simply define the array property
-            <code>$contexts</code>:
+            <varname>$contexts</varname>:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -373,7 +373,7 @@ class FooController extends Zend_Controller_Action
                     <code>addActionContext($action, $context)</code>: marks one
                     or more contexts as available to an action. If mappings
                     already exists, simply appends to those mappings.
-                    <code>$context</code> may be a single context, or an array
+                    <varname>$context</varname> may be a single context, or an array
                     of contexts.
                 </para>
 
@@ -392,13 +392,13 @@ class FooController extends Zend_Controller_Action
                     <code>setActionContext($action, $context)</code>: marks one
                     or more contexts as available to an action. If mappings
                     already exists, it replaces them with those specified.
-                    <code>$context</code> may be a single context, or an array
+                    <varname>$context</varname> may be a single context, or an array
                     of contexts.
             </para></listitem>
 
             <listitem><para>
                     <code>addActionContexts(array $contexts)</code>: add several
-                    action/context pairings at once. <code>$contexts</code>
+                    action/context pairings at once. <varname>$contexts</varname>
                     should be an associative array of action/context pairs. It
                     proxies to <code>addActionContext()</code>, meaning that if
                     pairings already exist, it appends to them.
@@ -424,7 +424,7 @@ class FooController extends Zend_Controller_Action
             <listitem><para>
                     <code>removeActionContext($action, $context)</code>: remove
                     one or more contexts from a given action.
-                    <code>$context</code> may be a single context or an array of
+                    <varname>$context</varname> may be a single context or an array of
                     contexts.
             </para></listitem>
 
@@ -515,8 +515,8 @@ $contextSwitch->initContext();
             <listitem>
                 <para>
                     <code>addHeader($context, $header, $content)</code>: Add a
-                    response header for a given context. <code>$header</code> is
-                    the header name, and <code>$content</code> is the value to
+                    response header for a given context. <varname>$header</varname> is
+                    the header name, and <varname>$content</varname> is the value to
                     pass for that header.
                 </para>
 
@@ -527,7 +527,7 @@ $contextSwitch->initContext();
                 </para>
 
                 <para>
-                    If the <code>$header</code> specified already exists for the
+                    If the <varname>$header</varname> specified already exists for the
                     context, an exception will be thrown.
                 </para>
             </listitem>
@@ -546,7 +546,7 @@ $contextSwitch->initContext();
                     <code>addHeaders($context, array $headers)</code>: Add
                     multiple headers at once to a given context. Proxies to
                     <code>addHeader()</code>, so if the header already exists,
-                    an exception will be thrown. <code>$headers</code> is an
+                    an exception will be thrown. <varname>$headers</varname> is an
                     array of header/context pairs.
                 </para>
             </listitem>
@@ -588,14 +588,14 @@ $contextSwitch->initContext();
                     a callback at a given trigger for a given context. Triggers
                     may be either 'init' or 'post' (indicating callback will be
                     called at either context initialization or postDispatch).
-                    <code>$callback</code> should be a valid PHP callback.
+                    <varname>$callback</varname> should be a valid PHP callback.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
                     <code>setCallbacks($context, array $callbacks)</code>: set
-                    multiple callbacks for a given context. <code>$callbacks</code>
+                    multiple callbacks for a given context. <varname>$callbacks</varname>
                     should be trigger/callback pairs. In actuality, the most callbacks
                     that can be registered are two, one for initialization and
                     one for post processing.
@@ -688,7 +688,7 @@ $contextSwitch->initContext();
 
         <para>
             First, it uses a different action controller property for
-            determining contexts, <code>$ajaxable</code>. This is so you can
+            determining contexts, <varname>$ajaxable</varname>. This is so you can
             have different contexts used for AJAX versus normal HTTP requests.
             The various <code>*ActionContext*()</code> methods of
             <code>AjaxContext</code> will write to this property.

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

@@ -78,9 +78,9 @@
                     <code>setUseAbsoluteUri()</code> can be used to force the
                     <code>Redirector</code> to use absolute URIs when
                     redirecting. When this option is set, it uses the value of
-                    <code>$_SERVER['HTTP_HOST']</code>,
-                    <code>$_SERVER['SERVER_PORT']</code>, and
-                    <code>$_SERVER['HTTPS']</code> to form a full URI to the URL
+                    <varname>$_SERVER['HTTP_HOST']</varname>,
+                    <varname>$_SERVER['SERVER_PORT']</varname>, and
+                    <varname>$_SERVER['HTTPS']</varname> to form a full URI to the URL
                     specified by one of the redirect methods. This option is off
                     by default, but may be enabled by default in later releases.
                 </para>

+ 10 - 10
documentation/manual/en/module_specs/Zend_Controller-ActionHelpers-ViewRenderer.xml

@@ -184,7 +184,7 @@ $this->foo(); // call Foo_View_Helper_Foo::foo()
                 <para>
                     <code>setView($view)</code> allows you to set the view
                     object for the <code>ViewRenderer</code>. It gets set as
-                    the public class property <code>$view</code>.
+                    the public class property <varname>$view</varname>.
                 </para>
             </listitem>
 
@@ -235,7 +235,7 @@ $this->foo(); // call Foo_View_Helper_Foo::foo()
             <listitem>
                 <para>
                     <code>setScriptAction($name)</code> can be used to
-                    specify the action script to render. <code>$name</code>
+                    specify the action script to render. <varname>$name</varname>
                     should be the name of the script minus the file suffix (and
                     without the controller subdirectory, unless
                     <code>noController</code> has been turned on). If not
@@ -421,7 +421,7 @@ $viewRenderer =
             <listitem><para>
                     <code>setInflector($inflector, $reference)</code> allows you
                     to set a custom inflector for use with the
-                    <code>ViewRenderer</code>. If <code>$reference</code> is
+                    <code>ViewRenderer</code>. If <varname>$reference</varname> is
                     true, it will set the suffix and module directory as static
                     references to <code>ViewRenderer</code> properties, as well
                     as the target.
@@ -502,7 +502,7 @@ $viewRenderer =
                     named path segment. When using this method, the
                     <code>ViewRenderer</code> does no autodetermination of the
                     script name, but instead directly passes the
-                    <code>$script</code> argument directly to the view object's
+                    <varname>$script</varname> argument directly to the view object's
                     <code>render()</code> method.
                 </para>
 
@@ -526,7 +526,7 @@ $viewRenderer =
                 <para>
                     <code>getViewScript($action, $vars)</code> creates the path
                     to a view script based on the action passed and/or any
-                    variables passed in <code>$vars</code>. Keys for this array
+                    variables passed in <varname>$vars</varname>. Keys for this array
                     may include any of the path specification keys ('moduleDir',
                     'module', 'controller', 'action', and 'suffix'). Any
                     variables passed will be used; otherwise, values based on
@@ -561,11 +561,11 @@ $viewRenderer =
             <listitem>
                 <para>
                     <code>render($action, $name, $noController)</code> checks
-                    first to see if either <code>$name</code> or
-                    <code>$noController</code> have been passed, and if so, sets
+                    first to see if either <varname>$name</varname> or
+                    <varname>$noController</varname> have been passed, and if so, sets
                     the appropriate flags (responseSegment and noController,
                     respectively) in the ViewRenderer. It then passes the
-                    <code>$action</code> argument, if any, on to
+                    <varname>$action</varname> argument, if any, on to
                     <code>getViewScript()</code>. Finally, it passes the
                     calculated view script path to <code>renderScript()</code>.
                 </para>
@@ -595,9 +595,9 @@ $viewRenderer =
                     <code>renderBySpec($action, $vars, $name)</code> allows you
                     to pass path specification variables in order to determine
                     the view script path to create. It passes
-                    <code>$action</code> and <code>$vars</code> to
+                    <varname>$action</varname> and <varname>$vars</varname> to
                     <code>getScriptPath()</code>, and then passes the resulting
-                    script path and <code>$name</code> on to
+                    script path and <varname>$name</varname> on to
                     <code>renderScript()</code>.
                 </para>
             </listitem>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Controller-ActionHelpers.xml

@@ -37,7 +37,7 @@
         </para>
 
         <para>
-            The helper broker is stored as the <code>$_helper</code> member of
+            The helper broker is stored as the <varname>$_helper</varname> member of
             <classname>Zend_Controller_Action</classname>; use the broker to retrieve or
             call on helpers. Some methods for doing so include:
         </para>
@@ -166,7 +166,7 @@ Zend_Controller_Action_HelperBroker::addPath('./Plugins/Helpers',
 
         <para>
             To determine if a helper exists in the helper broker, use
-            <code>hasHelper($name)</code>, where <code>$name</code> is the short
+            <code>hasHelper($name)</code>, where <varname>$name</varname> is the short
             name of the helper (minus the prefix):
         </para>
 
@@ -191,7 +191,7 @@ if (Zend_Controller_Action_HelperBroker::hasHelper('redirector')) {
         </para>
 
         <para>
-            Both methods take a single argument, <code>$name</code>, which is
+            Both methods take a single argument, <varname>$name</varname>, which is
             the short name of the helper (minus the prefix).
         </para>
 
@@ -211,7 +211,7 @@ $redirector =
 
         <para>
             Finally, to delete a registered helper from the broker, use
-            <code>removeHelper($name)</code>, where <code>$name</code> is the
+            <code>removeHelper($name)</code>, where <varname>$name</varname> is the
             short name of the helper (minus the prefix):
         </para>
 

+ 5 - 5
documentation/manual/en/module_specs/Zend_Controller-FrontController.xml

@@ -370,7 +370,7 @@ Zend_Controller_Front::run('../application/controllers');
                     <code>registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)</code>
                     allows you to register <link
                         linkend="zend.controller.plugins">plugin objects</link>.
-                    By setting the optional <code>$stackIndex</code>, you can
+                    By setting the optional <varname>$stackIndex</varname>, you can
                     control the order in which plugins will execute.
                 </para>
             </listitem>
@@ -380,7 +380,7 @@ Zend_Controller_Front::run('../application/controllers');
                     <code>unregisterPlugin($plugin)</code> let you
                     unregister <link
                         linkend="zend.controller.plugins">plugin objects</link>.
-                    <code>$plugin</code> may be either a plugin object or a
+                    <varname>$plugin</varname> may be either a plugin object or a
                     string denoting the class of plugin to unregister.
                 </para>
             </listitem>
@@ -440,8 +440,8 @@ Zend_Controller_Front::run('../application/controllers');
             <listitem>
                 <para>
                     <code>setParam($name, $value)</code> allows you to set a
-                    single parameter of <code>$name</code> with value
-                    <code>$value</code>.
+                    single parameter of <varname>$name</varname> with value
+                    <varname>$value</varname>.
                 </para>
             </listitem>
 
@@ -455,7 +455,7 @@ Zend_Controller_Front::run('../application/controllers');
             <listitem>
                 <para>
                     <code>getParam($name)</code> allows you to retrieve a single
-                    parameter at a time, using <code>$name</code> as the
+                    parameter at a time, using <varname>$name</varname> as the
                     identifier.
                 </para>
             </listitem>

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

@@ -509,11 +509,11 @@ final protected function _forward($action,
 ]]></programlisting>
 
                 <para>
-                    <code>$action</code> is always required; if no controller is
+                    <varname>$action</varname> is always required; if no controller is
                     specified, an action in the current controller is assumed.
-                    <code>$module</code> is always ignored unless
-                    <code>$controller</code> is specified. Finally, any
-                    <code>$params</code> provided will be appended to the
+                    <varname>$module</varname> is always ignored unless
+                    <varname>$controller</varname> is specified. Finally, any
+                    <varname>$params</varname> provided will be appended to the
                     request object. If you do not require the controller or
                     module, but still need to pass parameters, simply specify
                     null for those values.
@@ -667,7 +667,7 @@ echo $response;
                     <listitem><para>
                         <code>_redirect()</code> now takes an optional second
                         argument, the HTTP code to return with the redirect, and
-                        an optional third argument, <code>$prependBase</code>,
+                        an optional third argument, <varname>$prependBase</varname>,
                         that can indicate that the base URL registered with the
                         request object should be prepended to the url specified.
                     </para></listitem>

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

@@ -43,7 +43,7 @@
             Based on the type of request, there may be more methods available.
             The default request used, <classname>Zend_Controller_Request_Http</classname>,
             for instance, has methods for retrieving the request URI, path
-            information, <code>$_GET</code> and <code>$_POST</code> parameters,
+            information, <varname>$_GET</varname> and <varname>$_POST</varname> parameters,
             etc.
         </para>
 
@@ -97,10 +97,10 @@
             <para>
                 Specific superglobals can be accessed using a public method as
                 an alternative. For example, the raw value of
-                <code>$_POST['user']</code> can be accessed by calling
+                <varname>$_POST['user']</varname> can be accessed by calling
                 <code>getPost('user')</code> on the request object. These
                 include <code>getQuery()</code> for retrieving
-                <code>$_GET</code> elements, and <code>getHeader()</code> for
+                <varname>$_GET</varname> elements, and <code>getHeader()</code> for
                 retrieving request headers.
             </para>
 
@@ -171,9 +171,9 @@
                 <para>
                     If you are using Apache's 404 handler to pass incoming
                     requests to the front controller, or using a PT flag with
-                    rewrite rules, <code>$_SERVER['REDIRECT_URL']</code>
+                    rewrite rules, <varname>$_SERVER['REDIRECT_URL']</varname>
                     contains the URI you need, not
-                    <code>$_SERVER['REQUEST_URI']</code>. If you are using such
+                    <varname>$_SERVER['REQUEST_URI']</varname>. If you are using such
                     a setup and getting invalid routing, you should use the
                     <classname>Zend_Controller_Request_Apache404</classname> class instead
                     of the default Http class for your request object:

+ 11 - 11
documentation/manual/en/module_specs/Zend_Controller-Response.xml

@@ -160,7 +160,7 @@ $front->dispatch();
                     <code>setHeader($name, $value, $replace = false)</code> is
                     used to set an individual header. By default, it does not
                     replace existing headers of the same name in the object;
-                    however, setting <code>$replace</code> to true will force it
+                    however, setting <varname>$replace</varname> to true will force it
                     to do so.
                 </para>
 
@@ -181,7 +181,7 @@ $front->dispatch();
 
                 <para>
                     Internally, it calls <code>setHeader()</code> with the
-                    <code>$replace</code> flag on to ensure only one such header
+                    <varname>$replace</varname> flag on to ensure only one such header
                     is ever sent.
                 </para>
             </listitem>
@@ -316,7 +316,7 @@ array(
             <listitem>
                 <para>
                     <code>setBody()</code> and <code>appendBody()</code> both
-                    allow you to pass a second value, <code>$name</code>,
+                    allow you to pass a second value, <varname>$name</varname>,
                     indicating a named segment. In each case, if you provide
                     this, it will overwrite that specific named segment or
                     create it if it does not exist (appending to the array by
@@ -331,7 +331,7 @@ array(
             <listitem>
                 <para>
                     <code>prepend($name, $content)</code> will create a segment
-                    named <code>$name</code> and place it at the beginning of
+                    named <varname>$name</varname> and place it at the beginning of
                     the array. If the segment exists already, it will be removed
                     prior to the operation (i.e., overwritten and replaced).
                 </para>
@@ -340,7 +340,7 @@ array(
             <listitem>
                 <para>
                     <code>append($name, $content)</code> will create a segment
-                    named <code>$name</code> and place it at the end of
+                    named <varname>$name</varname> and place it at the end of
                     the array. If the segment exists already, it will be removed
                     prior to the operation (i.e., overwritten and replaced).
                 </para>
@@ -350,10 +350,10 @@ array(
                 <para>
                     <code>insert($name, $content, $parent = null, $before =
                         false)</code> will create a segment named
-                    <code>$name</code>. If provided with a <code>$parent</code>
+                    <varname>$name</varname>. If provided with a <varname>$parent</varname>
                     segment, the new segment will be placed either before or
                     after that segment (based on the value of
-                    <code>$before</code>) in the array. If the segment exists
+                    <varname>$before</varname>) in the array. If the segment exists
                     already, it will be removed prior to the operation (i.e.,
                     overwritten and replaced).
                 </para>
@@ -362,7 +362,7 @@ array(
             <listitem>
                 <para>
                     <code>clearBody($name = null)</code> will remove a single
-                    named segment if a <code>$name</code> is provided (and the
+                    named segment if a <varname>$name</varname> is provided (and the
                     entire array otherwise).
                 </para>
             </listitem>
@@ -370,10 +370,10 @@ array(
             <listitem>
                 <para>
                     <code>getBody($spec = false)</code> can be used to retrieve a single
-                    array segment if <code>$spec</code> is the name of a named
-                    segment. If <code>$spec</code> is false, it returns a string
+                    array segment if <varname>$spec</varname> is the name of a named
+                    segment. If <varname>$spec</varname> is false, it returns a string
                     formed by concatenating all named segments in order. If
-                    <code>$spec</code> is true, it returns the body content
+                    <varname>$spec</varname> is true, it returns the body content
                     array.
                 </para>
             </listitem>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Controller-Router-Route-Hostname.xml

@@ -45,7 +45,7 @@ $router->addRoute('user', $hostnameRoute->chain($plainPathRoute);
         that is, that a hostname route alone would match any path. So what you
         have to do is to chain a path route to the hostname route. This is done
         like in the example by calling <code>$hostnameRoute->chain($pathRoute);</code>.
-        By doing this, <code>$hostnameRoute</code> isn't modified, but a new
+        By doing this, <varname>$hostnameRoute</varname> isn't modified, but a new
         route (<classname>Zend_Controller_Router_Route_Chain</classname>) is returned,
         which can then be given to the router.
     </para>

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

@@ -57,10 +57,10 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
         <note>
             <title>IIS Isapi_Rewrite</title>
             <para>
-                When using IIS, <code>$_SERVER['REQUEST_URI']</code> will either
+                When using IIS, <varname>$_SERVER['REQUEST_URI']</varname> will either
                 not exist, or be set as an empty string. In this case,
                 <classname>Zend_Controller_Request_Http</classname> will attempt to use
-                the <code>$_SERVER['HTTP_X_REWRITE_URL']</code> value set by the
+                the <varname>$_SERVER['HTTP_X_REWRITE_URL']</varname> value set by the
                 Isapi_Rewrite extension.
             </para>
         </note>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Date-Constants.xml

@@ -5,7 +5,7 @@
     <title>Constants for General Date Functions</title>
 
     <para>
-        Whenever a <classname>Zend_Date</classname> method has a <code>$parts</code> parameter, one of the constants below can be
+        Whenever a <classname>Zend_Date</classname> method has a <varname>$parts</varname> parameter, one of the constants below can be
         used as the argument for that parameter, in order to select a specific part of a date or indicate the date
         format used or desired (e.g. RFC 822).
     </para>
@@ -555,7 +555,7 @@
         <para>
             Especially note <classname>Zend_Date::DATES</classname>, since this format specifier has a unique property within
             <classname>Zend_Date</classname> as an <emphasis>input</emphasis> format specifier. When used as an
-            input format for <code>$part</code>, this constant provides the most flexible acceptance of a variety of
+            input format for <varname>$part</varname>, this constant provides the most flexible acceptance of a variety of
             similar date formats. Heuristics are used to automatically extract dates from an input string and then "fix"
             simple errors in dates (if any), such as swapping of years, months, and days, when possible.
         </para>

+ 50 - 50
documentation/manual/en/module_specs/Zend_Date-Overview.xml

@@ -21,7 +21,7 @@
                 Several methods use date format strings, in a way similar to PHP's <code>date()</code>.
                 If you are more comfortable with PHP's date format specifier than with ISO format specifiers,
                 then you can use <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname>.
-                Afterward, use PHP's date format specifiers for all functions which accept a <code>$format</code> parameter.
+                Afterward, use PHP's date format specifiers for all functions which accept a <varname>$format</varname> parameter.
                 Use <classname>Zend_Date::setOptions(array('format_type' => 'iso'))</classname> to switch back to the default mode of
                 supporting only ISO date format tokens. For a list of supported format codes, see
                 <xref linkend="zend.date.constants.phpformats" />
@@ -137,18 +137,18 @@
         </para>
 
         <para>
-            Most methods expect a constant selecting the desired <code>$part</code> of a date, such as
+            Most methods expect a constant selecting the desired <varname>$part</varname> of a date, such as
             <classname>Zend_Date::HOUR</classname>. These constants are valid for all of the functions below. A list of all
             available constants is provided in
             <xref linkend="zend.date.constants.list" />
-            . If no <code>$part</code> is specified, then <classname>Zend_Date::TIMESTAMP</classname> is assumed. Alternatively, a
-            user-specified format may be used for <code>$part</code>, using the same underlying mechanism and format
+            . If no <varname>$part</varname> is specified, then <classname>Zend_Date::TIMESTAMP</classname> is assumed. Alternatively, a
+            user-specified format may be used for <varname>$part</varname>, using the same underlying mechanism and format
             codes as
             <link linkend="zend.locale.date.normalize"><classname>Zend_Locale_Format::getDate()</classname>
             </link>
             . If a date object is constructed using an obviously invalid date (e.g. a month number greater than 12),
             then <classname>Zend_Date</classname> will throw an exception, unless no specific date format has been selected -i.e.
-            <code>$part</code> is either <code>null</code> or <classname>Zend_Date::DATES</classname> (a "loose" format).
+            <varname>$part</varname> is either <code>null</code> or <classname>Zend_Date::DATES</classname> (a "loose" format).
         </para>
 
         <example id="zend.date.values.example-1">
@@ -167,19 +167,19 @@ echo $date3, "\n"; // outputs "Mar 3, 2007 12:00:00 AM"
         </example>
 
         <para>
-            If the optional <code>$locale</code> parameter is provided, then the <code>$locale</code> disambiguates the
-            <code>$date</code> operand by replacing month and weekday names for string <code>$date</code> operands, and
+            If the optional <varname>$locale</varname> parameter is provided, then the <varname>$locale</varname> disambiguates the
+            <varname>$date</varname> operand by replacing month and weekday names for string <varname>$date</varname> operands, and
             even parsing date strings expressed according to the conventions of that locale (see <code>
             <link linkend="zend.locale.date.normalize">Zend_Locale_Format::getDate()</link>
-            </code> ). The automatic normalization of localized <code>$date</code> operands of a string type occurs when
-            <code>$part</code> is one of the <classname>Zend_Date::DATE*</classname> or <classname>Zend_Date::TIME*</classname> constants.
+            </code> ). The automatic normalization of localized <varname>$date</varname> operands of a string type occurs when
+            <varname>$part</varname> is one of the <classname>Zend_Date::DATE*</classname> or <classname>Zend_Date::TIME*</classname> constants.
             The locale identifies which language should be used to parse month names and weekday names, if the
-            <code>$date</code> is a string containing a date. If there is no <code>$date</code> input parameter, then
-            the <code>$locale</code> parameter specifies the locale to use for localizing output (e.g. the date format
-            for a string representation). Note that the <code>$date</code> input parameter might actually have a type
-            name instead (e.g. <code>$hour</code> for <code>addHour()</code>), although that does not prevent the use of
-            <classname>Zend_Date</classname> objects as arguments for that parameter. If no <code>$locale</code> was specified,
-            then the locale of the current object is used to interpret <code>$date</code>, or select the localized
+            <varname>$date</varname> is a string containing a date. If there is no <varname>$date</varname> input parameter, then
+            the <varname>$locale</varname> parameter specifies the locale to use for localizing output (e.g. the date format
+            for a string representation). Note that the <varname>$date</varname> input parameter might actually have a type
+            name instead (e.g. <varname>$hour</varname> for <code>addHour()</code>), although that does not prevent the use of
+            <classname>Zend_Date</classname> objects as arguments for that parameter. If no <varname>$locale</varname> was specified,
+            then the locale of the current object is used to interpret <varname>$date</varname>, or select the localized
             format for output.
         </para>
 
@@ -207,12 +207,12 @@ $date = new Zend_Date('31.Feb.2007');
 
         <para>
             The methods <code>add(), sub(), compare(), get(), and set()</code> operate generically on dates. In each
-            case, the operation is performed on the date held in the instance object. The <code>$date</code> operand is
+            case, the operation is performed on the date held in the instance object. The <varname>$date</varname> operand is
             required for all of these methods, except <code>get()</code>, and may be a <classname>Zend_Date</classname> instance
-            object, a numeric string, or an integer. These methods assume <code>$date</code> is a timestamp, if it is
-            not an object. However, the <code>$part</code> operand controls which logical part of the two dates are
+            object, a numeric string, or an integer. These methods assume <varname>$date</varname> is a timestamp, if it is
+            not an object. However, the <varname>$part</varname> operand controls which logical part of the two dates are
             operated on, allowing operations on parts of the object's date, such as year or minute, even when
-            <code>$date</code> contains a long form date string, such as, "December 31, 2007 23:59:59". The result of
+            <varname>$date</varname> contains a long form date string, such as, "December 31, 2007 23:59:59". The result of
             the operation changes the date in the object, except for <code>compare()</code>, and <code>get()</code>.
         </para>
 
@@ -239,9 +239,9 @@ print $date;
 
         <para>
             These convenience methods have the same equivalent functionality as the basic operation methods, but expect
-            string and integer <code>$date</code> operands containing only the values representing the type indicated by
+            string and integer <varname>$date</varname> operands containing only the values representing the type indicated by
             the suffix of the convenience method. Thus, the names of these methods (e.g. "Year" or "Minute") identify
-            the units of the <code>$date</code> operand, when <code>$date</code> is a string or integer.
+            the units of the <varname>$date</varname> operand, when <varname>$date</varname> is a string or integer.
         </para>
 
         <sect3 id="id.date.basic.parts">
@@ -307,21 +307,21 @@ print $date;
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Day">Day</ulink>
                             </entry>
-                            <entry><classname>Zend_Date::DAY_SHORT</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry><classname>Zend_Date::DAY_SHORT</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Week">Week</ulink>
                             </entry>
-                            <entry><classname>Zend_Date::WEEK</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise an exception is raised. (Gregorian calendar assumed)</entry>
+                            <entry><classname>Zend_Date::WEEK</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise an exception is raised. (Gregorian calendar assumed)</entry>
                         </row>
                         <row>
                             <entry>Date</entry>
-                            <entry><classname>Zend_Date::DAY_MEDIUM</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname>. Otherwise, an attempt is made to normalize the <code>$date</code> string into a Zend_Date::DATE_MEDIUM formatted date. The format of <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's locale.</entry>
+                            <entry><classname>Zend_Date::DAY_MEDIUM</classname> is extracted from <varname>$date</varname> if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname>. Otherwise, an attempt is made to normalize the <varname>$date</varname> string into a Zend_Date::DATE_MEDIUM formatted date. The format of <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's locale.</entry>
                         </row>
                         <row>
                             <entry>Weekday</entry>
-                            <entry>Weekdays are represented numerically as 0 (for Sunday) through 6 (for Saturday). <classname>Zend_Date::WEEKDAY_DIGIT</classname> is extracted from <code>$date</code>, if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry>Weekdays are represented numerically as 0 (for Sunday) through 6 (for Saturday). <classname>Zend_Date::WEEKDAY_DIGIT</classname> is extracted from <varname>$date</varname>, if the <varname>$date</varname> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
                         </row>
                         <row>
                             <entry>DayOfYear</entry>
@@ -356,7 +356,7 @@ print $date;
                 The basic operations below can be used instead of the convenience operations for specific date parts, if
                 the
                 <link linkend="zend.date.constants.list">appropriate constant</link>
-                is used for the <code>$part</code> parameter.
+                is used for the <varname>$part</varname> parameter.
             </para>
 
             <table id="id.date.basic.operations.table">
@@ -376,8 +376,8 @@ print $date;
                                     <emphasis>get($part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Use <code>get($part)</code> to retrieve the date <code>$part</code> of this object's
-                                    date localized to <code>$locale</code> as a formatted string or integer. When using
+                                    Use <code>get($part)</code> to retrieve the date <varname>$part</varname> of this object's
+                                    date localized to <varname>$locale</varname> as a formatted string or integer. When using
                                     the BCMath extension, numeric strings might be returned instead of integers for
                                     large values. <emphasis>NOTE:</emphasis> Unlike <code>get()</code>,
                                     the other get*() convenience methods only return instances of <classname>Zend_Date</classname>
@@ -392,9 +392,9 @@ print $date;
                                     <emphasis>set($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Sets the <code>$part</code> of the current object to the corresponding value for
-                                    that part found in the input <code>$date</code> having a locale
-                                    <code>$locale</code>.
+                                    Sets the <varname>$part</varname> of the current object to the corresponding value for
+                                    that part found in the input <varname>$date</varname> having a locale
+                                    <varname>$locale</varname>.
                                 </para>
                             </entry>
                         </row>
@@ -405,8 +405,8 @@ print $date;
                                     <emphasis>add($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Adds the <code>$part</code> of <code>$date</code> having a locale
-                                    <code>$locale</code> to the current object's date.
+                                    Adds the <varname>$part</varname> of <varname>$date</varname> having a locale
+                                    <varname>$locale</varname> to the current object's date.
                                 </para>
                             </entry>
                         </row>
@@ -417,8 +417,8 @@ print $date;
                                     <emphasis>sub($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Subtracts the <code>$part</code> of <code>$date</code> having a locale
-                                    <code>$locale</code> from the current object's date.
+                                    Subtracts the <varname>$part</varname> of <varname>$date</varname> having a locale
+                                    <varname>$locale</varname> from the current object's date.
                                 </para>
                             </entry>
                         </row>
@@ -429,8 +429,8 @@ print $date;
                                     <emphasis>copyPart($part, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    Returns a cloned object, with only <code>$part</code> of the object's date copied to
-                                    the clone, with the clone have its locale arbitrarily set to <code>$locale</code>
+                                    Returns a cloned object, with only <varname>$part</varname> of the object's date copied to
+                                    the clone, with the clone have its locale arbitrarily set to <varname>$locale</varname>
                                     (if specified).
                                 </para>
                             </entry>
@@ -442,7 +442,7 @@ print $date;
                                     <emphasis>compare($date, $part = null, $locale = null)</emphasis>
                                 </para>
                                 <para>
-                                    compares <code>$part</code> of <code>$date</code> to this object's timestamp,
+                                    compares <varname>$part</varname> of <varname>$date</varname> to this object's timestamp,
                                     returning 0 if they are equal, 1 if this object's part was more recent than $date's
                                     part, otherwise -1.
                                 </para>
@@ -483,8 +483,8 @@ print $date;
                                 <emphasis>equals($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, if <code>$part</code> of <code>$date</code> having locale
-                                <code>$locale</code> is the same as this object's date <code>$part</code>, otherwise
+                                returns true, if <varname>$part</varname> of <varname>$date</varname> having locale
+                                <varname>$locale</varname> is the same as this object's date <varname>$part</varname>, otherwise
                                 false
                             </para>
                         </entry>
@@ -496,8 +496,8 @@ print $date;
                                 <emphasis>isEarlier($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, if <code>$part</code> of this object's date is earlier than
-                                <code>$part</code> of <code>$date</code> having a locale <code>$locale</code>
+                                returns true, if <varname>$part</varname> of this object's date is earlier than
+                                <varname>$part</varname> of <varname>$date</varname> having a locale <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>
@@ -508,8 +508,8 @@ print $date;
                                 <emphasis>isLater($date, $part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                returns true, if <code>$part</code> of this object's date is later than
-                                <code>$part</code> of <code>$date</code> having a locale <code>$locale</code>
+                                returns true, if <varname>$part</varname> of this object's date is later than
+                                <varname>$part</varname> of <varname>$date</varname> having a locale <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>
@@ -610,7 +610,7 @@ print $date;
                                 Invoke directly or via the magic method <code>__toString()</code>. The
                                 <code>toString()</code> method automatically formats the date object's value according
                                 to the conventions of the object's locale, or an optionally specified
-                                <code>$locale</code>. For a list of supported format codes, see
+                                <varname>$locale</varname>. For a list of supported format codes, see
                                 <xref linkend="zend.date.constants.selfdefinedformats" />
                                 .
                             </para>
@@ -713,9 +713,9 @@ print $date;
                                 <emphasis>toValue($part = null)</emphasis>
                             </para>
                             <para>
-                                Returns an integer representation of the selected date <code>$part</code> according to
+                                Returns an integer representation of the selected date <varname>$part</varname> according to
                                 the conventions of the object's locale. Returns <code>false</code> when
-                                <code>$part</code> selects a non-numeric value, such as
+                                <varname>$part</varname> selects a non-numeric value, such as
                                 <classname>Zend_Date::MONTH_NAME_SHORT</classname>. <emphasis>NOTE:</emphasis> This
                                 method calls
                                 <link linkend="id.date.basic.operations"><code>get()</code>
@@ -735,8 +735,8 @@ print $date;
                                 <emphasis>get($part = null, $locale = null)</emphasis>
                             </para>
                             <para>
-                                This method returns the <code>$part</code> of object's date localized to
-                                <code>$locale</code> as a formatted string or integer. See
+                                This method returns the <varname>$part</varname> of object's date localized to
+                                <varname>$locale</varname> as a formatted string or integer. See
                                 <xref linkend="id.date.basic.operations" />
                                 for more information.
                             </para>
@@ -750,7 +750,7 @@ print $date;
                             </para>
                             <para>
                                 This convenience function is equivalent to <code>new Zend_Date()</code>. It returns the
-                                current date as a <classname>Zend_Date</classname> object, having <code>$locale</code>
+                                current date as a <classname>Zend_Date</classname> object, having <varname>$locale</varname>
                             </para>
                         </entry>
                     </row>

+ 26 - 26
documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml

@@ -95,7 +95,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
 
         <para>
             If you use <classname>Zend_Db_Table</classname> to emulate cascading UPDATE and DELETE operations, declare the
-            <code>$_dependentTables</code> array in the class for the parent table. List the class
+            <varname>$_dependentTables</varname> array in the class for the parent table. List the class
             name for each dependent table. Use the class name, not the physical name of the SQL
             table.
         </para>
@@ -103,7 +103,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
         <note>
 
             <para>
-                Skip declaration of <code>$_dependentTables</code> if you use referential integrity
+                Skip declaration of <varname>$_dependentTables</varname> if you use referential integrity
                 constraints in the RDBMS server to implement cascading operations. See
                 <xref linkend="zend.db.table.relationships.cascading" /> for more information.
             </para>
@@ -111,14 +111,14 @@ class BugsProducts extends Zend_Db_Table_Abstract
         </note>
 
         <para>
-            Declare the <code>$_referenceMap</code> array in the class for each dependent table.
+            Declare the <varname>$_referenceMap</varname> array in the class for each dependent table.
             This is an associative array of reference "rules". A reference rule identifies which
             table is the parent table in the relationship, and also lists which columns in the
             dependent table reference which columns in the parent table.
         </para>
 
         <para>
-            The rule key is a string used as an index to the <code>$_referenceMap</code> array.
+            The rule key is a string used as an index to the <varname>$_referenceMap</varname> array.
             This rule key is used to identify each reference relationship. Choose a descriptive
             name for this rule key. It's best to use a string that can be part of a PHP method
             name, as you will see later.
@@ -131,7 +131,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
         </para>
 
         <para>
-            The value of each rule entry in the <code>$_referenceMap</code> array is also an
+            The value of each rule entry in the <varname>$_referenceMap</varname> array is also an
             associative array. The elements of this rule entry are described below:
         </para>
 
@@ -160,7 +160,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
                     the example database, there is one reference from the <code>bugs</code> table
                     to the <code>products</code> table, but three references from the
                     <code>bugs</code> table to the <code>accounts</code> table. Put each reference
-                    in a separate entry in the <code>$_referenceMap</code> array.
+                    in a separate entry in the <varname>$_referenceMap</varname> array.
                 </para>
             </listitem>
 
@@ -218,12 +218,12 @@ $row->findDependentRowset($table, [$rule]);
 
         <para>
             This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> object, containing a set of rows
-            from the dependent table <code>$table</code> that refer to the row identified by the
-            <code>$row</code> object.
+            from the dependent table <varname>$table</varname> that refer to the row identified by the
+            <varname>$row</varname> object.
         </para>
 
         <para>
-            The first argument <code>$table</code> can be a string that specifies the dependent
+            The first argument <varname>$table</varname> can be a string that specifies the dependent
             table by its class name. You can also specify the dependent table by using an object of
             that table class.
         </para>
@@ -248,8 +248,8 @@ $bugsReportedByUser = $user1234->findDependentRowset('Bugs');
         </example>
 
         <para>
-            The second argument <code>$rule</code> is optional. It is a string that names the rule
-            key in the <code>$_referenceMap</code> array of the dependent table class. If you don't
+            The second argument <varname>$rule</varname> is optional. It is a string that names the rule
+            key in the <varname>$_referenceMap</varname> array of the dependent table class. If you don't
             specify a rule, the first rule in the array that references the parent table is used.
             If you need to use a rule other than the first, you need to specify the key.
         </para>
@@ -395,7 +395,7 @@ $row->findParentRow($table, [$rule]);
         </para>
 
         <para>
-            The first argument <code>$table</code> can be a string that specifies the parent table
+            The first argument <varname>$table</varname> can be a string that specifies the parent table
             by its class name. You can also specify the parent table by using an object of that
             table class.
         </para>
@@ -421,8 +421,8 @@ $reporter = $bug1->findParentRow('Accounts');
         </example>
 
         <para>
-            The second argument <code>$rule</code> is optional. It is a string that names the rule
-            key in the <code>$_referenceMap</code> array of the dependent table class. If you don't
+            The second argument <varname>$rule</varname> is optional. It is a string that names the rule
+            key in the <varname>$_referenceMap</varname> array of the dependent table class. If you don't
             specify a rule, the first rule in the array that references the parent table is used.
             If you need to use a rule other than the first, you need to specify the key.
         </para>
@@ -539,19 +539,19 @@ $row->findManyToManyRowset($table,
 
         <para>
             This method returns a <classname>Zend_Db_Table_Rowset_Abstract</classname> containing rows from the table
-            <code>$table</code>, satisfying the many-to-many relationship. The current Row object
-            <code>$row</code> from the origin table is used to find rows in the intersection table,
+            <varname>$table</varname>, satisfying the many-to-many relationship. The current Row object
+            <varname>$row</varname> from the origin table is used to find rows in the intersection table,
             and that is joined to the destination table.
         </para>
 
         <para>
-            The first argument <code>$table</code> can be a string that specifies the destination
+            The first argument <varname>$table</varname> can be a string that specifies the destination
             table in the many-to-many relationship by its class name. You can also specify the
             destination table by using an object of that table class.
         </para>
 
         <para>
-            The second argument <code>$intersectionTable</code> can be a string that specifies the
+            The second argument <varname>$intersectionTable</varname> can be a string that specifies the
             intersection table between the two tables in the the many-to-many relationship by its
             class name. You can also specify the intersection table by using an object of that
             table class.
@@ -579,34 +579,34 @@ $productsRowset = $bug1234->findManyToManyRowset('Products',
         </example>
 
         <para>
-            The third and fourth arguments <code>$rule1</code> and <code>$rule2</code> are
-            optional. These are strings that name the rule keys in the <code>$_referenceMap</code>
+            The third and fourth arguments <varname>$rule1</varname> and <varname>$rule2</varname> are
+            optional. These are strings that name the rule keys in the <varname>$_referenceMap</varname>
             array of the intersection table.
         </para>
 
         <para>
-            The <code>$rule1</code> key names the rule for the relationship from the intersection
+            The <varname>$rule1</varname> key names the rule for the relationship from the intersection
             table to the origin table. In this example, this is the relationship from
             <code>BugsProducts</code> to <code>Bugs</code>.
         </para>
 
         <para>
-            The <code>$rule2</code> key names the rule for the relationship from the intersection
+            The <varname>$rule2</varname> key names the rule for the relationship from the intersection
             table to the destination table. In this example, this is the relationship from
             <code>Bugs</code> to <code>Products</code>.
         </para>
 
         <para>
             Similarly to the methods for finding parent and dependent rows, if you don't specify a
-            rule, the method uses the first rule in the <code>$_referenceMap</code> array that
+            rule, the method uses the first rule in the <varname>$_referenceMap</varname> array that
             matches the tables in the relationship. If you need to use a rule other than the first,
             you need to specify the key.
         </para>
 
         <para>
             In the example code above, the rule key is not specified, so the rules used by default
-            are the first ones that match. In this case, <code>$rule1</code> is
-            <code>'Reporter'</code> and <code>$rule2</code> is <code>'Product'</code>.
+            are the first ones that match. In this case, <varname>$rule1</varname> is
+            <code>'Reporter'</code> and <varname>$rule2</varname> is <code>'Product'</code>.
         </para>
 
         <example id="zend.db.table.relationships.fetching.many-to-many.example-by">
@@ -781,7 +781,7 @@ $product1234->delete();
 
         <para>
             To declare a cascading relationship in the <classname>Zend_Db_Table</classname>, edit the rules in the
-            <code>$_referenceMap</code>. Set the associative array keys <code>'onDelete'</code> and
+            <varname>$_referenceMap</varname>. Set the associative array keys <code>'onDelete'</code> and
             <code>'onUpdate'</code> to the string 'cascade' (or the constant
             <code>self::CASCADE</code>). Before a row is deleted from the parent table, or its
             primary key values updated, any rows in the dependent table that refer to the parent's

+ 16 - 16
documentation/manual/en/module_specs/Zend_Db_Table.xml

@@ -39,7 +39,7 @@
 
             <para>
                 Declare the database table for which this class is defined, using the protected
-                variable <code>$_name</code>. This is a string, and must contain the name of the
+                variable <varname>$_name</varname>. This is a string, and must contain the name of the
                 table spelled as it appears in the database.
             </para>
 
@@ -77,9 +77,9 @@ class bugs extends Zend_Db_Table_Abstract
 
             <para>
                 You can also declare the schema for the table, either with the protected variable
-                <code>$_schema</code>, or with the schema prepended to the table name in the
-                <code>$_name</code> property. Any schema specified with the <code>$_name</code>
-                property takes precedence over a schema specified with the <code>$_schema</code>
+                <varname>$_schema</varname>, or with the schema prepended to the table name in the
+                <varname>$_name</varname> property. Any schema specified with the <varname>$_name</varname>
+                property takes precedence over a schema specified with the <varname>$_schema</varname>
                 property. In some RDBMS brands, the term for schema is "database" or "tablespace,"
                 but it is used similarly.
             </para>
@@ -117,7 +117,7 @@ class Bugs extends Zend_Db_Table_Abstract
             <para>
                 The schema and table names may also be specified via constructor configuration
                 directives, which override any default values specified with the
-                <code>$_name</code> and <code>$_schema</code> properties. A schema specification
+                <varname>$_name</varname> and <varname>$_schema</varname> properties. A schema specification
                 given with the <code>name</code> directive overrides any value provided with the
                 <code>schema</code> option.
             </para>
@@ -161,7 +161,7 @@ $tableBugs = new Bugs(array('name' => 'bug_db.bugs',
 
             <para>
                 Every table must have a primary key. You can declare the column for the primary key
-                using the protected variable <code>$_primary</code>. This is either a string that
+                using the protected variable <varname>$_primary</varname>. This is either a string that
                 names the single column for the primary key, or else it is an array of column names
                 if your primary key is a compound key.
             </para>
@@ -253,7 +253,7 @@ class Bugs extends Zend_Db_Table_Abstract
                     <para>
                         <code>_setupMetadata()</code> sets the schema if the table name contains
                         the pattern "schema.table"; calls <code>describeTable()</code> to get
-                        metadata information; defaults the <code>$_cols</code> array to the columns
+                        metadata information; defaults the <varname>$_cols</varname> array to the columns
                         reported by <code>describeTable()</code>. By overriding this method, you
                         can specify the columns.
                     </para>
@@ -263,7 +263,7 @@ class Bugs extends Zend_Db_Table_Abstract
                     <para>
                         <code>_setupPrimaryKey()</code> defaults the primary key columns to those
                         reported by <code>describeTable()</code>; checks that the primary key
-                        columns are included in the <code>$_cols</code> array. By overriding this
+                        columns are included in the <varname>$_cols</varname> array. By overriding this
                         method, you can specify the primary key columns.
                     </para>
                 </listitem>
@@ -485,7 +485,7 @@ $data = array(
 
             <para>
                 In <classname>Zend_Db_Table_Abstract</classname>, if you define the protected variable
-                <code>$_sequence</code> to be the Boolean value <code>true</code>, then the class
+                <varname>$_sequence</varname> to be the Boolean value <code>true</code>, then the class
                 assumes that the table has an auto-incrementing primary key.
             </para>
 
@@ -516,7 +516,7 @@ class Bugs extends Zend_Db_Table_Abstract
                 based on the table and column name, and uses the sequence to generate key values
                 for new rows. IBM DB2 has an <code>IDENTITY</code> notation that works similarly.
                 If you use either of these notations, treat your <classname>Zend_Db_Table</classname> class as having an
-                auto-incrementing column with respect to declaring the <code>$_sequence</code>
+                auto-incrementing column with respect to declaring the <varname>$_sequence</varname>
                 member as <code>true</code>.
             </para>
 
@@ -532,7 +532,7 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
 
             <para>
-                If you define <code>$_sequence</code> to be a string, then <classname>Zend_Db_Table_Abstract</classname>
+                If you define <varname>$_sequence</varname> to be a string, then <classname>Zend_Db_Table_Abstract</classname>
                 assumes the string to name a sequence object in the database. The sequence is
                 invoked to generate a new value, and this value is used in the <code>INSERT</code>
                 operation.
@@ -578,7 +578,7 @@ class Bugs extends Zend_Db_Table_Abstract
             </para>
 
             <para>
-                If you define the <code>$_sequence</code> to be the Boolean value
+                If you define the <varname>$_sequence</varname> to be the Boolean value
                 <code>false</code>, then <classname>Zend_Db_Table_Abstract</classname> assumes that the table has a
                 natural primary key. You must provide values for the primary key columns in the
                 array of data to the <code>insert()</code> method, or else this method throws a
@@ -1465,7 +1465,7 @@ $bugs->setMetadataCacheInClass(false);
 
             <para>
                 The flag is enabled by default, which ensures that the
-                <code>$_metadata</code> array is only populated once per
+                <varname>$_metadata</varname> array is only populated once per
                 instance.
             </para>
         </sect3>
@@ -1657,20 +1657,20 @@ class Bugs extends Zend_Db_Table_Abstract
             <para>
                 For example, if your table class name is "<code>BugsProducts</code>", it would
                 match the physical table in the database called "<code>bugs_products</code>," if
-                you omit the explicit declaration of the <code>$_name</code> class property. In
+                you omit the explicit declaration of the <varname>$_name</varname> class property. In
                 this inflection mapping, the class name spelled in "CamelCase" format would be
                 transformed to lower case, and words are separated with an underscore.
             </para>
 
             <para>
                 You can specify the database table name independently from the class name by
-                declaring the table name with the <code>$_name</code> class property in each of
+                declaring the table name with the <varname>$_name</varname> class property in each of
                 your table classes.
             </para>
 
             <para>
                 <classname>Zend_Db_Table_Abstract</classname> performs no inflection to map the class name to the table
-                name. If you omit the declaration of <code>$_name</code> in your table class, the
+                name. If you omit the declaration of <varname>$_name</varname> in your table class, the
                 class maps to a database table that matches the spelling of the class name exactly.
             </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Db_Table_Row.xml

@@ -457,7 +457,7 @@ $rowClone->save();
             <classname>Zend_Db_Table_Row_Abstract</classname>. You can define your own concrete class for instances of Row
             by extending <classname>Zend_Db_Table_Row_Abstract</classname>. To use your new Row class to store results of
             Table queries, specify the custom Row class by name either in the
-            <code>$_rowClass</code> protected member of a Table class, or in the array argument of
+            <varname>$_rowClass</varname> protected member of a Table class, or in the array argument of
             the constructor of a Table object.
         </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml

@@ -340,7 +340,7 @@ $row->save();
         <para>
             You can use an alternative concrete class for instances of Rowsets
             by extending <classname>Zend_Db_Table_Rowset_Abstract</classname>. Specify the custom
-            Rowset class by name either in the <code>$_rowsetClass</code>
+            Rowset class by name either in the <varname>$_rowsetClass</varname>
             protected member of a Table class, or in the array argument of the
             constructor of a Table object.
         </para>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Debug.xml

@@ -19,23 +19,23 @@ Zend_Debug::dump($var, $label=null, $echo=true);
     </example>
 
     <para>
-        The <code>$var</code> argument specifies the expression or variable
+        The <varname>$var</varname> argument specifies the expression or variable
         about which the <classname>Zend_Debug::dump()</classname> method outputs
         information.
     </para>
 
     <para>
-        The <code>$label</code> argument is a string to be prepended to the
+        The <varname>$label</varname> argument is a string to be prepended to the
         output of <classname>Zend_Debug::dump()</classname>. It may be useful, for
         example, to use labels if you are dumping information about multiple
         variables on a given screen.
     </para>
 
     <para>
-        The boolean <code>$echo</code> argument specifies whether the output
+        The boolean <varname>$echo</varname> argument specifies whether the output
         of <classname>Zend_Debug::dump()</classname> is echoed or not.
         If <code>true</code>, the output is echoed.
-        Regardless of the value of the <code>$echo</code> argument, the
+        Regardless of the value of the <varname>$echo</varname> argument, the
         return value of this method contains the output.
     </para>