[MANUAL] English:

- unified classnames with classname

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

documentation/manual/en/module_specs/Zend_Filter.xml

@@ -78,7 +78,7 @@ echo $htmlEntities->filter('"'); // "
             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
-            filter class, relative to the Zend_Filter namespace. The
+            filter class, relative to the <classname>Zend_Filter</classname> namespace. The
             <methodname>staticFilter()</methodname> method automatically loads the class, creates
             an instance, and applies the <methodname>filter()</methodname> method to the data
             input.

documentation/manual/en/module_specs/Zend_Filter_Input.xml

@@ -148,7 +148,8 @@ $validators = array(
             <listitem>
                 <para>
                     An object instance of one of the classes that implement
-                    Zend_Filter_Interface or Zend_Validate_Interface.
+                    <classname>Zend_Filter_Interface</classname> or
+                    <classname>Zend_Validate_Interface</classname>.
                     <programlisting language="php"><![CDATA[
 $digits = new Zend_Validate_Digits();
 

documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml

@@ -17,7 +17,7 @@
             treated by the client by resending the same request to the
             specified location - using the same request method. However, most
             clients to not implement this and always use a GET request when
-            redirecting. By default, Zend_Http_Client does the same - when
+            redirecting. By default, <classname>Zend_Http_Client</classname> does the same - when
             redirecting on a 301 or 302 response, all GET and POST parameters
             are reset, and a GET request is sent to the new location. This
             behavior can be changed by setting the 'strictredirects' configuration
@@ -45,7 +45,7 @@ $client->setConfig(array('strictredirects' => false));
         <title>Adding Cookies and Using Cookie Persistence</title>
 
         <para>
-            Zend_Http_Client provides an easy interface for adding cookies
+            <classname>Zend_Http_Client</classname> provides an easy interface for adding cookies
             to your request, so that no direct header modification is
             required. This is done using the setCookie() method. This method
             can be used in several ways:
@@ -67,12 +67,12 @@ $client->setCookie($cookie);
 ]]></programlisting>
             </example>
 
-            For more information about Zend_Http_Cookie objects, see
+            For more information about <classname>Zend_Http_Cookie</classname> objects, see
             <xref linkend="zend.http.cookies" />.
         </para>
 
         <para>
-            Zend_Http_Client also provides the means for cookie stickiness -
+            <classname>Zend_Http_Client</classname> also provides the means for cookie stickiness -
             that is having the client internally store all sent and received
             cookies, and resend them automatically on subsequent requests. This
             is useful, for example when you need to log in to a remote site
@@ -102,7 +102,7 @@ $client->request('GET');
 ]]></programlisting>
             </example>
 
-            For more information about the Zend_Http_CookieJar class, see
+            For more information about the <classname>Zend_Http_CookieJar</classname> class, see
             <xref linkend="zend.http.cookies.cookiejar" />.
         </para>
     </sect2>
@@ -167,15 +167,15 @@ $client->setHeaders(array(
             This method takes a file name as the first parameter, a form name
             as the second parameter, and data as a third optional parameter.
             If the third data parameter is <constant>NULL</constant>, the first file name parameter
-            is considered to be a real file on disk, and Zend_Http_Client will
-            try to read this file and upload it. If the data parameter is not
+            is considered to be a real file on disk, and <classname>Zend_Http_Client</classname>
+            will try to read this file and upload it. If the data parameter is not
             <constant>NULL</constant>, the first file name parameter will be sent as the file name,
             but no actual file needs to exist on the disk.
             The second form name parameter is always required, and is equivalent
             to the "name" attribute of an &gt;input&lt; tag, if the file was to
             be uploaded through an HTML form.
             A fourth optional parameter provides the file's content-type. If
-            not specified, and Zend_Http_Client reads the file from the disk,
+            not specified, and <classname>Zend_Http_Client</classname> reads the file from the disk,
             the mime_content_type function will be used to guess the file's
             content type, if it is available. In any case, the default MIME
             type will be application/octet-stream.
@@ -219,7 +219,7 @@ $client->request('POST');
         <title>Sending Raw POST Data</title>
 
         <para>
-            You can use a Zend_Http_Client to send raw POST data using the
+            You can use a <classname>Zend_Http_Client</classname> to send raw POST data using the
             setRawData() method. This method takes two parameters: the first
             is the data to send in the request body. The second optional
             parameter is the content-type of the data. While this parameter is
@@ -263,8 +263,8 @@ $client->setRawData($xml)->setEncType('text/xml')->request('POST');
         <title>HTTP Authentication</title>
 
         <para>
-            Currently, Zend_Http_Client only supports basic HTTP authentication.
-            This feature is utilized using the <methodname>setAuth()</methodname>
+            Currently, <classname>Zend_Http_Client</classname> only supports basic HTTP
+            authentication. This feature is utilized using the <methodname>setAuth()</methodname>
             method, or by specifying a username and a password in the URI. The
             <methodname>setAuth()</methodname> method
             takes 3 parameters: The user name, the password and an optional

documentation/manual/en/module_specs/Zend_Http_Client.xml

@@ -18,9 +18,9 @@
 
         <para>
             The class constructor optionally accepts a URL as its first parameter
-            (can be either a string or a Zend_Uri_Http object), and an array or
-            Zend_Config object containing configuration options. Both can be left out,
-            and set later using the setUri() and setConfig() methods.
+            (can be either a string or a <classname>Zend_Uri_Http</classname> object), and an array
+            or <classname>Zend_Config</classname> object containing configuration options. Both can
+            be left out, and set later using the setUri() and setConfig() methods.
 
             <example id="zend.http.client.introduction.example-1">
                 <title>Instantiating a Zend_Http_Client Object</title>
@@ -45,11 +45,12 @@ $client->setConfig($config);
 
             <note>
                 <para>
-                    Zend_Http_Client uses Zend_Uri_Http to validate URLs. This means
+                    <classname>Zend_Http_Client</classname> uses
+                    <classname>Zend_Uri_Http</classname> to validate URLs. This means
                     that some special characters like the pipe symbol ('|') or the
                     caret symbol ('^') will not be accepted in the URL by default.
                     This can be modified by setting the 'allow_unwise' option of
-                    Zend_Uri to '<constant>TRUE</constant>'. See <xref
+                    <classname>Zend_Uri</classname> to '<constant>TRUE</constant>'. See <xref
                         linkend="zend.uri.validation.allowunwise" /> for more information.
                 </para>
             </note>

documentation/manual/en/module_specs/Zend_Http_Response.xml

@@ -15,9 +15,9 @@
         </para>
 
         <para>
-            In most cases, a Zend_Http_Response object will be instantiated
+            In most cases, a <classname>Zend_Http_Response</classname> object will be instantiated
             using the fromString() method, which reads a string containing an HTTP
-            response message, and returns a new Zend_Http_Response object:
+            response message, and returns a new <classname>Zend_Http_Response</classname> object:
             <example id="zend.http.response.introduction.example-1">
                 <title>Instantiating a Zend_Http_Response Object Using the Factory Method</title>
 

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

@@ -33,7 +33,10 @@
             <tbody>
                 <row>
                     <entry><code>Zend_Ldap_Dn getDn()</code></entry>
-                    <entry>Gets the DN of the current node as a Zend_Ldap_Dn.</entry>
+
+                    <entry>
+                        Gets the DN of the current node as a <classname>Zend_Ldap_Dn</classname>.
+                    </entry>
                 </row>
 
                 <row>

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

@@ -32,7 +32,10 @@
             <tbody>
                 <row>
                     <entry><code>Zend_Ldap_Dn getDn()</code></entry>
-                    <entry>Gets the DN of the current node as a Zend_Ldap_Dn.</entry>
+
+                    <entry>
+                        Gets the DN of the current node as a <classname>Zend_Ldap_Dn</classname>.
+                    </entry>
                 </row>
 
                 <row>

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

@@ -166,8 +166,9 @@
                     <entry><code>Zend_Ldap_Dn getCurrentDn()</code></entry>
 
                     <entry>
-                        Gets the current DN of the current node as a Zend_Ldap_Dn.
-                        This does not reflect possible rename-operations.
+                        Gets the current DN of the current node as a
+                        <classname>Zend_Ldap_Dn</classname>. This does not reflect possible
+                        rename-operations.
                     </entry>
                 </row>
 
@@ -175,8 +176,9 @@
                     <entry><code>Zend_Ldap_Dn getDn()</code></entry>
 
                     <entry>
-                        Gets the original DN of the current node as a Zend_Ldap_Dn.
-                        This reflects possible rename-operations.
+                        Gets the original DN of the current node as a
+                        <classname>Zend_Ldap_Dn</classname>. This reflects possible
+                        rename-operations.
                     </entry>
                 </row>
 

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

@@ -142,8 +142,8 @@
                     <entry><code>Zend_Ldap disconnect()</code></entry>
 
                     <entry>
-                        Disconnects the Zend_Ldap instance from the <acronym>LDAP</acronym>
-                        server.
+                        Disconnects the <classname>Zend_Ldap</classname> instance from the
+                        <acronym>LDAP</acronym> server.
                     </entry>
                 </row>
 
@@ -154,10 +154,10 @@
                     </entry>
 
                     <entry>
-                        Connects the Zend_Ldap instance to the given <acronym>LDAP</acronym> server.
-                        All parameters are optional and will be taken from the
-                        <acronym>LDAP</acronym> connection and binding parameters passed to the
-                        instance via the construtor or via
+                        Connects the <classname>Zend_Ldap</classname> instance to the given
+                        <acronym>LDAP</acronym> server. All parameters are optional and will be
+                        taken from the <acronym>LDAP</acronym> connection and binding parameters
+                        passed to the instance via the construtor or via
                         <methodname>Zend_Ldap::setOptions()</methodname> when set to
                         <constant>NULL</constant>.
                     </entry>

documentation/manual/en/module_specs/Zend_Log-Overview.xml

@@ -235,9 +235,10 @@ $logger->setEventItem('pid', getmypid());
         <title>Log PHP Errors</title>
 
         <para>
-            Zend_Log can also be used to log <acronym>PHP</acronym> errors. Calling
-            <methodname>registerErrorHandler()</methodname> will add Zend_Log before the current
-            error handler, and will pass the error along as well.
+            <classname>Zend_Log</classname> can also be used to log <acronym>PHP</acronym> errors.
+            Calling <methodname>registerErrorHandler()</methodname> will add
+            <classname>Zend_Log</classname> before the current error handler, and will pass the
+            error along as well.
         </para>
 
         <table id="zend.log.overview.as-errorHandler.properties.table-1">

documentation/manual/en/module_specs/Zend_Oauth-GettingStarted.xml

@@ -14,8 +14,8 @@
     <para>
         Assuming we have obtained a key and secret, we can start the OAuth workflow
         by setting up a <classname>Zend_Oauth_Consumer</classname> instance as
-        follows passing it a configuration (either an array or <classname>
-        Zend_Config</classname> object).
+        follows passing it a configuration (either an array or <classname>Zend_Config</classname>
+        object).
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -57,8 +57,8 @@ $consumer = new Zend_Oauth_Consumer($config);
 
     <para>
         In addition, you should note several other configuration values not
-        explicitly used: requestMethod and requestScheme. By default, <classname>
-        Zend_Oauth_Consumer</classname> sends requests as POST (except for a
+        explicitly used: requestMethod and requestScheme. By default,
+        <classname>Zend_Oauth_Consumer</classname> sends requests as POST (except for a
         redirect which uses GET). The customised client (see later) also includes its
         authorization by way of a header. Some services may, at their discretion,
         require alternatives. You can reset the requestMethod (which defaults
@@ -175,9 +175,9 @@ if (!empty($_GET) && isset($_SESSION['TWITTER_REQUEST_TOKEN'])) {
     <para>
         Success! We have an authorized access token - so it's time to actually
         use the Twitter <acronym>API</acronym>. Since the access token must be included with every
-        single <acronym>API</acronym> request, Zend_Oauth_Consumer offers a ready-to-go HTTP client
-        (a subclass of <classname>Zend_Http_Client</classname>) to use either
-        by itself or by passing it as a custom HTTP Client to another library or
+        single <acronym>API</acronym> request, <classname>Zend_Oauth_Consumer</classname> offers a
+        ready-to-go HTTP client (a subclass of <classname>Zend_Http_Client</classname>) to use
+        either by itself or by passing it as a custom HTTP Client to another library or
         component. Here's an example of using it standalone. This can be done
         from anywhere in your application, so long as you can access the OAuth
         configuration and retrieve the final authorized access token.

documentation/manual/en/module_specs/Zend_Paginator-Advanced.xml

@@ -255,7 +255,7 @@ interface Zend_Paginator_AdapterAggregate
             The interface is fairly small and only expects you to return an instance of
             <classname>Zend_Paginator_Adapter_Abstract</classname>. An Adapter Aggregate instance is
             then recognized by both <code>Zend_Paginator::factory</code> and the constructor of
-            Zend_Paginator and handled accordingly.
+            <classname>Zend_Paginator</classname> and handled accordingly.
         </para>
     </sect2>
 </sect1>

documentation/manual/en/module_specs/Zend_Search_Lucene-QueryLanguage.xml

@@ -268,8 +268,8 @@ roam~0.8
         </para>
 
         <para>
-            So Zend_Search_Lucene sets a limit of matching terms per query (subquery). This limit
-            can be retrieved and set using
+            So <classname>Zend_Search_Lucene</classname> sets a limit of matching terms per query
+            (subquery). This limit can be retrieved and set using
             <code>Zend_Search_Lucene::getTermsPerQueryLimit()</code>/<code>Zend_Search_Lucene::setTermsPerQueryLimit($limit)</code>
             methods.
         </para>

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

@@ -26,10 +26,10 @@ $myNamespace = new Zend_Session_Namespace('myNamespace');
 // $myNamespace corresponds to $_SESSION['myNamespace']
 ]]></programlisting>
 
-        It is possible to use Zend_Session in conjunction with other code that uses
-        <varname>$_SESSION</varname> directly. To avoid problems, however, it is highly recommended
-        that such code only uses parts of <varname>$_SESSION</varname> that do not correspond to
-        instances of <classname>Zend_Session_Namespace</classname>.
+        It is possible to use <classname>Zend_Session</classname> in conjunction with other code
+        that uses <varname>$_SESSION</varname> directly. To avoid problems, however, it is highly
+        recommended that such code only uses parts of <varname>$_SESSION</varname> that do not
+        correspond to instances of <classname>Zend_Session_Namespace</classname>.
     </para>
 
     <sect2 id="zend.session.basic_usage.basic_examples">

documentation/manual/en/module_specs/Zend_Tool-Extending.xml

@@ -818,9 +818,9 @@ class Zend_Tool_Framework_Client_Storage
         <title>Zend_Tool_Project Extensions</title>
 
         <para>
-            Zend_Tool_Project exposes a rich set of functionality and capabilities that make the
-            task of creating new providers, specficially those targetting project easier and more
-            manageable.
+            <classname>Zend_Tool_Project</classname> exposes a rich set of functionality and
+            capabilities that make the task of creating new providers, specficially those targetting
+            project easier and more manageable.
         </para>
 
         <sect3 id="zend.tool.extending.zend-tool-project.architecture">

documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml

@@ -385,10 +385,10 @@ zf configure dbadapter "adapter=Pdo_Sqlite&dbname=../data/test.db" -s developmen
             <title>DbTable</title>
 
             <para>
-                The DbTable provider is responsible for creating Zend_Db_Table
-                model/data access files for your application to consume, with the proper
-                class name, and in the proper location in the application. The two
-                important pieces of information are the <emphasis>DbTable name</emphasis>,
+                The DbTable provider is responsible for creating
+                <classname>Zend_Db_Table</classname> model/data access files for your application to
+                consume, with the proper class name, and in the proper location in the application.
+                The two important pieces of information are the <emphasis>DbTable name</emphasis>,
                 and the <emphasis>actual database table name</emphasis>. For example:
             </para>
 

documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml

@@ -125,8 +125,8 @@
                 environment variable. If the environment variable
                 <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the
                 location of the configuration file to use with the Console Client. The
-                <constant>ZF_CONFIG_FILE</constant> can point to any Zend_Config readable INI, XML
-                or <acronym>PHP</acronym> File.
+                <constant>ZF_CONFIG_FILE</constant> can point to any
+                <classname>Zend_Config</classname> readable INI, XML or <acronym>PHP</acronym> File.
             </para>
 
             <para>

documentation/manual/en/module_specs/Zend_Validate-Between.xml

@@ -12,8 +12,8 @@
         <title>Zend_Validate_Between supports only number validation</title>
 
         <para>
-            It should be noted that Zend_Validate_Between supports only the validation of numbers.
-            Strings or dates can not be validated with this validator.
+            It should be noted that <classname>Zend_Validate_Between</classname> supports only the
+            validation of numbers. Strings or dates can not be validated with this validator.
         </para>
     </note>
 

documentation/manual/en/module_specs/Zend_Validate-GreaterThan.xml

@@ -12,8 +12,8 @@
         <title>Zend_Validate_GreaterThan supports only number validation</title>
 
         <para>
-            It should be noted that Zend_Validate_GreaterThan supports only the validation of
-            numbers. Strings or dates can not be validated with this validator.
+            It should be noted that <classname>Zend_Validate_GreaterThan</classname> supports only
+            the validation of numbers. Strings or dates can not be validated with this validator.
         </para>
     </note>
 

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

@@ -90,7 +90,8 @@ if ($validator->isValid($hostname)) {
         </para>
 
         <para>
-            The Zend_Validate_Hostname constants are: <constant>ALLOW_DNS</constant> to allow only
+            The <classname>Zend_Validate_Hostname</classname> constants are:
+            <constant>ALLOW_DNS</constant> to allow only
             <acronym>DNS</acronym> hostnames, <constant>ALLOW_IP</constant> to allow IP addresses,
             <constant>ALLOW_LOCAL</constant> to allow local network names, and
             <constant>ALLOW_ALL</constant> to allow all three types. To just check for IP addresses
@@ -112,7 +113,7 @@ if ($validator->isValid($hostname)) {
         <para>
             As well as using <constant>ALLOW_ALL</constant> to accept all hostnames types you can
             combine these types to allow for combinations. For example, to accept DNS and Local
-            hostnames instantiate your Zend_Validate_Hostname object as so:
+            hostnames instantiate your <classname>Zend_Validate_Hostname</classname> object as so:
         </para>
 
         <programlisting language="php"><![CDATA[

documentation/manual/en/module_specs/Zend_Validate-StringLength.xml

@@ -11,8 +11,9 @@
         <title>Zend_Validate_StringLength supports only string validation</title>
 
         <para>
-            It should be noted that Zend_Validate_StringLength supports only the validation of
-            strings. Integers, floats, dates or objects can not be validated with this validator.
+            It should be noted that <classname>Zend_Validate_StringLength</classname> supports only
+            the validation of strings. Integers, floats, dates or objects can not be validated with
+            this validator.
         </para>
     </note>
 

documentation/manual/en/tutorials/multiuser-sessions.xml

@@ -24,9 +24,9 @@
         <para>
             In <acronym>PHP</acronym>, the session problem is solved by the session extension which
             utilizes some state tracking, typically cookies, and some form of local storage which is
-            exposed via the $_SESSION superglobal. In Zend Framework, the component Zend_Session
-            adds value to the <acronym>PHP</acronym> session extension making it easier to use and
-            depend on inside object-oriented applications.
+            exposed via the $_SESSION superglobal. In Zend Framework, the component
+            <classname>Zend_Session</classname> adds value to the <acronym>PHP</acronym> session
+            extension making it easier to use and depend on inside object-oriented applications.
         </para>
     </sect2>
 
@@ -34,24 +34,26 @@
         <title>Basic Usage of Zend_Session</title>
 
         <para>
-            The Zend_Session component is both a session manager as well as an
-            <acronym>API</acronym> for storing data into a session object for long-term persistence.
-            The Zend_Session <acronym>API</acronym> is for managing the options and behavior of a
-            session, like options, starting and stopping a session, whereas Zend_Session_Namespace
-            is the actual object used to store data.
+            The <classname>Zend_Session</classname> component is both a session manager as well as
+            an <acronym>API</acronym> for storing data into a session object for long-term
+            persistence. The <classname>Zend_Session</classname> <acronym>API</acronym> is for
+            managing the options and behavior of a session, like options, starting and stopping a
+            session, whereas <classname>Zend_Session_Namespace</classname> is the actual object used
+            to store data.
         </para>
 
         <para>
             While its generally good practice to start a session inside a bootstrap process, this
             is generally not necessary as all sessions will be automatically started upon the first
-            creation of a Zend_Session_Namespace object.
+            creation of a <classname>Zend_Session_Namespace</classname> object.
         </para>
 
         <para>
-            Zend_Application is capable of configuring Zend_Session for you as part of the
-            Zend_Application_Resource system. To use this, assuming your project uses
-            Zend_Application to bootstrap, you would add the following code to your
-            application.ini file:
+            <classname>Zend_Application</classname> is capable of configuring
+            <classname>Zend_Session</classname> for you as part of the
+            <classname>Zend_Application_Resource</classname> system. To use this, assuming your
+            project uses <classname>Zend_Application</classname> to bootstrap, you would add the
+            following code to your application.ini file:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -69,18 +71,20 @@ resources.session.remember_me_seconds = 864000
         </para>
 
         <para>
-            Most Zend Framework components that use sessions need nothing more to use Zend_Session.
-            At this point, you an either use a component that consumes Zend_Session, or start
-            storing your own data inside a session with Zend_Session_Namespace.
+            Most Zend Framework components that use sessions need nothing more to use
+            <classname>Zend_Session</classname>. At this point, you an either use a component that
+            consumes <classname>Zend_Session</classname>, or start storing your own data inside a
+            session with <classname>Zend_Session_Namespace</classname>.
         </para>
 
         <para>
-            Zend_Session_Namespace is a simple class that proxies data via an easy to use
-            <acronym>API</acronym> into the Zend_Session managed $_SESSION superglobal. The reason
-            it is called Zend_Session_Namespace is that it effectively namespaces the data inside
-            $_SESSION, thus allowing multiple components and objects to safely store and retrieve
-            data. In the following code, we'll explore how to build a simple session incrementing
-            counter, starting at 1000 and resetting itself after 1999.
+            <classname>Zend_Session_Namespace</classname> is a simple class that proxies data via an
+            easy to use <acronym>API</acronym> into the <classname>Zend_Session</classname> managed
+            $_SESSION superglobal. The reason it is called
+            <classname>Zend_Session_Namespace</classname> is that it effectively namespaces the data
+            inside $_SESSION, thus allowing multiple components and objects to safely store and
+            retrieve data. In the following code, we'll explore how to build a simple session
+            incrementing counter, starting at 1000 and resetting itself after 1999.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -110,7 +114,8 @@ if ($mysession->counter > 1999) {
 
         <para>
             Additionally, if you wanted to use the DbTable
-            save handler for Zend_Session, you'd add the following code to your application.ini:
+            save handler for <classname>Zend_Session</classname>, you'd add the following code to
+            your application.ini:
         </para>
 
         <programlisting language="php"><![CDATA[

documentation/manual/en/tutorials/paginator-control.xml

@@ -16,10 +16,10 @@
         The View Partial is a small view script that renders the Pagination controls, such as
         buttons to go to the next or previous page. Which pagination controls are rendered depends
         on the contents of the view partial. Working with the view partial requires that you have
-        set up Zend_View. To get started with the pagination control, create a new view script
-        somewhere in your view scripts path. You can name it anything you want, but we'll call it
-        "controls.phtml" in this text. The reference manual contains various examples of what might
-        go in the view script. Here is one example.
+        set up <classname>Zend_View</classname>. To get started with the pagination control, create
+        a new view script somewhere in your view scripts path. You can name it anything you want,
+        but we'll call it "controls.phtml" in this text. The reference manual contains various
+        examples of what might go in the view script. Here is one example.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -65,8 +65,9 @@
 ]]></programlisting>
 
     <para>
-        The next step is to tell Zend_Paginator which view partial can be used to render
-        the navigation controls. Put the following line in your application's bootstrap file.
+        The next step is to tell <classname>Zend_Paginator</classname> which view partial can be
+        used to render the navigation controls. Put the following line in your application's
+        bootstrap file.
     </para>
 
     <programlisting language="php"><![CDATA[

documentation/manual/en/tutorials/paginator-together.xml

@@ -71,7 +71,6 @@ foreach ($this->paginator as $item) {
         Now navigate to your project's index and see Paginator in action. What we have discussed
         in this tutorial is just the tip of the iceberg. The reference manual and
         <acronym>API</acronym> documentation can tell you more about what you can do with
-        Zend_Paginator.
+        <classname>Zend_Paginator</classname>.
     </para>
-
 </sect1>

documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -41,8 +41,8 @@
     </para>
 
     <para>
-        To get started using Zend_Layout, first we need to inform our bootstrap to use the
-        <classname>Layout</classname> resource. This can be done using the
+        To get started using <classname>Zend_Layout</classname>, first we need to inform our
+        bootstrap to use the <classname>Layout</classname> resource. This can be done using the
         <command>zf enable layout</command> command:
     </para>