Browse Source

[DOCUMENTATION] English:
- manual fixes: <code>variable name</code> => <varname>variable name</varname>

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

mikaelkael 16 năm trước cách đây
mục cha
commit
5ef5ba8949
78 tập tin đã thay đổi với 462 bổ sung462 xóa
  1. 2 2
      documentation/manual/en/module_specs/Zend_Dojo-Data.xml
  2. 1 1
      documentation/manual/en/module_specs/Zend_Dojo-Form-Decorators.xml
  3. 1 1
      documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml
  4. 23 23
      documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml
  5. 1 1
      documentation/manual/en/module_specs/Zend_Feed-FindFeeds.xml
  6. 3 3
      documentation/manual/en/module_specs/Zend_File_Transfer-Filters.xml
  7. 1 1
      documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml
  8. 6 6
      documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml
  9. 1 1
      documentation/manual/en/module_specs/Zend_Filter-Inflector.xml
  10. 9 9
      documentation/manual/en/module_specs/Zend_Filter-Set.xml
  11. 5 5
      documentation/manual/en/module_specs/Zend_Filter_Input.xml
  12. 1 1
      documentation/manual/en/module_specs/Zend_Form-Decorators.xml
  13. 8 8
      documentation/manual/en/module_specs/Zend_Form-Elements.xml
  14. 3 3
      documentation/manual/en/module_specs/Zend_Form-Forms.xml
  15. 2 2
      documentation/manual/en/module_specs/Zend_Form-QuickStart.xml
  16. 3 3
      documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml
  17. 1 1
      documentation/manual/en/module_specs/Zend_Form-StandardElements.xml
  18. 1 1
      documentation/manual/en/module_specs/Zend_Gdata_AuthSub.xml
  19. 1 1
      documentation/manual/en/module_specs/Zend_Gdata_Gbase.xml
  20. 5 5
      documentation/manual/en/module_specs/Zend_Gdata_Spreadsheets.xml
  21. 1 1
      documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml
  22. 10 10
      documentation/manual/en/module_specs/Zend_Http_Cookie-Handling.xml
  23. 5 5
      documentation/manual/en/module_specs/Zend_Http_Response.xml
  24. 2 2
      documentation/manual/en/module_specs/Zend_Json-Server.xml
  25. 2 2
      documentation/manual/en/module_specs/Zend_Layout-Options.xml
  26. 27 27
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Attribute.xml
  27. 16 16
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Dn.xml
  28. 3 3
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Filter.xml
  29. 3 3
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Ldif-Encoder.xml
  30. 5 5
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node-RootDse.xml
  31. 27 27
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node.xml
  32. 58 58
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap.xml
  33. 17 17
      documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml
  34. 5 5
      documentation/manual/en/module_specs/Zend_Loader-PluginLoader.xml
  35. 9 9
      documentation/manual/en/module_specs/Zend_Loader.xml
  36. 5 5
      documentation/manual/en/module_specs/Zend_Locale-DatesTimes.xml
  37. 2 2
      documentation/manual/en/module_specs/Zend_Locale-Parsing.xml
  38. 6 6
      documentation/manual/en/module_specs/Zend_Memory-MemoryManager.xml
  39. 8 8
      documentation/manual/en/module_specs/Zend_Mime_Part.xml
  40. 1 1
      documentation/manual/en/module_specs/Zend_Navigation-Containers.xml
  41. 2 2
      documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml
  42. 1 1
      documentation/manual/en/module_specs/Zend_Pdf-Pages.xml
  43. 1 1
      documentation/manual/en/module_specs/Zend_Reflection-Reference.xml
  44. 1 1
      documentation/manual/en/module_specs/Zend_Search_Lucene-Overview.xml
  45. 7 7
      documentation/manual/en/module_specs/Zend_Search_Lucene-Queries.xml
  46. 4 4
      documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml
  47. 6 6
      documentation/manual/en/module_specs/Zend_Service_Amazon_S3.xml
  48. 1 1
      documentation/manual/en/module_specs/Zend_Service_Amazon_Sqs.xml
  49. 3 3
      documentation/manual/en/module_specs/Zend_Service_Audioscrobbler.xml
  50. 4 4
      documentation/manual/en/module_specs/Zend_Service_StrikeIron-Overview.xml
  51. 3 3
      documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml
  52. 6 6
      documentation/manual/en/module_specs/Zend_Session-BasicUsage.xml
  53. 9 9
      documentation/manual/en/module_specs/Zend_Session-GlobalSessionManagement.xml
  54. 2 2
      documentation/manual/en/module_specs/Zend_Session-Introduction.xml
  55. 1 1
      documentation/manual/en/module_specs/Zend_Soap_AutoDiscovery.xml
  56. 2 2
      documentation/manual/en/module_specs/Zend_Soap_Client.xml
  57. 3 3
      documentation/manual/en/module_specs/Zend_Soap_Server.xml
  58. 11 11
      documentation/manual/en/module_specs/Zend_Soap_Wsdl.xml
  59. 16 16
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Assertions.xml
  60. 2 2
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Bootstrapping.xml
  61. 2 2
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Testing.xml
  62. 2 2
      documentation/manual/en/module_specs/Zend_Translate-Additional.xml
  63. 3 3
      documentation/manual/en/module_specs/Zend_Validate-Db.xml
  64. 1 1
      documentation/manual/en/module_specs/Zend_Validate-EmailAddress.xml
  65. 1 1
      documentation/manual/en/module_specs/Zend_Validate-Hostname.xml
  66. 21 21
      documentation/manual/en/module_specs/Zend_Validate-Set.xml
  67. 1 1
      documentation/manual/en/module_specs/Zend_Validate-ValidatorChains.xml
  68. 1 1
      documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml
  69. 3 3
      documentation/manual/en/module_specs/Zend_View-Abstract.xml
  70. 1 1
      documentation/manual/en/module_specs/Zend_View-Helpers-Action.xml
  71. 3 3
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml
  72. 6 6
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml
  73. 6 6
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadScript.xml
  74. 4 4
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml
  75. 11 11
      documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml
  76. 1 1
      documentation/manual/en/module_specs/Zend_View-Helpers-Partial.xml
  77. 3 3
      documentation/manual/en/module_specs/Zend_View-Helpers-Placeholder.xml
  78. 17 17
      documentation/manual/en/module_specs/Zend_View-Helpers.xml

+ 2 - 2
documentation/manual/en/module_specs/Zend_Dojo-Data.xml

@@ -288,7 +288,7 @@ $json = (string) $data; // cast to string == cast to JSON
                 <listitem><para>
                     <methodname>setItems($items)</methodname>: set multiple items at once,
                     overwriting any items that were previously set in the
-                    object. <code>$items</code> should be an array or a
+                    object. <varname>$items</varname> should be an array or a
                     <code>Traversable</code> object.
                 </para></listitem>
 
@@ -314,7 +314,7 @@ $json = (string) $data; // cast to string == cast to JSON
                     <methodname>addItems($items)</methodname>: add multiple items at once,
                     appending them to any current items. Will raise an exception
                     if any of the new items have an identifier matching an
-                    identifier already in the collection. <code>$items</code>
+                    identifier already in the collection. <varname>$items</varname>
                     should be an array or a <code>Traversable</code> object.
                 </para></listitem>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Dojo-Form-Decorators.xml

@@ -14,7 +14,7 @@
     <para>
         All dijit decorators look for the <code>dijitParams</code> property of
         the given element being decorated, and push them as the
-        <code>$params</code> array to the dijit view helper being used; these
+        <varname>$params</varname> array to the dijit view helper being used; these
         are then separated from any other properties so that no duplication of
         information occurs.
     </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml

@@ -304,7 +304,7 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem><para><methodname>getLayers()</methodname>: get a list of all
                     registered layer paths (custom builds).</para></listitem>
             <listitem><para><methodname>removeLayer($path)</methodname>: remove the layer
-                    that matches <code>$path</code> from the list of registered
+                    that matches <varname>$path</varname> from the list of registered
                     layers (custom builds).</para></listitem>
             <listitem><para><methodname>setCdnBase($url)</methodname>: set the base URL for
                     a CDN; typically, one of the

+ 23 - 23
documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml

@@ -28,26 +28,26 @@
 
             <itemizedlist>
                 <listitem><para>
-                        <code>$id</code>: the container name or DOM ID.
+                        <varname>$id</varname>: the container name or DOM ID.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$content</code>: the content to wrap in the
+                        <varname>$content</varname>: the content to wrap in the
                         layout container.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$params</code> (optional): dijit-specific
+                        <varname>$params</varname> (optional): dijit-specific
                         parameters. Basically, any non-HTML attribute that can
                         be used to configure the dijit layout container.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$attribs</code> (optional): any additional HTML
+                        <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the container
                         div. If the key 'id' is passed in this array, it will
                         be used for the form element DOM id, and
-                        <code>$id</code> will be used for its name.
+                        <varname>$id</varname> will be used for its name.
                 </para></listitem>
             </itemizedlist>
 
@@ -72,17 +72,17 @@
 
             <itemizedlist>
                 <listitem><para>
-                        <code>$id</code>: the container name or DOM ID.
+                        <varname>$id</varname>: the container name or DOM ID.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$attribs</code> (optional): any additional HTML
+                        <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the container
                         div.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$content</code> (optional): the content to wrap
+                        <varname>$content</varname> (optional): the content to wrap
                         in the form. If none is passed, an empty string will be
                         used.
                 </para></listitem>
@@ -105,25 +105,25 @@
 
             <itemizedlist>
                 <listitem><para>
-                        <code>$id</code>: the element name or DOM ID.
+                        <varname>$id</varname>: the element name or DOM ID.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$value</code> (optional): the current value of
+                        <varname>$value</varname> (optional): the current value of
                         the element.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$params</code> (optional): dijit-specific
+                        <varname>$params</varname> (optional): dijit-specific
                         parameters. Basically, any non-HTML attribute that can
                         be used to configure a dijit.
                 </para></listitem>
 
                 <listitem><para>
-                        <code>$attribs</code> (optional): any additional HTML
+                        <varname>$attribs</varname> (optional): any additional HTML
                         attributes that should be used to render the dijit. If
                         the key 'id' is passed in this array, it will be used
-                        for the form element DOM id, and <code>$id</code> will
+                        for the form element DOM id, and <varname>$id</varname> will
                         be used for its name.
                 </para></listitem>
             </itemizedlist>
@@ -329,8 +329,8 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                 <para>
                     <code>captureStart($id, array $params = array(), array $attribs =
                         array())</code>: begin capturing content to include in a container.
-                    <code>$params</code> refers to the dijit params to use with
-                    the container, while <code>$attribs</code> refer to any
+                    <varname>$params</varname> refers to the dijit params to use with
+                    the container, while <varname>$attribs</varname> refer to any
                     general HTML attributes to use.
                 </para>
 
@@ -344,7 +344,7 @@ $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
                 <para>
                     <methodname>captureEnd($id)</methodname>:
                     finish capturing content to include in a container.
-                    <code>$id</code> should refer to an id previously used with
+                    <varname>$id</varname> should refer to an id previously used with
                     a <methodname>captureStart()</methodname> call. Returns a string
                     representing the container and its contents, just as if
                     you'd simply passed content to the helper itself.
@@ -437,7 +437,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                     <emphasis>CheckBox</emphasis>:
                     dijit.form.CheckBox. Display a checkbox. Accepts an
                     optional fifth argument, the array
-                    <code>$checkedOptions</code>, which may contain either:
+                    <varname>$checkedOptions</varname>, which may contain either:
                 </para>
 
                 <itemizedlist>
@@ -453,7 +453,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                 </itemizedlist>
 
                 <para>
-                    If <code>$checkedOptions</code> is not provided, 1 and 0
+                    If <varname>$checkedOptions</varname> is not provided, 1 and 0
                     are assumed.
                 </para>
 
@@ -476,10 +476,10 @@ echo $view->borderContainer()->captureEnd('masterLayout');
                     difference is that you may type an option that is not in
                     the list of available options, and it will still consider
                     it valid input. It accepts an optional fifth argument, an
-                    associative array <code>$options</code>; if provided,
+                    associative array <varname>$options</varname>; if provided,
                     ComboBox will be rendered as a <code>select</code>. Note
                     also that the <emphasis>label values</emphasis> of the
-                    <code>$options</code> array will be returned in the form --
+                    <varname>$options</varname> array will be returned in the form --
                     not the values themselves.
                 </para>
 
@@ -492,7 +492,7 @@ echo $view->borderContainer()->captureEnd('masterLayout');
 
                 <para>
                     To specify a datastore, provide one of the following
-                    <code>$params</code> key combinations:
+                    <varname>$params</varname> key combinations:
                 </para>
 
                 <itemizedlist>
@@ -917,9 +917,9 @@ echo $view->passwordTextBox(
 
                 <para>
                     RadioButton accepts an optional fifth argument,
-                    <code>$options</code>, an associative array of value/label
+                    <varname>$options</varname>, an associative array of value/label
                     pairs used as the radio options. You may also pass these as
-                    the <code>$attribs</code> key <code>options</code>.
+                    the <varname>$attribs</varname> key <code>options</code>.
                 </para>
 
                 <programlisting language="php"><![CDATA[

+ 1 - 1
documentation/manual/en/module_specs/Zend_Feed-FindFeeds.xml

@@ -14,7 +14,7 @@ $feedArray = Zend_Feed::findFeeds('http://www.example.com/news.html');
         Here the <methodname>findFeeds()</methodname> method returns an array of
         <classname>Zend_Feed_Abstract</classname> objects that are referenced by
         <code>&lt;link&gt;</code> tags on the news.html web page. Depending on the type of each
-        feed, each respective entry in the <code>$feedArray</code> array may be a
+        feed, each respective entry in the <varname>$feedArray</varname> array may be a
         <classname>Zend_Feed_Rss</classname> or <classname>Zend_Feed_Atom</classname> instance.
         <classname>Zend_Feed</classname> will throw a <classname>Zend_Feed_Exception</classname>
         upon failure, such as an HTTP 404 response code or a malformed feed.

+ 3 - 3
documentation/manual/en/module_specs/Zend_File_Transfer-Filters.xml

@@ -58,7 +58,7 @@
                     <code>addFilter($filter, $options = null, $files =
                     null)</code>: Adds the given filter to the filter
                     stack (optionally only to the file(s) specified).
-                    <code>$filter</code> may be either an actual filter
+                    <varname>$filter</varname> may be either an actual filter
                     instance, or a short name specifying the filter type
                     (e.g., 'Rename').
                 </para>
@@ -101,7 +101,7 @@
             <listitem>
                 <para>
                     <methodname>getFilters($files = null)</methodname>: Returns
-                    registered filters; if <code>$files</code> is passed,
+                    registered filters; if <varname>$files</varname> is passed,
                     returns filters for that particular file or set of
                     files.
                 </para>
@@ -144,7 +144,7 @@ $upload->addFilter('Rename',
             <para>
                 <methodname>addFilter()</methodname>, <methodname>addFilters()</methodname>, and
                 <methodname>setFilters()</methodname> each accept a final
-                <code>$files</code> argument. This argument can be used to
+                <varname>$files</varname> argument. This argument can be used to
                 specify a particular file or array of files on which to set the
                 given filter.
             </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml

@@ -251,7 +251,7 @@ $upload->receive();
 
         <para>
             By default file names will be returned with the complete path. If you only need the file
-            name without path, you can set the second parameter, <code>$path</code>, which will
+            name without path, you can set the second parameter, <varname>$path</varname>, which will
             truncate the file path when set to false.
         </para>
 

+ 6 - 6
documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml

@@ -167,7 +167,7 @@
             <listitem>
                 <para>
                     <methodname>isValid($files = null)</methodname>: Checks the specified files using all
-                    validators. <code>$files</code> may be either a real filename, the element's
+                    validators. <varname>$files</varname> may be either a real filename, the element's
                     name or the name of the temporary file.
                 </para>
             </listitem>
@@ -177,7 +177,7 @@
                     <code>addValidator($validator, $breakChainOnFailure, $options = null, $files =
                     null)</code>: Adds the specified validator to the validator
                     stack (optionally only to the file(s) specified).
-                    <code>$validator</code> may be either an actual validator
+                    <varname>$validator</varname> may be either an actual validator
                     instance or a short name specifying the validator type (e.g., 'Count').
                 </para>
             </listitem>
@@ -219,7 +219,7 @@
             <listitem>
                 <para>
                     <methodname>getValidators($files = null)</methodname>: Returns
-                    registered validators. If <code>$files</code> is specified,
+                    registered validators. If <varname>$files</varname> is specified,
                     returns validators for that particular file or set of
                     files.
                 </para>
@@ -267,7 +267,7 @@ $upload->setValidators(array(
             <para>
                 <methodname>addValidator()</methodname>, <methodname>addValidators()</methodname>, and
                 <methodname>setValidators()</methodname> each accept a final
-                <code>$files</code> argument. This argument can be used to
+                <varname>$files</varname> argument. This argument can be used to
                 specify a particular file or array of files on which to set the
                 given validator.
             </para>
@@ -500,7 +500,7 @@ $upload->addValidator('Crc32', false, array('3b3652f', 'e612b69'));
 
         <para>
             In some cases it is useful to match in a case-sensitive fashion. So the constructor
-            allows a second parameter called <code>$case</code> which, if set to true, validates the
+            allows a second parameter called <varname>$case</varname> which, if set to true, validates the
             extension by comparing it with the specified values in a case-sensitive fashion.
         </para>
 
@@ -681,7 +681,7 @@ $upload->addValidator('Exists',
 
         <para>
             In some cases it is useful to test in a case-sensitive fashion. Therefore the
-            constructor takes a second parameter <code>$case</code>, which, if set to true, will
+            constructor takes a second parameter <varname>$case</varname>, which, if set to true, will
             validate the extension in a case-sensitive fashion.
         </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Filter-Inflector.xml

@@ -418,7 +418,7 @@ $inflector->addRules(array(
                     <methodname>getRule($spec, $index)</methodname> fetches a single rule
                     for a given variable; this can be useful for fetching a
                     specific filter rule for a variable that has a filter chain.
-                    <code>$index</code> must be passed.
+                    <varname>$index</varname> must be passed.
             </para></listitem>
 
             <listitem><para>

+ 9 - 9
documentation/manual/en/module_specs/Zend_Filter-Set.xml

@@ -11,7 +11,7 @@
     <sect2 id="zend.filter.set.alnum">
         <title>Alnum</title>
         <para>
-            Returns the string <code>$value</code>, removing all but alphabetic and digit
+            Returns the string <varname>$value</varname>, removing all but alphabetic and digit
             characters. This filter includes an option to also allow white space characters.
         </para>
 
@@ -28,7 +28,7 @@
     <sect2 id="zend.filter.set.alpha">
         <title>Alpha</title>
         <para>
-            Returns the string <code>$value</code>, removing all but alphabetic characters. This
+            Returns the string <varname>$value</varname>, removing all but alphabetic characters. This
             filter includes an option to also allow white space characters.
         </para>
     </sect2>
@@ -47,7 +47,7 @@
     <sect2 id="zend.filter.set.digits">
         <title>Digits</title>
         <para>
-            Returns the string <code>$value</code>, removing all but digit characters.
+            Returns the string <varname>$value</varname>, removing all but digit characters.
         </para>
     </sect2>
 
@@ -63,7 +63,7 @@
     <sect2 id="zend.filter.set.htmlentities">
         <title>HtmlEntities</title>
         <para>
-            Returns the string <code>$value</code>, converting characters to their corresponding
+            Returns the string <varname>$value</varname>, converting characters to their corresponding
             HTML entity equivalents where they exist.
         </para>
     </sect2>
@@ -71,7 +71,7 @@
     <sect2 id="zend.filter.set.int">
         <title>Int</title>
         <para>
-            Returns (int) <code>$value</code>
+            Returns (int) <varname>$value</varname>
         </para>
     </sect2>
 
@@ -81,7 +81,7 @@
     <sect2 id="zend.filter.set.stripnewlines">
         <title>StripNewlines</title>
         <para>
-            Returns the string <code>$value</code> without any newline control characters.
+            Returns the string <varname>$value</varname> without any newline control characters.
         </para>
     </sect2>
 
@@ -90,7 +90,7 @@
     <sect2 id="zend.filter.set.stringtolower">
         <title>StringToLower</title>
         <para>
-            Returns the string <code>$value</code>, converting alphabetic characters to lowercase as
+            Returns the string <varname>$value</varname>, converting alphabetic characters to lowercase as
             necessary.
         </para>
     </sect2>
@@ -98,7 +98,7 @@
     <sect2 id="zend.filter.set.stringtoupper">
         <title>StringToUpper</title>
         <para>
-            Returns the string <code>$value</code>, converting alphabetic characters to uppercase as
+            Returns the string <varname>$value</varname>, converting alphabetic characters to uppercase as
             necessary.
         </para>
     </sect2>
@@ -106,7 +106,7 @@
     <sect2 id="zend.filter.set.stringtrim">
         <title>StringTrim</title>
         <para>
-            Returns the string <code>$value</code> with characters stripped from the beginning and
+            Returns the string <varname>$value</varname> with characters stripped from the beginning and
             end.
         </para>
     </sect2>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Filter_Input.xml

@@ -124,7 +124,7 @@ $validators = array(
 ]]></programlisting>
 
         <para>
-            Each key in the <code>$filters</code> array above is the name of a rule for applying a
+            Each key in the <varname>$filters</varname> array above is the name of a rule for applying a
             filter to a specific data field. By default, the name of the rule
             is also the name of the input data field to which to apply the
             rule.
@@ -224,8 +224,8 @@ $input = new Zend_Filter_Input($filters, $validators);
         <para>
             You can specify input data as the third constructor argument. The
             data structure is an associative array. The keys are field names,
-            and the values are data values. The standard <code>$_GET</code>
-            and <code>$_POST</code> superglobal variables in PHP are examples
+            and the values are data values. The standard <varname>$_GET</varname>
+            and <varname>$_POST</varname> superglobal variables in PHP are examples
             of this format. You can use either of these variables as input
             data for Zend_Filter_Input.
         </para>
@@ -476,7 +476,7 @@ $input->setDefaultEscapeFilter(new Zend_Filter_StringTrim());
                 be harder to provide both escaped and unescaped versions of the
                 data. So it is recommended to declare filters to escape output
                 using <methodname>setDefaultEscapeFilter()</methodname>, not in the
-                <code>$filters</code> array.
+                <varname>$filters</varname> array.
             </para>
 
             <para>
@@ -932,7 +932,7 @@ $validators = array(
             <para>
                 The default value for 'allowEmpty', 'breakChainOnFailure', and
                 'presence' metacommands can be set for all rules using the
-                <code>$options</code> argument to the constructor of
+                <varname>$options</varname> argument to the constructor of
                 Zend_Filter_Input. This allows you to set the default value
                 for all rules, without requiring you to set the metacommand for
                 every rule.

+ 1 - 1
documentation/manual/en/module_specs/Zend_Form-Decorators.xml

@@ -112,7 +112,7 @@
 
         <para>
             Each decorator's <methodname>render()</methodname> method accepts a string,
-            <code>$content</code>. When the first decorator is called, this
+            <varname>$content</varname>. When the first decorator is called, this
             string is typically empty, while on subsequent calls it will be
             populated. Based on the type of decorator and the options passed in,
             the decorator will either replace this string, prepend the string,

+ 8 - 8
documentation/manual/en/module_specs/Zend_Form-Elements.xml

@@ -68,21 +68,21 @@
         <itemizedlist>
             <listitem><para>
                 <methodname>setPluginLoader($loader, $type)</methodname>:
-                <code>$loader</code> is the plugin loader object itself, while
-                <code>$type</code> is one of the types specified above. This
+                <varname>$loader</varname> is the plugin loader object itself, while
+                <varname>$type</varname> is one of the types specified above. This
                 sets the plugin loader for the given type to the newly
                 specified loader object.
             </para></listitem>
 
             <listitem><para>
                 <methodname>getPluginLoader($type)</methodname>: retrieves the plugin
-                loader associated with <code>$type</code>.
+                loader associated with <varname>$type</varname>.
             </para></listitem>
 
             <listitem><para>
                 <methodname>addPrefixPath($prefix, $path, $type = null)</methodname>: adds
                 a prefix/path association to the loader specified by
-                <code>$type</code>. If <code>$type</code> is null, it will
+                <varname>$type</varname>. If <varname>$type</varname> is null, it will
                 attempt to add the path to all loaders, by appending the prefix
                 with each of "_Validate", "_Filter", and "_Decorator"; and
                 appending the path with "Validate/", "Filter/", and
@@ -409,7 +409,7 @@ $element->addValidator('StringLength', false, array(6, 20));
             Arguments passed in this way should be in the order in which they
             are defined in the constructor. The above example will instantiate
             the <classname>Zend_Validate_StringLenth</classname> class with its
-            <code>$min</code> and <code>$max</code> parameters:
+            <varname>$min</varname> and <varname>$max</varname> parameters:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -421,7 +421,7 @@ $validator = new Zend_Validate_StringLength(6, 20);
 
             <para>
                 Some developers may wish to provide custom error messages for a
-                validator. The <code>$options</code> argument of the
+                validator. The <varname>$options</varname> argument of the
                 <classname>Zend_Form_Element::addValidator()</classname> method allows you to do so
                 by providing the key 'messages' and mapping it to an array of key/value pairs
                 for setting the message templates. You will need to know the
@@ -520,9 +520,9 @@ if ($element->isValid($value)) {
 
             <para>
                 <classname>Zend_Form_Element::isValid()</classname> supports an
-                additional argument, <code>$context</code>.
+                additional argument, <varname>$context</varname>.
                 <classname>Zend_Form::isValid()</classname> passes the entire array of
-                data being processed to <code>$context</code> when validating a
+                data being processed to <varname>$context</varname> when validating a
                 form, and <classname>Zend_Form_Element::isValid()</classname>, in turn,
                 passes it to each validator. This means you can write
                 validators that are aware of data passed to other form

+ 3 - 3
documentation/manual/en/module_specs/Zend_Form-Forms.xml

@@ -133,12 +133,12 @@ $form = new Zend_Form($config);
             <listitem><para>
                 <methodname>addElementPrefixPath($prefix, $path, $type = null)</methodname>:
                 Just like <methodname>addPrefixPath()</methodname>, you must specify a class
-                prefix and a path. <code>$type</code>, when specified, must be
+                prefix and a path. <varname>$type</varname>, when specified, must be
                 one of the plugin loader types specified by
                 <classname>Zend_Form_Element</classname>; see the <link
                     linkend="zend.form.elements.loaders">element plugins
                     section</link> for more information on valid
-                <code>$type</code> values. If no <code>$type</code> is
+                <varname>$type</varname> values. If no <varname>$type</varname> is
                 specified, the method will assume it is a general prefix for all
                 types.
             </para></listitem>
@@ -147,7 +147,7 @@ $form = new Zend_Form($config);
                 <methodname>addDisplayGroupPrefixPath($prefix, $path)</methodname>:
                 Just like <methodname>addPrefixPath()</methodname>, you must specify a class
                 prefix and a path; however, since display groups only support
-                decorators as plugins, no <code>$type</code> is necessary.
+                decorators as plugins, no <varname>$type</varname> is necessary.
             </para></listitem>
         </itemizedlist>
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Form-QuickStart.xml

@@ -363,8 +363,8 @@ $form->addElement('text', 'username', array('order' => 10));
         </para>
 
         <para>
-            Where does the data come from? You can use <code>$_POST</code> or
-            <code>$_GET</code>, or any other data source you might have at hand
+            Where does the data come from? You can use <varname>$_POST</varname> or
+            <varname>$_GET</varname>, or any other data source you might have at hand
             (web service requests, for instance):
         </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml

@@ -17,9 +17,9 @@
             render content. Callbacks should be specified via the 'callback'
             option passed in the decorator configuration, and can be any
             valid PHP callback type. Callbacks should accept three
-            arguments, <code>$content</code> (the original content passed to
-            the decorator), <code>$element</code> (the item being
-            decorated), and an array of <code>$options</code>. As an example
+            arguments, <varname>$content</varname> (the original content passed to
+            the decorator), <varname>$element</varname> (the item being
+            decorated), and an array of <varname>$options</varname>. As an example
             callback:
         </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Form-StandardElements.xml

@@ -179,7 +179,7 @@ $element = new Zend_Form_Element_Captcha('foo', array(
 
         <para>
             By default, it uses the <code>Http</code> transfer adapter, which
-            introspects the <code>$_FILES</code> array and allows you to attach
+            introspects the <varname>$_FILES</varname> array and allows you to attach
             validators and filters. Validators and filters attached to the form
             element are in turn attached to the transfer adapter.
         </para>

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

@@ -135,7 +135,7 @@ if (isset($_GET['logout'])) {
     <note>
         <title>Security notes</title>
         <para>
-            The treatment of the <code>$php_self</code> variable in the
+            The treatment of the <varname>$php_self</varname> variable in the
             example above is a general security guideline, it is not
             specific to <classname>Zend_Gdata</classname>. You should always filter content you
             output to http headers.

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

@@ -278,7 +278,7 @@ foreach ($feed->entries as $entry) {
             A customer/owner can access his own Customer Items feed to insert, update, or delete their items. These operations do not apply to the public snippets feed.
         </para>
         <para>
-            You can test a feed operation before it is actually executed by setting the dry-run flag (<code>$dryRun</code>) to <constant>TRUE</constant>. Once you are sure that you want to submit the data, set it to <constant>FALSE</constant> to execute the operation.
+            You can test a feed operation before it is actually executed by setting the dry-run flag (<varname>$dryRun</varname>) to <constant>TRUE</constant>. Once you are sure that you want to submit the data, set it to <constant>FALSE</constant> to execute the operation.
         </para>
         <sect3 id="zend.gdata.gbase.crud.insert">
             <title>Insert an Item</title>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Gdata_Spreadsheets.xml

@@ -135,7 +135,7 @@ $listFeed = $spreadsheetService->getListFeed($query);
 
             <para>
                 The resulting <classname>Zend_Gdata_Spreadsheets_ListFeed</classname>
-                object <code>$listfeed</code> represents a response from the
+                object <varname>$listfeed</varname> represents a response from the
                 server. Among other things, this feed contains an array of
                 <classname>Zend_Gdata_Spreadsheets_ListEntry</classname> objects
                 (<code>$listFeed->entries</code>), each of which represents
@@ -232,7 +232,7 @@ $insertedListEntry = $spreadsheetService->insertRow($rowData,
 ]]></programlisting>
 
             <para>
-                The <code>$rowData</code> parameter contains an array of column
+                The <varname>$rowData</varname> parameter contains an array of column
                 keys to data values. The method returns a
                 <classname>Zend_Gdata_Spreadsheets_SpreadsheetsEntry</classname> object
                 which represents the inserted row.
@@ -260,8 +260,8 @@ $updatedListEntry = $spreadsheetService->updateRow($oldListEntry,
 ]]></programlisting>
 
             <para>
-                The <code>$oldListEntry</code> parameter contains the list entry
-                to be updated. <code>$newRowData</code> contains an array of
+                The <varname>$oldListEntry</varname> parameter contains the list entry
+                to be updated. <varname>$newRowData</varname> contains an array of
                 column keys to data values, to be used as the new row data.
                 The method returns a
                 <classname>Zend_Gdata_Spreadsheets_SpreadsheetsEntry</classname> object
@@ -322,7 +322,7 @@ $cellFeed = $spreadsheetService->getCellFeed($query);
 
             <para>
                 The resulting <classname>Zend_Gdata_Spreadsheets_CellFeed</classname>
-                object <code>$cellFeed</code> represents a response from the
+                object <varname>$cellFeed</varname> represents a response from the
                 server. Among other things, this feed contains an array of
                 <classname>Zend_Gdata_Spreadsheets_CellEntry</classname> objects
                 (<code>$cellFeed>entries</code>), each of which represents

+ 1 - 1
documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml

@@ -398,7 +398,7 @@ $client = new Zend_Http_Client($uri, $config);
             the Socket Adapter and it also accepts the same configuration parameters
             as the Socket and Proxy adapters. You can also change the cURL options by either specifying
             the 'curloptions' key in the constructor of the adapter or by calling
-            <methodname>setCurlOption($name, $value)</methodname>. The <code>$name</code> key
+            <methodname>setCurlOption($name, $value)</methodname>. The <varname>$name</varname> key
             corresponds to the CURL_* constants of the cURL extension. You can
             get access to the Curl handle by calling <code>$adapter->getHandle();</code>
         </para>

+ 10 - 10
documentation/manual/en/module_specs/Zend_Http_Cookie-Handling.xml

@@ -41,33 +41,33 @@
                     <itemizedlist>
                         <listitem>
                             <para>
-                            <code>$name</code>: The name of the cookie (eg. 'PHPSESSID') (required)
+                            <varname>$name</varname>: The name of the cookie (eg. 'PHPSESSID') (required)
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$value</code>: The value of the cookie (required)
+                            <varname>$value</varname>: The value of the cookie (required)
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$domain</code>: The cookie's domain (eg. '.example.com') (required)
+                            <varname>$domain</varname>: The cookie's domain (eg. '.example.com') (required)
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$expires</code>: Cookie expiration time, as UNIX time stamp (optional, defaults to null).
+                            <varname>$expires</varname>: Cookie expiration time, as UNIX time stamp (optional, defaults to null).
                             If not set, cookie will be treated as a 'session cookie' with no expiration time.
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$path</code>: Cookie path, eg. '/foo/bar/' (optional, defaults to '/')
+                            <varname>$path</varname>: Cookie path, eg. '/foo/bar/' (optional, defaults to '/')
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$secure</code>: Boolean, Whether the cookie is to be sent over secure (HTTPS)
+                            <varname>$secure</varname>: Boolean, Whether the cookie is to be sent over secure (HTTPS)
                             connections only (optional, defaults to boolean FALSE)
                             </para>
                         </listitem>
@@ -438,26 +438,26 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                     <itemizedlist>
                         <listitem>
                             <para>
-                            <code>$uri</code> is either a Zend_Uri_Http object or a string specifying the
+                            <varname>$uri</varname> is either a Zend_Uri_Http object or a string specifying the
                             connection type (secure or non-secure), domain and path to match against.
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$matchSessionCookies</code> is a boolean telling whether to match session
+                            <varname>$matchSessionCookies</varname> is a boolean telling whether to match session
                             cookies or not. Session cookies are cookies that have no specified expiration
                             time. Defaults to true.
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$ret_as</code> specifies the return type as described above. If not
+                            <varname>$ret_as</varname> specifies the return type as described above. If not
                             specified, defaults to COOKIE_OBJECT.
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                            <code>$now</code> is an integer representing the UNIX time stamp to consider
+                            <varname>$now</varname> is an integer representing the UNIX time stamp to consider
                             as "now" - that is any cookies who are set to expire before this time will
                             not be matched. If not specified, defaults to the current time.
                             </para>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Http_Response.xml

@@ -45,27 +45,27 @@ $response = Zend_Http_Response::factory($str);
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>$code</code>: The HTTP response code (eg. 200, 404, etc.)
+                    <varname>$code</varname>: The HTTP response code (eg. 200, 404, etc.)
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$headers</code>: An associative array of HTTP response headers (eg. 'Host' => 'example.com')
+                    <varname>$headers</varname>: An associative array of HTTP response headers (eg. 'Host' => 'example.com')
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$body</code>: The response body as a string
+                    <varname>$body</varname>: The response body as a string
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$version</code>: The HTTP response version (usually 1.0 or 1.1)
+                    <varname>$version</varname>: The HTTP response version (usually 1.0 or 1.1)
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$message</code>: The HTTP response message (eg 'OK', 'Internal Server Error').
+                    <varname>$message</varname>: The HTTP response message (eg 'OK', 'Internal Server Error').
                     If not specified, the message will be set according to the response code
                 </para>
             </listitem>

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

@@ -268,7 +268,7 @@ $server->handle();
 
             <itemizedlist>
                 <listitem><para><methodname>setOptions(array $options)</methodname>: Specify
-                        object configuration. <code>$options</code> may contain
+                        object configuration. <varname>$options</varname> may contain
                         keys matching any 'set' method:
                         <methodname>setParams()</methodname>, <methodname>setMethod()</methodname>,
                         <methodname>setId()</methodname>, and
@@ -592,7 +592,7 @@ $server->handle();
                     several parameters at once; each param should be an assoc
                     array containing minimally the key 'type' describing the
                     parameter type, and optionally the key 'order'; any other
-                    keys will be passed as <code>$options</code> to
+                    keys will be passed as <varname>$options</varname> to
                     <methodname>addOption()</methodname>.</para></listitem>
                 <listitem><para><methodname>setParams(array $params)</methodname>: Set many
                     parameters at once, overwriting any existing

+ 2 - 2
documentation/manual/en/module_specs/Zend_Layout-Options.xml

@@ -97,8 +97,8 @@
         <title>Examples</title>
 
         <para>
-            The following examples assume the following <code>$options</code>
-            array and <code>$config</code> object:
+            The following examples assume the following <varname>$options</varname>
+            array and <varname>$config</varname> object:
         </para>
 
         <programlisting language="php"><![CDATA[

+ 27 - 27
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Attribute.xml

@@ -86,11 +86,11 @@
                         </emphasis>
                     </entry>
                     <entry>
-                        Sets the attribute <code>$attribName</code> in
-                        <code>$data</code> to the value <code>$value</code>. If
-                        <code>$append</code> is <code>true</code> (<code>false</code> by
-                        default) <code>$value</code> will be appended to the attribute.
-                        <code>$value</code> can be a scalar value or an array of scalar
+                        Sets the attribute <varname>$attribName</varname> in
+                        <varname>$data</varname> to the value <varname>$value</varname>. If
+                        <varname>$append</varname> is <code>true</code> (<code>false</code> by
+                        default) <varname>$value</varname> will be appended to the attribute.
+                        <varname>$value</varname> can be a scalar value or an array of scalar
                         values. Conversion will take place.
                     </entry>
                 </row>
@@ -100,8 +100,8 @@
                         string $attribName, integer|null $index)</code> </emphasis>
                     </entry>
                     <entry>
-                        Returns the attribute <code>$attribName</code> from
-                        <code>$data</code>. If <code>$index</code> is <code>null</code>
+                        Returns the attribute <varname>$attribName</varname> from
+                        <varname>$data</varname>. If <varname>$index</varname> is <code>null</code>
                         (default) an array will be returned containing all the values for
                         the given attribute. An empty array will be returned if the
                         attribute does not exist in the given array. If an integer index is
@@ -116,10 +116,10 @@
                         string $attribName, mixed|array $value)</code> </emphasis>
                     </entry>
                     <entry>
-                        Checks if the attribute <code>$attribName</code> in
-                        <code>$data</code> has the value(s) given in <code>$value</code>.
+                        Checks if the attribute <varname>$attribName</varname> in
+                        <varname>$data</varname> has the value(s) given in <varname>$value</varname>.
                         The method returns <code>true</code> only if all values in
-                        <code>$value</code> are present in the attribute. Comparison is
+                        <varname>$value</varname> are present in the attribute. Comparison is
                         done strictly (respecting the data type).
                     </entry>
                 </row>
@@ -130,7 +130,7 @@
                     </entry>
                     <entry>
                         Removes all duplicates from the attribute
-                        <code>$attribName</code> in <code>$data</code>.
+                        <varname>$attribName</varname> in <varname>$data</varname>.
                     </entry>
                 </row>
                 <row>
@@ -139,9 +139,9 @@
                         string $attribName, mixed|array $value)</code> </emphasis>
                     </entry>
                     <entry>
-                        Removes the value(s) given in <code>$value</code> from
-                        the attribute <code>$attribName</code> in
-                        <code>$data</code>.
+                        Removes the value(s) given in <varname>$value</varname> from
+                        the attribute <varname>$attribName</varname> in
+                        <varname>$data</varname>.
                     </entry>
                 </row>
                 <row>
@@ -172,7 +172,7 @@
                     </entry>
                     <entry>
                         Converts a timestamp into its <acronym>LDAP</acronym> date/time representation.
-                        If <code>$utc</code> is <code>true</code> (<code>false</code> by
+                        If <varname>$utc</varname> is <code>true</code> (<code>false</code> by
                         default) the resulting <acronym>LDAP</acronym> date/time string will be in UTC,
                         otherwise a local date/time string will be returned.
                     </entry>
@@ -185,7 +185,7 @@
                     </entry>
                     <entry>
                         Converts <acronym>LDAP</acronym> date/time representation into a timestamp. The
-                        method returns <code>null</code> if <code>$value</code> can not be
+                        method returns <code>null</code> if <varname>$value</varname> can not be
                         converted back into a PHP timestamp.
                     </entry>
                 </row>
@@ -197,10 +197,10 @@
                     </entry>
                     <entry>
                         Sets a <acronym>LDAP</acronym> password for the attribute
-                        <code>$attribName</code> in <code>$data</code>.
-                        <code>$attribName</code> defaults to <code>'userPassword'</code>
+                        <varname>$attribName</varname> in <varname>$data</varname>.
+                        <varname>$attribName</varname> defaults to <code>'userPassword'</code>
                         which is the standard password attribute. The password hash can be
-                        specified with <code>$hashType</code>. The default value here is
+                        specified with <varname>$hashType</varname>. The default value here is
                         <code>Zend_Ldap_Attribute::PASSWORD_HASH_MD5</code> with
                         <code>Zend_Ldap_Attribute::PASSWORD_HASH_SHA</code> as the other
                         possibilty.
@@ -213,7 +213,7 @@
                     </entry>
                     <entry>
                         Creates a <acronym>LDAP</acronym> password. The password hash can be specified
-                        with <code>$hashType</code>. The default value here is
+                        with <varname>$hashType</varname>. The default value here is
                         <code>Zend_Ldap_Attribute::PASSWORD_HASH_MD5</code> with
                         <code>Zend_Ldap_Attribute::PASSWORD_HASH_SHA</code> as the other
                         possibilty.
@@ -226,11 +226,11 @@
                         $append)</code> </emphasis>
                     </entry>
                     <entry>
-                        Sets the attribute <code>$attribName</code> in
-                        <code>$data</code> to the date/time value <code>$value</code>. If
-                        <code>$append</code> is <code>true</code> (<code>false</code> by
-                        default) <code>$value</code> will be appended to the attribute.
-                        <code>$value</code> can be an integer value or an array of
+                        Sets the attribute <varname>$attribName</varname> in
+                        <varname>$data</varname> to the date/time value <varname>$value</varname>. If
+                        <varname>$append</varname> is <code>true</code> (<code>false</code> by
+                        default) <varname>$value</varname> will be appended to the attribute.
+                        <varname>$value</varname> can be an integer value or an array of
                         integers. Date-time-conversion according to
                         <methodname>Zend_Ldap_Attribute::convertToLdapDateTimeValue()</methodname> will
                         take place.
@@ -243,8 +243,8 @@
                         </emphasis>
                     </entry>
                     <entry>
-                        Returns the date/time attribute <code>$attribName</code>
-                        from <code>$data</code>. If <code>$index</code> is
+                        Returns the date/time attribute <varname>$attribName</varname>
+                        from <varname>$data</varname>. If <varname>$index</varname> is
                         <code>null</code> (default) an array will be returned containing
                         all the date/time values for the given attribute. An empty array
                         will be returned if the attribute does not exist in the given

+ 16 - 16
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Dn.xml

@@ -5,7 +5,7 @@
 
     <para>
         <classname>Zend_Ldap_Dn</classname> provides an object-oriented interface to
-        manipulating <acronym>LDAP</acronym> distinguished names (DN). The parameter <code>$caseFold</code>
+        manipulating <acronym>LDAP</acronym> distinguished names (DN). The parameter <varname>$caseFold</varname>
         that is used in several methods determines the way DN attributes are handled
         regarding their case. Allowed values for this paraneter are:
     </para>
@@ -31,7 +31,7 @@
         The default case-folding is <code>Zend_Ldap_Dn::ATTR_CASEFOLD_NONE</code> and
         can be set with <methodname>Zend_Ldap_Dn::setDefaultCaseFold()</methodname>. Each instance of
         <classname>Zend_Ldap_Dn</classname> can have its own case-folding-setting. If the
-        <code>$caseFold</code> parameter is ommitted in method-calls it defaults to the
+        <varname>$caseFold</varname> parameter is ommitted in method-calls it defaults to the
         instance's case-folding setting.
     </para>
 
@@ -113,7 +113,7 @@
                     </entry>
                     <entry>
                         Gets the DN of the current DN's ancestor
-                        <code>$levelUp</code> levels up the tree. <code>$levelUp</code>
+                        <varname>$levelUp</varname> levels up the tree. <varname>$levelUp</varname>
                         defaults to <code>1</code>.
                     </entry>
                 </row>
@@ -124,7 +124,7 @@
                     </entry>
                     <entry>
                         Returns a slice of the current DN determined by
-                        <code>$index</code> and <code>$length</code>. <code>$index</code>
+                        <varname>$index</varname> and <varname>$length</varname>. <varname>$index</varname>
                         starts with <code>0</code> on the DN part from the left.
                     </entry>
                 </row>
@@ -145,7 +145,7 @@
                     </entry>
                     <entry>
                         Removes a DN part from the current DN. This operation
-                        manipulates the current instance. <code>$length</code> defaults to
+                        manipulates the current instance. <varname>$length</varname> defaults to
                         <code>1</code>
                     </entry>
                 </row>
@@ -169,7 +169,7 @@
                         $value)</code>
                     </entry>
                     <entry>
-                        Inserts a DN part after the index <code>$index</code> to the
+                        Inserts a DN part after the index <varname>$index</varname> to the
                         current DN. This operation manipulates the current
                         instance.
                     </entry>
@@ -178,7 +178,7 @@
                     <entry><code>void setCaseFold(string|null $caseFold)</code></entry>
                     <entry>
                         Sets the case-folding option to the current DN instance. If
-                        <code>$caseFold</code> is null the default case-folding setting
+                        <varname>$caseFold</varname> is null the default case-folding setting
                         (<code>Zend_Ldap_Dn::ATTR_CASEFOLD_NONE</code> by default or set
                         via <methodname>Zend_Ldap_Dn::setDefaultCaseFold()</methodname> will be set for
                         the current instance.
@@ -234,9 +234,9 @@
                         </emphasis>
                     </entry>
                     <entry>
-                        Explodes the DN <code>$dn</code> into an array containing
-                        all parts of the given DN. <code>$keys</code> optinally receive DN
-                        keys (e.g. CN, OU, DC, ...). <code>$vals</code> optionally receive
+                        Explodes the DN <varname>$dn</varname> into an array containing
+                        all parts of the given DN. <varname>$keys</varname> optinally receive DN
+                        keys (e.g. CN, OU, DC, ...). <varname>$vals</varname> optionally receive
                         DN values. The resulting array will be of type
                     <programlisting language="php"><![CDATA[
 array(
@@ -255,8 +255,8 @@ array("dc" => "org")
                         </emphasis>
                     </entry>
                     <entry>
-                        Checks if a given DN <code>$dn</code> is malformed. If
-                        <code>$keys</code> or <code>$keys</code> and <code>$vals</code> are
+                        Checks if a given DN <varname>$dn</varname> is malformed. If
+                        <varname>$keys</varname> or <varname>$keys</varname> and <varname>$vals</varname> are
                         given, these arrays will be filled with the appropriate DN keys and
                         values.
                     </entry>
@@ -280,8 +280,8 @@ array("dc" => "org")
                     <entry>
                         Implodes an array in the form delivered by
                         <methodname>Zend_Ldap_Dn::explodeDn()</methodname> to a DN string.
-                        <code>$separator</code> defaults to <code>','</code> but some LDAP
-                        servers also understand <code>';'</code>. <code>$dnArray</code>
+                        <varname>$separator</varname> defaults to <code>','</code> but some LDAP
+                        servers also understand <code>';'</code>. <varname>$dnArray</varname>
                         must of type
                     <programlisting language="php"><![CDATA[
 array(
@@ -299,8 +299,8 @@ array("dc" => "org")
                         $childDn, string|Zend_Ldap_Dn $parentDn)</code> </emphasis>
                     </entry>
                     <entry>
-                        Checks if given <code>$childDn</code> is beneath
-                        <code>$parentDn</code> subtree.
+                        Checks if given <varname>$childDn</varname> is beneath
+                        <varname>$parentDn</varname> subtree.
                     </entry>
                 </row>
             </tbody>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Filter.xml

@@ -128,8 +128,8 @@
                         $value,...)</code> </emphasis>
                     </entry>
                     <entry>
-                        Creates a filter from a string mask. All <code>$value</code>
-                        parameters will be escaped and substituted into <code>$mask</code>
+                        Creates a filter from a string mask. All <varname>$value</varname>
+                        parameters will be escaped and substituted into <varname>$mask</varname>
                         by using
                         <ulink url="http://php.net/sprintf">
                         <methodname>sprintf()</methodname></ulink>
@@ -206,7 +206,7 @@
                         $values)</code> </emphasis>
                     </entry>
                     <entry>
-                        Escapes the given <code>$values</code> according to RFC 2254
+                        Escapes the given <varname>$values</varname> according to RFC 2254
                         so that they can be safely used in <acronym>LDAP</acronym> filters. If a single string
                         is given, a string is returned - otherwise an array is returned.
                         Any control characters with an ACII code &lt; 32 as well as the

+ 3 - 3
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Ldif-Encoder.xml

@@ -20,7 +20,7 @@
                         </emphasis>
                     </entry>
                     <entry>
-                        Decodes the string <code>$string</code> into an array of
+                        Decodes the string <varname>$string</varname> into an array of
                         <acronym>LDIF</acronym> items.
                     </entry>
                 </row>
@@ -30,8 +30,8 @@
                         $value, array $options)</code> </emphasis>
                     </entry>
                     <entry>
-                        Encode <code>$value</code> into a <acronym>LDIF</acronym> representation.
-                        <code>$options</code> is an array that may contain the following
+                        Encode <varname>$value</varname> into a <acronym>LDIF</acronym> representation.
+                        <varname>$options</varname> is an array that may contain the following
                         keys:
                         <variablelist>
                             <varlistentry>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node-RootDse.xml

@@ -74,7 +74,7 @@
                     </entry>
                     <entry>
                         Returns an array representation of the current node. If
-                        <code>$includeSystemAttributes</code> is <code>false</code>
+                        <varname>$includeSystemAttributes</varname> is <code>false</code>
                         (defaults to <code>true</code>) the system specific attributes are
                         stripped from the array. Unlike
                         <methodname>Zend_Ldap_Node_RootDse::getAttributes()</methodname> the resulting
@@ -108,9 +108,9 @@
                     </entry>
                     <entry>
                         Checks whether a given attribute exists. If
-                        <code>$emptyExists</code> is <code>false</code> empty attributes
+                        <varname>$emptyExists</varname> is <code>false</code> empty attributes
                         (containing only array()) are treated as non-existent returning
-                        <code>false</code>. If <code>$emptyExists</code> is true empty
+                        <code>false</code>. If <varname>$emptyExists</varname> is true empty
                         attributes are treated as existent returning <code>true</code>. In
                         this case teh method returns <code>false</code> only if the
                         attribute name is missing in the key-collection.
@@ -124,7 +124,7 @@
                     <entry>
                         Checks if the given value(s) exist in the attribute. The
                         method returns <code>true</code> only if all values in
-                        <code>$value</code> are present in the attribute. Comparison is
+                        <varname>$value</varname> are present in the attribute. Comparison is
                         done strictly (respecting the data type).
                     </entry>
                 </row>
@@ -152,7 +152,7 @@
                     </entry>
                     <entry>
                         Gets all attributes of node. If
-                        <code>$includeSystemAttributes</code> is <code>false</code>
+                        <varname>$includeSystemAttributes</varname> is <code>false</code>
                         (defaults to <code>true</code>) the system specific attributes are
                         stripped from the array.
                     </entry>

+ 27 - 27
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node.xml

@@ -41,11 +41,11 @@
                         $ldap)</code>
                     </entry>
                     <entry>
-                        Attach the current node to the <code>$ldap</code>
+                        Attach the current node to the <varname>$ldap</varname>
                         <classname>Zend_Ldap</classname> instance. Throws
-                        <classname>Zend_Ldap_Exception</classname> if <code>$ldap</code> is not
+                        <classname>Zend_Ldap_Exception</classname> if <varname>$ldap</varname> is not
                         responsible for the current node (node is not a child of the
-                        <code>$ldap</code> base DN).
+                        <varname>$ldap</varname> base DN).
                     </entry>
                 </row>
                 <row>
@@ -68,8 +68,8 @@
                     <entry>
                         Factory method to create a new detached
                         <classname>Zend_Ldap_Node</classname> for a given DN. Creates a new
-                        <classname>Zend_Ldap_Node</classname> with the DN <code>$dn</code> and the
-                        object-classes <code>$objectClass</code>.
+                        <classname>Zend_Ldap_Node</classname> with the DN <varname>$dn</varname> and the
+                        object-classes <varname>$objectClass</varname>.
                     </entry>
                 </row>
                 <row>
@@ -81,8 +81,8 @@
                     <entry>
                         Factory method to create an attached
                         <classname>Zend_Ldap_Node</classname> for a given DN. Loads an existing
-                        <classname>Zend_Ldap_Node</classname> with the DN <code>$dn</code> from the
-                        <acronym>LDAP</acronym> connection <code>$ldap</code>.
+                        <classname>Zend_Ldap_Node</classname> with the DN <varname>$dn</varname> from the
+                        <acronym>LDAP</acronym> connection <varname>$ldap</varname>.
                     </entry>
                 </row>
                 <row>
@@ -92,8 +92,8 @@
                     </entry>
                     <entry>
                         Factory method to create a detached
-                        <classname>Zend_Ldap_Node</classname> from array data <code>$data</code>. If
-                        <code>$fromDataSource</code> is <code>true</code>
+                        <classname>Zend_Ldap_Node</classname> from array data <varname>$data</varname>. If
+                        <varname>$fromDataSource</varname> is <code>true</code>
                         (<code>false</code> by default), the data is treated as beeing
                         present in a <acronym>LDAP</acronym> tree.
                     </entry>
@@ -133,10 +133,10 @@
                     <entry><code>Zend_Ldap_Node update(Zend_Ldap $ldap)</code></entry>
                     <entry>
                         Sends all pending changes to the <acronym>LDAP</acronym> server. If
-                        <code>$ldap</code> is omitted the current <acronym>LDAP</acronym> connection is used.
+                        <varname>$ldap</varname> is omitted the current <acronym>LDAP</acronym> connection is used.
                         If the current node is detached from a <acronym>LDAP</acronym> connection a
                         <classname>Zend_Ldap_Exception</classname> will be thrown. If
-                        <code>$ldap</code> is provided the current node will be attached to
+                        <varname>$ldap</varname> is provided the current node will be attached to
                         the given <acronym>LDAP</acronym> connection.
                     </entry>
                 </row>
@@ -234,7 +234,7 @@
                     <entry><code>string toLdif(array $options)</code></entry>
                     <entry>
                         Returns a <acronym>LDIF</acronym> representation of the current node.
-                        <code>$options</code> will be passed to the
+                        <varname>$options</varname> will be passed to the
                         <classname>Zend_Ldap_Ldif_Encoder</classname>.
                     </entry>
                 </row>
@@ -272,7 +272,7 @@
                     </entry>
                     <entry>
                         Returns an array representation of the current node. If
-                        <code>$includeSystemAttributes</code> is <code>false</code>
+                        <varname>$includeSystemAttributes</varname> is <code>false</code>
                         (defaults to <code>true</code>) the system specific attributes are
                         stripped from the array. Unlike
                         <methodname>Zend_Ldap_Node::getAttributes()</methodname> the resulting array
@@ -306,9 +306,9 @@
                     </entry>
                     <entry>
                         Checks whether a given attribute exists. If
-                        <code>$emptyExists</code> is <code>false</code> empty attributes
+                        <varname>$emptyExists</varname> is <code>false</code> empty attributes
                         (containing only array()) are treated as non-existent returning
-                        <code>false</code>. If <code>$emptyExists</code> is true empty
+                        <code>false</code>. If <varname>$emptyExists</varname> is true empty
                         attributes are treated as existent returning <code>true</code>. In
                         this case teh method returns <code>false</code> only if the
                         attribute name is missing in the key-collection.
@@ -322,7 +322,7 @@
                     <entry>
                         Checks if the given value(s) exist in the attribute. The
                         method returns <code>true</code> only if all values in
-                        <code>$value</code> are present in the attribute. Comparison is
+                        <varname>$value</varname> are present in the attribute. Comparison is
                         done strictly (respecting the data type).
                     </entry>
                 </row>
@@ -350,7 +350,7 @@
                     </entry>
                     <entry>
                         Gets all attributes of node. If
-                        <code>$includeSystemAttributes</code> is <code>false</code>
+                        <varname>$includeSystemAttributes</varname> is <code>false</code>
                         (defaults to <code>true</code>) the system specific attributes are
                         stripped from the array.
                     </entry>
@@ -414,9 +414,9 @@
                         string $hashType, string $attribName)</code>
                     </entry>
                     <entry>
-                        Sets a <acronym>LDAP</acronym> password on <code>$attribName</code> (defaults
-                        to <code>'userPassword'</code>) to <code>$password</code> with the
-                        hash type <code>$hashType</code> (defaults to
+                        Sets a <acronym>LDAP</acronym> password on <varname>$attribName</varname> (defaults
+                        to <code>'userPassword'</code>) to <varname>$password</varname> with the
+                        hash type <varname>$hashType</varname> (defaults to
                         <code>Zend_Ldap_Attribute::PASSWORD_HASH_MD5</code>).
                     </entry>
                 </row>
@@ -464,9 +464,9 @@
                     </entry>
                     <entry>
                         Searches the nodes's subtree with the given
-                        <code>$filter</code> and the given search parameters. See
+                        <varname>$filter</varname> and the given search parameters. See
                         <methodname>Zend_Ldap::search()</methodname> for details on the parameters
-                        <code>$scope</code> and <code>$sort</code>.
+                        <varname>$scope</varname> and <varname>$sort</varname>.
                     </entry>
                 </row>
                 <row>
@@ -476,9 +476,9 @@
                     </entry>
                     <entry>
                         Count the nodes's subtree items matching the given
-                        <code>$filter</code> and the given search scope. See
+                        <varname>$filter</varname> and the given search scope. See
                         <methodname>Zend_Ldap::search()</methodname> for details on the
-                        <code>$scope</code> parameter.
+                        <varname>$scope</varname> parameter.
                     </entry>
                 </row>
                 <row>
@@ -493,8 +493,8 @@
                     </entry>
                     <entry>
                         Searches the nodes's children matching the given
-                        <code>$filter</code>. See <methodname>Zend_Ldap::search()</methodname> for
-                        details on the <code>$sort</code> parameter.
+                        <varname>$filter</varname>. See <methodname>Zend_Ldap::search()</methodname> for
+                        details on the <varname>$sort</varname> parameter.
                     </entry>
                 </row>
                 <row>
@@ -515,7 +515,7 @@
                     </entry>
                     <entry>
                         Returns the parent of the current node using the LDAP
-                        connection <code>$ldap</code> (uses the current <acronym>LDAP</acronym> connection if
+                        connection <varname>$ldap</varname> (uses the current <acronym>LDAP</acronym> connection if
                         omitted).
                     </entry>
                 </row>

+ 58 - 58
documentation/manual/en/module_specs/Zend_Ldap-API-Ldap.xml

@@ -36,8 +36,8 @@
                         <code>boolean explodeDn($dn, array &amp;$keys = null, array &amp;$vals = null)</code>
                     </entry>
                     <entry>
-                        Checks if a given DN <code>$dn</code> is malformed. If
-                        <code>$keys</code> or <code>$keys</code> and <code>$vals</code> are
+                        Checks if a given DN <varname>$dn</varname> is malformed. If
+                        <varname>$keys</varname> or <varname>$keys</varname> and <varname>$vals</varname> are
                         given, these arrays will be filled with the appropriate DN keys and
                         values. This method is <emphasis>deprecated</emphasis>, please use
                         <methodname>Zend_Ldap_Dn::checkDn()</methodname> instead.
@@ -46,7 +46,7 @@
                 <row>
                     <entry><methodname>__construct($options)</methodname></entry>
                     <entry>
-                        Constructor. The <code>$options</code> parameter is optional
+                        Constructor. The <varname>$options</varname> parameter is optional
                         and can be set to an array or a <classname>Zend_Config</classname> instance.
                         If no options are provided at instantiation, the connection
                         parameters must be passed to the instance using
@@ -73,18 +73,18 @@
                     </entry>
                     <entry>
                         Returns the <acronym>LDAP</acronym> error message of the last <acronym>LDAP</acronym> command. The
-                        optional <code>$errorCode</code> parameter is set to the <acronym>LDAP</acronym> error
-                        number when given. The optional <code>$errorMessages</code> array
+                        optional <varname>$errorCode</varname> parameter is set to the <acronym>LDAP</acronym> error
+                        number when given. The optional <varname>$errorMessages</varname> array
                         will be filled with the raw error messages when given. The various
                         <acronym>LDAP</acronym> error retrieval functions can return different things, so they
-                        are all collected if <code>$errorMessages</code> is given.
+                        are all collected if <varname>$errorMessages</varname> is given.
                     </entry>
                 </row>
                 <row>
                     <entry><code>Zend_Ldap setOptions($options)</code></entry>
                     <entry>
                         Sets the <acronym>LDAP</acronym> connection and binding parameters.
-                        <code>$options</code> can be an array or an instance of
+                        <varname>$options</varname> can be an array or an instance of
                         <classname>Zend_Config</classname>. The allowed options are specified in
                         <link
                             linkend="zend.ldap.api.configuration.table">Zend_Ldap Options</link>
@@ -110,7 +110,7 @@
                     </entry>
                     <entry>
                         Returns the canonical account name of the given account name
-                        <code>$acctname</code>. <code>$form</code> specifies the <link
+                        <varname>$acctname</varname>. <varname>$form</varname> specifies the <link
                             linkend="zend.ldap.using.theory-of-operation.account-name-canonicalization.table">format</link>
                         into which the account name is canonicalized. See <link
                             linkend="zend.ldap.introduction.theory-of-operations.account-name-canonicalization">Account Name Canonicalization</link>
@@ -141,14 +141,14 @@
                         <code>Zend_Ldap bind(string $username, string $password)</code>
                     </entry>
                     <entry>
-                        Authenticates <code>$username</code> with
-                        <code>$password</code> at the <acronym>LDAP</acronym> server. If both paramaters are
+                        Authenticates <varname>$username</varname> with
+                        <varname>$password</varname> at the <acronym>LDAP</acronym> server. If both paramaters are
                         omitted the binding will be carried out with the credentials given
                         in the connection and binding parameters. If no credentials are
                         given in the connection and binding parameters an anonymous bind
                         will be performed. Note that this requires anonymous binds to be
                         allowed on the <acronym>LDAP</acronym> server. An empty string <code>''</code> can be
-                        passed as <code>$password</code> together with a username if, and
+                        passed as <varname>$password</varname> together with a username if, and
                         only if, <code>allowEmptyPassword</code> is set to
                         <code>true</code> in the connection and binding parameters.
                     </entry>
@@ -158,7 +158,7 @@
                         <code>Zend_Ldap_Collection search(string|Zend_Ldap_Filter_Abstract $filter, string|Zend_Ldap_Dn $basedn, integer $scope, array $attributes, string $sort, string $collectionClass)</code>
                     </entry>
                     <entry>
-                        Searches the <acronym>LDAP</acronym> tree with the given <code>$filter</code>
+                        Searches the <acronym>LDAP</acronym> tree with the given <varname>$filter</varname>
                         and the given search parameters.
                         <variablelist>
                             <varlistentry>
@@ -192,11 +192,11 @@
                                     <para>
                                         The search scope.
                                         <code>Zend_Ldap::SEARCH_SCOPE_SUB</code> searches the
-                                        complete subtree including the <code>$baseDn</code> node.
+                                        complete subtree including the <varname>$baseDn</varname> node.
                                         <code>Zend_Ldap::SEARCH_SCOPE_ONE</code> restricts search
-                                        to one level below <code>$baseDn</code>.
+                                        to one level below <varname>$baseDn</varname>.
                                         <code>Zend_Ldap::SEARCH_SCOPE_BASE</code> restricts search
-                                        to the <code>$baseDn</code> itself; this can be used to
+                                        to the <varname>$baseDn</varname> itself; this can be used to
                                         efficiently retrieve a single entry by its DN. The default
                                         value is
                                         <code>Zend_Ldap::SEARCH_SCOPE_SUB</code>.
@@ -227,7 +227,7 @@
                                 <listitem>
                                     <para>
                                         If given the result collection will be sorted
-                                        after the attribute <code>$sort</code>. Results can only be
+                                        after the attribute <varname>$sort</varname>. Results can only be
                                         sorted after one single attribute as this parameter uses
                                         the ext/ldap function <methodname>ldap_sort()</methodname>.
                                     </para>
@@ -240,7 +240,7 @@
                                 <listitem>
                                     <para>
                                         If given the result will be wrapped in an object
-                                        of type <code>$collectionClass</code>. By default an object
+                                        of type <varname>$collectionClass</varname>. By default an object
                                         of type <classname>Zend_Ldap_Collection</classname> will be returned.
                                         The custom class must extend
                                         <classname>Zend_Ldap_Collection</classname> and will be passed a
@@ -271,14 +271,14 @@
                     </entry>
                     <entry>
                         Counts the direct descendants (children) of the entry
-                        identified by the given <code>$dn</code>.
+                        identified by the given <varname>$dn</varname>.
                     </entry>
                 </row>
                 <row>
                     <entry><code>boolean exists(string|Zend_Ldap_Dn $dn)</code></entry>
                     <entry>
                         Checks whether the entry identified by the given
-                        <code>$dn</code> exists.
+                        <varname>$dn</varname> exists.
                     </entry>
                 </row>
                 <row>
@@ -301,11 +301,11 @@
                         $attributes, boolean $throwOnNotFound)</code>
                     </entry>
                     <entry>
-                        Retrieves the <acronym>LDAP</acronym> entry identified by <code>$dn</code> with
-                        the attributes specified in <code>$attributes</code>. If
-                        <code>$attributes</code> is ommitted, all attributes
+                        Retrieves the <acronym>LDAP</acronym> entry identified by <varname>$dn</varname> with
+                        the attributes specified in <varname>$attributes</varname>. If
+                        <varname>$attributes</varname> is ommitted, all attributes
                         (<methodname>array()</methodname>) are included in the result.
-                        <code>$throwOnNotFound</code> is <code>false</code> by default, so
+                        <varname>$throwOnNotFound</varname> is <code>false</code> by default, so
                         the method will return <code>null</code> if the specified entry
                         cannot be found. If set to <code>true</code>, a
                         <classname>Zend_Ldap_Exception</classname> will be thrown instead.
@@ -329,8 +329,8 @@
                         $entry)</code>
                     </entry>
                     <entry>
-                        Adds the entry identified by <code>$dn</code> with its
-                        attributes <code>$entry</code> to the <acronym>LDAP</acronym> tree. Throws a
+                        Adds the entry identified by <varname>$dn</varname> with its
+                        attributes <varname>$entry</varname> to the <acronym>LDAP</acronym> tree. Throws a
                         <classname>Zend_Ldap_Exception</classname> if the entry could not be
                         added.
                     </entry>
@@ -341,8 +341,8 @@
                         $entry)</code>
                     </entry>
                     <entry>
-                        Updates the entry identified by <code>$dn</code> with its
-                        attributes <code>$entry</code> to the <acronym>LDAP</acronym> tree. Throws a
+                        Updates the entry identified by <varname>$dn</varname> with its
+                        attributes <varname>$entry</varname> to the <acronym>LDAP</acronym> tree. Throws a
                         <classname>Zend_Ldap_Exception</classname> if the entry could not be
                         modified.
                     </entry>
@@ -353,8 +353,8 @@
                         $entry)</code>
                     </entry>
                     <entry>
-                        Saves the entry identified by <code>$dn</code> with its
-                        attributes <code>$entry</code> to the <acronym>LDAP</acronym> tree. Throws a
+                        Saves the entry identified by <varname>$dn</varname> with its
+                        attributes <varname>$entry</varname> to the <acronym>LDAP</acronym> tree. Throws a
                         <classname>Zend_Ldap_Exception</classname> if the entry could not be saved.
                         This method decides by querying the <acronym>LDAP</acronym> tree if the entry will be
                         added or updated.
@@ -366,14 +366,14 @@
                         $recursively)</code>
                     </entry>
                     <entry>
-                        Deletes the entry identified by <code>$dn</code> from the
+                        Deletes the entry identified by <varname>$dn</varname> from the
                         <acronym>LDAP</acronym> tree. Throws a <classname>Zend_Ldap_Exception</classname> if the entry
-                        could not be deleted. <code>$recursively</code> is
+                        could not be deleted. <varname>$recursively</varname> is
                         <code>false</code> by default. If set to <code>true</code> the
                         deletion will be carried out recursively and will effectively
                         delete a complete subtree. Deletion will fail if
-                        <code>$recursively</code> is <code>false</code> and the entry
-                        <code>$dn</code> is not a leaf entry.
+                        <varname>$recursively</varname> is <code>false</code> and the entry
+                        <varname>$dn</varname> is not a leaf entry.
                     </entry>
                 </row>
                 <row>
@@ -383,14 +383,14 @@
                         $alwaysEmulate)</code>
                     </entry>
                     <entry>
-                        Moves the entry identified by <code>$from</code> to a
-                        location below <code>$to</code> keeping its <acronym>RDN</acronym> unchanged.
-                        <code>$recursively</code> specifies if the operation will be
+                        Moves the entry identified by <varname>$from</varname> to a
+                        location below <varname>$to</varname> keeping its <acronym>RDN</acronym> unchanged.
+                        <varname>$recursively</varname> specifies if the operation will be
                         carried out recursively (<code>false</code> by default) so that the
-                        entry <code>$from</code> and all its descendants will be moved.
-                        Moving will fail if <code>$recursively</code> is <code>false</code>
-                        and the entry <code>$from</code> is not a leaf entry.
-                        <code>$alwaysEmulate</code> controls whether the ext/ldap function
+                        entry <varname>$from</varname> and all its descendants will be moved.
+                        Moving will fail if <varname>$recursively</varname> is <code>false</code>
+                        and the entry <varname>$from</varname> is not a leaf entry.
+                        <varname>$alwaysEmulate</varname> controls whether the ext/ldap function
                         <methodname>ldap_rename()</methodname> should be used if available. This can
                         only work for leaf entries and for servers and for ext/ldap
                         supporting this function. Set to <code>true</code> to always use an
@@ -424,13 +424,13 @@
                         $alwaysEmulate)</code>
                     </entry>
                     <entry>
-                        Renames the entry identified by <code>$from</code> to
-                        <code>$to</code>. <code>$recursively</code> specifies if the
+                        Renames the entry identified by <varname>$from</varname> to
+                        <varname>$to</varname>. <varname>$recursively</varname> specifies if the
                         operation will be carried out recursively (<code>false</code> by
-                        default) so that the entry <code>$from</code> and all its
+                        default) so that the entry <varname>$from</varname> and all its
                         descendants will be moved. Moving will fail if
-                        <code>$recursively</code> is <code>false</code> and the entry
-                        <code>$from</code> is not a leaf entry. <code>$alwaysEmulate</code>
+                        <varname>$recursively</varname> is <code>false</code> and the entry
+                        <varname>$from</varname> is not a leaf entry. <varname>$alwaysEmulate</varname>
                         controls whether the ext/ldap function <methodname>ldap_rename()</methodname>
                         should be used if available. This can only work for leaf entries
                         and for servers and for ext/ldap supporting this function. Set to
@@ -444,13 +444,13 @@
                         string|Zend_Ldap_Dn $to, boolean $recursively)</code>
                     </entry>
                     <entry>
-                        Copies the entry identified by <code>$from</code> to a
-                        location below <code>$to</code> keeping its <acronym>RDN</acronym> unchanged.
-                        <code>$recursively</code> specifies if the operation will be
+                        Copies the entry identified by <varname>$from</varname> to a
+                        location below <varname>$to</varname> keeping its <acronym>RDN</acronym> unchanged.
+                        <varname>$recursively</varname> specifies if the operation will be
                         carried out recursively (<code>false</code> by default) so that the
-                        entry <code>$from</code> and all its descendants will be copied.
-                        Copying will fail if <code>$recursively</code> is
-                        <code>false</code> and the entry <code>$from</code> is not a leaf
+                        entry <varname>$from</varname> and all its descendants will be copied.
+                        Copying will fail if <varname>$recursively</varname> is
+                        <code>false</code> and the entry <varname>$from</varname> is not a leaf
                         entry.
                     </entry>
                 </row>
@@ -460,13 +460,13 @@
                         string|Zend_Ldap_Dn $to, boolean $recursively)</code>
                     </entry>
                     <entry>
-                        Copies the entry identified by <code>$from</code> to
-                        <code>$to</code>. <code>$recursively</code> specifies if the
+                        Copies the entry identified by <varname>$from</varname> to
+                        <varname>$to</varname>. <varname>$recursively</varname> specifies if the
                         operation will be carried out recursively (<code>false</code> by
-                        default) so that the entry <code>$from</code> and all its
+                        default) so that the entry <varname>$from</varname> and all its
                         descendants will be copied. Copying will fail if
-                        <code>$recursively</code> is <code>false</code> and the entry
-                        <code>$from</code> is not a leaf entry.
+                        <varname>$recursively</varname> is <code>false</code> and the entry
+                        <varname>$from</varname> is not a leaf entry.
                     </entry>
                 </row>
                 <row>
@@ -475,14 +475,14 @@
                         $dn)</code>
                     </entry>
                     <entry>
-                        Returns the entry <code>$dn</code> wrapped in a
+                        Returns the entry <varname>$dn</varname> wrapped in a
                         <classname>Zend_Ldap_Node</classname>.
                     </entry>
                 </row>
                 <row>
                     <entry><code>Zend_Ldap_Node getBaseNode()</code></entry>
                     <entry>
-                        Returns the entry for the base DN <code>$baseDn</code>
+                        Returns the entry for the base DN <varname>$baseDn</varname>
                         wrapped in a <classname>Zend_Ldap_Node</classname>.
                     </entry>
                 </row>

+ 17 - 17
documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml

@@ -207,7 +207,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><code>string|false</code></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$class</code>, <emphasis>required</emphasis>.
+                                <varname>$class</varname>, <emphasis>required</emphasis>.
                                 A string class name to load.
                             </para></listitem>
                         </itemizedlist></entry>
@@ -222,7 +222,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$callback</code>, <emphasis>required</emphasis>.
+                                <varname>$callback</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -247,7 +247,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$autoloaders</code>, <emphasis>required</emphasis>.
+                                <varname>$autoloaders</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -271,7 +271,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><type>Array</type></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>required</emphasis>
+                                <varname>$namespace</varname>, <emphasis>required</emphasis>
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -285,12 +285,12 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>required</emphasis>.
+                                <varname>$namespace</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
                             Register one or more namespaces with the default
-                            autoloader. If <code>$namespace</code> is a string,
+                            autoloader. If <varname>$namespace</varname> is a string,
                             it registers that namespace; if it's an array of
                             strings, registers each as a namespace.
                         </para></entry>
@@ -301,12 +301,12 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>required</emphasis>.
+                                <varname>$namespace</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
                             Unregister one or more namespaces from the default
-                            autoloader. If <code>$namespace</code> is a string,
+                            autoloader. If <varname>$namespace</varname> is a string,
                             it unregisters that namespace; if it's an array of
                             strings, unregisters each as a namespace.
                         </para></entry>
@@ -327,7 +327,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><code>boolean|Zend_Loader_Autoloader</code></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$flag</code>, <emphasis>optional</emphasis>.
+                                <varname>$flag</varname>, <emphasis>optional</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -347,7 +347,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$flag</code>, <emphasis>required</emphasis>.
+                                <varname>$flag</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -374,7 +374,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><type>Array</type></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$class</code>, <emphasis>required</emphasis>.
+                                <varname>$class</varname>, <emphasis>required</emphasis>.
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
@@ -390,12 +390,12 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$callback</code>, <emphasis>required</emphasis>.
+                                <varname>$callback</varname>, <emphasis>required</emphasis>.
                                 A valid PHP callback
                             </para></listitem>
 
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>optional</emphasis>.
+                                <varname>$namespace</varname>, <emphasis>optional</emphasis>.
                                 A string representing a class prefix namespace.
                             </para></listitem>
                         </itemizedlist></entry>
@@ -413,12 +413,12 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$callback</code>, <emphasis>required</emphasis>.
+                                <varname>$callback</varname>, <emphasis>required</emphasis>.
                                 A valid PHP callback
                             </para></listitem>
 
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>optional</emphasis>.
+                                <varname>$namespace</varname>, <emphasis>optional</emphasis>.
                                 A string representing a class prefix namespace.
                             </para></listitem>
                         </itemizedlist></entry>
@@ -436,12 +436,12 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><classname>Zend_Loader_Autoloader</classname></entry>
                         <entry><itemizedlist>
                             <listitem><para>
-                                <code>$callback</code>, <emphasis>required</emphasis>.
+                                <varname>$callback</varname>, <emphasis>required</emphasis>.
                                 A valid PHP callback
                             </para></listitem>
 
                             <listitem><para>
-                                <code>$namespace</code>, <emphasis>optional</emphasis>.
+                                <varname>$namespace</varname>, <emphasis>optional</emphasis>.
                                 A string representing a class prefix namespace,
                                 or an array of namespace strings.
                             </para></listitem>

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

@@ -146,23 +146,23 @@ $loader = new Zend_Loader_PluginLoader(array(), 'foobar');
         <itemizedlist>
             <listitem><para>
                     <methodname>getPaths($prefix = null)</methodname> returns all paths as
-                    prefix / path pairs if no <code>$prefix</code> is provided,
+                    prefix / path pairs if no <varname>$prefix</varname> is provided,
                     or just the paths registered for a given prefix if a
-                    <code>$prefix</code> is present.
+                    <varname>$prefix</varname> is present.
             </para></listitem>
 
             <listitem><para>
                     <methodname>clearPaths($prefix = null)</methodname> will clear all
                     registered paths by default, or only those associated with a
-                    given prefix, if the <code>$prefix</code> is provided and
+                    given prefix, if the <varname>$prefix</varname> is provided and
                     present in the stack.
             </para></listitem>
 
             <listitem><para>
                     <methodname>removePrefixPath($prefix, $path = null)</methodname> allows
                     you to selectively remove a specific path associated with a
-                    given prefix. If no <code>$path</code> is provided, all
-                    paths for that prefix are removed. If a <code>$path</code>
+                    given prefix. If no <varname>$path</varname> is provided, all
+                    paths for that prefix are removed. If a <varname>$path</varname>
                     is provided and exists for that prefix, only that path will
                     be removed.
             </para></listitem>

+ 9 - 9
documentation/manual/en/module_specs/Zend_Loader.xml

@@ -41,23 +41,23 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
     </example>
 
         <para>
-            The <code>$filename</code> argument specifies the filename to load,
+            The <varname>$filename</varname> argument specifies the filename to load,
             which must not contain any path information.
-            A security check is performed on <code>$filename</code>.
-            The <code>$filename</code> may only contain alphanumeric characters,
+            A security check is performed on <varname>$filename</varname>.
+            The <varname>$filename</varname> may only contain alphanumeric characters,
             dashes ("-"), underscores ("_"), or periods (".").
-            No such restriction is placed on the <code>$dirs</code> argument.
+            No such restriction is placed on the <varname>$dirs</varname> argument.
         </para>
 
         <para>
-            The <code>$dirs</code> argument specifies which directories to search for
+            The <varname>$dirs</varname> argument specifies which directories to search for
             the file in. If the value is <constant>NULL</constant>, only the <code>include_path</code>
             is searched; if the value is a string or an array, the directory or directories
             specified will be searched, followed by the <code>include_path</code>.
         </para>
 
         <para>
-            The <code>$once</code> argument is a boolean. If <constant>TRUE</constant>,
+            The <varname>$once</varname> argument is a boolean. If <constant>TRUE</constant>,
             <classname>Zend_Loader::loadFile()</classname> uses the PHP function
             <ulink url="http://php.net/include"><methodname>include_once()</methodname></ulink>
             for loading the file, otherwise the PHP function
@@ -95,10 +95,10 @@ Zend_Loader::loadClass('Container_Tree',
         </para>
 
         <para>
-            If <code>$dirs</code> is a string or an array,
+            If <varname>$dirs</varname> is a string or an array,
             <classname>Zend_Loader::loadClass()</classname> searches the directories in
             the order supplied. The first matching file is loaded. If the file
-            does not exist in the specified <code>$dirs</code>, then the
+            does not exist in the specified <varname>$dirs</varname>, then the
             <code>include_path</code> for the PHP environment is searched.
         </para>
 
@@ -135,7 +135,7 @@ if (Zend_Loader::isReadable($filename)) {
         </example>
 
         <para>
-            The <code>$filename</code> argument specifies the filename to
+            The <varname>$filename</varname> argument specifies the filename to
             check. This may contain path information.
             This method is a wrapper for the PHP function
             <ulink url="http://php.net/is_readable"><methodname>is_readable()</methodname></ulink>.

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

@@ -187,12 +187,12 @@ Array
         </example>
 
         <para>
-            Since <methodname>getDate()</methodname> is "locale-aware", specifying the <code>$locale</code> is sufficient for date
+            Since <methodname>getDate()</methodname> is "locale-aware", specifying the <varname>$locale</varname> is sufficient for date
             strings adhering to that locale's format. The option '<code>fix_date</code>' uses simple tests to
             determine if the day or month is not valid, and then applies heuristics to try and correct any detected
             problems. Note the use of '<classname>Zend_Locale_Format::STANDARD</classname>' as the value for
             '<code>date_format</code>' to prevent the use of a class-wide default date format set using
-            <methodname>setOptions()</methodname>. This forces getDate to use the default date format for <code>$locale</code>.
+            <methodname>setOptions()</methodname>. This forces getDate to use the default date format for <varname>$locale</varname>.
         </para>
 
         <example id="zend.locale.date.normalize.example-2">
@@ -228,9 +228,9 @@ print_r ($date);
         </example>
 
         <para>
-            If a specific format is desired, specify the <code>$format</code> argument, without giving a
-            <code>$locale</code>. Only single-letter codes (H, m, s, y, M, d), and MMMM and EEEE are supported in the
-            <code>$format</code>.
+            If a specific format is desired, specify the <varname>$format</varname> argument, without giving a
+            <varname>$locale</varname>. Only single-letter codes (H, m, s, y, M, d), and MMMM and EEEE are supported in the
+            <varname>$format</varname>.
         </para>
 
         <example id="zend.locale.date.normalize.example-4">

+ 2 - 2
documentation/manual/en/module_specs/Zend_Locale-Parsing.xml

@@ -428,8 +428,8 @@ if (Zend_Locale_Format::isInteger('13.445', array('locale' => $locale)) {
             Most software and PHP functions expect input using Arabic numerals. Fortunately, converting this input
             to its equivalent Latin numerals "100" requires little effort using
             <methodname>convertNumerals($inputNumeralString, $sourceNumeralSystem, $destNumeralSystem)</methodname>
-            , which returns the <code>$input</code> with numerals in the script <code>$sourceNumeralSystem</code>
-            converted to the script <code>$destNumeralSystem</code>.
+            , which returns the <varname>$input</varname> with numerals in the script <varname>$sourceNumeralSystem</varname>
+            converted to the script <varname>$destNumeralSystem</varname>.
         </para>
 
         <example id="zend.locale.numbersystems.example-1">

+ 6 - 6
documentation/manual/en/module_specs/Zend_Memory-MemoryManager.xml

@@ -15,12 +15,12 @@
         </para>
 
         <para>
-            The first argument <code>$backendName</code> is a string that
+            The first argument <varname>$backendName</varname> is a string that
             names one of the backend implementations supported by <classname>Zend_Cache</classname>.
         </para>
 
         <para>
-            The second argument <code>$backendOptions</code> is an optional
+            The second argument <varname>$backendOptions</varname> is an optional
             backend options array.
         </para>
 
@@ -82,8 +82,8 @@ $memObject = $memoryManager->create($data);
             </para>
 
             <para>
-                The <code>$data</code> argument is optional and used to
-                initialize the object value. If the <code>$data</code>
+                The <varname>$data</varname> argument is optional and used to
+                initialize the object value. If the <varname>$data</varname>
                 argument is omitted, the value is an empty string.
             </para>
 
@@ -102,8 +102,8 @@ $memObject = $memoryManager->createLocked($data);
             </para>
 
             <para>
-                The <code>$data</code> argument is optional and used to
-                initialize the object value. If the <code>$data</code>
+                The <varname>$data</varname> argument is optional and used to
+                initialize the object value. If the <varname>$data</varname>
                 argument is omitted, the value is an empty string.
             </para>
 

+ 8 - 8
documentation/manual/en/module_specs/Zend_Mime_Part.xml

@@ -54,50 +54,50 @@ public $language;
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>$charset</code>
+                    <varname>$charset</varname>
                     has to be set to the actual charset of the content if it is a text type (Text or HTML).
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$id</code>
+                    <varname>$id</varname>
                     may be set to identify a content-id for inline images in a HTML mail.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$filename</code>
+                    <varname>$filename</varname>
                     contains the name the file will get when downloading it.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$disposition</code>
+                    <varname>$disposition</varname>
                     defines if the file should be treated as an attachment or if it is used inside
                     the (HTML-) mail (inline).
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$description</code>
+                    <varname>$description</varname>
                     is only used for informational purposes.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$boundary</code>
+                    <varname>$boundary</varname>
                     defines string as boundary.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$location</code>
+                    <varname>$location</varname>
                     can be used as resource URI that has relation to the content.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>$language</code>
+                    <varname>$language</varname>
                     defines languages in the content.
                 </para>
             </listitem>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Navigation-Containers.xml

@@ -513,7 +513,7 @@ $container->removePages();      // removes all pages
             null if it cannot be found. The second method will return
             all pages with a property matching the given value. The third
             method will call one of the two former methods depending on the
-            <code>$all</code> flag.
+            <varname>$all</varname> flag.
         </para>
 
         <para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml

@@ -630,7 +630,7 @@ public function setLineDashingPattern($pattern, $phase = 0);
         <para>
         <classname>Zend_Pdf_Page::drawRectangle()</classname>, <classname>Zend_Pdf_Page::drawPolygon()</classname>,
         <classname>Zend_Pdf_Page::drawCircle()</classname> and <classname>Zend_Pdf_Page::drawEllipse()</classname> methods take
-        <code>$fillType</code> argument as an optional parameter. It can be:
+        <varname>$fillType</varname> argument as an optional parameter. It can be:
         </para>
 
         <itemizedlist>
@@ -647,7 +647,7 @@ public function setLineDashingPattern($pattern, $phase = 0);
 
         <para>
         <classname>Zend_Pdf_Page::drawPolygon()</classname> methods also takes an additional parameter
-        <code>$fillMethod</code>:
+        <varname>$fillMethod</varname>:
         </para>
         <itemizedlist>
             <listitem>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Pdf-Pages.xml

@@ -47,7 +47,7 @@
         </para>
 
         <para>
-            Document pages are stored in the <code>$pages</code> public attribute of the <classname>Zend_Pdf</classname> class.
+            Document pages are stored in the <varname>$pages</varname> public attribute of the <classname>Zend_Pdf</classname> class.
             The attribute holds an array of <classname>Zend_Pdf_Page</classname> objects and completely defines the instances and order of pages.
             This array can be manipulated like any other PHP array:
         </para>

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

@@ -86,7 +86,7 @@
 
             <listitem><para>
                 <methodname>getTags($filter)</methodname>: Retrieve all tags, or all tags
-                matching the given <code>$filter</code> string. The tags
+                matching the given <varname>$filter</varname> string. The tags
                 returned will be an array of
                 <classname>Zend_Reflection_Docblock_Tag</classname> objects.
             </para></listitem>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Search_Lucene-Overview.xml

@@ -97,7 +97,7 @@ $doc->addField(Zend_Search_Lucene_Field::UnStored('contents',
 
             <para>
                 Each of these methods (excluding the <classname>Zend_Search_Lucene_Field::Binary()</classname> method) has an optional
-                <code>$encoding</code> parameter for specifying input data encoding.
+                <varname>$encoding</varname> parameter for specifying input data encoding.
             </para>
 
             <para>

+ 7 - 7
documentation/manual/en/module_specs/Zend_Search_Lucene-Queries.xml

@@ -193,7 +193,7 @@ $hits  = $index->find($query);
         </para>
 
         <para>
-            The <code>$signs</code> array contains information about the term type:
+            The <varname>$signs</varname> array contains information about the term type:
             <itemizedlist>
                 <listitem>
                     <para>
@@ -323,7 +323,7 @@ $hits  = $index->find($query);
         </para>
 
         <para>
-            The <code>$signs</code> array contains information about the subquery type:
+            The <varname>$signs</varname> array contains information about the subquery type:
             <itemizedlist>
                 <listitem>
                     <para>
@@ -514,17 +514,17 @@ Zend_Search_Lucene_Search_Query_Phrase(
 ]]></programlisting>
 
         <para>
-            The <code>$terms</code> parameter is an array of strings that contains a set of phrase terms.
+            The <varname>$terms</varname> parameter is an array of strings that contains a set of phrase terms.
             If it's omitted or equal to null, then an empty query is constructed.
         </para>
 
         <para>
-            The <code>$offsets</code> parameter is an array of integers that contains offsets of terms in a phrase.
+            The <varname>$offsets</varname> parameter is an array of integers that contains offsets of terms in a phrase.
             If it's omitted or equal to null, then the terms' positions are assumed to be sequential with no gaps.
         </para>
 
         <para>
-            The <code>$field</code> parameter is a string that indicates the document field to search.
+            The <varname>$field</varname> parameter is a string that indicates the document field to search.
             If it's omitted or equal to null, then the default field is searched.
         </para>
 
@@ -570,11 +570,11 @@ Zend_Search_Lucene_Search_Query_Phrase::addTerm(
 ]]></programlisting>
 
         <para>
-            The <code>$term</code> parameter describes the next term in the phrase. It must indicate the same field as previous terms, or an exception will be thrown.
+            The <varname>$term</varname> parameter describes the next term in the phrase. It must indicate the same field as previous terms, or an exception will be thrown.
         </para>
 
         <para>
-            The <code>$position</code> parameter indicates the term position in the phrase.
+            The <varname>$position</varname> parameter indicates the term position in the phrase.
         </para>
 
         <para>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml

@@ -290,18 +290,18 @@ $index->find($query [, $sortField [, $sortType [, $sortOrder]]]
         </para>
 
         <para>
-             A name of stored field by which to sort result should be passed as the <code>$sortField</code> parameter.
+             A name of stored field by which to sort result should be passed as the <varname>$sortField</varname> parameter.
         </para>
 
         <para>
-            <code>$sortType</code> may be omitted or take the following enumerated values:
+            <varname>$sortType</varname> may be omitted or take the following enumerated values:
             <code>SORT_REGULAR</code> (compare items normally- default value),
             <code>SORT_NUMERIC</code> (compare items numerically),
             <code>SORT_STRING</code> (compare items as strings).
         </para>
 
         <para>
-            <code>$sortOrder</code> may be omitted or take the following enumerated values:
+            <varname>$sortOrder</varname> may be omitted or take the following enumerated values:
             <code>SORT_ASC</code> (sort in ascending order- default value),
             <code>SORT_DESC</code> (sort in descending order).
         </para>
@@ -448,7 +448,7 @@ interface Zend_Search_Lucene_Search_Highlighter_Interface
             provided to the <classname>Zend_Search_Lucene_Search_Query->highlightMatches()</classname> method.
         </para>
         <para>
-            If <code>$highlighter</code> parameter is omitted, then <classname>Zend_Search_Lucene_Search_Highlighter_Default</classname>
+            If <varname>$highlighter</varname> parameter is omitted, then <classname>Zend_Search_Lucene_Search_Highlighter_Default</classname>
             object is instantiated and used.
         </para>
         <para>

+ 6 - 6
documentation/manual/en/module_specs/Zend_Service_Amazon_S3.xml

@@ -228,10 +228,10 @@ foreach($list as $bucket) {
         <itemizedlist>
             <listitem>
                 <para>
-                    <methodname>putObject($object, $data, $meta)</methodname> created an object with name <code>$object</code>
-                    (should contain the bucket name as prefix!) having <code>$data</code> as its content.
+                    <methodname>putObject($object, $data, $meta)</methodname> created an object with name <varname>$object</varname>
+                    (should contain the bucket name as prefix!) having <varname>$data</varname> as its content.
                 </para>
-                <para>Optional <code>$meta</code> parameter is the array of metadata, which currently supports the
+                <para>Optional <varname>$meta</varname> parameter is the array of metadata, which currently supports the
                 following parameters as keys:
                 </para>
                 <variablelist>
@@ -362,11 +362,11 @@ foreach($list as $name) {
             </listitem>
             <listitem>
                 <para>
-                    <methodname>putFile($path, $object, $meta)</methodname> puts the content of the file in <code>$path</code>
-                    into the object named <code>$object</code>.
+                    <methodname>putFile($path, $object, $meta)</methodname> puts the content of the file in <varname>$path</varname>
+                    into the object named <varname>$object</varname>.
                 </para>
                 <para>
-                The optional <code>$meta</code> argument is the same as for <code>putObject</code>. If the
+                The optional <varname>$meta</varname> argument is the same as for <code>putObject</code>. If the
                 content type is omitted, it will be guessed basing on the source file name.
                 </para>
             </listitem>

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

@@ -240,7 +240,7 @@ foreach($list as $queue) {
             <listitem>
                 <para>
                     <methodname>sent($queue_url, $message)</methodname> send the
-                    <code>$message</code> to the <code>$queue_url</code> SQS
+                    <varname>$message</varname> to the <varname>$queue_url</varname> SQS
                     queue URL.
                 </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_Service_Audioscrobbler.xml

@@ -143,21 +143,21 @@
                 <listitem>
                     <para>
                         <methodname>userGetPreviousWeeklyArtistChart($fromDate, $toDate)</methodname>: Returns a SimpleXML object
-                        containing the Weekly Artist Chart from <code>$fromDate</code> to <code>$toDate</code> for the
+                        containing the Weekly Artist Chart from <varname>$fromDate</varname> to <varname>$toDate</varname> for the
                         current user.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <methodname>userGetPreviousWeeklyAlbumChart($fromDate, $toDate)</methodname>: Returns a SimpleXML object
-                        containing the Weekly Album Chart from <code>$fromDate</code> to <code>$toDate</code> for the
+                        containing the Weekly Album Chart from <varname>$fromDate</varname> to <varname>$toDate</varname> for the
                         current user.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <methodname>userGetPreviousWeeklyTrackChart($fromDate, $toDate)</methodname>: Returns a SimpleXML object
-                        containing the Weekly Track Chart from <code>$fromDate</code> to <code>$toDate</code> for the
+                        containing the Weekly Track Chart from <varname>$fromDate</varname> to <varname>$toDate</varname> for the
                         current user.
                     </para>
                 </listitem>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Service_StrikeIron-Overview.xml

@@ -199,7 +199,7 @@ echo $rateInfo->GST;
         In the example above, the <methodname>getService()</methodname> method is used
         to return a client to the
         <link linkend="zend.service.strikeiron.bundled-services.sales-use-tax-basic">Sales &amp; Use Tax Basic</link> service.
-        The client object is stored in <code>$taxBasic</code>.
+        The client object is stored in <varname>$taxBasic</varname>.
       </para>
 
       <para>
@@ -210,7 +210,7 @@ echo $rateInfo->GST;
 
       <para>
         The result from <methodname>getTaxRateCanada()</methodname> is stored in
-        <code>$rateInfo</code> and has properties like <code>province</code>
+        <varname>$rateInfo</varname> and has properties like <code>province</code>
         and <code>GST</code>.
       </para>
 
@@ -263,12 +263,12 @@ Zend_Service_StrikeIron_Decorator Object
       </para>
 
       <para>
-        In the output above, we see that the decorator (<code>$rateInfo</code>) wraps an object
+        In the output above, we see that the decorator (<varname>$rateInfo</varname>) wraps an object
         named <code>GetTaxRateCanadaResult</code>, the result of the call to <methodname>getTaxRateCanada()</methodname>.
       </para>
 
       <para>
-        This means that <code>$rateInfo</code> has public properties like <code>abbreviation</code>,
+        This means that <varname>$rateInfo</varname> has public properties like <code>abbreviation</code>,
         <code>province</code>, and <code>GST</code>. These are accessed like <code>$rateInfo->province</code>.
       </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml

@@ -297,8 +297,8 @@ try {
             The second parameter in the constructor above tells <classname>Zend_Session_Namespace</classname> that any future
             instances with the "<classname>Zend_Auth</classname>" namespace are not allowed. Attempting to create such an instance
             causes an exception to be thrown by the constructor. The developer therefore becomes responsible for storing
-            a reference to an instance object (<code>$authSpaceAccessor1</code>, <code>$authSpaceAccessor2</code>, or
-            <code>$authSpaceAccessor3</code> in the example above) somewhere, if access to the session namespace is
+            a reference to an instance object (<varname>$authSpaceAccessor1</varname>, <varname>$authSpaceAccessor2</varname>, or
+            <varname>$authSpaceAccessor3</varname> in the example above) somewhere, if access to the session namespace is
             needed at a later time during the same request. For example, a developer may store the reference in a static
             variable, add the reference to a
             <ulink url="http://www.martinfowler.com/eaaCatalog/registry.html">registry</ulink> (see
@@ -446,7 +446,7 @@ echo $myNamespace->someArray['foo']; // prints "bar"
             <code>tests/Zend/Session</code>, which make use of PHP's <methodname>exec()</methodname> to launch a separate process.
             The new process more accurately simulates a second, successive request from a browser. The separate process
             begins with a "clean" session, just like any PHP script execution for a web request. Also, any changes to
-            <code>$_SESSION</code> made in the calling process become available to the child process, provided the
+            <varname>$_SESSION</varname> made in the calling process become available to the child process, provided the
             parent closed the session before using <methodname>exec()</methodname>.
         </para>
 

+ 6 - 6
documentation/manual/en/module_specs/Zend_Session-BasicUsage.xml

@@ -8,14 +8,14 @@
         <classname>Zend_Session_Namespace</classname> instances provide the primary API for manipulating session data in the Zend
         Framework. Namespaces are used to segregate all session data, although a default namespace exists for those who
         only want one namespace for all their session data. <classname>Zend_Session</classname> utilizes ext/session and its
-        special <code>$_SESSION</code> superglobal as the storage mechanism for session state data. While
-        <code>$_SESSION</code> is still available in PHP's global namespace, developers should refrain from directly
+        special <varname>$_SESSION</varname> superglobal as the storage mechanism for session state data. While
+        <varname>$_SESSION</varname> is still available in PHP's global namespace, developers should refrain from directly
         accessing it, so that <classname>Zend_Session</classname> and <classname>Zend_Session_Namespace</classname> can most effectively and
         securely provide its suite of session related functionality.
     </para>
 
     <para>
-        Each instance of <classname>Zend_Session_Namespace</classname> corresponds to an entry of the <code>$_SESSION</code>
+        Each instance of <classname>Zend_Session_Namespace</classname> corresponds to an entry of the <varname>$_SESSION</varname>
         superglobal array, where the namespace is used as the key.
 
         <programlisting language="php"><![CDATA[
@@ -24,8 +24,8 @@ $myNamespace = new Zend_Session_Namespace('myNamespace');
 // $myNamespace corresponds to $_SESSION['myNamespace']
 ]]></programlisting>
 
-        It is possible to use Zend_Session in conjunction with other code that uses <code>$_SESSION</code> directly. To
-        avoid problems, however, it is highly recommended that such code only uses parts of <code>$_SESSION</code> that
+        It is possible to use Zend_Session in conjunction with other code that uses <varname>$_SESSION</varname> directly. To
+        avoid problems, however, it is highly recommended that such code only uses parts of <varname>$_SESSION</varname> that
         do not correspond to instances of <classname>Zend_Session_Namespace</classname>.
     </para>
 
@@ -64,7 +64,7 @@ echo "Page requests this session: ",
         <para>
             When multiple modules use instances of <classname>Zend_Session_Namespace</classname> having different namespaces, each
             module obtains data encapsulation for its session data. The <classname>Zend_Session_Namespace</classname> constructor
-            can be passed an optional <code>$namespace</code> argument, which allows developers to partition session
+            can be passed an optional <varname>$namespace</varname> argument, which allows developers to partition session
             data into separate namespaces. Namespacing provides an effective and popular way to secure session state
             data against changes due to accidental naming collisions.
         </para>

+ 9 - 9
documentation/manual/en/module_specs/Zend_Session-GlobalSessionManagement.xml

@@ -255,7 +255,7 @@ Zend_Session::setOptions($config->toArray());
             identifiers. The cookie's value is the unique identifier of your browser's session. PHP's ext/session
             uses this identifier to maintain a unique one-to-one relationship between website visitors, and
             persistent session data storage unique to each visitor. Zend_Session* wraps this storage mechanism
-            (<code>$_SESSION</code>) with an object-oriented interface. Unfortunately, if an attacker gains access
+            (<varname>$_SESSION</varname>) with an object-oriented interface. Unfortunately, if an attacker gains access
             to the value of the cookie (the session id), an attacker might be able to hijack a visitor's session.
             This problem is not unique to PHP, or Zend Framework. The <methodname>regenerateId()</methodname> method allows
             an application to change the session id (stored in the visitor's cookie) to a new, random, unpredictable
@@ -418,7 +418,7 @@ if (!isset($defaultNamespace->initialized)) {
             session. However, no variables in PHP are affected, so your namespaced sessions (instances of
             <classname>Zend_Session_Namespace</classname>) remain readable. To complete a "logout", set the optional parameter to
             <constant>TRUE</constant> (the default) to also delete the user agent's session id cookie. The optional
-            <code>$readonly</code> parameter removes the ability to create new <classname>Zend_Session_Namespace</classname>
+            <varname>$readonly</varname> parameter removes the ability to create new <classname>Zend_Session_Namespace</classname>
             instances and for <classname>Zend_Session</classname> methods to write to the session data store.
         </para>
 
@@ -434,7 +434,7 @@ if (!isset($defaultNamespace->initialized)) {
         <note>
             <title>Throws</title>
             <para>
-                By default, <code>$readonly</code> is enabled and further actions involving writing to the session data
+                By default, <varname>$readonly</varname> is enabled and further actions involving writing to the session data
                 store will throw an exception.
             </para>
         </note>
@@ -461,8 +461,8 @@ if (!isset($defaultNamespace->initialized)) {
         <title>writeClose($readonly = true)</title>
 
         <para>
-            Shutdown the session, close writing and detach <code>$_SESSION</code> from the back-end storage mechanism.
-            This will complete the internal data transformation on this request. The optional <code>$readonly</code>
+            Shutdown the session, close writing and detach <varname>$_SESSION</varname> from the back-end storage mechanism.
+            This will complete the internal data transformation on this request. The optional <varname>$readonly</varname>
             boolean parameter can remove write access by throwing an exception upon any attempt to write to the session
             via <classname>Zend_Session</classname> or <classname>Zend_Session_Namespace</classname>.
         </para>
@@ -470,10 +470,10 @@ if (!isset($defaultNamespace->initialized)) {
         <note>
             <title>Throws</title>
             <para>
-                By default, <code>$readonly</code> is enabled and further actions involving writing to the session data
-                store will throw an exception. However, some legacy application might expect <code>$_SESSION</code> to
+                By default, <varname>$readonly</varname> is enabled and further actions involving writing to the session data
+                store will throw an exception. However, some legacy application might expect <varname>$_SESSION</varname> to
                 remain writable after ending the session via <methodname>session_write_close()</methodname>. Although not considered
-                "best practice", the <code>$readonly</code> option is available for those who need it.
+                "best practice", the <varname>$readonly</varname> option is available for those who need it.
             </para>
         </note>
 
@@ -550,7 +550,7 @@ if (!isset($defaultNamespace->initialized)) {
 
         <para>
             DEPRECATED: Use <methodname>getIterator()</methodname> in <classname>Zend_Session_Namespace</classname>. This method returns an
-            array of the contents of <code>$namespace</code>. If you have logical reasons to keep this method publicly
+            array of the contents of <varname>$namespace</varname>. If you have logical reasons to keep this method publicly
             accessible, please provide feedback to the
             <ulink url="mailto:fw-auth@lists.zend.com">fw-auth@lists.zend.com</ulink> mail list. Actually, all
             participation on any relevant topic is welcome :)

+ 2 - 2
documentation/manual/en/module_specs/Zend_Session-Introduction.xml

@@ -17,7 +17,7 @@
         client side and are only shared with the client when server-side source code voluntarily makes the data
         available in response to a client request. For the purposes of this component and documentation, the term
         "session data" refers to the server-side data stored in
-        <ulink url="http://www.php.net/manual/en/reserved.variables.php#reserved.variables.session"><code>$_SESSION</code></ulink>,
+        <ulink url="http://www.php.net/manual/en/reserved.variables.php#reserved.variables.session"><varname>$_SESSION</varname></ulink>,
         managed by <classname>Zend_Session</classname>, and individually manipulated by <classname>Zend_Session_Namespace</classname>
         accessor objects. <emphasis>Session namespaces</emphasis> provide access to session data using
         classic <ulink url="http://en.wikipedia.org/wiki/Namespace_%28computer_science%29">namespaces</ulink>
@@ -26,7 +26,7 @@
 
     <para>
         <classname>Zend_Session_Namespace</classname> instances are accessor objects for namespaced slices of
-        <code>$_SESSION</code>. The <classname>Zend_Session</classname> component wraps the existing PHP ext/session with an
+        <varname>$_SESSION</varname>. The <classname>Zend_Session</classname> component wraps the existing PHP ext/session with an
         administration and management interface, as well as providing an API for <classname>Zend_Session_Namespace</classname> to
         persist session namespaces. <classname>Zend_Session_Namespace</classname> provides a standardized, object-oriented
         interface for working with namespaces persisted inside PHP's standard session mechanism. Support exists for

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

@@ -287,7 +287,7 @@ $autodiscover->handle();
                                 <classname>Zend_Soap_AutoDiscover</classname> will be created with the <classname>Zend_Soap_Wsdl_Strategy_DefaultComplexType</classname>
                                 class as detection algorithm for complex types. The first parameter of the AutoDiscover constructor takes
                                 any complex type strategy implementing <classname>Zend_Soap_Wsdl_Strategy_Interface</classname> or a string with the name
-                                of the class. For backwards compatibility with <code>$extractComplexType</code> boolean variables are parsed
+                                of the class. For backwards compatibility with <varname>$extractComplexType</varname> boolean variables are parsed
                                 exactly like in <classname>Zend_Soap_Wsdl</classname>. See the <link linkend="zend.soap.wsdl.types.add_complex"><classname>Zend_Soap_Wsdl</classname> manual
                                 on adding complex</link> types for more information.
                             </para>

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

@@ -29,12 +29,12 @@
             <itemizedlist>
                 <listitem>
                     <para>
-                        <code>$wsdl</code> - the URI of a WSDL file.
+                        <varname>$wsdl</varname> - the URI of a WSDL file.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>$options</code> - options to create SOAP client object.
+                        <varname>$options</varname> - options to create SOAP client object.
                     </para>
                 </listitem>
             </itemizedlist>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Soap_Server.xml

@@ -39,7 +39,7 @@
                 <orderedlist>
                     <listitem>
                         <para>
-                            <code>$wsdl</code>, which is an URI of a WSDL file<footnote>
+                            <varname>$wsdl</varname>, which is an URI of a WSDL file<footnote>
                                                                                   <para>
                                                                                       May be set later using <methodname>setWsdl($wsdl)</methodname> method.
                                                                                   </para>
@@ -48,7 +48,7 @@
                     </listitem>
                     <listitem>
                         <para>
-                            <code>$options</code> - options to create SOAP server object<footnote>
+                            <varname>$options</varname> - options to create SOAP server object<footnote>
                                                                                             <para>
                                                                                                 Options may be set later using
                                                                                                 <methodname>setOptions($options)</methodname> method.
@@ -104,7 +104,7 @@
             </para>
 
             <para>
-                The second constructor parameter (<code>$options</code>) is an array with options to create
+                The second constructor parameter (<varname>$options</varname>) is an array with options to create
                 SOAP server object<footnote>
                                       <para>
                                           Options may be set later using <methodname>setOptions($options)</methodname> method.

+ 11 - 11
documentation/manual/en/module_specs/Zend_Soap_Wsdl.xml

@@ -20,18 +20,18 @@
             <classname>Zend_Soap_Wsdl</classname> constructor takes three parameters:
             <orderedlist>
                 <listitem>
-                    <simpara><code>$name</code> - name of the Web Service being described.</simpara>
+                    <simpara><varname>$name</varname> - name of the Web Service being described.</simpara>
                 </listitem>
                 <listitem>
                     <simpara>
-                        <code>$uri</code> - URI where the WSDL will be available
+                        <varname>$uri</varname> - URI where the WSDL will be available
                         (could also be a reference to the file in the filesystem.)
                     </simpara>
                 </listitem>
                 <listitem>
                     <simpara>
-                        <code>$strategy</code> - optional flag used to identify the strategy for complex types (objects)
-                        detection. This was a boolean <code>$extractComplexTypes</code> before version 1.7 and can
+                        <varname>$strategy</varname> - optional flag used to identify the strategy for complex types (objects)
+                        detection. This was a boolean <varname>$extractComplexTypes</varname> before version 1.7 and can
                         still be set as a boolean for backwards compatibility. By default the 1.6 detection behaviour
                         is set. To read more on complex type detection strategies go to the section:
                         <xref linkend="zend.soap.wsdl.types.add_complex" />.
@@ -52,10 +52,10 @@
             <classname>Zend_Soap_Client</classname> functionality.
         </para>
         <para>
-           <code>$name</code> parameter represents message name.
+           <varname>$name</varname> parameter represents message name.
         </para>
         <para>
-           <code>$parts</code> parameter is an array of message parts which describe SOAP call parameters.
+           <varname>$parts</varname> parameter is an array of message parts which describe SOAP call parameters.
            It's an associative array: 'part name' (SOAP call parameter name) =&gt; 'part type'.
         </para>
         <para>
@@ -112,7 +112,7 @@
         </para>
         <para>
             It also adds corresponding port operation messages depending on specified
-            <code>$input</code>, <code>$output</code> and <code>$fault</code> parameters.
+            <varname>$input</varname>, <varname>$output</varname> and <varname>$fault</varname> parameters.
 
             <note>
                 <para>
@@ -164,7 +164,7 @@
         </para>
         <para>
             It takes <code>XML_Tree_Node</code> object returned by <methodname>addBinding()</methodname> as an input
-            (<code>$binding</code> parameter) to add 'operation' element with input/output/false entries depending on
+            (<varname>$binding</varname> parameter) to add 'operation' element with input/output/false entries depending on
             specified parameters
         </para>
         <para>
@@ -255,7 +255,7 @@
                     </para>
                 </listitem>
             </itemizedlist>
-            where <code>$name</code> is a class name for the Web Service definition mode using class and
+            where <varname>$name</varname> is a class name for the Web Service definition mode using class and
             script name for the Web Service definition mode using set of functions.
         </para>
         <para>
@@ -295,7 +295,7 @@
                                 By default <classname>Zend_Soap_Wsdl</classname> will be created with the <classname>Zend_Soap_Wsdl_Strategy_DefaultComplexType</classname>
                                 class as detection algorithm for complex types. The first parameter of the AutoDiscover constructor takes
                                 any complex type strategy implementing <classname>Zend_Soap_Wsdl_Strategy_Interface</classname> or a string with the name
-                                of the class. For backwards compatibility with <code>$extractComplexType</code> boolean variables are parsed
+                                of the class. For backwards compatibility with <varname>$extractComplexType</varname> boolean variables are parsed
                                 the following way: If true, <classname>Zend_Soap_Wsdl_Strategy_DefaultComplexType</classname>, if false
                                 <classname>Zend_Soap_Wsdl_Strategy_AnyType</classname>.
                             </para>
@@ -384,7 +384,7 @@ $soapMyClassType = $wsdl->getType('MyClass');
                     <para>Class <classname>Zend_Soap_Wsdl_Strategy_Composite</classname>: This strategy can
                     combine all strategies by connecting PHP Complex types (Classnames) to the desired strategy
                     via the <methodname>connectTypeToStrategy($type, $strategy)</methodname> method. A complete typemap can be
-                    given to the constructor as an array with <code>$type</code> -> <code>$strategy</code> pairs.
+                    given to the constructor as an array with <varname>$type</varname> -> <varname>$strategy</varname> pairs.
                     The second parameter specifies the default strategy that will be used if an unknown type is
                     requested for adding. This parameter defaults to the <classname>Zend_Soap_Wsdl_Strategy_DefaultComplexType</classname>
                     strategy.</para>

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

@@ -37,7 +37,7 @@
             <listitem><para>
                 <methodname>assertQuery($path, $message = '')</methodname>: assert that
                 one or more DOM elements matching the given CSS selector are
-                present. If a <code>$message</code> is present, it will be
+                present. If a <varname>$message</varname> is present, it will be
                 prepended to any failed assertion message.
             </para></listitem>
 
@@ -45,8 +45,8 @@
                 <code>assertQueryContentContains($path, $match, $message =
                     '')</code>: assert that one or more DOM elements matching
                 the given CSS selector are present, and that at least one
-                contains the content provided in <code>$match</code>. If a
-                <code>$message</code> is present, it will be prepended to any
+                contains the content provided in <varname>$match</varname>. If a
+                <varname>$message</varname> is present, it will be prepended to any
                 failed assertion message.
             </para></listitem>
 
@@ -55,37 +55,37 @@
                     '')</code>: assert that one or more DOM elements matching
                 the given CSS selector are present, and that at least one
                 matches the regular expression provided in
-                <code>$pattern</code>. If a <code>$message</code> is present,
+                <varname>$pattern</varname>. If a <varname>$message</varname> is present,
                 it will be prepended to any failed assertion message.
             </para></listitem>
 
             <listitem><para>
                 <code>assertQueryCount($path, $count, $message =
                     '')</code>: assert that there are exactly
-                <code>$count</code> DOM elements matching the given CSS
-                selector present. If a <code>$message</code> is present, it
+                <varname>$count</varname> DOM elements matching the given CSS
+                selector present. If a <varname>$message</varname> is present, it
                 will be prepended to any failed assertion message.
             </para></listitem>
 
             <listitem><para>
                 <code>assertQueryCountMin($path, $count, $message =
                     '')</code>: assert that there are at least
-                <code>$count</code> DOM elements matching the given CSS
-                selector present. If a <code>$message</code> is present, it
+                <varname>$count</varname> DOM elements matching the given CSS
+                selector present. If a <varname>$message</varname> is present, it
                 will be prepended to any failed assertion message.
                 <emphasis>Note:</emphasis> specifying a value of 1 for
-                <code>$count</code> is the same as simply using
+                <varname>$count</varname> is the same as simply using
                 <methodname>assertQuery()</methodname>.
             </para></listitem>
 
             <listitem><para>
                 <code>assertQueryCountMax($path, $count, $message =
                     '')</code>: assert that there are no more than
-                <code>$count</code> DOM elements matching the given CSS
-                selector present. If a <code>$message</code> is present, it
+                <varname>$count</varname> DOM elements matching the given CSS
+                selector present. If a <varname>$message</varname> is present, it
                 will be prepended to any failed assertion message.
                 <emphasis>Note:</emphasis> specifying a value of 1 for
-                <code>$count</code> is the same as simply using
+                <varname>$count</varname> is the same as simply using
                 <methodname>assertQuery()</methodname>.
             </para></listitem>
         </itemizedlist>
@@ -168,27 +168,27 @@
             <listitem><para>
                 <methodname>assertRedirectTo($url, $message = '')</methodname>: assert that
                 a redirect has occurred, and that the value of the Location
-                header is the <code>$url</code> provided.
+                header is the <varname>$url</varname> provided.
             </para></listitem>
 
             <listitem><para>
                 <methodname>assertNotRedirectTo($url, $message = '')</methodname>: assert that
                 a redirect has either NOT occurred, or that the value of the Location
-                header is NOT the <code>$url</code> provided.
+                header is NOT the <varname>$url</varname> provided.
             </para></listitem>
 
             <listitem><para>
                 <methodname>assertRedirectRegex($pattern, $message = '')</methodname>:
                 assert that a redirect has occurred, and that the value of the
                 Location header matches the regular expression provided by
-                <code>$pattern</code>.
+                <varname>$pattern</varname>.
             </para></listitem>
 
             <listitem><para>
                 <methodname>assertNotRedirectRegex($pattern, $message = '')</methodname>:
                 assert that a redirect has either NOT occurred, or that the value of the
                 Location header does NOT match the regular expression provided by
-                <code>$pattern</code>.
+                <varname>$pattern</varname>.
             </para></listitem>
         </itemizedlist>
     </sect3>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Bootstrapping.xml

@@ -16,7 +16,7 @@
     <para>
         In order to test your MVC application, you will need to bootstrap it.
         There are several ways to do this, all of which hinge on the public
-        <code>$bootstrap</code> property.
+        <varname>$bootstrap</varname> property.
     </para>
 
     <para>
@@ -84,7 +84,7 @@ class UserControllerTest extends Zend_Test_PHPUnit_ControllerTestCase
         environment to a clean request state, resetting any plugins and
         helpers, resetting the front controller instance, and creating new
         request and response objects. Once this is done, it will then either
-        <code>include</code> the file specified in <code>$bootstrap</code>, or
+        <code>include</code> the file specified in <varname>$bootstrap</varname>, or
         call the callback specified.
     </para>
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Testing.xml

@@ -154,7 +154,7 @@
                         <entry>
                             Create a DataTable Object that is filled with the data from a given
                             <classname>Zend_Db_Table_Rowset_Abstract</classname> instance. The table
-                            the rowset is connected to is chosen when <code>$tableName</code> is
+                            the rowset is connected to is chosen when <varname>$tableName</varname> is
                             null.
                         </entry>
                     </row>
@@ -179,7 +179,7 @@
                         </entry>
 
                         <entry>
-                            Create a DataSet containing the given <code>$tables</code>, an array of
+                            Create a DataSet containing the given <varname>$tables</varname>, an array of
                             <classname>Zend_Db_Table_Abstract</classname> instances.
                         </entry>
                     </row>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Translate-Additional.xml

@@ -594,7 +594,7 @@ $translate = new Zend_Translate(
             locale for which you want to do the check. The optional second parameter declares
             whether translation is fixed to the declared language or a lower set of translations
             can be used. If you have a text which can be returned for 'en' but not for 'en_US' you
-            will normally get the translation returned, but by setting <code>$original</code> to
+            will normally get the translation returned, but by setting <varname>$original</varname> to
             true, <methodname>isTranslated()</methodname> will return false.
         </para>
 
@@ -728,7 +728,7 @@ $translate->translate('unknown string');
         </para>
 
         <para>
-            Both methods accept an optional parameter <code>$locale</code> which, if set, returns
+            Both methods accept an optional parameter <varname>$locale</varname> which, if set, returns
             the translation data for the specified language. If this parameter is not given, the
             actual set language will be used. Keep in mind that normally all translations should be
             available in all languages. Which means that in a normal situation you will not have to

+ 3 - 3
documentation/manual/en/module_specs/Zend_Validate-Db.xml

@@ -33,7 +33,7 @@ if ($validator->isValid($emailaddress)) {
         <para>
             The above will test that a given email address is in the database
             table. If no record is found containing the value of
-            <code>$emailaddress</code> in the specified column, then an error
+            <varname>$emailaddress</varname> in the specified column, then an error
             message is displayed.
         </para>
 
@@ -54,7 +54,7 @@ if ($validator->isValid($username)) {
         <para>
             The above will test that a given username is not in the database
             table. If a record is found containing the value of
-            <code>$username</code> in the specified column, then an error
+            <varname>$username</varname> in the specified column, then an error
             message is displayed.
         </para>
     </sect3>
@@ -134,7 +134,7 @@ if ($validator->isValid($username)) {
         <para>
             The above example will check the <code>posts_categories</code> table
             to ensure that a record with the <code>post_id</code> has a value
-            matching <code>$category_id</code>
+            matching <varname>$category_id</varname>
         </para>
     </sect3>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Validate-EmailAddress.xml

@@ -29,7 +29,7 @@ if ($validator->isValid($email)) {
 }
 ]]></programlisting>
 
-        This will match the email address <code>$email</code> and on failure populate
+        This will match the email address <varname>$email</varname> and on failure populate
         <code>$validator->getMessages()</code> with useful error messages.
     </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Validate-Hostname.xml

@@ -30,7 +30,7 @@ if ($validator->isValid($hostname)) {
 }
 ]]></programlisting>
 
-        This will match the hostname <code>$hostname</code> and on failure populate
+        This will match the hostname <varname>$hostname</varname> and on failure populate
         <code>$validator->getMessages()</code> with useful error messages.
 
     </para>

+ 21 - 21
documentation/manual/en/module_specs/Zend_Validate-Set.xml

@@ -12,7 +12,7 @@
     <sect2 id="zend.validate.set.alnum">
         <title>Alnum</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> contains only alphabetic
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only alphabetic
             and digit characters. This validator includes an option to also consider white space
             characters as valid.
         </para>
@@ -30,7 +30,7 @@
     <sect2 id="zend.validate.set.alpha">
         <title>Alpha</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> contains only alphabetic
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only alphabetic
             characters. This validator includes an option to also consider white space characters
             as valid.
         </para>
@@ -52,10 +52,10 @@
     <sect2 id="zend.validate.set.between">
         <title>Between</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is between the minimum and
-            maximum boundary values. The comparison is inclusive by default (<code>$value</code> may
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is between the minimum and
+            maximum boundary values. The comparison is inclusive by default (<varname>$value</varname> may
             equal a boundary value), though this may be overridden in order to do a strict
-            comparison, where <code>$value</code> must be strictly greater than the minimum and
+            comparison, where <varname>$value</varname> must be strictly greater than the minimum and
             strictly less than the maximum.
         </para>
     </sect2>
@@ -63,7 +63,7 @@
     <sect2 id="zend.validate.set.ccnum">
         <title>Ccnum</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> follows the Luhn algorithm
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> follows the Luhn algorithm
             (mod-10 checksum) for credit card numbers.
         </para>
     </sect2>
@@ -71,7 +71,7 @@
     <sect2 id="zend.validate.set.date">
         <title>Date</title>
         <para>
-            Returns <constant>TRUE</constant> if <code>$value</code> is a valid date of the format
+            Returns <constant>TRUE</constant> if <varname>$value</varname> is a valid date of the format
             <code>YYYY-MM-DD</code>. If the optional <code>locale</code> option is set then the date
             will be validated according to the set locale. And if the optional <code>format</code>
             option is set this format is used for the validation. for details about the optional
@@ -85,7 +85,7 @@
     <sect2 id="zend.validate.set.digits">
         <title>Digits</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> only contains digit
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> only contains digit
             characters.
         </para>
     </sect2>
@@ -95,7 +95,7 @@
     <sect2 id="zend.validate.set.float">
         <title>Float</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is a floating-point value.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a floating-point value.
             Since Zend Framework 1.8 this validator takes into account the actual locale from
             browser, environment or application wide set locale. You can of course use the
             get/setLocale accessors to change the used locale or give it while creating a instance
@@ -106,7 +106,7 @@
     <sect2 id="zend.validate.set.greater_than">
         <title>GreaterThan</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is greater than the minimum
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is greater than the minimum
             boundary.
         </para>
     </sect2>
@@ -114,7 +114,7 @@
     <sect2 id="zend.validate.set.hex">
         <title>Hex</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> contains only hexadecimal
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains only hexadecimal
             digit characters.
         </para>
     </sect2>
@@ -124,7 +124,7 @@
     <sect2 id="zend.validate.set.iban">
         <title>Iban</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> contains a valid IBAN
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> contains a valid IBAN
             (International Bank Account Number). IBAN numbers are validated against the country
             where they are used and by a checksum.
         </para>
@@ -170,7 +170,7 @@ if ($validator->isValid($iban)) {
         <title>Identical</title>
         <para>
             Returns <constant>TRUE</constant> if and only if a given token is identical
-            with <code>$value</code>. This validator can handle any given type.
+            with <varname>$value</varname>. This validator can handle any given type.
         </para>
 
         <para>
@@ -196,16 +196,16 @@ if ($validator->isValid(1)) { // token invalid
     <sect2 id="zend.validate.set.in_array">
         <title>InArray</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if a "needle" <code>$value</code> is contained in
+            Returns <constant>TRUE</constant> if and only if a "needle" <varname>$value</varname> is contained in
             a "haystack" array. If the strict option is <constant>TRUE</constant>, then the type of
-            <code>$value</code> is also checked.
+            <varname>$value</varname> is also checked.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.int">
         <title>Int</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is a valid integer. Since
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a valid integer. Since
             Zend Framework 1.8 this validator takes into account the actual locale from browser,
             environment or application wide set locale. You can of course use the get/setLocale
             accessors to change the used locale or give it while creating a instance of this
@@ -216,14 +216,14 @@ if ($validator->isValid(1)) { // token invalid
     <sect2 id="zend.validate.set.ip">
         <title>Ip</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is a valid IP address.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is a valid IP address.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.less_than">
         <title>LessThan</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is less than the maximum
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is less than the maximum
             boundary.
         </para>
     </sect2>
@@ -231,14 +231,14 @@ if ($validator->isValid(1)) { // token invalid
     <sect2 id="zend.validate.set.not_empty">
         <title>NotEmpty</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> is not an empty value.
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> is not an empty value.
         </para>
     </sect2>
 
     <sect2 id="zend.validate.set.regex">
         <title>Regex</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if <code>$value</code> matches against a regular
+            Returns <constant>TRUE</constant> if and only if <varname>$value</varname> matches against a regular
             expression pattern.
         </para>
     </sect2>
@@ -248,7 +248,7 @@ if ($validator->isValid(1)) { // token invalid
     <sect2 id="zend.validate.set.string_length">
         <title>StringLength</title>
         <para>
-            Returns <constant>TRUE</constant> if and only if the string length of <code>$value</code> is at
+            Returns <constant>TRUE</constant> if and only if the string length of <varname>$value</varname> is at
             least a minimum and no greater than a maximum (when the max option is not
             <constant>NULL</constant>). The <methodname>setMin()</methodname> method throws an exception if the minimum
             length is set to a value greater than the set maximum length, and the

+ 1 - 1
documentation/manual/en/module_specs/Zend_Validate-ValidatorChains.xml

@@ -40,7 +40,7 @@ if ($validatorChain->isValid($username)) {
         In some cases it makes sense to have a validator break the chain if its validation process
         fails. <classname>Zend_Validate</classname> supports such use cases with the second
         parameter to the <methodname>addValidator()</methodname> method. By setting
-        <code>$breakChainOnFailure</code> to <constant>TRUE</constant>, the added validator will break the
+        <varname>$breakChainOnFailure</varname> to <constant>TRUE</constant>, the added validator will break the
         chain execution upon failure, which avoids running any other validations that are determined
         to be unnecessary or inappropriate for the situation. If the above example were written as
         follows, then the alphanumeric validation would not occur if the string length validation

+ 1 - 1
documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml

@@ -162,7 +162,7 @@ class MyValid_NumericBetween extends Zend_Validate_Abstract
 }
 ]]></programlisting>
 
-            The public properties <code>$minimum</code> and <code>$maximum</code> have been
+            The public properties <varname>$minimum</varname> and <varname>$maximum</varname> have been
             established to provide the minimum and maximum boundaries, respectively, for a value to
             successfully validate. The class also defines two message variables that correspond to
             the public properties and allow <code>min</code> and <code>max</code> to be used in

+ 3 - 3
documentation/manual/en/module_specs/Zend_View-Abstract.xml

@@ -38,12 +38,12 @@ protected function _run()
 
     <para>
         As such, the view scripts have access to the current object
-        (<code>$this</code>), <emphasis>and any methods or members of that
+        (<varname>$this</varname>), <emphasis>and any methods or members of that
             object</emphasis>. Since many operations depend on members with
         limited visibility, this poses a problem: the view scripts could
         potentially make calls to such methods or modify critical properties
-        directly. Imagine a script overwriting <code>$_path</code> or
-        <code>$_file</code> inadvertently -- any further calls to
+        directly. Imagine a script overwriting <varname>$_path</varname> or
+        <varname>$_file</varname> inadvertently -- any further calls to
         <methodname>render()</methodname> or view helpers would break!
     </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_View-Helpers-Action.xml

@@ -19,7 +19,7 @@
         The API for the <code>Action</code> view helper follows that of most MVC
         components that invoke controller actions: <code>action($action,
             $controller, $module = null, array $params = array())</code>.
-        <code>$action</code> and <code>$controller</code> are required; if no
+        <varname>$action</varname> and <varname>$controller</varname> are required; if no
         module is specified, the default module is assumed.
     </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml

@@ -28,11 +28,11 @@
     </itemizedlist>
 
     <para>
-        The <code>$media</code> value defaults to 'screen', but may be any valid
-        media value. <code>$conditionalStylesheet</code> is a string or boolean false,
+        The <varname>$media</varname> value defaults to 'screen', but may be any valid
+        media value. <varname>$conditionalStylesheet</varname> is a string or boolean false,
         and will be used at rendering time to determine if special comments should be
         included to prevent loading of the stylesheet on certain platforms.
-        <code>$extras</code> is an array of any extra values that you want to be added
+        <varname>$extras</varname> is an array of any extra values that you want to be added
         to the tag.
     </para>
 

+ 6 - 6
documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml

@@ -36,9 +36,9 @@
     </itemizedlist>
 
     <para>
-        The <code>$keyValue</code> item is used to define a value for the 'name'
-        or 'http-equiv' key; <code>$content</code> is the value for the
-        'content' key, and <code>$modifiers</code> is an optional associative
+        The <varname>$keyValue</varname> item is used to define a value for the 'name'
+        or 'http-equiv' key; <varname>$content</varname> is the value for the
+        'content' key, and <varname>$modifiers</varname> is an optional associative
         array that can contain keys for 'lang' and/or 'scheme'.
     </para>
 
@@ -46,9 +46,9 @@
         You may also set meta tags using the <methodname>headMeta()</methodname> helper
         method, which has the following signature: <code>headMeta($content,
             $keyValue, $keyType = 'name', $modifiers = array(), $placement =
-            'APPEND')</code>. <code>$keyValue</code> is the content for the key
-        specified in <code>$keyType</code>, which should be either 'name' or
-        'http-equiv'. <code>$placement</code> can be either 'SET' (overwrites
+            'APPEND')</code>. <varname>$keyValue</varname> is the content for the key
+        specified in <varname>$keyType</varname>, which should be either 'name' or
+        'http-equiv'. <varname>$placement</varname> can be either 'SET' (overwrites
         all previously stored values), 'APPEND' (added to end of stack), or
         'PREPEND' (added to top of stack).
     </para>

+ 6 - 6
documentation/manual/en/module_specs/Zend_View-Helpers-HeadScript.xml

@@ -35,10 +35,10 @@
     </itemizedlist>
 
     <para>
-        In the case of the <code>*File()</code> methods, <code>$src</code> is
+        In the case of the <code>*File()</code> methods, <varname>$src</varname> is
         the remote location of the script to load; this is usually in the form
         of a URL or a path. For the <code>*Script()</code> methods,
-        <code>$script</code> is the client-side scripting directives you wish to
+        <varname>$script</varname> is the client-side scripting directives you wish to
         use in the element.
     </para>
 
@@ -48,7 +48,7 @@
         <para>
             <code>HeadScript</code> allows you to wrap the script tag in conditional comments,
             which allows you to hide it from specific browsers. To add the conditional
-            tags, pass the conditional value as part of the <code>$attrs</code> parameter in
+            tags, pass the conditional value as part of the <varname>$attrs</varname> parameter in
             the method calls.
         </para>
 
@@ -76,10 +76,10 @@ $this->headScript()->appendFile(
         Finally, you can also use the <methodname>headScript()</methodname> method to
         quickly add script elements; the signature for this is
         <methodname>headScript($mode = 'FILE', $spec, $placement = 'APPEND')</methodname>.
-        The <code>$mode</code> is either 'FILE' or 'SCRIPT', depending on if
-        you're linking a script or defining one. <code>$spec</code> is either
+        The <varname>$mode</varname> is either 'FILE' or 'SCRIPT', depending on if
+        you're linking a script or defining one. <varname>$spec</varname> is either
         the script file to link or the script source itself.
-        <code>$placement</code> should be either 'APPEND', 'PREPEND', or 'SET'.
+        <varname>$placement</varname> should be either 'APPEND', 'PREPEND', or 'SET'.
     </para>
 
     <para>

+ 4 - 4
documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml

@@ -36,8 +36,8 @@
     </itemizedlist>
 
     <para>
-        In all cases, <code>$content</code> is the actual CSS declarations.
-        <code>$attributes</code> are any additional attributes you wish to provide to the
+        In all cases, <varname>$content</varname> is the actual CSS declarations.
+        <varname>$attributes</varname> are any additional attributes you wish to provide to the
         <code>style</code> tag: lang, title, media, or dir are all permissible.
     </para>
 
@@ -47,7 +47,7 @@
         <para>
             <code>HeadStyle</code> allows you to wrap the style tag in conditional comments,
             which allows you to hide it from specific browsers. To add the conditional
-            tags, pass the conditional value as part of the <code>$attributes</code> parameter in
+            tags, pass the conditional value as part of the <varname>$attributes</varname> parameter in
             the method calls.
         </para>
 
@@ -71,7 +71,7 @@ $this->headStyle()->appendStyle($styles, array('conditional' => 'lt IE 7');
         Finally, you can also use the <methodname>headStyle()</methodname> method to
         quickly add declarations elements; the signature for this is
         <methodname>headStyle($content$placement = 'APPEND', $attributes = array())</methodname>.
-        <code>$placement</code> should be either 'APPEND', 'PREPEND', or 'SET'.
+        <varname>$placement</varname> should be either 'APPEND', 'PREPEND', or 'SET'.
     </para>
 
     <para>

+ 11 - 11
documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -155,7 +155,7 @@
                     container. If depths are not given, the method will use
                     the values retrieved from <methodname>getMinDepth()</methodname> and
                     <methodname>getMaxDepth()</methodname>. The deepest active page must
-                    be between <code>$minDepth</code> and <code>$axnDepth</code>
+                    be between <varname>$minDepth</varname> and <varname>$axnDepth</varname>
                     inclusively. Returns an array containing a reference to the
                     found page instance and the depth at which the page was
                     found.
@@ -764,9 +764,9 @@ Products, Foo Server, FAQ
         <para>
             There are two types of relations; forward and reverse, indicated
             by the keyords <code>'rel'</code> and <code>'rev'</code>. Most
-            methods in the helper will take a <code>$rel</code> param, which
+            methods in the helper will take a <varname>$rel</varname> param, which
             must be either <code>'rel'</code> or <code>'rev'</code>. Most
-            methods also take a <code>$type</code> param, which is used
+            methods also take a <varname>$type</varname> param, which is used
             for specifying the link type (e.g. alternate, start, next, prev,
             chapter, etc).
         </para>
@@ -775,16 +775,16 @@ Products, Foo Server, FAQ
             Relationships can be added to page objects manually, or found
             by traversing the container registered in the helper. The method
             <methodname>findRelation($page, $rel, $type)</methodname> will first try
-            to find the given <code>$rel</code> of <code>$type</code> from
-            the <code>$page</code> by calling <code>$page->findRel($type)</code>
-            or <code>$page->findRel($type)</code>. If the <code>$page</code>
+            to find the given <varname>$rel</varname> of <varname>$type</varname> from
+            the <varname>$page</varname> by calling <code>$page->findRel($type)</code>
+            or <code>$page->findRel($type)</code>. If the <varname>$page</varname>
             has a relation that can be converted to a page instance, that
-            relation will be used. If the <code>$page</code> instance doesn't
-            have the specified <code>$type</code>, the helper will look for
+            relation will be used. If the <varname>$page</varname> instance doesn't
+            have the specified <varname>$type</varname>, the helper will look for
             a method in the helper named <code>search$rel$type</code> (e.g.
             <methodname>searchRelNext()</methodname> or <methodname>searchRevAlternate()</methodname>).
             If such a method exists, it will be used for determining the
-            <code>$page</code>'s relation by traversing the container.
+            <varname>$page</varname>'s relation by traversing the container.
         </para>
 
         <para>
@@ -1235,11 +1235,11 @@ Output:
                     a HTML <code>UL</code> list.
                 </para>
                 <para>
-                    If <code>$container</code> is not given, the container
+                    If <varname>$container</varname> is not given, the container
                     registered in the helper will be rendered.
                 </para>
                 <para>
-                    <code>$options</code> is used for overriding options
+                    <varname>$options</varname> is used for overriding options
                     specified temporarily without rsetting the values in the
                     helper instance. It is an associative array where each key
                     corresponds to an option in the helper.

+ 1 - 1
documentation/manual/en/module_specs/Zend_View-Helpers-Partial.xml

@@ -200,7 +200,7 @@ $model = array(
             Sometime a partial will exist in a different module. If you know the
             name of the module, you can pass it as the second argument to either
             <methodname>partial()</methodname> or <methodname>partialLoop()</methodname>, moving the
-            <code>$model</code> argument to third position.
+            <varname>$model</varname> argument to third position.
         </para>
 
         <para>

+ 3 - 3
documentation/manual/en/module_specs/Zend_View-Helpers-Placeholder.xml

@@ -133,18 +133,18 @@ echo $foo['bar'];
                 </para>
 
                 <para>
-                    <code>$type</code> should be one of the
+                    <varname>$type</varname> should be one of the
                     <code>Placeholder</code> constants <code>APPEND</code> or
                     <code>SET</code>. If <code>APPEND</code>, captured content
                     is appended to the list of current content in the
                     placeholder; if <code>SET</code>, captured content is used
                     as the sole value of the placeholder (potentially replacing
-                    any previous content). By default, <code>$type</code> is
+                    any previous content). By default, <varname>$type</varname> is
                     <code>APPEND</code>.
                 </para>
 
                 <para>
-                    <code>$key</code> can be used to specify a specific key in
+                    <varname>$key</varname> can be used to specify a specific key in
                     the placeholder container to which you want content
                     captured.
                 </para>

+ 17 - 17
documentation/manual/en/module_specs/Zend_View-Helpers.xml

@@ -77,18 +77,18 @@
 
             <listitem><para>
                 <code>fieldset($name, $content, $attribs):</code> Creates an
-                XHTML fieldset. If <code>$attribs</code> contains a 'legend'
+                XHTML fieldset. If <varname>$attribs</varname> contains a 'legend'
                 key, that value will be used for the fieldset legend. The
-                fieldset will surround the <code>$content</code> as provided to
+                fieldset will surround the <varname>$content</varname> as provided to
                 the helper.
             </para></listitem>
 
             <listitem><para>
                 <code>form($name, $attribs, $content):</code> Generates an XHTML
-                form. All <code>$attribs</code> are escaped and rendered as
-                XHTML attributes of the form tag. If <code>$content</code> is
+                form. All <varname>$attribs</varname> are escaped and rendered as
+                XHTML attributes of the form tag. If <varname>$content</varname> is
                 present and not a boolean false, then that content is rendered
-                within the start and close form tags; if <code>$content</code>
+                within the start and close form tags; if <varname>$content</varname>
                 is a boolean false (the default), only the opening form tag is
                 generated.
             </para></listitem>
@@ -179,9 +179,9 @@ echo $this->formCheckbox('foo',
             <listitem>
                 <para>
                     <code>formErrors($errors, $options):</code> Generates an
-                    XHTML unordered list to show errors. <code>$errors</code>
+                    XHTML unordered list to show errors. <varname>$errors</varname>
                     should be a string or an array of strings;
-                    <code>$options</code> should be any attributes you want
+                    <varname>$options</varname> should be any attributes you want
                     placed in the opening list tag.
                 </para>
 
@@ -196,7 +196,7 @@ echo $this->formCheckbox('foo',
                             <methodname>setElementStart($string)</methodname>; default is
                             '&lt;ul class="errors"%s"&gt;&lt;li&gt;', where %s
                             is replaced with the attributes as specified in
-                            <code>$options</code>.
+                            <varname>$options</varname>.
                     </para></listitem>
 
                     <listitem><para>
@@ -224,18 +224,18 @@ echo $this->formCheckbox('foo',
             <listitem><para>
                 <code>formLabel($name, $value, $attribs):</code> Creates a
                 &lt;label&gt; element, setting the <code>for</code> attribute to
-                <code>$name</code>, and the actual label text to
-                <code>$value</code>. If <code>disable</code> is passed in
+                <varname>$name</varname>, and the actual label text to
+                <varname>$value</varname>. If <code>disable</code> is passed in
                 <code>attribs</code>, nothing will be returned.
             </para></listitem>
 
             <listitem><para>
                 <code>formMultiCheckbox($name, $value, $attribs, $options,
                     $listsep):</code> Creates a list of checkboxes.
-                <code>$options</code> should be an associative array, and may be
-                arbitrarily deep. <code>$value</code> may be a single value or
+                <varname>$options</varname> should be an associative array, and may be
+                arbitrarily deep. <varname>$value</varname> may be a single value or
                 an array of selected values that match the keys in the
-                <code>$options</code> array. <code>$listsep</code> is an HTML
+                <varname>$options</varname> array. <varname>$listsep</varname> is an HTML
                 break ("&lt;br /&gt;") by default. By default, this element is
                 treated as an array; all checkboxes share the same name, and are
                 submitted as an array.
@@ -285,16 +285,16 @@ echo $this->formCheckbox('foo',
 
             <listitem><para>
                 <code>url($urlOptions, $name, $reset):</code> Creates a URL
-                string based on a named route. <code>$urlOptions</code> should
+                string based on a named route. <varname>$urlOptions</varname> should
                 be an associative array of key/value pairs used by the
                 particular route.
             </para></listitem>
 
             <listitem><para>
                 <code>htmlList($items, $ordered, $attribs, $escape):</code> generates
-                unordered and ordered lists based on the <code>$items</code>
-                passed to it. If <code>$items</code> is a multidimensional
-                array, a nested list will be built. If the <code>$escape</code>
+                unordered and ordered lists based on the <varname>$items</varname>
+                passed to it. If <varname>$items</varname> is a multidimensional
+                array, a nested list will be built. If the <varname>$escape</varname>
                 flag is true (default), individual items will be escaped using
                 the view objects registered escaping mechanisms; pass a false
                 value if you want to allow markup in your lists.