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

[DOCUMENTATION] English:
- manual fixes: <classname>method name</classname> => <methodname>method name</methodname>

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

mikaelkael 16 лет назад
Родитель
Сommit
074a0fd00a
71 измененных файлов с 230 добавлено и 230 удалено
  1. 2 2
      documentation/manual/en/module_specs/Zend_Controller-Response.xml
  2. 4 4
      documentation/manual/en/module_specs/Zend_Controller-Router-Route.xml
  3. 2 2
      documentation/manual/en/module_specs/Zend_Controller-Router.xml
  4. 3 3
      documentation/manual/en/module_specs/Zend_Date-Constants.xml
  5. 3 3
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  6. 1 1
      documentation/manual/en/module_specs/Zend_Db_Adapter.xml
  7. 3 3
      documentation/manual/en/module_specs/Zend_Db_Table.xml
  8. 7 7
      documentation/manual/en/module_specs/Zend_Debug.xml
  9. 1 1
      documentation/manual/en/module_specs/Zend_Dojo-Form-Examples.xml
  10. 4 4
      documentation/manual/en/module_specs/Zend_Dojo-Form.xml
  11. 5 5
      documentation/manual/en/module_specs/Zend_Feed-Importing.xml
  12. 1 1
      documentation/manual/en/module_specs/Zend_Feed-ModifyingFeed.xml
  13. 8 8
      documentation/manual/en/module_specs/Zend_File_Transfer-Migration.xml
  14. 1 1
      documentation/manual/en/module_specs/Zend_Filter.xml
  15. 3 3
      documentation/manual/en/module_specs/Zend_Form-Advanced.xml
  16. 5 5
      documentation/manual/en/module_specs/Zend_Form-Elements.xml
  17. 1 1
      documentation/manual/en/module_specs/Zend_Form-QuickStart.xml
  18. 1 1
      documentation/manual/en/module_specs/Zend_Gdata-Introduction.xml
  19. 3 3
      documentation/manual/en/module_specs/Zend_Gdata_AuthSub.xml
  20. 1 1
      documentation/manual/en/module_specs/Zend_Gdata_ClientLogin.xml
  21. 4 4
      documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml
  22. 3 3
      documentation/manual/en/module_specs/Zend_Http_Client-Migration.xml
  23. 1 1
      documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml
  24. 2 2
      documentation/manual/en/module_specs/Zend_Json-Basics.xml
  25. 2 2
      documentation/manual/en/module_specs/Zend_Json-Objects.xml
  26. 5 5
      documentation/manual/en/module_specs/Zend_Json-xml2json.xml
  27. 1 1
      documentation/manual/en/module_specs/Zend_Layout-Advanced.xml
  28. 1 1
      documentation/manual/en/module_specs/Zend_Layout-QuickStart.xml
  29. 2 2
      documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml
  30. 10 10
      documentation/manual/en/module_specs/Zend_Loader.xml
  31. 1 1
      documentation/manual/en/module_specs/Zend_Locale-Introduction.xml
  32. 1 1
      documentation/manual/en/module_specs/Zend_Locale-Parsing.xml
  33. 1 1
      documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml
  34. 1 1
      documentation/manual/en/module_specs/Zend_Mail-Sending.xml
  35. 3 3
      documentation/manual/en/module_specs/Zend_Memory-MemoryManager.xml
  36. 1 1
      documentation/manual/en/module_specs/Zend_Memory-Overview.xml
  37. 3 3
      documentation/manual/en/module_specs/Zend_Mime.xml
  38. 1 1
      documentation/manual/en/module_specs/Zend_Mime_Message.xml
  39. 1 1
      documentation/manual/en/module_specs/Zend_Navigation-Pages-Factory.xml
  40. 3 3
      documentation/manual/en/module_specs/Zend_OpenId-Consumer.xml
  41. 2 2
      documentation/manual/en/module_specs/Zend_OpenId-Provider.xml
  42. 4 4
      documentation/manual/en/module_specs/Zend_Pdf-Create.xml
  43. 13 13
      documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml
  44. 3 3
      documentation/manual/en/module_specs/Zend_Pdf-Pages.xml
  45. 2 2
      documentation/manual/en/module_specs/Zend_Pdf-Properties.xml
  46. 4 4
      documentation/manual/en/module_specs/Zend_Pdf-Save.xml
  47. 4 4
      documentation/manual/en/module_specs/Zend_Search_Lucene-Extending.xml
  48. 7 7
      documentation/manual/en/module_specs/Zend_Search_Lucene-IndexCreation.xml
  49. 4 4
      documentation/manual/en/module_specs/Zend_Search_Lucene-Overview.xml
  50. 5 5
      documentation/manual/en/module_specs/Zend_Search_Lucene-Queries.xml
  51. 5 5
      documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml
  52. 4 4
      documentation/manual/en/module_specs/Zend_Service_Akismet.xml
  53. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon.xml
  54. 11 11
      documentation/manual/en/module_specs/Zend_Service_Technorati.xml
  55. 12 12
      documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml
  56. 13 13
      documentation/manual/en/module_specs/Zend_Session-GlobalSessionManagement.xml
  57. 2 2
      documentation/manual/en/module_specs/Zend_Soap_Server.xml
  58. 1 1
      documentation/manual/en/module_specs/Zend_Soap_Wsdl.xml
  59. 1 1
      documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Quickstart.xml
  60. 2 2
      documentation/manual/en/module_specs/Zend_Text_Table.xml
  61. 1 1
      documentation/manual/en/module_specs/Zend_Translate-Adapters.xml
  62. 10 10
      documentation/manual/en/module_specs/Zend_Uri.xml
  63. 1 1
      documentation/manual/en/module_specs/Zend_Validate-Sitemap.xml
  64. 1 1
      documentation/manual/en/module_specs/Zend_Validate-WritingValidators.xml
  65. 1 1
      documentation/manual/en/module_specs/Zend_Validate.xml
  66. 1 1
      documentation/manual/en/module_specs/Zend_Version.xml
  67. 1 1
      documentation/manual/en/module_specs/Zend_View-Abstract.xml
  68. 1 1
      documentation/manual/en/module_specs/Zend_View-Helpers-Json.xml
  69. 1 1
      documentation/manual/en/module_specs/Zend_View-Migration.xml
  70. 1 1
      documentation/manual/en/module_specs/Zend_XmlRpc_Client.xml
  71. 4 4
      documentation/manual/en/module_specs/Zend_XmlRpc_Server.xml

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

@@ -14,7 +14,7 @@
             caught exceptions to the response object, allowing the developer to
             gracefully handle exceptions. This functionality may be overridden
             by setting
-            <classname>Zend_Controller_Front::throwExceptions(true)</classname>:
+            <methodname>Zend_Controller_Front::throwExceptions(true)</methodname>:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -75,7 +75,7 @@ $this->getResponse()
                     linkend="zend.controller.action.viewintegration">view
                     integration</link>, you do not need to set the rendered view
                 script content in the response object, as
-                <classname>Zend_Controller_Action::render()</classname> does this by default.
+                <methodname>Zend_Controller_Action::render()</methodname> does this by default.
             </para>
         </note>
 

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

@@ -73,8 +73,8 @@ $values = array(
         the <methodname>userinfoAction()</methodname> method of your
         <code>ProfileController</code> class (in the default module) based on
         these values. There you will be able to access all variables by means of
-        the <classname>Zend_Controller_Action::_getParam()</classname> or
-        <classname>Zend_Controller_Request::getParam()</classname> methods:
+        the <methodname>Zend_Controller_Action::_getParam()</methodname> or
+        <methodname>Zend_Controller_Request::getParam()</methodname> methods:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -207,7 +207,7 @@ $router->addRoute('archive', $route);
             <listitem>
                 <para>
                     Set it via the static method
-                    <classname>Zend_Controller_Router_Route::setDefaultTranslator()</classname>.
+                    <methodname>Zend_Controller_Router_Route::setDefaultTranslator()</methodname>.
                 </para>
             </listitem>
             <listitem>
@@ -233,7 +233,7 @@ $router->addRoute('archive', $route);
             <listitem>
                 <para>
                     Set it via the static method
-                    <classname>Zend_Controller_Router_Route::setDefaultLocale()</classname>.
+                    <methodname>Zend_Controller_Router_Route::setDefaultLocale()</methodname>.
                 </para>
             </listitem>
             <listitem>

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

@@ -235,8 +235,8 @@ $router->addRoute('user',
             <para>
                 Values returned from routing come from URL parameters or user
                 defined route defaults. These variables are later accessible
-                through the <classname>Zend_Controller_Request::getParam()</classname> or
-                <classname>Zend_Controller_Action::_getParam()</classname> methods.
+                through the <methodname>Zend_Controller_Request::getParam()</methodname> or
+                <methodname>Zend_Controller_Action::_getParam()</methodname> methods.
             </para>
         </note>
 

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

@@ -728,7 +728,7 @@
             The accepted format specifiers can be changed from ISO Format to PHP's date format if
             you are more comfortable with it. However, not all formats defined in the ISO norm are
             supported with PHP's date format specifiers. Use the
-            <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to
+            <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
             switch Zend_Date methods from supporting ISO format specifiers to PHP date() type
             specifiers (see <xref linkend="zend.date.constants.phpformats" /> below).
         </para>
@@ -1166,7 +1166,7 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
         <para>
             If you are more comfortable with PHP's date format specifier than with ISO format
             specifiers, then you can use the
-            <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname> method to
+            <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
             switch Zend_Date methods from supporting ISO format specifiers to PHP date() type
             specifiers. Afterwards, all format parameters must be given with
             <ulink url="http://php.net/date">PHP's <methodname>date()</methodname> format
@@ -1197,7 +1197,7 @@ print $date->toString("'Format:D M j G:i:s T Y='D M j G:i:s T Y");
             The following table shows the list of PHP date format specifiers with their equivalent
             Zend_Date constants and CLDR/ISO equivalent format specifiers. In most cases, when the
             CLDR/ISO format does not have an equivalent format specifier, the PHP format specifier
-            is not altered by <classname>Zend_Locale_Format::convertPhpToIsoFormat()</classname>,
+            is not altered by <methodname>Zend_Locale_Format::convertPhpToIsoFormat()</methodname>,
             and the Zend_Date methods then recognize these "peculiar" PHP format specifiers, even
             when in the default "ISO" format mode.
         </para>

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

@@ -21,10 +21,10 @@
                 Several methods use date format strings, in a way similar to PHP's
                 <methodname>date()</methodname>. If you are more comfortable with PHP's date format
                 specifier than with ISO format specifiers, then you can use
-                <classname>Zend_Date::setOptions(array('format_type' => 'php'))</classname>.
+                <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname>.
                 Afterward, use PHP's date format specifiers for all functions which accept a
                 <varname>$format</varname> parameter. Use
-                <classname>Zend_Date::setOptions(array('format_type' => 'iso'))</classname> to
+                <methodname>Zend_Date::setOptions(array('format_type' => 'iso'))</methodname> to
                 switch back to the default mode of supporting only ISO date format tokens. For a
                 list of supported format codes, see
                 <xref linkend="zend.date.constants.phpformats" />
@@ -159,7 +159,7 @@
             specified, then <classname>Zend_Date::TIMESTAMP</classname> is assumed. Alternatively, a
             user-specified format may be used for <varname>$part</varname>, using the same
             underlying mechanism and format codes as <link
-                linkend="zend.locale.date.normalize"><classname>Zend_Locale_Format::getDate()</classname></link>.
+                linkend="zend.locale.date.normalize"><methodname>Zend_Locale_Format::getDate()</methodname></link>.
             If a date object is constructed using an obviously invalid date (e.g. a month number
             greater than 12), then <classname>Zend_Date</classname> will throw an exception, unless
             no specific date format has been selected -i.e. <varname>$part</varname> is either

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

@@ -145,7 +145,7 @@ $db = new Zend_Db_Adapter_Pdo_Mysql(array(
             <para>
                 As an alternative to using an adapter constructor directly, you
                 can create an instance of an adapter using the static method
-                <classname>Zend_Db::factory()</classname>. This method dynamically loads
+                <methodname>Zend_Db::factory()</methodname>. This method dynamically loads
                 the adapter class file on demand using
                 <link linkend="zend.loader.load.class">Zend_Loader::loadClass()</link>.
             </para>

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

@@ -380,7 +380,7 @@ $table = new Bugs(array('db' => $db));
                 object of type <classname>Zend_Db_Adapter_Abstract</classname> to be a default
                 database adapter for all subsequent instances of Tables in your application. You can
                 do this with the static method
-                <classname>Zend_Db_Table_Abstract::setDefaultAdapter()</classname>. The argument is
+                <methodname>Zend_Db_Table_Abstract::setDefaultAdapter()</methodname>. The argument is
                 an object of type <classname>Zend_Db_Adapter_Abstract</classname>.
             </para>
 
@@ -1347,7 +1347,7 @@ echo "The table name is " . $info['name'] . "\n";
                 <listitem>
                     <para>
                         <emphasis>Call
-                        <classname>Zend_Db_Table_Abstract::setDefaultMetadataCache()</classname></emphasis>
+                        <methodname>Zend_Db_Table_Abstract::setDefaultMetadataCache()</methodname></emphasis>
                         - This allows a developer to once set the default cache object to be used
                         for all table classes.
                     </para>
@@ -1356,7 +1356,7 @@ echo "The table name is " . $info['name'] . "\n";
                 <listitem>
                     <para>
                         <emphasis>Configure
-                        <classname>Zend_Db_Table_Abstract::__construct()</classname></emphasis> -
+                        <methodname>Zend_Db_Table_Abstract::__construct()</methodname></emphasis> -
                         This allows a developer to set the cache object to be used for a particular
                         table class instance.
                     </para>

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

@@ -5,7 +5,7 @@
     <title>Dumping Variables</title>
 
     <para>
-        The static method <classname>Zend_Debug::dump()</classname> prints or returns
+        The static method <methodname>Zend_Debug::dump()</methodname> prints or returns
         information about an expression. This simple technique of debugging is
         common, because it is easy to use in an ad hoc fashion, and requires no
         initialization, special tools, or debugging environment.
@@ -20,20 +20,20 @@ Zend_Debug::dump($var, $label=null, $echo=true);
 
     <para>
         The <varname>$var</varname> argument specifies the expression or variable
-        about which the <classname>Zend_Debug::dump()</classname> method outputs
+        about which the <methodname>Zend_Debug::dump()</methodname> method outputs
         information.
     </para>
 
     <para>
         The <varname>$label</varname> argument is a string to be prepended to the
-        output of <classname>Zend_Debug::dump()</classname>. It may be useful, for
+        output of <methodname>Zend_Debug::dump()</methodname>. It may be useful, for
         example, to use labels if you are dumping information about multiple
         variables on a given screen.
     </para>
 
     <para>
         The boolean <varname>$echo</varname> argument specifies whether the output
-        of <classname>Zend_Debug::dump()</classname> is echoed or not.
+        of <methodname>Zend_Debug::dump()</methodname> is echoed or not.
         If <constant>TRUE</constant>, the output is echoed.
         Regardless of the value of the <varname>$echo</varname> argument, the
         return value of this method contains the output.
@@ -41,7 +41,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
 
     <para>
         It may be helpful to understand that internally,
-        <classname>Zend_Debug::dump()</classname> method wraps the PHP function
+        <methodname>Zend_Debug::dump()</methodname> method wraps the PHP function
         <ulink url="http://php.net/var_dump"><methodname>var_dump()</methodname></ulink>.
         If the output stream is detected as a web presentation,
         the output of <methodname>var_dump()</methodname> is escaped using
@@ -52,7 +52,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
     <tip>
         <title>Debugging with Zend_Log</title>
         <para>
-            Using <classname>Zend_Debug::dump()</classname> is best for ad hoc
+            Using <methodname>Zend_Debug::dump()</methodname> is best for ad hoc
             debugging during software development. You can add code to dump
             a variable and then remove the code very quickly.
         </para>
@@ -61,7 +61,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
             component when writing more permanent debugging code.
             For example, you can use the <code>DEBUG</code> log level and the
             Stream log writer, to output the string returned by
-            <classname>Zend_Debug::dump()</classname>.
+            <methodname>Zend_Debug::dump()</methodname>.
         </para>
     </tip>
 

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

@@ -356,7 +356,7 @@ class My_Form_Test extends Zend_Dojo_Form
 
         <para>
             Existing forms can be modified to utilize Dojo as well, by use of
-            the <classname>Zend_Dojo::enableForm()</classname> static method.
+            the <methodname>Zend_Dojo::enableForm()</methodname> static method.
         </para>
 
         <para>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Dojo-Form.xml

@@ -17,12 +17,12 @@
     <itemizedlist>
         <listitem>
             <para>
-                Use <classname>Zend_Dojo::enableForm()</classname>. This will add plugin
+                Use <methodname>Zend_Dojo::enableForm()</methodname>. This will add plugin
                 paths for decorators and elements to all attached form items,
                 recursively. Additionally, it will dojo-enable the view object.
                 Note, however, that any sub forms you attach
                 <emphasis>after</emphasis> this call will also need to be
-                passed through <classname>Zend_Dojo::enableForm()</classname>.
+                passed through <methodname>Zend_Dojo::enableForm()</methodname>.
             </para>
         </listitem>
 
@@ -43,7 +43,7 @@
                 Last, and most tedious, you can set the appropriate decorator
                 and element paths yourself, set the default DisplayGroup class,
                 and dojo-enable the view. Since
-                <classname>Zend_Dojo::enableForm()</classname> does this already, there's
+                <methodname>Zend_Dojo::enableForm()</methodname> does this already, there's
                 little reason to go this route.
             </para>
         </listitem>
@@ -66,7 +66,7 @@
         </para>
 
         <para>
-            A second approach is to call <classname>Zend_Dojo::enableForm()</classname>
+            A second approach is to call <methodname>Zend_Dojo::enableForm()</methodname>
             within your custom form's <methodname>init()</methodname> method; when the form
             definition is complete, loop through all SubForms to dojo-enable
             them:

+ 5 - 5
documentation/manual/en/module_specs/Zend_Feed-Importing.xml

@@ -6,7 +6,7 @@
 
     <para>
         <classname>Zend_Feed</classname> enables developers to retrieve feeds very easily. If you
-        know the URI of a feed, simply use the <classname>Zend_Feed::import()</classname> method:
+        know the URI of a feed, simply use the <methodname>Zend_Feed::import()</methodname> method:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -43,8 +43,8 @@ $feedFromPHP = Zend_Feed::importString($feedString);
         <para>
             <classname>Zend_Feed</classname> enables developers to create custom feeds very easily.
             You just have to create an array and to import it with <classname>Zend_Feed</classname>.
-            This array can be imported with <classname>Zend_Feed::importArray()</classname> or with
-            <classname>Zend_Feed::importBuilder()</classname>. In this last case the array will be
+            This array can be imported with <methodname>Zend_Feed::importArray()</methodname> or with
+            <methodname>Zend_Feed::importBuilder()</methodname>. In this last case the array will be
             computed on the fly by a custom data source implementing
             <classname>Zend_Feed_Builder_Interface</classname>.
         </para>
@@ -294,7 +294,7 @@ array(
                 You can create a Zeed_Feed instance from any data source implementing
                 <classname>Zend_Feed_Builder_Interface</classname>. You just have to implement the
                 <methodname>getHeader()</methodname> and <methodname>getEntries()</methodname> methods to be able to use
-                your object with <classname>Zend_Feed::importBuilder()</classname>. As a simple
+                your object with <methodname>Zend_Feed::importBuilder()</methodname>. As a simple
                 reference implementation, you can use <classname>Zend_Feed_Builder</classname>,
                 which takes an array in its constructor, performs some minor validation, and then
                 can be used in the <methodname>importBuilder()</methodname> method. The <methodname>getHeader()</methodname>
@@ -312,7 +312,7 @@ array(
             </note>
 
             <para>
-                Here is an example of <classname>Zend_Feed::importBuilder()</classname> usage:
+                Here is an example of <methodname>Zend_Feed::importBuilder()</methodname> usage:
             </para>
 
             <programlisting language="php"><![CDATA[

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

@@ -36,7 +36,7 @@ echo $entry->saveXML();
         If you want to use a namespace other than <code>atom:</code>, <code>rss:</code>, or
         <code>osrss:</code> in your entry, you need to register the namespace with
         <classname>Zend_Feed</classname> using
-        <classname>Zend_Feed::registerNamespace()</classname>. When you are modifying an existing
+        <methodname>Zend_Feed::registerNamespace()</methodname>. When you are modifying an existing
         element, it will always maintain its original namespace. When adding a new element, it will
         go into the default namespace if you do not explicitly specify another namespace.
     </para>

+ 8 - 8
documentation/manual/en/module_specs/Zend_File_Transfer-Migration.xml

@@ -44,7 +44,7 @@
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Filter_File_Rename($options)</classname>
+                        New method API: <methodname>Zend_Filter_File_Rename($options)</methodname>
                         where $options accepts the following array keys:
                         <emphasis>source</emphasis> equals to $oldfile,
                         <emphasis>target</emphasis> equals to $newfile,
@@ -76,11 +76,11 @@ $upload->addFilter('Rename',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Count($min, $max)</classname>
+                        Old method API: <methodname>Zend_Validate_File_Count($min, $max)</methodname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Count($options)</classname>
+                        New method API: <methodname>Zend_Validate_File_Count($options)</methodname>
                         where $options accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,
@@ -117,7 +117,7 @@ $upload->addValidator('Count',
 
                     <listitem><para>
                         New method API:
-                        <classname>Zend_Validate_File_Extension($options)</classname> where $options
+                        <methodname>Zend_Validate_File_Extension($options)</methodname> where $options
                         accepts the following array keys:
                         <emphasis>*</emphasis> equals to $extension and can have any other key,
                         <emphasis>case</emphasis> equals to $case,
@@ -154,7 +154,7 @@ $upload->addValidator('Extension',
 
                     <listitem><para>
                         New method API:
-                        <classname>Zend_Validate_File_FilesSize($options)</classname> where $options
+                        <methodname>Zend_Validate_File_FilesSize($options)</methodname> where $options
                         accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,
@@ -206,7 +206,7 @@ $upload->setUseByteSting(true); // set flag
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Hash($options)</classname>
+                        New method API: <methodname>Zend_Validate_File_Hash($options)</methodname>
                         where $options accepts the following array keys:
                         <emphasis>*</emphasis> equals to $hash and can have any other key,
                         <emphasis>algorithm</emphasis> equals to $algorithm,
@@ -243,7 +243,7 @@ $upload->addValidator('Hash',
 
                     <listitem><para>
                         New method API:
-                        <classname>Zend_Validate_File_FilesSize($options)</classname> where $options
+                        <methodname>Zend_Validate_File_FilesSize($options)</methodname> where $options
                         accepts the following array keys: <emphasis>minwidth</emphasis> equals to
                         $minwidth, <emphasis>maxwidth</emphasis> equals to $maxwidth,
                         <emphasis>minheight</emphasis> equals to $minheight,
@@ -282,7 +282,7 @@ $upload->addValidator('ImageSize',
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Size($options)</classname>
+                        New method API: <methodname>Zend_Validate_File_Size($options)</methodname>
                         where $options accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,

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

@@ -80,7 +80,7 @@ echo $htmlEntities->filter('"'); // &quot;
         <para>
             If it is inconvenient to load a given filter class and create an
             instance of the filter, you can use the static method
-            <classname>Zend_Filter::filterStatic()</classname> as an alternative invocation style.
+            <methodname>Zend_Filter::filterStatic()</methodname> as an alternative invocation style.
             The first argument of this method is a data input value, that you
             would pass to the <methodname>filter()</methodname> method. The second
             argument is a string, which corresponds to the basename of the

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

@@ -172,7 +172,7 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <classname>Zend_Form::setIsArray($flag)</classname>: By setting the
+                    <methodname>Zend_Form::setIsArray($flag)</methodname>: By setting the
                     flag true, you can indicate that an entire form should be
                     treated as an array. By default, the form's name will be
                     used as the name of the array, unless
@@ -190,7 +190,7 @@
             </listitem>
 
             <listitem><para>
-                    <classname>Zend_Form::setElementsBelongTo($array)</classname>:
+                    <methodname>Zend_Form::setElementsBelongTo($array)</methodname>:
                     Using this method, you can specify the name of an array to
                     which all elements of the form belong. You can determine the
                     name using the <methodname>getElementsBelongTo()</methodname> accessor.
@@ -200,7 +200,7 @@
         <para>
             Additionally, on the element level, you can specify individual
             elements may belong to particular arrays using
-            <classname>Zend_Form_Element::setBelongsTo()</classname> method.
+            <methodname>Zend_Form_Element::setBelongsTo()</methodname> method.
             To discover what this value is -- whether set explicitly or
             implicitly via the form -- you may use the
             <methodname>getBelongsTo()</methodname> accessor.

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

@@ -422,7 +422,7 @@ $validator = new Zend_Validate_StringLength(6, 20);
             <para>
                 Some developers may wish to provide custom error messages for a
                 validator. The <varname>$options</varname> argument of the
-                <classname>Zend_Form_Element::addValidator()</classname> method allows you to do so
+                <methodname>Zend_Form_Element::addValidator()</methodname> 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
                 error codes of the various validation error types for the
@@ -508,7 +508,7 @@ if ($element->isValid($value)) {
             <title>Validation Operates On Filtered Values</title>
 
             <para>
-                <classname>Zend_Form_Element::isValid()</classname> filters values through
+                <methodname>Zend_Form_Element::isValid()</methodname> filters values through
                 the provided filter chain prior to validation. See <link
                     linkend="zend.form.elements.filters">the Filters
                     section</link> for more information.
@@ -519,11 +519,11 @@ if ($element->isValid($value)) {
             <title>Validation Context</title>
 
             <para>
-                <classname>Zend_Form_Element::isValid()</classname> supports an
+                <methodname>Zend_Form_Element::isValid()</methodname> supports an
                 additional argument, <varname>$context</varname>.
-                <classname>Zend_Form::isValid()</classname> passes the entire array of
+                <methodname>Zend_Form::isValid()</methodname> passes the entire array of
                 data being processed to <varname>$context</varname> when validating a
-                form, and <classname>Zend_Form_Element::isValid()</classname>, in turn,
+                form, and <methodname>Zend_Form_Element::isValid()</methodname>, in turn,
                 passes it to each validator. This means you can write
                 validators that are aware of data passed to other form
                 elements. As an example, consider a standard registration form

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

@@ -220,7 +220,7 @@ $username->addValidators(array('alnum',
         <para>
             Simple as this is, repeating it this for every element in a form
             can be a bit tedious. Let's try option (b) from above. When we
-            create a new element using <classname>Zend_Form::addElement()</classname> as
+            create a new element using <methodname>Zend_Form::addElement()</methodname> as
             a factory, we can optionally pass in configuration options. These
             can include validators and filters. To do all of the
             above implicitly, try the following:

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

@@ -547,7 +547,7 @@ function getNextPage($feed) {
         <para>
             If you would prefer not to work with pages in your application,
             pass the first page of the feed into
-            <classname>Zend_Gdata_App::retrieveAllEntriesForFeed()</classname>, which
+            <methodname>Zend_Gdata_App::retrieveAllEntriesForFeed()</methodname>, which
             will consolidate all entries from each page into a single feed.
             This example shows how to use this function:
         </para>

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

@@ -45,7 +45,7 @@
         <para>
             Your PHP application should provide a hyperlink to the
             Google URL that performs authentication. The static function
-            <classname>Zend_Gdata_AuthSub::getAuthSubTokenUri()</classname>
+            <methodname>Zend_Gdata_AuthSub::getAuthSubTokenUri()</methodname>
             provides the correct URL. The arguments to this function include
             the URL to your PHP application so that Google can redirect the
             user's browser back to your application after the user's
@@ -64,7 +64,7 @@
 
         <para>
             Then use the token value in a call to
-            <classname>Zend_Gdata_AuthSub::getHttpClient()</classname>.
+            <methodname>Zend_Gdata_AuthSub::getHttpClient()</methodname>.
             This function returns an instance of <classname>Zend_Http_Client</classname>,
             with appropriate headers set so that subsequent requests your
             application submits using that Http Client are also authenticated.
@@ -112,7 +112,7 @@ $cal = new Zend_Gdata_Calendar($client);
 
         <para>
             To terminate the authenticated status of a given token, use the
-            <classname>Zend_Gdata_AuthSub::AuthSubRevokeToken()</classname>
+            <methodname>Zend_Gdata_AuthSub::AuthSubRevokeToken()</methodname>
             static function. Otherwise, the token is still valid for
             some time.
         </para>

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

@@ -37,7 +37,7 @@
         <para>
             The process of creating an authenticated Http client using
             the ClientLogin mechanism is to call the static function
-            <classname>Zend_Gdata_ClientLogin::getHttpClient()</classname>
+            <methodname>Zend_Gdata_ClientLogin::getHttpClient()</methodname>
             and pass the Google account credentials in plain text.
             The return value of this function is an object of class
             <classname>Zend_Http_Client</classname>.

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

@@ -184,17 +184,17 @@ $response = $client->request();
                 <itemizedlist>
                     <listitem>
                         <para>
-                            <firstterm><classname>setStreamContext($context)</classname></firstterm>
+                            <firstterm><methodname>setStreamContext($context)</methodname></firstterm>
                             Sets the stream context to be used by the adapter. Can accept either
                             a stream context resource created using the
-                            <ulink url="http://php.net/manual/en/function.stream-context-create.php"><classname>stream_context_create()</classname></ulink>
+                            <ulink url="http://php.net/manual/en/function.stream-context-create.php"><methodname>stream_context_create()</methodname></ulink>
                             PHP function, or an array of stream context options, in the same format provided to this function.
                             Providing an array will create a new stream context using these options, and set it.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            <firstterm><classname>getStreamContext()</classname></firstterm>
+                            <firstterm><methodname>getStreamContext()</methodname></firstterm>
                             Get the stream context of the adapter. If no stream context was set,
                             will create a default stream context and return it. You can then set
                             or get the value of different context options using regular PHP stream
@@ -254,7 +254,7 @@ echo $opts['ssl']['peer_certificate'];
                 to preform actual requests. If no context is set before preforming HTTP requests
                 with the Socket adapter, a default stream context will be created. This context
                 resource could be accessed after preforming any requests using the
-                <classname>getStreamContext()</classname> method.
+                <methodname>getStreamContext()</methodname> method.
             </para>
         </note>
         </sect3>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Http_Client-Migration.xml

@@ -26,7 +26,7 @@
             <para>
                 In version 1.9 of Zend Framework, there has been a change in the way
                 <classname>Zend_Http_Client</classname> internally stores information about
-                files to be uploaded, set using the <classname>Zend_Http_Client::setFileUpload()</classname>
+                files to be uploaded, set using the <methodname>Zend_Http_Client::setFileUpload()</methodname>
                 method.
             </para>
 
@@ -88,14 +88,14 @@ $client->setFileUpload('file2.txt',
             <title>Deprecation of Zend_Http_Client::_getParametersRecursive()</title>
 
             <para>
-                Starting from version 1.9, the protected method <classname>_getParametersRecursive()</classname>
+                Starting from version 1.9, the protected method <methodname>_getParametersRecursive()</methodname>
                 is no longer used by <classname>Zend_Http_Client</classname> and is deprecated.
                 Using it will cause an E_NOTICE message to be emitted by PHP.
             </para>
 
             <para>
                 If you subclass <classname>Zend_Http_Client</classname> and call this method, you
-                should look into using the <classname>Zend_Http_Client::_flattenParametersArray()</classname>
+                should look into using the <methodname>Zend_Http_Client::_flattenParametersArray()</methodname>
                 static method instead.
             </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml

@@ -229,7 +229,7 @@ if (isset($_POST['xmlToken'])) {
             data requested by your web site when the user authenticated. As
             shown in the examples above, the validity of the information card
             can be ascertained by calling the
-            <classname>Zend_InfoCard_Claims::isValid()</classname> method. Claims
+            <methodname>Zend_InfoCard_Claims::isValid()</methodname> method. Claims
             themselves can either be retrieved by simply accessing the
             identifier desired (i.e. <code>givenname</code>) as a property of
             the object or through the <methodname>getClaim()</methodname> method.

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

@@ -4,8 +4,8 @@
     <title>Basic Usage</title>
     <para>
         Usage of <classname>Zend_Json</classname> involves using the two public static
-        methods available: <classname>Zend_Json::encode()</classname> and
-        <classname>Zend_Json::decode()</classname>.
+        methods available: <methodname>Zend_Json::encode()</methodname> and
+        <methodname>Zend_Json::decode()</methodname>.
     </para>
     <programlisting language="php"><![CDATA[
 // Retrieve a value:

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

@@ -12,8 +12,8 @@
         <para>
             JSON does not allow object references, so care should be taken not to
             encode objects with recursive references. If you have issues with
-            recursion, <classname>Zend_Json::encode()</classname> and
-            <classname>Zend_Json_Encoder::encode()</classname> allow an optional second
+            recursion, <methodname>Zend_Json::encode()</methodname> and
+            <methodname>Zend_Json_Encoder::encode()</methodname> allow an optional second
             parameter to check for recursion; if an object is serialized twice, an
             exception will be thrown.
         </para>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Json-xml2json.xml

@@ -10,7 +10,7 @@
     </para>
 
     <para>
-        <classname>Zend_Json</classname> includes a static function called <classname>Zend_Json::fromXml()</classname>.
+        <classname>Zend_Json</classname> includes a static function called <methodname>Zend_Json::fromXml()</methodname>.
         This function will generate JSON from a given XML input. This function takes any arbitrary
         XML string as an input parameter. It also takes an optional boolean input parameter to instruct the
         conversion logic to ignore or not ignore the XML attributes during the conversion process. If this
@@ -24,7 +24,7 @@ $jsonContents = Zend_Json::fromXml($xmlStringContents, true);
 ]]></programlisting>
 
     <para>
-        <classname>Zend_Json::fromXml()</classname> function does the conversion of the XML formatted string input
+        <methodname>Zend_Json::fromXml()</methodname> function does the conversion of the XML formatted string input
         parameter and returns the equivalent JSON formatted string output. In case of any XML input format
         error or conversion logic error, this function will throw an exception. The conversion logic also
         uses recursive techniques to traverse the XML tree. It supports recursion upto 25 levels deep.
@@ -36,13 +36,13 @@ $jsonContents = Zend_Json::fromXml($xmlStringContents, true);
     <para>
         The following is a simple example that shows both the XML input string passed to
         and the JSON output string returned as a result from the
-        <classname>Zend_Json::fromXml()</classname> function. This example used the optional function parameter as
+        <methodname>Zend_Json::fromXml()</methodname> function. This example used the optional function parameter as
         not to ignore the XML attributes during the conversion. Hence, you can notice that the
         resulting JSON string includes a representation of the XML attributes present in the XML input string.
     </para>
 
     <para>
-        XML input string passed to <classname>Zend_Json::fromXml()</classname> function:
+        XML input string passed to <methodname>Zend_Json::fromXml()</methodname> function:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -69,7 +69,7 @@ $jsonContents = Zend_Json::fromXml($xmlStringContents, true);
 ]]></programlisting>
 
     <para>
-        JSON output string returned from <classname>Zend_Json::fromXml()</classname> function:
+        JSON output string returned from <methodname>Zend_Json::fromXml()</methodname> function:
     </para>
 
     <programlisting language="php"><![CDATA[

+ 1 - 1
documentation/manual/en/module_specs/Zend_Layout-Advanced.xml

@@ -173,7 +173,7 @@ $layoutVars   = $placeholders->placeholder('Zend_Layout')->getArrayCopy();
             accessors, modify the inflector rules and target of the inflector
             associated with the <classname>Zend_Layout</classname> instance, or create
             your own inflector instance and pass it to
-            <classname>Zend_Layout::setInflector()</classname>.
+            <methodname>Zend_Layout::setInflector()</methodname>.
         </para>
 
         <example id="zend.layout.advanced.inflector.accessors">

+ 1 - 1
documentation/manual/en/module_specs/Zend_Layout-QuickStart.xml

@@ -100,7 +100,7 @@
         </para>
 
         <para>
-            <classname>Zend_Layout::startMvc()</classname> creates an instance of
+            <methodname>Zend_Layout::startMvc()</methodname> creates an instance of
             <classname>Zend_Layout</classname> with any optional configuration you provide
             it. It then registers a front controller plugin that renders the
             layout with any application content once the dispatch loop is done,

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

@@ -104,7 +104,7 @@ $autoloader->pushAutoloader(array('ezcBase', 'autoload'), 'ezc');
         <para>
             By default, <classname>Zend_Loader_Autoloader</classname> does no error
             suppression when using its internal autoloader, which utilizes
-            <classname>Zend_Loader::loadClass()</classname>. Most of the time, this is
+            <methodname>Zend_Loader::loadClass()</methodname>. Most of the time, this is
             exactly what you want. However, there may be cases where you want to
             suppress them. You can do this using
             <methodname>suppressNotFoundWarnings()</methodname>:
@@ -238,7 +238,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><para>
                             Retrieve the default autoloader implementation; by
                             default, this is
-                            <classname>Zend_Loader::loadClass()</classname>.
+                            <methodname>Zend_Loader::loadClass()</methodname>.
                         </para></entry>
                     </row>
 

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

@@ -25,7 +25,7 @@
         <title>Loading Files</title>
 
         <para>
-            The static method <classname>Zend_Loader::loadFile()</classname> loads a PHP
+            The static method <methodname>Zend_Loader::loadFile()</methodname> loads a PHP
             file. The file loaded may contain any PHP code.
             The method is a wrapper for the PHP function
             <ulink url="http://php.net/include"><methodname>include()</methodname></ulink>.
@@ -58,7 +58,7 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
 
         <para>
             The <varname>$once</varname> argument is a boolean. If <constant>TRUE</constant>,
-            <classname>Zend_Loader::loadFile()</classname> uses the PHP function
+            <methodname>Zend_Loader::loadFile()</methodname> uses the PHP function
             <ulink url="http://php.net/include"><methodname>include_once()</methodname></ulink>
             for loading the file, otherwise the PHP function
             <ulink url="http://php.net/include_once"><methodname>include()</methodname></ulink>
@@ -72,7 +72,7 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
         <title>Loading Classes</title>
 
         <para>
-            The static method <classname>Zend_Loader::loadClass($class, $dirs)</classname>
+            The static method <methodname>Zend_Loader::loadClass($class, $dirs)</methodname>
             loads a PHP file and then checks for the existence of the class.
         </para>
 
@@ -96,7 +96,7 @@ Zend_Loader::loadClass('Container_Tree',
 
         <para>
             If <varname>$dirs</varname> is a string or an array,
-            <classname>Zend_Loader::loadClass()</classname> searches the directories in
+            <methodname>Zend_Loader::loadClass()</methodname> searches the directories in
             the order supplied. The first matching file is loaded. If the file
             does not exist in the specified <varname>$dirs</varname>, then the
             <code>include_path</code> for the PHP environment is searched.
@@ -104,11 +104,11 @@ Zend_Loader::loadClass('Container_Tree',
 
         <para>
             If the file is not found or the class does not exist after the load,
-            <classname>Zend_Loader::loadClass()</classname> throws a <classname>Zend_Exception</classname>.
+            <methodname>Zend_Loader::loadClass()</methodname> throws a <classname>Zend_Exception</classname>.
         </para>
 
         <para>
-            <classname>Zend_Loader::loadFile()</classname> is used for loading, so the
+            <methodname>Zend_Loader::loadFile()</methodname> is used for loading, so the
             class name may only contain alphanumeric characters and the hyphen
             ('-'), underscore ('_'), and period ('.').
         </para>
@@ -120,7 +120,7 @@ Zend_Loader::loadClass('Container_Tree',
         <title>Testing if a File is Readable</title>
 
         <para>
-            The static method <classname>Zend_Loader::isReadable($pathname)</classname>
+            The static method <methodname>Zend_Loader::isReadable($pathname)</methodname>
             returns <constant>TRUE</constant> if a file at the specified pathname exists
             and is readable, <constant>FALSE</constant> otherwise.
         </para>
@@ -140,7 +140,7 @@ if (Zend_Loader::isReadable($filename)) {
             This method is a wrapper for the PHP function
             <ulink url="http://php.net/is_readable"><methodname>is_readable()</methodname></ulink>.
             The PHP function does not search the <code>include_path</code>,
-            while <classname>Zend_Loader::isReadable()</classname> does.
+            while <methodname>Zend_Loader::isReadable()</methodname> does.
         </para>
 
     </sect2>
@@ -151,7 +151,7 @@ if (Zend_Loader::isReadable($filename)) {
 
         <para>
             The <classname>Zend_Loader</classname> class contains a method you can register with the
-            PHP SPL autoloader. <classname>Zend_Loader::autoload()</classname> is the
+            PHP SPL autoloader. <methodname>Zend_Loader::autoload()</methodname> is the
             callback method. As a convenience, <classname>Zend_Loader</classname> provides the
             <methodname>registerAutoload()</methodname> function to register its
             <methodname>autoload()</methodname> method. If the <code>spl_autoload</code>
@@ -170,7 +170,7 @@ Zend_Loader::registerAutoload();
             After registering the Zend Framework autoload callback, you can
             reference classes from Zend Framework without having to load
             them explicitly. The <methodname>autoload()</methodname> method uses
-            <classname>Zend_Loader::loadClass()</classname> automatically when you
+            <methodname>Zend_Loader::loadClass()</methodname> automatically when you
             reference a class.
         </para>
 

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

@@ -521,7 +521,7 @@ Zend_Locale_Format::setOptions(array('locale' => Zend_Locale_Format::STANDARD,
         <para>
             <classname>Zend_Locale</classname> and its subclasses can be speed up by the usage of
             <classname>Zend_Cache</classname>. Use the static method
-            <classname>Zend_Locale::setCache($cache)</classname> if you are using
+            <methodname>Zend_Locale::setCache($cache)</methodname> if you are using
             <classname>Zend_Locale</classname>. <classname>Zend_Locale_Format</classname> can be
             speed up the using the option <code>cache</code> within
             <classname>Zend_Locale_Format::setOptions(array('cache' => $adapter));</classname>.

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

@@ -404,7 +404,7 @@ if (Zend_Locale_Format::isInteger('13.445', array('locale' => $locale)) {
         <title>Numeral System Conversion</title>
 
         <para>
-            <classname>Zend_Locale_Format::convertNumerals()</classname> converts digits between different
+            <methodname>Zend_Locale_Format::convertNumerals()</methodname> converts digits between different
             <ulink url="http://en.wikipedia.org/wiki/Arabic_numerals">numeral systems</ulink>
             , including the standard Arabic/European/Latin numeral system (0,1,2,3,4,5,6,7,8,9), not to be confused with
             <ulink url="http://en.wikipedia.org/wiki/Eastern_Arabic_numerals">Eastern Arabic numerals</ulink>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml

@@ -118,7 +118,7 @@ $log->error('unable to connect to database');
 
         <para>
             The <methodname>setSubjectPrependText()</methodname> method may be used in place
-            of <classname>Zend_Mail::setSubject()</classname> to have the email subject
+            of <methodname>Zend_Mail::setSubject()</methodname> to have the email subject
             line dynamically written before the email is sent. For example, if
             the subject prepend text reads "Errors from script", the subject of
             an email generated by <classname>Zend_Log_Writer_Mail</classname> with two

+ 1 - 1
documentation/manual/en/module_specs/Zend_Mail-Sending.xml

@@ -5,7 +5,7 @@
     <para>
         To send mail via SMTP, <classname>Zend_Mail_Transport_Smtp</classname> needs to be created and registered with
         <classname>Zend_Mail</classname> before the <methodname>send()</methodname> method is called. For all remaining
-        <classname>Zend_Mail::send()</classname> calls in the current script, the SMTP transport will then be used:
+        <methodname>Zend_Mail::send()</methodname> calls in the current script, the SMTP transport will then be used:
     </para>
     <example id="zend.mail.sending.example-1">
         <title>Sending E-Mail via SMTP</title>

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

@@ -10,7 +10,7 @@
         <para>
             You can create new a memory manager
             (<classname>Zend_Memory_Manager</classname> object) using the
-            <classname>Zend_Memory::factory($backendName [, $backendOprions])</classname>
+            <methodname>Zend_Memory::factory($backendName [, $backendOprions])</methodname>
             method.
         </para>
 
@@ -74,7 +74,7 @@ $memoryManager = Zend_Memory::factory('None');
 
             <para>
                 Create movable objects (objects, which may be swapped) using
-                the <classname>Zend_Memory_Manager::create([$data])</classname> method:
+                the <methodname>Zend_Memory_Manager::create([$data])</methodname> method:
                 <programlisting language="php"><![CDATA[
 $memObject = $memoryManager->create($data);
 ]]></programlisting>
@@ -95,7 +95,7 @@ $memObject = $memoryManager->create($data);
 
             <para>
                 Create locked objects (objects, which are not swapped) using
-                the <classname>Zend_Memory_Manager::createLocked([$data])</classname> method:
+                the <methodname>Zend_Memory_Manager::createLocked([$data])</methodname> method:
                 <programlisting language="php"><![CDATA[
 $memObject = $memoryManager->createLocked($data);
 ]]></programlisting>

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

@@ -32,7 +32,7 @@
         <example id="zend.memory.introduction.example-1">
             <title>Using Zend_Memory component</title>
             <para>
-                <classname>Zend_Memory::factory()</classname> instantiates the memory
+                <methodname>Zend_Memory::factory()</methodname> instantiates the memory
                 manager object with specified backend options.
             </para>
                 <programlisting language="php"><![CDATA[

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

@@ -20,18 +20,18 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <classname>Zend_Mime::isPrintable()</classname>: Returns TRUE if the given string contains no unprintable characters,
+                    <methodname>Zend_Mime::isPrintable()</methodname>: Returns TRUE if the given string contains no unprintable characters,
                 FALSE otherwise.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <classname>Zend_Mime::encodeBase64()</classname>: Encodes a string into base64 encoding.
+                    <methodname>Zend_Mime::encodeBase64()</methodname>: Encodes a string into base64 encoding.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <classname>Zend_Mime::encodeQuotedPrintable()</classname>: Encodes a string with the quoted-printable mechanism.
+                    <methodname>Zend_Mime::encodeQuotedPrintable()</methodname>: Encodes a string with the quoted-printable mechanism.
                 </para>
             </listitem>
         </itemizedlist>

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

@@ -73,7 +73,7 @@
         <classname>Zend_Mime_Message</classname> has a static factory Method to parse this
         String and return a <classname>Zend_Mime_Message</classname> Object.</para>
 
-        <para><classname>Zend_Mime_Message::createFromMessage($str, $boundary)</classname>
+        <para><methodname>Zend_Mime_Message::createFromMessage($str, $boundary)</methodname>
         decodes the given string and returns a <classname>Zend_Mime_Message</classname>
         Object that can then be examined using <code>-&gt;getParts()</code></para>
     </sect2>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Navigation-Pages-Factory.xml

@@ -5,7 +5,7 @@
 
     <para>
         All pages (also custom classes), can be created using the page
-        factory, <classname>Zend_Navigation_Page::factory()</classname>. The factory
+        factory, <methodname>Zend_Navigation_Page::factory()</methodname>. The factory
         can take an array with options, or a
         <classname>Zend_Config</classname> object. Each key in the
         array/config corresponds to a page option, as seen in the

+ 3 - 3
documentation/manual/en/module_specs/Zend_OpenId-Consumer.xml

@@ -63,7 +63,7 @@
         <para>
             This form passes the OpenID identity on submission to the following PHP
             script that performs the second step of authentication. The
-            PHP script need only call the <classname>Zend_OpenId_Consumer::login()</classname> method in this step.
+            PHP script need only call the <methodname>Zend_OpenId_Consumer::login()</methodname> method in this step.
             The first argument of this
             method is an accepted OpenID identity, and the second is the URL of a script
             that handles the third and last step of authentication.
@@ -80,7 +80,7 @@ if (!$consumer->login($_POST['openid_identifier'], 'example-1_3.php')) {
         </example>
 
         <para>
-            The <classname>Zend_OpenId_Consumer::login()</classname> method performs discovery on
+            The <methodname>Zend_OpenId_Consumer::login()</methodname> method performs discovery on
             a given identifier, and, if successful, obtains the address of the identity
             provider and its local identifier. It then creates an association to the
             given provider so that both the site and provider share a secret
@@ -100,7 +100,7 @@ if (!$consumer->login($_POST['openid_identifier'], 'example-1_3.php')) {
         </para>
 
         <para>
-            On success, <classname>Zend_OpenId_Consumer::login()</classname> does not
+            On success, <methodname>Zend_OpenId_Consumer::login()</methodname> does not
             return, instead performing an HTTP redirection. However, if there is an error
             it may return false. Errors may occur due to an invalid identity, unresponsive
             provider, communication error, etc.

+ 2 - 2
documentation/manual/en/module_specs/Zend_OpenId-Provider.xml

@@ -347,7 +347,7 @@ if (!$server->hasUser(TEST_ID)) {
             This script is a variation of the script in the "Everything Together" example. It uses the
             same automatic login mechanism, but doesn't contain any code for a trust
             page. The user already trusts the example scripts forever. This trust was
-            established by calling the <classname>Zend_OpenId_Provider::allowSite()</classname> method in the identity
+            established by calling the <methodname>Zend_OpenId_Provider::allowSite()</methodname> method in the identity
             script. The same method associates the profile with the trusted URL. This
             profile will be returned automatically for a request from the trusted
             URL.
@@ -356,7 +356,7 @@ if (!$server->hasUser(TEST_ID)) {
         <para>
             To make Simple Registration Extension work, you must simply
             pass an instance of <classname>Zend_OpenId_Extension_Sreg</classname> as the second
-            argument to the <classname>Zend_OpenId_Provider::handle()</classname> method.
+            argument to the <methodname>Zend_OpenId_Provider::handle()</methodname> method.
         </para>
 
         <example id="zend.openid.provider.example-7">

+ 4 - 4
documentation/manual/en/module_specs/Zend_Pdf-Create.xml

@@ -13,7 +13,7 @@
 
     <para>
     <classname>Zend_Pdf</classname> class also provides two static methods to load an existing PDF document.
-    These are the <classname>Zend_Pdf::load()</classname> and <classname>Zend_Pdf::parse()</classname> methods.
+    These are the <methodname>Zend_Pdf::load()</methodname> and <methodname>Zend_Pdf::parse()</methodname> methods.
     Both of them return <classname>Zend_Pdf</classname> objects as a result or throw an exception if an error occurs.
     </para>
 
@@ -39,11 +39,11 @@ $pdf3 = Zend_Pdf::parse($pdfString);
     <classname>Zend_Pdf</classname> component supports the retrieval of a specified revision.
     </para>
     <para>
-    A revision can be specified as a second parameter to the <classname>Zend_Pdf::load()</classname> and
-    <classname>Zend_Pdf::parse()</classname> methods or requested by calling the <classname>Zend_Pdf::rollback()</classname> method.
+    A revision can be specified as a second parameter to the <methodname>Zend_Pdf::load()</methodname> and
+    <methodname>Zend_Pdf::parse()</methodname> methods or requested by calling the <methodname>Zend_Pdf::rollback()</methodname> method.
         <footnote>
             <para>
-            <classname>Zend_Pdf::rollback()</classname> method must be invoked before any changes are applied to the document,
+            <methodname>Zend_Pdf::rollback()</methodname> method must be invoked before any changes are applied to the document,
             otherwise the behavior is not defined.
             </para>
         </footnote>

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

@@ -229,8 +229,8 @@ $pdfPage->drawText($unicodeString, 72, 720, 'UTF-8');
     <sect2 id="zend.pdf.drawing.using-fonts">
         <title>Using fonts</title>
         <para>
-        <classname>Zend_Pdf_Page::drawText()</classname> uses the page's current font and font size, which is set with
-        the <classname>Zend_Pdf_Page::setFont()</classname> method:
+        <methodname>Zend_Pdf_Page::drawText()</methodname> uses the page's current font and font size, which is set with
+        the <methodname>Zend_Pdf_Page::setFont()</methodname> method:
         </para>
         <programlisting language="php"><![CDATA[
 /**
@@ -249,8 +249,8 @@ public function setFont(Zend_Pdf_Resource_Font $font, $fontSize);
         </para>
         <para>
         <classname>Zend_Pdf</classname> currently supports the standard 14 PDF fonts as well as your own custom TrueType fonts. Font
-        objects are obtained via one of two factory methods: <classname>Zend_Pdf_Font::fontWithName($fontName)</classname>
-        for the standard 14 PDF fonts or <classname>Zend_Pdf_Font::fontWithPath($filePath)</classname> for custom fonts.
+        objects are obtained via one of two factory methods: <methodname>Zend_Pdf_Font::fontWithName($fontName)</methodname>
+        for the standard 14 PDF fonts or <methodname>Zend_Pdf_Font::fontWithPath($filePath)</methodname> for custom fonts.
         </para>
         <example id="zend.pdf.drawing.using-fonts.example-1">
             <title>Create a standard font</title>
@@ -570,7 +570,7 @@ for ($charIndex = 0; $charIndex < strlen($text); $charIndex++) {
 public function drawImage(Zend_Pdf_Resource_Image $image, $x1, $y1, $x2, $y2);
 ]]></programlisting>
         <para>
-        Image objects should be created with <classname>Zend_Pdf_Image::imageWithPath($filePath)</classname> method
+        Image objects should be created with <methodname>Zend_Pdf_Image::imageWithPath($filePath)</methodname> method
         (JPG, PNG and TIFF images are supported now):
         </para>
         <example id="zend.pdf.drawing.image-drawing.example-1">
@@ -628,8 +628,8 @@ public function setLineDashingPattern($pattern, $phase = 0);
     <sect2 id="zend.pdf.drawing.fill-style">
         <title>Fill style</title>
         <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
+        <methodname>Zend_Pdf_Page::drawRectangle()</methodname>, <methodname>Zend_Pdf_Page::drawPolygon()</methodname>,
+        <methodname>Zend_Pdf_Page::drawCircle()</methodname> and <methodname>Zend_Pdf_Page::drawEllipse()</methodname> methods take
         <varname>$fillType</varname> argument as an optional parameter. It can be:
         </para>
 
@@ -646,7 +646,7 @@ public function setLineDashingPattern($pattern, $phase = 0);
         </itemizedlist>
 
         <para>
-        <classname>Zend_Pdf_Page::drawPolygon()</classname> methods also takes an additional parameter
+        <methodname>Zend_Pdf_Page::drawPolygon()</methodname> methods also takes an additional parameter
         <varname>$fillMethod</varname>:
         </para>
         <itemizedlist>
@@ -715,7 +715,7 @@ public function setLineDashingPattern($pattern, $phase = 0);
             <title>Rotations</title>
             <para>
             PDF page can be rotated before applying any draw operation.
-            It can be done by <classname>Zend_Pdf_Page::rotate()</classname> method:
+            It can be done by <methodname>Zend_Pdf_Page::rotate()</methodname> method:
             </para>
             <programlisting language="php"><![CDATA[
 /**
@@ -733,7 +733,7 @@ public function rotate($x, $y, $angle);
         <sect3 id="zend.pdf.drawing.linear-transformations.scale">
             <title>Starting from ZF 1.8, scaling</title>
             <para>
-            Scaling transformation is provided by <classname>Zend_Pdf_Page::scale()</classname> method:
+            Scaling transformation is provided by <methodname>Zend_Pdf_Page::scale()</methodname> method:
             </para>
             <programlisting language="php"><![CDATA[
 /**
@@ -750,7 +750,7 @@ public function scale($xScale, $yScale);
         <sect3 id="zend.pdf.drawing.linear-transformations.translate">
             <title>Starting from ZF 1.8, translating</title>
             <para>
-                Coordinate system shifting is performed by <classname>Zend_Pdf_Page::translate()</classname> method:
+                Coordinate system shifting is performed by <methodname>Zend_Pdf_Page::translate()</methodname> method:
             </para>
             <programlisting language="php"><![CDATA[
 /**
@@ -767,7 +767,7 @@ public function translate($xShift, $yShift);
         <sect3 id="zend.pdf.drawing.linear-transformations.skew">
             <title>Starting from ZF 1.8, skewing</title>
             <para>
-                Page skewing can be done using <classname>Zend_Pdf_Page::skew()</classname> method:
+                Page skewing can be done using <methodname>Zend_Pdf_Page::skew()</methodname> method:
             </para>
             <programlisting language="php"><![CDATA[
 /**
@@ -1042,7 +1042,7 @@ public function getFontSize();
         <classname>Zend_Pdf</classname> module supports transparency handling.
         </para>
         <para>
-        Transparency may be set using <classname>Zend_Pdf_Page::setAlpha()</classname> method:
+        Transparency may be set using <methodname>Zend_Pdf_Page::setAlpha()</methodname> method:
         <programlisting language="php"><![CDATA[
 /**
  * Set the transparency

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

@@ -14,8 +14,8 @@
 
         <para>
             New pages can be created by instantiating new <classname>Zend_Pdf_Page</classname> objects directly or by calling
-            the <classname>Zend_Pdf::newPage()</classname> method, which returns a <classname>Zend_Pdf_Page</classname> object.
-            <classname>Zend_Pdf::newPage()</classname> creates a page that is already attached to
+            the <methodname>Zend_Pdf::newPage()</methodname> method, which returns a <classname>Zend_Pdf_Page</classname> object.
+            <methodname>Zend_Pdf::newPage()</methodname> creates a page that is already attached to
             a document. Unattached pages can't be used with multiple PDF documents,
             but they are somewhat more performant.
             <footnote>
@@ -27,7 +27,7 @@
         </para>
 
         <para>
-        The <classname>Zend_Pdf::newPage()</classname> method and the <classname>Zend_Pdf_Page</classname> constructor take the same
+        The <methodname>Zend_Pdf::newPage()</methodname> method and the <classname>Zend_Pdf_Page</classname> constructor take the same
         parameters specifying page size. They can take either the size of page ($x, $y) in points (1/72 inch)
         or a predefined constant representing a page type:
             <itemizedlist>

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

@@ -165,8 +165,8 @@ $pdf->save($pdfPath);
     </para>
 
     <para>
-        This XML document can be retrieved and attached to the PDF with <classname>Zend_Pdf::getMetadata()</classname> and
-        <classname>Zend_Pdf::setMetadata($metadata)</classname> methods:
+        This XML document can be retrieved and attached to the PDF with <methodname>Zend_Pdf::getMetadata()</methodname> and
+        <methodname>Zend_Pdf::setMetadata($metadata)</methodname> methods:
             <programlisting language="php"><![CDATA[
 $pdf = Zend_Pdf::load($pdfPath);
 $metadata = $pdf->getMetadata();

+ 4 - 4
documentation/manual/en/module_specs/Zend_Pdf-Save.xml

@@ -3,17 +3,17 @@
 <sect1 id="zend.pdf.save">
     <title>Save Changes to PDF Documents</title>
     <para>
-    There are two methods that save changes to PDF documents: the <classname>Zend_Pdf::save()</classname> and
-    <classname>Zend_Pdf::render()</classname> methods.
+    There are two methods that save changes to PDF documents: the <methodname>Zend_Pdf::save()</methodname> and
+    <methodname>Zend_Pdf::render()</methodname> methods.
     </para>
 
     <para>
-    <classname>Zend_Pdf::save($filename, $updateOnly = false)</classname> saves the PDF document to a file. If $updateOnly
+    <methodname>Zend_Pdf::save($filename, $updateOnly = false)</methodname> saves the PDF document to a file. If $updateOnly
     is true, then only the new PDF file segment is appended to a file. Otherwise, the file is overwritten.
     </para>
 
     <para>
-    <classname>Zend_Pdf::render($newSegmentOnly = false)</classname> returns the PDF document as a string. If
+    <methodname>Zend_Pdf::render($newSegmentOnly = false)</methodname> returns the PDF document as a string. If
     $newSegmentOnly is true, then only the new PDF file segment is returned.
     </para>
 

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

@@ -11,7 +11,7 @@
         </para>
 
         <para>
-            The <classname>Zend_Search_Lucene_Analysis_Analyzer::getDefault()</classname> and <code>
+            The <methodname>Zend_Search_Lucene_Analysis_Analyzer::getDefault()</methodname> and <code>
             Zend_Search_Lucene_Analysis_Analyzer::setDefault()</code> methods are used
             to get and set the default analyzer.
         </para>
@@ -234,11 +234,11 @@ Zend_Search_Lucene_Analysis_Analyzer::setDefault($analyzer);
         </para>
 
         <para>
-            tf(t in d) - <classname>Zend_Search_Lucene_Search_Similarity::tf($freq)</classname> - a score factor based on the frequency of a term or phrase in a document.
+            tf(t in d) - <methodname>Zend_Search_Lucene_Search_Similarity::tf($freq)</methodname> - a score factor based on the frequency of a term or phrase in a document.
         </para>
 
         <para>
-            idf(t) - <classname>Zend_Search_Lucene_Search_Similarity::tf($term, $reader)</classname> - a score factor for a simple term with the specified index.
+            idf(t) - <methodname>Zend_Search_Lucene_Search_Similarity::tf($term, $reader)</methodname> - a score factor for a simple term with the specified index.
         </para>
 
         <para>
@@ -257,7 +257,7 @@ Zend_Search_Lucene_Analysis_Analyzer::setDefault($analyzer);
         </para>
 
         <para>
-            coord(q,d) - <classname>Zend_Search_Lucene_Search_Similarity::coord($overlap, $maxOverlap)</classname> - a
+            coord(q,d) - <methodname>Zend_Search_Lucene_Search_Similarity::coord($overlap, $maxOverlap)</methodname> - a
             score factor based on the fraction of all query terms that a document contains.
         </para>
 

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

@@ -70,7 +70,7 @@ $index->addDocument($doc);
         </para>
 
         <para>
-            <classname>Zend_Search_Lucene::delete()</classname> method operates with an internal index document id. It can be retrieved
+            <methodname>Zend_Search_Lucene::delete()</methodname> method operates with an internal index document id. It can be retrieved
             from a query hit by 'id' property:
         </para>
 
@@ -91,13 +91,13 @@ foreach ($hits as $hit) {
         </para>
 
         <para>
-             <classname>Zend_Search_Lucene::maxDoc()</classname> returns one greater than the largest possible document number.
+             <methodname>Zend_Search_Lucene::maxDoc()</methodname> returns one greater than the largest possible document number.
              It's actually the overall number of the documents in the index including deleted documents,
-             so it has a synonym: <classname>Zend_Search_Lucene::count()</classname>.
+             so it has a synonym: <methodname>Zend_Search_Lucene::count()</methodname>.
         </para>
 
         <para>
-             <classname>Zend_Search_Lucene::numDocs()</classname> returns the total number of non-deleted documents.
+             <methodname>Zend_Search_Lucene::numDocs()</methodname> returns the total number of non-deleted documents.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -106,7 +106,7 @@ $documents = $index->numDocs();
 ]]></programlisting>
 
         <para>
-            <classname>Zend_Search_Lucene::isDeleted($id)</classname> method may be used to check if a document is deleted.
+            <methodname>Zend_Search_Lucene::isDeleted($id)</methodname> method may be used to check if a document is deleted.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -145,7 +145,7 @@ for ($count = 0; $count < $index->maxDoc(); $count++) {
         </para>
 
         <para>
-            Full index optimization can be trigger by calling the <classname>Zend_Search_Lucene::optimize()</classname> method. It merges all
+            Full index optimization can be trigger by calling the <methodname>Zend_Search_Lucene::optimize()</methodname> method. It merges all
             index segments into one new segment:
         </para>
         <programlisting language="php"><![CDATA[
@@ -242,7 +242,7 @@ $index->optimize();
         </para>
 
         <para>
-            It's possible to override this with the <classname>Zend_Search_Lucene_Storage_Directory_Filesystem::setDefaultFilePermissions()</classname> method:
+            It's possible to override this with the <methodname>Zend_Search_Lucene_Storage_Directory_Filesystem::setDefaultFilePermissions()</methodname> method:
         </para>
 
         <programlisting language="php"><![CDATA[

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

@@ -96,7 +96,7 @@ $doc->addField(Zend_Search_Lucene_Field::UnStored('contents',
 ]]></programlisting>
 
             <para>
-                Each of these methods (excluding the <classname>Zend_Search_Lucene_Field::Binary()</classname> method) has an optional
+                Each of these methods (excluding the <methodname>Zend_Search_Lucene_Field::Binary()</methodname> method) has an optional
                 <varname>$encoding</varname> parameter for specifying input data encoding.
             </para>
 
@@ -304,7 +304,7 @@ $index->addDocument($doc);
 
         <para>
             Document links are not included in the generated document, but may be retrieved with
-            the <classname>Zend_Search_Lucene_Document_Html::getLinks()</classname> and <classname>Zend_Search_Lucene_Document_Html::getHeaderLinks()</classname>
+            the <methodname>Zend_Search_Lucene_Document_Html::getLinks()</methodname> and <methodname>Zend_Search_Lucene_Document_Html::getHeaderLinks()</methodname>
             methods:
             <programlisting language="php"><![CDATA[
 $doc = Zend_Search_Lucene_Document_Html::loadHTML($htmlString);
@@ -315,10 +315,10 @@ $headerLinksArray = $doc->getHeaderLinks();
 
         <para>
             Starting from ZF 1.6 it's also possible to exclude links with <code>rel</code> attribute set to <code>'nofollow'</code>.
-            Use <classname>Zend_Search_Lucene_Document_Html::setExcludeNoFollowLinks($true)</classname> to turn on this option.
+            Use <methodname>Zend_Search_Lucene_Document_Html::setExcludeNoFollowLinks($true)</methodname> to turn on this option.
         </para>
         <para>
-            <classname>Zend_Search_Lucene_Document_Html::getExcludeNoFollowLinks()</classname> method returns current state of
+            <methodname>Zend_Search_Lucene_Document_Html::getExcludeNoFollowLinks()</methodname> method returns current state of
             "Exclude nofollow links" flag.
         </para>
     </sect2>

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

@@ -49,10 +49,10 @@ try {
             Starting in 1.5, query parsing exceptions are suppressed by default. If query doesn't conform query language,
             then it's tokenized using current default analyzer and all tokenized terms are used for searching.
 
-            Use <classname>Zend_Search_Lucene_Search_QueryParser::dontSuppressQueryParsingExceptions()</classname> method
+            Use <methodname>Zend_Search_Lucene_Search_QueryParser::dontSuppressQueryParsingExceptions()</methodname> method
             to turn exceptions on.
-            <classname>Zend_Search_Lucene_Search_QueryParser::suppressQueryParsingExceptions()</classname> and
-            <classname>Zend_Search_Lucene_Search_QueryParser::queryParsingExceptionsSuppressed()</classname> methods are also
+            <methodname>Zend_Search_Lucene_Search_QueryParser::suppressQueryParsingExceptions()</methodname> and
+            <methodname>Zend_Search_Lucene_Search_QueryParser::queryParsingExceptionsSuppressed()</methodname> methods are also
             intended to manage exceptions handling behavior.
 
         </para>
@@ -501,7 +501,7 @@ $query4 = new Zend_Search_Lucene_Search_Query_Phrase(
 
         <para>
             A phrase query can be constructed in one step with a class constructor or step by step with
-            <classname>Zend_Search_Lucene_Search_Query_Phrase::addTerm()</classname> method calls.
+            <methodname>Zend_Search_Lucene_Search_Query_Phrase::addTerm()</methodname> method calls.
         </para>
 
         <para>
@@ -560,7 +560,7 @@ $query = new Zend_Search_Lucene_Search_Query_Phrase(
         </para>
 
         <para>
-            <classname>Zend_Search_Lucene_Search_Query_Phrase::addTerm()</classname> takes two arguments, a
+            <methodname>Zend_Search_Lucene_Search_Query_Phrase::addTerm()</methodname> takes two arguments, a
             required <classname>Zend_Search_Lucene_Index_Term</classname> object and an optional position:
         </para>
         <programlisting language="php"><![CDATA[

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

@@ -66,7 +66,7 @@ $index = Zend_Search_Lucene::open('/data/my_index');
 $index->find($query);
 ]]></programlisting>
         <para>
-            The <classname>Zend_Search_Lucene::find()</classname> method determines the input type automatically and
+            The <methodname>Zend_Search_Lucene::find()</methodname> method determines the input type automatically and
             uses the query parser to construct an appropriate <classname>Zend_Search_Lucene_Search_Query</classname> object
             from an input of type string.
         </para>
@@ -86,7 +86,7 @@ $index->find($query);
         <sect3 id="zend.search.lucene.searching.query_building.parsing">
             <title>Query Parsing</title>
             <para>
-                <classname>Zend_Search_Lucene_Search_QueryParser::parse()</classname> method may be used to parse query strings
+                <methodname>Zend_Search_Lucene_Search_QueryParser::parse()</methodname> method may be used to parse query strings
                 into query objects.
             </para>
 
@@ -115,7 +115,7 @@ $hits = $index->find($query);
             </para>
 
             <para>
-                <classname>Zend_Search_Lucene_Search_QueryParser::parse()</classname> method also takes an optional encoding parameter,
+                <methodname>Zend_Search_Lucene_Search_QueryParser::parse()</methodname> method also takes an optional encoding parameter,
                 which can specify query string encoding:
             <programlisting language="php"><![CDATA[
 $userQuery = Zend_Search_Lucene_Search_QueryParser::parse($queryStr,
@@ -129,7 +129,7 @@ $userQuery = Zend_Search_Lucene_Search_QueryParser::parse($queryStr,
 
             <para>
                 It's also possible to specify the default query string encoding with
-                <classname>Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding()</classname> method:
+                <methodname>Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding()</methodname> method:
                 <programlisting language="php"><![CDATA[
 Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('iso-8859-5');
 ...
@@ -138,7 +138,7 @@ $userQuery = Zend_Search_Lucene_Search_QueryParser::parse($queryStr);
             </para>
 
             <para>
-                <classname>Zend_Search_Lucene_Search_QueryParser::getDefaultEncoding()</classname> returns the current default query
+                <methodname>Zend_Search_Lucene_Search_QueryParser::getDefaultEncoding()</methodname> returns the current default query
                 string encoding (the empty string means "current locale").
             </para>
         </sect3>

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

@@ -38,7 +38,7 @@
         <title>Verify an API key</title>
 
         <para>
-            <classname>Zend_Service_Akismet::verifyKey($key)</classname> is used to
+            <methodname>Zend_Service_Akismet::verifyKey($key)</methodname> is used to
             verify that an Akismet API key is valid. In most cases, you
             will not need to check, but if you need a sanity check, or
             to determine if a newly acquired key is active, you may do
@@ -72,7 +72,7 @@ if ($akismet->verifyKey($apiKey) {
         <title>Check for spam</title>
 
         <para>
-            <classname>Zend_Service_Akismet::isSpam($data)</classname> is used to
+            <methodname>Zend_Service_Akismet::isSpam($data)</methodname> is used to
             determine if the data provided is considered spam by
             Akismet. It accepts an associative array as the sole
             argument. That array requires the following keys be set:
@@ -213,7 +213,7 @@ if ($akismet->isSpam($data)) {
         </para>
 
         <para>
-            <classname>Zend_Service_Akismet::submitSpam()</classname> takes the same data
+            <methodname>Zend_Service_Akismet::submitSpam()</methodname> takes the same data
             array as passed to <methodname>isSpam()</methodname>, but does not return a
             value. An exception will be raised if the API key used is invalid.
         </para>
@@ -253,7 +253,7 @@ $akismet->submitSpam($data));
         </para>
 
         <para>
-            <classname>Zend_Service_Akismet::submitHam()</classname> takes the same data
+            <methodname>Zend_Service_Akismet::submitHam()</methodname> takes the same data
             array as passed to <methodname>isSpam()</methodname> or
             <methodname>submitSpam()</methodname>, and, like <methodname>submitSpam()</methodname>, does
             not return a value. An exception will be raised if the API key used

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

@@ -225,9 +225,9 @@ foreach ($results as $result) {
         <title>Zend_Service_Amazon Classes</title>
         <para>
             The following classes are all returned by
-            <link linkend="zend.service.amazon.itemlookup"><classname>Zend_Service_Amazon::itemLookup()</classname></link>
+            <link linkend="zend.service.amazon.itemlookup"><methodname>Zend_Service_Amazon::itemLookup()</methodname></link>
             and
-            <link linkend="zend.service.amazon.itemsearch"><classname>Zend_Service_Amazon::itemSearch()</classname></link>:
+            <link linkend="zend.service.amazon.itemsearch"><methodname>Zend_Service_Amazon::itemSearch()</methodname></link>:
             <itemizedlist>
                 <listitem><para><link linkend="zend.service.amazon.classes.item"><classname>Zend_Service_Amazon_Item</classname></link></para></listitem>
                 <listitem><para><link linkend="zend.service.amazon.classes.image"><classname>Zend_Service_Amazon_Image</classname></link></para></listitem>

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

@@ -220,10 +220,10 @@ try {
             From time to time you probably will want to check your API key daily usage. By default Technorati limits
             your API usage to 500 calls per day, and an exception is returned by <classname>Zend_Service_Technorati</classname>
             if you try to use it beyond this limit. You can get information about your API key usage using the
-            <classname>Zend_Service_Technorati::keyInfo()</classname> method.
+            <methodname>Zend_Service_Technorati::keyInfo()</methodname> method.
         </para>
         <para>
-            <classname>Zend_Service_Technorati::keyInfo()</classname> returns a
+            <methodname>Zend_Service_Technorati::keyInfo()</methodname> returns a
             <classname>Zend_Service_Technorati_KeyInfoResult</classname> object. For full details please see the
             <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
         </para>
@@ -262,7 +262,7 @@ echo "Daily Usage: " . $key->getApiQueries() . "/" .
                 <ulink url="http://technorati.com/developers/api/cosmos.html">Cosmos</ulink> query lets you see what
                 blogs are linking to a given URL. It returns a
                 <link linkend="zend.service.technorati.classes.cosmosresultset"><classname>Zend_Service_Technorati_CosmosResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::cosmos()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::cosmos()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.cosmos.example-1">
@@ -289,7 +289,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/search.html">Search</ulink> query lets you see
                 what blogs contain a given search string. It returns a
                 <link linkend="zend.service.technorati.classes.searchresultset"><classname>Zend_Service_Technorati_SearchResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::search()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::search()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.search.example-1">
@@ -316,7 +316,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/tag.html">Tag</ulink> query lets you see what
                 posts are associated with a given tag. It returns a
                 <link linkend="zend.service.technorati.classes.tagresultset"><classname>Zend_Service_Technorati_TagResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::tag()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::tag()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.tag.example-1">
@@ -343,7 +343,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/dailycounts.html">DailyCounts</ulink> query
                 provides daily counts of posts containing the queried keyword. It returns a
                 <link linkend="zend.service.technorati.classes.dailycountsresultset"><classname>Zend_Service_Technorati_DailyCountsResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::dailyCounts()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::dailyCounts()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.dailycounts.example-1">
@@ -367,7 +367,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/toptags.html">TopTags</ulink> query provides
                 information on top tags indexed by Technorati. It returns a
                 <link linkend="zend.service.technorati.classes.tagsresultset"><classname>Zend_Service_Technorati_TagsResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::topTags()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::topTags()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.toptags.example-1">
@@ -394,7 +394,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/bloginfo.html">BlogInfo</ulink> query provides
                 information on what blog, if any, is associated with a given URL. It returns a
                 <link linkend="zend.service.technorati.classes.bloginforesult"><classname>Zend_Service_Technorati_BlogInfoResult</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::blogInfo()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::blogInfo()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.bloginfo.example-1">
@@ -415,7 +415,7 @@ echo '<h2><a href="' . (string) $result->getWeblog()->getUrl() . '">' .
                 The <ulink url="http://technorati.com/developers/api/blogposttags.html">BlogPostTags</ulink> query
                 provides information on the top tags used by a specific blog. It returns a
                 <link linkend="zend.service.technorati.classes.tagsresultset"><classname>Zend_Service_Technorati_TagsResultSet</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::blogPostTags()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::blogPostTags()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.blogposttags.example-1">
@@ -442,7 +442,7 @@ echo "</ol>";
                 The <ulink url="http://technorati.com/developers/api/getinfo.html">GetInfo</ulink> query tells you
                 things that Technorati knows about a member. It returns a
                 <link linkend="zend.service.technorati.classes.getinforesult"><classname>Zend_Service_Technorati_GetInfoResult</classname></link>
-                object. For full details please see <classname>Zend_Service_Technorati::getInfo()</classname> in the
+                object. For full details please see <methodname>Zend_Service_Technorati::getInfo()</methodname> in the
                 <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
             <example id="zend.service.technorati.queries.getinfo.example-1">
@@ -468,7 +468,7 @@ echo "</ol>";
             <para>
                 The KeyInfo query provides information on daily usage of an API key. It returns a
                <link linkend="zend.service.technorati.classes.keyinforesult"><classname>Zend_Service_Technorati_KeyInfoResult</classname></link>
-               object. For full details please see <classname>Zend_Service_Technorati::keyInfo()</classname> in the
+               object. For full details please see <methodname>Zend_Service_Technorati::keyInfo()</methodname> in the
                <ulink url="http://framework.zend.com/apidoc/core/">API reference guide</ulink>.
             </para>
         </sect3>

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

@@ -32,7 +32,7 @@ Zend_Session::start();
         <para>
             By starting the session in the bootstrap file, you avoid the possibility that your session might be started
             after headers have been sent to the browser, which results in an exception, and possibly a broken page for
-            website viewers. Various advanced features require <classname>Zend_Session::start()</classname> first. (More on
+            website viewers. Various advanced features require <methodname>Zend_Session::start()</methodname> first. (More on
             advanced features later.)
         </para>
 
@@ -61,15 +61,15 @@ php_value session.auto_start 0
                     <ulink url="http://www.php.net/session_start"><methodname>session_start()</methodname></ulink> function
                     directly. If you use <methodname>session_start()</methodname> directly, and then start using
                     <classname>Zend_Session_Namespace</classname>, an exception will be thrown by
-                    <classname>Zend_Session::start()</classname> ("session has already been started"). If you call
+                    <methodname>Zend_Session::start()</methodname> ("session has already been started"). If you call
                     <methodname>session_start()</methodname> after using <classname>Zend_Session_Namespace</classname> or calling
-                    <classname>Zend_Session::start()</classname>, an error of level <code>E_NOTICE</code> will be generated, and
+                    <methodname>Zend_Session::start()</methodname>, an error of level <code>E_NOTICE</code> will be generated, and
                     the call will be ignored.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    Correct: Use <classname>Zend_Session::start()</classname>. If you want all requests to have and use
+                    Correct: Use <methodname>Zend_Session::start()</methodname>. If you want all requests to have and use
                     sessions, then place this function call early and unconditionally in your bootstrap code.
                     Sessions have some overhead. If some requests need sessions, but other requests will not need to use
                     sessions, then:
@@ -78,29 +78,29 @@ php_value session.auto_start 0
                     <listitem>
                         <para>
                             Unconditionally set the <code>strict</code> option to <constant>TRUE</constant> using
-                            <classname>Zend_Session::setOptions()</classname> in your bootstrap.
+                            <methodname>Zend_Session::setOptions()</methodname> in your bootstrap.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            Call <classname>Zend_Session::start()</classname> only for requests that need to use sessions and
+                            Call <methodname>Zend_Session::start()</methodname> only for requests that need to use sessions and
                             before any <classname>Zend_Session_Namespace</classname> objects are instantiated.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
                             Use "<code>new Zend_Session_Namespace()</code>" normally, where needed, but make sure
-                            <classname>Zend_Session::start()</classname> has been called previously.
+                            <methodname>Zend_Session::start()</methodname> has been called previously.
                         </para>
                     </listitem>
                 </itemizedlist>
                 <para>
                     The <code>strict</code> option prevents <code>new Zend_Session_Namespace()</code> from automatically
-                    starting the session using <classname>Zend_Session::start()</classname>. Thus, this option helps application
+                    starting the session using <methodname>Zend_Session::start()</methodname>. Thus, this option helps application
                     developers enforce a design decision to avoid using sessions for certain requests, since it causes
                     an exception to be thrown when <classname>Zend_Session_Namespace</classname> is instantiated before
-                    <classname>Zend_Session::start()</classname> is called. Developers should carefully consider the impact of
-                    using <classname>Zend_Session::setOptions()</classname>, since these options have global effect, owing to
+                    <methodname>Zend_Session::start()</methodname> is called. Developers should carefully consider the impact of
+                    using <methodname>Zend_Session::setOptions()</methodname>, since these options have global effect, owing to
                     their correspondence to the underlying options for ext/session.
                 </para>
             </listitem>
@@ -432,8 +432,8 @@ echo $myNamespace->someArray['foo']; // prints "bar"
             suite of unit tests to cover the code in their applications. The exception
             "<emphasis>Zend_Session is currently marked as read-only</emphasis>" is thrown while
             performing unit tests, if any write-related methods are used after ending the session. However, unit tests
-            using Zend_Session require extra attention, because closing (<classname>Zend_Session::writeClose()</classname>), or
-            destroying a session (<classname>Zend_Session::destroy()</classname>) prevents any further setting or unsetting of
+            using Zend_Session require extra attention, because closing (<methodname>Zend_Session::writeClose()</methodname>), or
+            destroying a session (<methodname>Zend_Session::destroy()</methodname>) prevents any further setting or unsetting of
             keys in any instance of <classname>Zend_Session_Namespace</classname>. This behavior is a direct result of the
             underlying ext/session mechanism and PHP's <methodname>session_destroy()</methodname> and
             <methodname>session_write_close()</methodname>, which have no "undo" mechanism to facilitate setup/teardown with unit

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

@@ -8,8 +8,8 @@
         The default behavior of sessions can be modified using the static methods of Zend_Session. All management and
         manipulation of global session management occurs using Zend_Session, including configuration of the
         <ulink url="http://www.php.net/session#session.configuration">usual options provided by ext/session</ulink>,
-        using <classname>Zend_Session::setOptions()</classname>. For example, failure to insure the use of a safe
-        <code>save_path</code> or a unique cookie name by ext/session using <classname>Zend_Session::setOptions()</classname> may
+        using <methodname>Zend_Session::setOptions()</methodname>. For example, failure to insure the use of a safe
+        <code>save_path</code> or a unique cookie name by ext/session using <methodname>Zend_Session::setOptions()</methodname> may
         result in security issues.
     </para>
 
@@ -20,14 +20,14 @@
         <para>
             When the first session namespace is requested, Zend_Session will automatically start the PHP session, unless
             already started with
-            <link linkend="zend.session.advanced_usage.starting_a_session"><classname>Zend_Session::start()</classname></link>.
+            <link linkend="zend.session.advanced_usage.starting_a_session"><methodname>Zend_Session::start()</methodname></link>.
             The underlying PHP session will use defaults from Zend_Session, unless modified first by
-            <classname>Zend_Session::setOptions()</classname>.
+            <methodname>Zend_Session::setOptions()</methodname>.
         </para>
 
         <para>
             To set a session configuration option, include the basename (the part of the name after
-            "<code>session.</code>") as a key of an array passed to <classname>Zend_Session::setOptions()</classname>. The
+            "<code>session.</code>") as a key of an array passed to <methodname>Zend_Session::setOptions()</methodname>. The
             corresponding value in the array is used to set the session option value. If no options are set by the
             developer, Zend_Session will utilize recommended default options first, then the default php.ini settings.
             Community feedback about best practices for these options should be sent to
@@ -89,7 +89,7 @@ remember_me_seconds = 864000
 
             <para>
                 Next, load the configuration file and pass its array representation to
-                <classname>Zend_Session::setOptions()</classname>:
+                <methodname>Zend_Session::setOptions()</methodname>:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -274,7 +274,7 @@ Zend_Session::setOptions($config->toArray());
         </para>
 
         <para>
-            When to use regenerateId(): Adding <classname>Zend_Session::regenerateId()</classname> to your Zend Framework
+            When to use regenerateId(): Adding <methodname>Zend_Session::regenerateId()</methodname> to your Zend Framework
             bootstrap yields one of the safest and most secure ways to regenerate session id's in user agent
             cookies. If there is no conditional logic to determine when to regenerate the session id, then there are
             no flaws in that logic. Although regenerating on every request prevents several possible avenues of
@@ -312,7 +312,7 @@ Zend_Session::setOptions($config->toArray());
             </para>
 
             <para>
-                By itself, calling <classname>Zend_Session::regenerateId()</classname> when the user's session is first used, does
+                By itself, calling <methodname>Zend_Session::regenerateId()</methodname> when the user's session is first used, does
                 not prevent session fixation attacks, unless you can distinguish between a session originated by an
                 attacker emulating the victim. At first, this might sound contradictory to the previous statement above,
                 until we consider an attacker who first initiates a real session on your website. The session is "first
@@ -377,10 +377,10 @@ if (!isset($defaultNamespace->initialized)) {
         <para>
             Ordinarily, sessions end when the user agent terminates, such as when an end user exits a web browser
             program. However, your application may provide the ability to extend user sessions beyond the lifetime of
-            the client program through the use of persistent cookies. Use <classname>Zend_Session::rememberMe()</classname> before
+            the client program through the use of persistent cookies. Use <methodname>Zend_Session::rememberMe()</methodname> before
             a session is started to control the length of time before a persisted session cookie expires. If you do not
             specify a number of seconds, then the session cookie lifetime defaults to <code>remember_me_seconds</code>,
-            which may be set using <classname>Zend_Session::setOptions()</classname>. To help thwart session fixation/hijacking,
+            which may be set using <methodname>Zend_Session::setOptions()</methodname>. To help thwart session fixation/hijacking,
             use this function when a user successfully authenticates with your application (e.g., from a "login" form).
         </para>
 
@@ -414,7 +414,7 @@ if (!isset($defaultNamespace->initialized)) {
         <title>destroy(bool $remove_cookie = true, bool $readonly = true)</title>
 
         <para>
-            <classname>Zend_Session::destroy()</classname> destroys all of the persistent data associated with the current
+            <methodname>Zend_Session::destroy()</methodname> destroys all of the persistent data associated with the current
             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
@@ -426,7 +426,7 @@ if (!isset($defaultNamespace->initialized)) {
             If you see the error message, "Cannot modify header information - headers already sent", then either avoid
             using <constant>TRUE</constant> as the value for the first argument (requesting removal of the session cookie), or
             see <xref linkend="zend.session.global_session_management.headers_sent" />. Thus,
-            <classname>Zend_Session::destroy(true)</classname> must either be called before PHP has sent HTTP headers, or output
+            <methodname>Zend_Session::destroy(true)</methodname> must either be called before PHP has sent HTTP headers, or output
             buffering must be enabled. Also, the total output sent must not exceed the set buffer size, in order to
             prevent triggering sending the output before the call to <methodname>destroy()</methodname>.
         </para>
@@ -526,7 +526,7 @@ if (!isset($defaultNamespace->initialized)) {
         <title>namespaceUnset($namespace)</title>
 
         <para>
-            Use <classname>Zend_Session::namespaceUnset($namespace)</classname> to efficiently remove an entire namespace and its
+            Use <methodname>Zend_Session::namespaceUnset($namespace)</methodname> to efficiently remove an entire namespace and its
             contents. As with all arrays in PHP, if a variable containing an array is unset, and the array contains
             other objects, those objects will remain available, if they were also stored by reference in other
             array/objects that remain accessible via other variables. So <methodname>namespaceUnset()</methodname> does not perform

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

@@ -254,7 +254,7 @@ $server->handle();
             <title>Request processing</title>
 
             <para>
-                <classname>Zend_Soap_Server::handle()</classname> method takes request from the standard input stream ('php://input').
+                <methodname>Zend_Soap_Server::handle()</methodname> method takes request from the standard input stream ('php://input').
                 It may be overridden either by supplying optional parameter to the <methodname>handle()</methodname> method or
                 by setting request using <methodname>setRequest()</methodname> method:
                 <programlisting language="php"><![CDATA[
@@ -318,7 +318,7 @@ $request = $server->getLastRequest();
             <title>Response pre-processing</title>
 
             <para>
-                <classname>Zend_Soap_Server::handle()</classname> method automatically emits generated response to the output stream.
+                <methodname>Zend_Soap_Server::handle()</methodname> method automatically emits generated response to the output stream.
                 It may be blocked using <methodname>setReturnResponse()</methodname> with <constant>TRUE</constant> or <constant>FALSE</constant>
                 as a parameter<footnote>
                                 <para>

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

@@ -76,7 +76,7 @@
                 (see <ulink url="http://schemas.xmlsoap.org/soap/encoding/"/>).
             </para>
             <para>
-                All non-standard types, which may be added using <classname>Zend_Soap_Wsdl::addComplexType()</classname> method, are
+                All non-standard types, which may be added using <methodname>Zend_Soap_Wsdl::addComplexType()</methodname> method, are
                 described using 'complexType' node of '/definitions/types/schema/' section of WSDL document.
             </para>
             <para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Test-PHPUnit-Db-Quickstart.xml

@@ -304,7 +304,7 @@ class BugsTest extends Zend_Test_PHPUnit_DatabaseTestCase
         <para>
             Here we create the current database state from a
             <classname>Zend_Db_Table_Rowset_Abstract</classname> instance in conjunction with
-            the <classname>Zend_Test_PHPUnit_Db_DataSet_DbRowset($rowset)</classname> instance
+            the <methodname>Zend_Test_PHPUnit_Db_DataSet_DbRowset($rowset)</methodname> instance
             which creates an internal data-representation of the rowset.  This can again be
             compared against another data-table by using the
             <methodname>$this->assertTablesEqual()</methodname> assertion.

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

@@ -19,9 +19,9 @@
             <code>setContent</code> method of <classname>Zend_Text_Table_Column</classname>.
             Alternatively if you have a different encoding in the entire
             process, you can define the standard input charset with
-            <classname>Zend_Text_Table::setInputCharset($charset)</classname>. In
+            <methodname>Zend_Text_Table::setInputCharset($charset)</methodname>. In
             case you need another output charset for the table, you can set
-            this with <classname>Zend_Text_Table::setOutputCharset($charset)</classname>.
+            this with <methodname>Zend_Text_Table::setOutputCharset($charset)</methodname>.
         </para>
     </note>
     <para>

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

@@ -365,7 +365,7 @@ try {
 
         <para>
             To use caching you will just have to give a cache object to the
-            <classname>Zend_Translate::setCache()</classname> method. It takes a instance of
+            <methodname>Zend_Translate::setCache()</methodname> method. It takes a instance of
             <classname>Zend_Cache</classname> as only parameter. Also if you use any adapter direct you
             can use the <methodname>setCache()</methodname> method. For convenience there are also the static methods
             <methodname>getCache()</methodname>, <methodname>hasCache()</methodname>, <methodname>clearCache()</methodname> and

+ 10 - 10
documentation/manual/en/module_specs/Zend_Uri.xml

@@ -31,7 +31,7 @@
 
     <para>
       <classname>Zend_Uri</classname> will build a new URI from scratch if only a scheme
-      is passed to <classname>Zend_Uri::factory()</classname>.
+      is passed to <methodname>Zend_Uri::factory()</methodname>.
     </para>
 
     <example id="zend.uri.creation.example-1">
@@ -47,7 +47,7 @@ $uri = Zend_Uri::factory('http');
 
     <para>
       To create a new URI from scratch, pass only the scheme to
-      <classname>Zend_Uri::factory()</classname><footnote><para>At the time of writing,
+      <methodname>Zend_Uri::factory()</methodname><footnote><para>At the time of writing,
       Zend_Uri only supports the HTTP and HTTPS schemes.</para></footnote> .
       If an unsupported scheme is passed, a <classname>Zend_Uri_Exception</classname>
       will be thrown.
@@ -55,7 +55,7 @@ $uri = Zend_Uri::factory('http');
 
     <para>
       If the scheme or URI passed is supported,
-      <classname>Zend_Uri::factory()</classname> will return a subclass of itself that
+      <methodname>Zend_Uri::factory()</methodname> will return a subclass of itself that
       specializes in the scheme to be created.
     </para>
   </sect2>
@@ -65,7 +65,7 @@ $uri = Zend_Uri::factory('http');
 
     <para>
       To manipulate an existing URI, pass the entire URI to
-      <classname>Zend_Uri::factory()</classname>.
+      <methodname>Zend_Uri::factory()</methodname>.
     </para>
 
     <example id="zend.uri.manipulation.example-1">
@@ -82,7 +82,7 @@ $uri = Zend_Uri::factory('http://www.zend.com');
     <para>
       The URI will be parsed and validated. If it is found to be invalid, a
       <classname>Zend_Uri_Exception</classname> will be thrown immediately. Otherwise,
-      <classname>Zend_Uri::factory()</classname> will return a subclass of itself that
+      <methodname>Zend_Uri::factory()</methodname> will return a subclass of itself that
       specializes in the scheme to be manipulated.
     </para>
   </sect2>
@@ -91,7 +91,7 @@ $uri = Zend_Uri::factory('http://www.zend.com');
     <title>URI Validation</title>
 
     <para>
-      The <classname>Zend_Uri::check()</classname> function can be used if only
+      The <methodname>Zend_Uri::check()</methodname> function can be used if only
       validation of an existing URI is needed.
     </para>
 
@@ -107,8 +107,8 @@ $valid = Zend_Uri::check('http://uri.in.question');
     </example>
 
     <para>
-      <classname>Zend_Uri::check()</classname> returns a boolean,
-      which is more convenient than using <classname>Zend_Uri::factory()</classname>
+      <methodname>Zend_Uri::check()</methodname> returns a boolean,
+      which is more convenient than using <methodname>Zend_Uri::factory()</methodname>
       and catching the exception.
     </para>
 
@@ -145,7 +145,7 @@ Zend_Uri::setConfig(array('allow_unwise' => false));
         </example>
 
         <note>
-            <para><classname>Zend_Uri::setConfig()</classname> sets configuration options globally.
+            <para><methodname>Zend_Uri::setConfig()</methodname> sets configuration options globally.
             It is recommended to reset the 'allow_unwise' option to 'false' like in
             the example above, unless you are certain you want to always allow
             unwise characters globally.</para>
@@ -210,7 +210,7 @@ echo $uri->getUri();  // "http://www.zend.com"
       <title>Validating the URI</title>
 
       <para>
-        <classname>Zend_Uri::factory()</classname> will always validate any URI passed
+        <methodname>Zend_Uri::factory()</methodname> will always validate any URI passed
         to it and will not instantiate a new <classname>Zend_Uri</classname> subclass
         if the given URI is found to be invalid. However, after the
         <classname>Zend_Uri</classname> subclass is instantiated for a new URI or a

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

@@ -62,7 +62,7 @@ $validator->isValid('yesterday'); // false
         <para>
             Validates whether a string is valid for using as a 'loc'
             element in a Sitemap XML document. This uses
-            <classname>Zend_Form::check()</classname> internally. Read more at
+            <methodname>Zend_Form::check()</methodname> internally. Read more at
             <link linkend="zend.uri.validation">URI Validation</link>.
         </para>
     </sect3>

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

@@ -15,7 +15,7 @@
         <methodname>isValid()</methodname>, <methodname>getMessages()</methodname>, and <methodname>getErrors()</methodname>, that may
         be implemented by user classes in order to create custom validation objects. An object that
         implements <classname>Zend_Validate_Interface</classname> interface may be added to a
-        validator chain with <classname>Zend_Validate::addValidator()</classname>. Such objects may
+        validator chain with <methodname>Zend_Validate::addValidator()</methodname>. Such objects may
         also be used with <link
             linkend="zend.filter.input"><classname>Zend_Filter_Input</classname></link>.
     </para>

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

@@ -191,7 +191,7 @@ if (!validator->isValid('word')) {
         <para>
             If it's inconvenient to load a given validation class and create an
             instance of the validator, you can use the static method
-            <classname>Zend_Validate::is()</classname> as an alternative invocation
+            <methodname>Zend_Validate::is()</methodname> as an alternative invocation
             style. The first argument of this method is a data input value,
             that you would pass to the <methodname>isValid()</methodname> method. The
             second argument is a string, which corresponds to the basename of

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

@@ -12,7 +12,7 @@
     </para>
 
     <para>
-        The static method <classname>Zend_Version::compareVersion($version)</classname>
+        The static method <methodname>Zend_Version::compareVersion($version)</methodname>
         is based on the PHP function
         <ulink url="http://php.net/version_compare"><methodname>version_compare()</methodname></ulink>.
         This method returns -1 if the specified version

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

@@ -26,7 +26,7 @@
 
     <para>
         It is this latter point that is salient to the design decisions.
-        Internally, <classname>Zend_View::_run()</classname> does the following:
+        Internally, <methodname>Zend_View::_run()</methodname> does the following:
     </para>
 
     <programlisting language="php"><![CDATA[

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

@@ -38,7 +38,7 @@ Content-Type: application/json
             Each method in the JSON helper accepts a second, optional argument.
             This second argument can be a boolean flag to enable or disable
             layouts, or an array of options that will be passed to
-            <classname>Zend_Json::encode()</classname> and used internally to encode data.
+            <methodname>Zend_Json::encode()</methodname> and used internally to encode data.
         </para>
 
         <para>

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

@@ -14,7 +14,7 @@
         <para>
             Prior to the 1.7.5 release, the Zend Framework team was notified of
             a potential Local File Inclusion (LFI) vulnerability in the
-            <classname>Zend_View::render()</classname> method. Prior to 1.7.5, the method
+            <methodname>Zend_View::render()</methodname> method. Prior to 1.7.5, the method
             allowed, by default, the ability to specify view scripts that
             included parent directory notation (e.g., "../" or "..\"). This
             opens the possibility for an LFI attack if unfiltered user input is

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

@@ -231,7 +231,7 @@ $result = $client->call('foo.bar', array(array()));
                 There are two ways to create a <classname>Zend_XmlRpc_Value</classname>
                 object: instantiate one of the <classname>Zend_XmlRpc_Value</classname>
                 subclasses directly, or use the static factory method
-                <classname>Zend_XmlRpc_Value::getXmlRpcValue()</classname>.
+                <methodname>Zend_XmlRpc_Value::getXmlRpcValue()</methodname>.
             </para>
 
             <table id="zend.xmlrpc.value.parameters.xmlrpc-value.table-1">

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

@@ -44,14 +44,14 @@ echo $server->handle();
 
         <para>
             Once done, you may either pass a <classname>Zend_XmlRpc_Request</classname>
-            object to <classname>Zend_XmlRpc_Server::handle()</classname>, or it will
+            object to <methodname>Zend_XmlRpc_Server::handle()</methodname>, or it will
             instantiate a <classname>Zend_XmlRpc_Request_Http</classname> object if none
             is provided -- thus grabbing the request from
             <code>php://input</code>.
         </para>
 
         <para>
-            <classname>Zend_XmlRpc_Server::handle()</classname> then attempts to
+            <methodname>Zend_XmlRpc_Server::handle()</methodname> then attempts to
             dispatch to the appropriate handler based on the method
             requested. It then returns either a
             <classname>Zend_XmlRpc_Response</classname>-based object or a
@@ -208,7 +208,7 @@ $server->addFunction('somefunc', 'funcs');
 
         <para>
             To use a custom response class, use
-            <classname>Zend_XmlRpc_Server::setResponseClass()</classname> prior to calling
+            <methodname>Zend_XmlRpc_Server::setResponseClass()</methodname> prior to calling
             <methodname>handle()</methodname>.
         </para>
     </sect2>
@@ -230,7 +230,7 @@ $server->addFunction('somefunc', 'funcs');
         <para>
             Exception classes can be whitelisted to be used as fault responses,
             however. To do so, simply utilize
-            <classname>Zend_XmlRpc_Server_Fault::attachFaultException()</classname> to pass an
+            <methodname>Zend_XmlRpc_Server_Fault::attachFaultException()</methodname> to pass an
             exception class to whitelist:
         </para>