Browse Source

[DOCUMENTATION] English:
- manual fixes: wrap acronym PHP|HTTP|XML|SOAP|XHTML|URI|URL|MVC|AJAX|API|LDAP|SQL|CSS|PDO|RDBMS with <acronym> in <para>

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

mikaelkael 16 years ago
parent
commit
da09a33b05
100 changed files with 810 additions and 810 deletions
  1. 1 1
      documentation/manual/en/module_specs/Zend_Auth_Adapter_DbTable.xml
  2. 1 1
      documentation/manual/en/module_specs/Zend_Controller-FrontController.xml
  3. 1 1
      documentation/manual/en/module_specs/Zend_Controller-Plugins-ErrorHandler.xml
  4. 23 23
      documentation/manual/en/module_specs/Zend_Controller-Request.xml
  5. 7 7
      documentation/manual/en/module_specs/Zend_Controller-Response.xml
  6. 1 1
      documentation/manual/en/module_specs/Zend_Controller-Router-Route-Chain.xml
  7. 1 1
      documentation/manual/en/module_specs/Zend_Controller-Router-Route-Hostname.xml
  8. 6 6
      documentation/manual/en/module_specs/Zend_Controller-Router-Route-Regex.xml
  9. 2 2
      documentation/manual/en/module_specs/Zend_Controller-Router-Route-Static.xml
  10. 8 8
      documentation/manual/en/module_specs/Zend_Controller-Router-Route.xml
  11. 13 13
      documentation/manual/en/module_specs/Zend_Controller-Router.xml
  12. 2 2
      documentation/manual/en/module_specs/Zend_Currency-Migrating.xml
  13. 4 4
      documentation/manual/en/module_specs/Zend_Date-Additional.xml
  14. 2 2
      documentation/manual/en/module_specs/Zend_Date-Basic.xml
  15. 12 12
      documentation/manual/en/module_specs/Zend_Date-Constants.xml
  16. 8 8
      documentation/manual/en/module_specs/Zend_Date-Introduction.xml
  17. 11 11
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  18. 2 2
      documentation/manual/en/module_specs/Zend_Date-Theory.xml
  19. 138 138
      documentation/manual/en/module_specs/Zend_Db_Adapter.xml
  20. 2 2
      documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml
  21. 6 6
      documentation/manual/en/module_specs/Zend_Db_Profiler.xml
  22. 44 44
      documentation/manual/en/module_specs/Zend_Db_Select.xml
  23. 11 11
      documentation/manual/en/module_specs/Zend_Db_Statement.xml
  24. 11 11
      documentation/manual/en/module_specs/Zend_Db_Table-Relationships.xml
  25. 20 20
      documentation/manual/en/module_specs/Zend_Db_Table.xml
  26. 3 3
      documentation/manual/en/module_specs/Zend_Db_Table_Row.xml
  27. 3 3
      documentation/manual/en/module_specs/Zend_Db_Table_Rowset.xml
  28. 1 1
      documentation/manual/en/module_specs/Zend_Debug.xml
  29. 2 2
      documentation/manual/en/module_specs/Zend_Dojo-Data.xml
  30. 4 4
      documentation/manual/en/module_specs/Zend_Dojo-Form-Elements.xml
  31. 4 4
      documentation/manual/en/module_specs/Zend_Dojo-View-Dojo.xml
  32. 2 2
      documentation/manual/en/module_specs/Zend_Dojo-View-Helpers.xml
  33. 13 13
      documentation/manual/en/module_specs/Zend_Dom-Query.xml
  34. 1 1
      documentation/manual/en/module_specs/Zend_Dom.xml
  35. 2 2
      documentation/manual/en/module_specs/Zend_Feed-ConsumingAtomSingle.xml
  36. 8 8
      documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml
  37. 1 1
      documentation/manual/en/module_specs/Zend_Feed-FindFeeds.xml
  38. 2 2
      documentation/manual/en/module_specs/Zend_Feed-Importing.xml
  39. 2 2
      documentation/manual/en/module_specs/Zend_Feed-Introduction.xml
  40. 3 3
      documentation/manual/en/module_specs/Zend_Feed-ModifyingFeed.xml
  41. 1 1
      documentation/manual/en/module_specs/Zend_Feed_Reader.xml
  42. 2 2
      documentation/manual/en/module_specs/Zend_File_Transfer-Filters.xml
  43. 7 7
      documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml
  44. 20 20
      documentation/manual/en/module_specs/Zend_File_Transfer-Migration.xml
  45. 6 6
      documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml
  46. 1 1
      documentation/manual/en/module_specs/Zend_Filter-Set.xml
  47. 4 4
      documentation/manual/en/module_specs/Zend_Filter_Input.xml
  48. 4 4
      documentation/manual/en/module_specs/Zend_Form-Elements.xml
  49. 2 2
      documentation/manual/en/module_specs/Zend_Form-Forms.xml
  50. 5 5
      documentation/manual/en/module_specs/Zend_Form-QuickStart.xml
  51. 1 1
      documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml
  52. 3 3
      documentation/manual/en/module_specs/Zend_Form-StandardElements.xml
  53. 18 18
      documentation/manual/en/module_specs/Zend_Gdata-Introduction.xml
  54. 6 6
      documentation/manual/en/module_specs/Zend_Gdata_AuthSub.xml
  55. 17 17
      documentation/manual/en/module_specs/Zend_Gdata_Books.xml
  56. 24 24
      documentation/manual/en/module_specs/Zend_Gdata_Calendar.xml
  57. 4 4
      documentation/manual/en/module_specs/Zend_Gdata_ClientLogin.xml
  58. 6 6
      documentation/manual/en/module_specs/Zend_Gdata_Docs.xml
  59. 3 3
      documentation/manual/en/module_specs/Zend_Gdata_Exception.xml
  60. 16 16
      documentation/manual/en/module_specs/Zend_Gdata_Gapps.xml
  61. 9 9
      documentation/manual/en/module_specs/Zend_Gdata_Gbase.xml
  62. 20 20
      documentation/manual/en/module_specs/Zend_Gdata_Health.xml
  63. 13 13
      documentation/manual/en/module_specs/Zend_Gdata_Photos.xml
  64. 5 5
      documentation/manual/en/module_specs/Zend_Gdata_Spreadsheets.xml
  65. 16 16
      documentation/manual/en/module_specs/Zend_Gdata_YouTube.xml
  66. 25 25
      documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml
  67. 3 3
      documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml
  68. 3 3
      documentation/manual/en/module_specs/Zend_Http_Client-Migration.xml
  69. 4 4
      documentation/manual/en/module_specs/Zend_Http_Client.xml
  70. 26 26
      documentation/manual/en/module_specs/Zend_Http_Cookie-Handling.xml
  71. 25 25
      documentation/manual/en/module_specs/Zend_Http_Response.xml
  72. 8 8
      documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml
  73. 6 6
      documentation/manual/en/module_specs/Zend_Json-Introduction.xml
  74. 5 5
      documentation/manual/en/module_specs/Zend_Json-Objects.xml
  75. 17 17
      documentation/manual/en/module_specs/Zend_Json-Server.xml
  76. 13 13
      documentation/manual/en/module_specs/Zend_Json-xml2json.xml
  77. 2 2
      documentation/manual/en/module_specs/Zend_Layout-Advanced.xml
  78. 2 2
      documentation/manual/en/module_specs/Zend_Layout-Introduction.xml
  79. 5 5
      documentation/manual/en/module_specs/Zend_Layout-Options.xml
  80. 6 6
      documentation/manual/en/module_specs/Zend_Layout-QuickStart.xml
  81. 1 1
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Attribute.xml
  82. 1 1
      documentation/manual/en/module_specs/Zend_Ldap-API-Ldap.xml
  83. 1 1
      documentation/manual/en/module_specs/Zend_Loader-Autoloader-Resource.xml
  84. 5 5
      documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml
  85. 1 1
      documentation/manual/en/module_specs/Zend_Loader-PluginLoader.xml
  86. 13 13
      documentation/manual/en/module_specs/Zend_Loader.xml
  87. 4 4
      documentation/manual/en/module_specs/Zend_Locale-DatesTimes.xml
  88. 1 1
      documentation/manual/en/module_specs/Zend_Locale-Functions.xml
  89. 6 6
      documentation/manual/en/module_specs/Zend_Locale-Introduction.xml
  90. 4 4
      documentation/manual/en/module_specs/Zend_Locale-Migration.xml
  91. 5 5
      documentation/manual/en/module_specs/Zend_Locale-Parsing.xml
  92. 1 1
      documentation/manual/en/module_specs/Zend_Log-Overview.xml
  93. 3 3
      documentation/manual/en/module_specs/Zend_Log-Writers-Firebug.xml
  94. 1 1
      documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml
  95. 3 3
      documentation/manual/en/module_specs/Zend_Mail-Introduction.xml
  96. 2 2
      documentation/manual/en/module_specs/Zend_Mail_Read.xml
  97. 3 3
      documentation/manual/en/module_specs/Zend_Measure-Creation.xml
  98. 2 2
      documentation/manual/en/module_specs/Zend_Memory-MemoryObjects.xml
  99. 1 1
      documentation/manual/en/module_specs/Zend_Memory-Overview.xml
  100. 1 1
      documentation/manual/en/module_specs/Zend_Mime_Part.xml

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

@@ -77,7 +77,7 @@
                 The following code creates an adapter for an in-memory database,
                 creates a simple table schema, and inserts a row against
                 which we can perform an authentication query later. This example
-                requires the PDO SQLite extension to be available:
+                requires the <acronym>PDO</acronym> SQLite extension to be available:
             </para>
 
             <programlisting language="php"><![CDATA[

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

@@ -332,7 +332,7 @@ Zend_Controller_Front::run('../application/controllers');
                     <methodname>setBaseUrl()</methodname> and
                     <methodname>getBaseUrl()</methodname> let you specify <link
                         linkend="zend.controller.request.http.baseurl">the base
-                        URL</link> to strip when routing requests and to
+                        <acronym>URL</acronym></link> to strip when routing requests and to
                     retrieve the current value. The value is provided to the
                     request object just prior to routing.
                 </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Controller-Plugins-ErrorHandler.xml

@@ -27,7 +27,7 @@
 
     <para>
         In other words, the <emphasis>ErrorHandler</emphasis> plugin is designed to
-        handle HTTP 404-type errors (page missing) and 500-type errors (internal
+        handle <acronym>HTTP</acronym> 404-type errors (page missing) and 500-type errors (internal
         error). It is not intended to catch exceptions raised in other plugins
         or routing.
     </para>

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

@@ -9,7 +9,7 @@
             <classname>Zend_Controller_Front</classname> and the router, dispatcher, and
             controller classes. It packages the names of the requested module,
             controller, action, and optional parameters, as well as the rest of
-            the request environment, be it HTTP, the CLI, or PHP-GTK.
+            the request environment, be it <acronym>HTTP</acronym>, the CLI, or <acronym>PHP</acronym>-GTK.
         </para>
 
         <itemizedlist>
@@ -42,7 +42,7 @@
         <para>
             Based on the type of request, there may be more methods available.
             The default request used, <classname>Zend_Controller_Request_Http</classname>,
-            for instance, has methods for retrieving the request URI, path
+            for instance, has methods for retrieving the request <acronym>URI</acronym>, path
             information, <varname>$_GET</varname> and <varname>$_POST</varname> parameters,
             etc.
         </para>
@@ -57,10 +57,10 @@
         <para>
             Additionally, the request object is particularly useful in testing.
             The developer may craft the request environment, including module,
-            controller, action, parameters, URI, etc, and pass the request
+            controller, action, parameters, <acronym>URI</acronym>, etc, and pass the request
             object to the front controller to test application flow. When paired
             with the <link linkend="zend.controller.response">response
-                object</link>, elaborate and precise unit testing of MVC
+                object</link>, elaborate and precise unit testing of <acronym>MVC</acronym>
             applications becomes possible.
         </para>
     </sect2>
@@ -75,9 +75,9 @@
                 <classname>Zend_Controller_Request_Http</classname> encapsulates access to
                 relevant values such as the key name and value for the
                 controller and action router variables, and all additional
-                parameters parsed from the URI. It additionally allows access to
+                parameters parsed from the <acronym>URI</acronym>. It additionally allows access to
                 values contained in the superglobals as public members, and
-                manages the current Base URL and Request URI. Superglobal
+                manages the current Base <acronym>URL</acronym> and Request <acronym>URI</acronym>. Superglobal
                 values cannot be set on a request object, instead use the
                 setParam/getParam methods to set or retrieve user parameters.
             </para>
@@ -126,7 +126,7 @@
 
                 <para>
                     This is primarily useful for accepting content when
-                    developing a RESTful MVC application.
+                    developing a RESTful <acronym>MVC</acronym> application.
                 </para>
             </note>
 
@@ -134,7 +134,7 @@
                 You may also set user parameters in the request object using
                 <methodname>setParam()</methodname> and retrieve these later using
                 <methodname>getParam()</methodname>. The router makes use of this
-                functionality to set parameters matched in the request URI into
+                functionality to set parameters matched in the request <acronym>URI</acronym> into
                 the request object.
             </para>
 
@@ -172,7 +172,7 @@
                     If you are using Apache's 404 handler to pass incoming
                     requests to the front controller, or using a PT flag with
                     rewrite rules, <varname>$_SERVER['REDIRECT_URL']</varname>
-                    contains the URI you need, not
+                    contains the <acronym>URI</acronym> you need, not
                     <varname>$_SERVER['REQUEST_URI']</varname>. If you are using such
                     a setup and getting invalid routing, you should use the
                     <classname>Zend_Controller_Request_Apache404</classname> class instead
@@ -187,7 +187,7 @@ $front->setRequest($request);
                 <para>
                     This class extends the
                     <classname>Zend_Controller_Request_Http</classname> class and simply
-                    modifies the autodiscovery of the request URI. It can be
+                    modifies the autodiscovery of the request <acronym>URI</acronym>. It can be
                     used as a drop-in replacement.
                 </para>
             </note>
@@ -200,18 +200,18 @@ $front->setRequest($request);
                 <classname>Zend_Controller_Request_Http</classname> allows
                 <classname>Zend_Controller_Router_Rewrite</classname> to be used in subdirectories.
                 <classname>Zend_Controller_Request_Http</classname> will attempt to automatically
-                detect your base URL and set it accordingly.
+                detect your base <acronym>URL</acronym> and set it accordingly.
             </para>
 
             <para>
                 For example, if you keep your <filename>index.php</filename> in a
                 webserver subdirectory named
-                <filename>/projects/myapp/index.php</filename>, base URL (rewrite base)
+                <filename>/projects/myapp/index.php</filename>, base <acronym>URL</acronym> (rewrite base)
                 should be set to <filename>/projects/myapp</filename>. This string will
                 then be stripped from the beginning of the path before
                 calculating any route matches. This frees one from the necessity
                 of prepending it to any of your routes. A route of
-                <filename>'user/:username'</filename> will match URIs like
+                <filename>'user/:username'</filename> will match <acronym>URI</acronym>s like
                 <filename>http://localhost/projects/myapp/user/martel</filename> and
                 <filename>http://example.com/user/martel</filename>.
             </para>
@@ -219,21 +219,21 @@ $front->setRequest($request);
             <note>
                 <title>URL Detection is Case Sensitive</title>
                 <para>
-                    Automatic base URL detection is case sensitive, so make sure your URL
+                    Automatic base <acronym>URL</acronym> detection is case sensitive, so make sure your <acronym>URL</acronym>
                     will match a subdirectory name in a filesystem (even on Windows
                     machines). If it doesn't, an exception will be raised.
                 </para>
             </note>
 
             <para>
-                Should base URL be detected incorrectly you can override it
+                Should base <acronym>URL</acronym> be detected incorrectly you can override it
                 with your own base path with the help of the
                 <methodname>setBaseUrl()</methodname> method of either the
                 <classname>Zend_Controller_Request_Http</classname> class, or the
                 <classname>Zend_Controller_Front</classname> class. The easiest
                 method is to set it in <classname>Zend_Controller_Front</classname>,
                 which will proxy it into the request object. Example usage to
-                set a custom base URL:
+                set a custom base <acronym>URL</acronym>:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -254,7 +254,7 @@ $response   = $controller->dispatch();
             <title>Determining the Request Method</title>
 
             <para>
-                <methodname>getMethod()</methodname> allows you to determine the HTTP
+                <methodname>getMethod()</methodname> allows you to determine the <acronym>HTTP</acronym>
                 request method used to request the current resource.
                 Additionally, a variety of methods exist that allow you to get
                 boolean responses when asking if a specific type of request has
@@ -271,7 +271,7 @@ $response   = $controller->dispatch();
             </itemizedlist>
 
             <para>
-                The primary use case for these is for creating RESTful MVC
+                The primary use case for these is for creating RESTful <acronym>MVC</acronym>
                 architectures.
             </para>
         </sect3>
@@ -281,9 +281,9 @@ $response   = $controller->dispatch();
 
             <para>
                 <classname>Zend_Controller_Request_Http</classname> has a rudimentary
-                method for detecting AJAX requests:
+                method for detecting <acronym>AJAX</acronym> requests:
                 <methodname>isXmlHttpRequest()</methodname>. This method looks for an
-                HTTP request header <code>X-Requested-With</code> with the value
+                <acronym>HTTP</acronym> request header <code>X-Requested-With</code> with the value
                 'XMLHttpRequest'; if found, it returns <constant>TRUE</constant>.
             </para>
 
@@ -301,7 +301,7 @@ $response   = $controller->dispatch();
             </itemizedlist>
 
             <para>
-                Most AJAX libraries allow you to send custom HTTP request
+                Most <acronym>AJAX</acronym> libraries allow you to send custom <acronym>HTTP</acronym> request
                 headers; if your library does not send this header, simply add
                 it as a request header to ensure the
                 <methodname>isXmlHttpRequest()</methodname> method works for you.
@@ -415,8 +415,8 @@ abstract class Zend_Controller_Request_Abstract
             Extend this class, or one of its derivatives, when you need the
             request class to interact with a specific environment in order to
             retrieve data for use in the above tasks. Examples include <link
-                linkend="zend.controller.request.http">the HTTP
-                environment</link>, a CLI environment, or a PHP-GTK environment.
+                linkend="zend.controller.request.http">the <acronym>HTTP</acronym>
+                environment</link>, a CLI environment, or a <acronym>PHP</acronym>-GTK environment.
         </para>
     </sect2>
 </sect1>

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

@@ -139,7 +139,7 @@ $front->dispatch();
 
         <para>
             As stated previously, one aspect of the response object's duties is
-            to collect and emit HTTP response headers. A variety of methods
+            to collect and emit <acronym>HTTP</acronym> response headers. A variety of methods
             exist for this:
         </para>
 
@@ -174,8 +174,8 @@ $front->dispatch();
 
             <listitem>
                 <para>
-                    <methodname>setRedirect($url, $code = 302)</methodname> sets an HTTP
-                    Location header for a redirect. If an HTTP status code has
+                    <methodname>setRedirect($url, $code = 302)</methodname> sets an <acronym>HTTP</acronym>
+                    Location header for a redirect. If an <acronym>HTTP</acronym> status code has
                     been provided, it will use that status code.
                 </para>
 
@@ -203,7 +203,7 @@ $front->dispatch();
             <listitem>
                 <para>
                     <methodname>setRawHeader()</methodname> can be used to set headers that
-                    are not key/value pairs, such as an HTTP status header.
+                    are not key/value pairs, such as an <acronym>HTTP</acronym> status header.
                 </para>
             </listitem>
 
@@ -231,7 +231,7 @@ $front->dispatch();
 
         <para>
             In addition to the above methods, there are accessors for setting
-            and retrieving the HTTP response code for the current request,
+            and retrieving the <acronym>HTTP</acronym> response code for the current request,
             <methodname>setHttpResponseCode()</methodname> and
             <methodname>getHttpResponseCode()</methodname>.
         </para>
@@ -389,7 +389,7 @@ array(
             in a stack, which allows you to keep all exceptions thrown --
             application exceptions, dispatch exceptions, plugin exceptions, etc.
             Should you wish to check for particular exceptions or to log
-            exceptions, you'll want to use the response object's exception API:
+            exceptions, you'll want to use the response object's exception <acronym>API</acronym>:
         </para>
 
         <itemizedlist>
@@ -495,7 +495,7 @@ array(
         <para>
             Reasons to subclass the response object include modifying how output
             is returned based on the request environment (e.g., not sending
-            headers for CLI or PHP-GTK requests), adding functionality to return
+            headers for CLI or <acronym>PHP</acronym>-GTK requests), adding functionality to return
             a final view based on content stored in named segments, etc.
         </para>
     </sect2>

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

@@ -77,7 +77,7 @@ echo $chainedRoute->assemble();
             parent- nor the child-route will be added directly to the router but
             only the resulting chained route. The name of the chained route in
             the router will be the parent route name and the child route name
-            concatenated with a dash (-) by default. A simple config in XML would look
+            concatenated with a dash (-) by default. A simple config in <acronym>XML</acronym> would look
             like this:
         </para>
 

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

@@ -6,7 +6,7 @@
     <para>
         <classname>Zend_Controller_Router_Route_Hostname</classname> is the hostname route of
         the framework. It works similar to the standard route, but it works on
-        the with the hostname of the called URL instead with the path.
+        the with the hostname of the called <acronym>URL</acronym> instead with the path.
     </para>
 
     <para>

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

@@ -45,8 +45,8 @@ $values = array(
 
     <note>
         <para>
-            Leading and trailing slashes are trimmed from the URL in the Router
-            prior to a match. As a result, matching the URL
+            Leading and trailing slashes are trimmed from the <acronym>URL</acronym> in the Router
+            prior to a match. As a result, matching the <acronym>URL</acronym>
             <filename>http://domain.com/foo/bar/</filename>, would involve a regex of
             <filename>foo/bar</filename>, and not <filename>/foo/bar</filename>.
         </para>
@@ -186,7 +186,7 @@ $route = new Zend_Controller_Router_Route_Regex(
 
     <para>
         Which will result in mixed values available in the Request. As an
-        example, the URL <filename>http://domain.com/archive/2006/page/10</filename>
+        example, the <acronym>URL</acronym> <filename>http://domain.com/archive/2006/page/10</filename>
         will result in following values:
     </para>
 
@@ -201,7 +201,7 @@ $values = array(
 
     <para>
         Since regex patterns are not easily reversed, you will need to prepare
-        a reverse URL if you wish to use a URL helper or even an assemble method
+        a reverse <acronym>URL</acronym> if you wish to use a <acronym>URL</acronym> helper or even an assemble method
         of this class. This reversed path is represented by a string parsable by
         sprintf() and is defined as a fourth construct parameter:
     </para>
@@ -218,8 +218,8 @@ $route = new Zend_Controller_Router_Route_Regex(
     <para>
         All of this is something which was already possible by the means of a
         standard route object, so where's the benefit in using the Regex route,
-        you ask? Primarily, it allows you to describe any type of URL without
-        any restrictions. Imagine you have a blog and wish to create URLs like:
+        you ask? Primarily, it allows you to describe any type of <acronym>URL</acronym> without
+        any restrictions. Imagine you have a blog and wish to create <acronym>URL</acronym>s like:
         <filename>http://domain.com/blog/archive/01-Using_the_Regex_Router.html</filename>,
         and have it decompose the last path element,
         <filename>01-Using_the_Regex_Router.html</filename>, into an article ID and

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

@@ -19,7 +19,7 @@ $router->addRoute('login', $route);
 ]]></programlisting>
 
     <para>
-        Above route will match a URL of <filename>http://domain.com/login</filename>,
+        Above route will match a <acronym>URL</acronym> of <filename>http://domain.com/login</filename>,
         and dispatch to <methodname>AuthController::loginAction()</methodname>.
     </para>
 
@@ -27,7 +27,7 @@ $router->addRoute('login', $route);
         <title>Warning: Static Routes must Contain Sane Defaults</title>
 
         <para>
-            Since a static route does not pass any part of the URL to the
+            Since a static route does not pass any part of the <acronym>URL</acronym> to the
             request object as parameters, you <emphasis>must</emphasis> pass
             all parameters necessary for dispatching a request as defaults to
             the route. Omitting the "controller" or "action" default values will

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

@@ -6,7 +6,7 @@
     <para>
         <classname>Zend_Controller_Router_Route</classname> is the standard framework
         route. It combines ease of use with flexible route definition. Each
-        route consists primarily of URL mapping (of static and dynamic parts
+        route consists primarily of <acronym>URL</acronym> mapping (of static and dynamic parts
         (variables)) and may be initialized with defaults as well as with
         variable requirements.
     </para>
@@ -33,7 +33,7 @@ $router->addRoute('user', $route);
 
     <para>
         The first parameter in the <classname>Zend_Controller_Router_Route</classname>
-        constructor is a route definition that will be matched to a URL. Route
+        constructor is a route definition that will be matched to a <acronym>URL</acronym>. Route
         definitions consist of static and dynamic parts separated by the slash
         ('/') character. Static parts are just simple text:
         <code>author</code>. Dynamic parts, called variables, are marked by
@@ -45,7 +45,7 @@ $router->addRoute('user', $route);
         <para>
             The current implementation allows you to use any character (except a
             slash) as a variable identifier, but it is strongly recommended that
-            one uses only characters that are valid for PHP variable
+            one uses only characters that are valid for <acronym>PHP</acronym> variable
             identifiers. Future implementations may alter this behaviour, which
             could result in hidden bugs in your code.
         </para>
@@ -90,7 +90,7 @@ public function userinfoAction()
     <para>
         Route definition can contain one more special character - a wildcard
         - represented by '*' symbol. It is used to gather parameters similarly
-        to the default Module route (var => value pairs defined in the URI). The
+        to the default Module route (var => value pairs defined in the <acronym>URI</acronym>). The
         following route more-or-less mimics the Module route behavior:
     </para>
 
@@ -121,7 +121,7 @@ $router->addRoute('archive', $route);
 ]]></programlisting>
 
         <para>
-            The above route will match URLs like
+            The above route will match <acronym>URL</acronym>s like
             <filename>http://domain.com/archive/2005</filename> and
             <filename>http://example.com/archive</filename>. In the latter case the
             variable year will have an initial default value of 2006.
@@ -183,7 +183,7 @@ $router->addRoute('archive', $route);
         <para>
             With a route defined like above, the router will match it only when
             the year variable will contain numeric data, eg.
-            <filename>http://domain.com/archive/2345</filename>. A URL like
+            <filename>http://domain.com/archive/2345</filename>. A <acronym>URL</acronym> like
             <filename>http://example.com/archive/test</filename> will not be matched and
             control will be passed to the next route in the chain instead.
         </para>
@@ -257,7 +257,7 @@ $router->addRoute('archive', $route);
             are prefixed by <code>:@</code>. When assembling, the given
             parameter will be translated and inserted into the parameter
             position. When matching, the translated parameter from the
-            URL will be reverted to the message ID again.
+            <acronym>URL</acronym> will be reverted to the message ID again.
         </para>
 
         <note>
@@ -265,7 +265,7 @@ $router->addRoute('archive', $route);
             <para>
                 Occasionally a message ID which you want to use in one
                 of your routes is already used in a view script or somewhere
-                else. To have full control over safe URLs, you should use
+                else. To have full control over safe <acronym>URL</acronym>s, you should use
                 a separate language file for the messages used in the route.
             </para>
         </note>

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

@@ -6,8 +6,8 @@
         <title>Introduction</title>
         <para>
             <classname>Zend_Controller_Router_Rewrite</classname> is the standard
-            framework router. Routing is the process of taking a URI endpoint
-            (that part of the URI which comes after the base URL) and
+            framework router. Routing is the process of taking a <acronym>URI</acronym> endpoint
+            (that part of the <acronym>URI</acronym> which comes after the base <acronym>URL</acronym>) and
             decomposing it into parameters to determine which module,
             controller, and action of that controller should receive the
             request. This values of the module, controller, action and other
@@ -20,9 +20,9 @@
 
         <para>
             <classname>Zend_Controller_Router_Rewrite</classname> is designed to allow for
-            mod_rewrite-like functionality using pure PHP structures. It is very
+            mod_rewrite-like functionality using pure <acronym>PHP</acronym> structures. It is very
             loosely based on Ruby on Rails routing and does not require any
-            prior knowledge of webserver URL rewriting. It is designed to work
+            prior knowledge of webserver <acronym>URL</acronym> rewriting. It is designed to work
             with a single Apache mod_rewrite rule (one of):
         </para>
 
@@ -66,7 +66,7 @@ RewriteRule ^[\w/\%]*(?:\.(?!(?:js|ico|gif|jpg|png|css|html)$)[\w\%]*$)? /index.
         </note>
 
         <para>
-            IIS 7.0 introduces a native URL rewriting module, and it can be
+            IIS 7.0 introduces a native <acronym>URL</acronym> rewriting module, and it can be
             configured as follows:
         </para>
 
@@ -184,7 +184,7 @@ $router->addRoute('user',
 
         <para>
             The first parameter to addRoute is the name of the route. It is used
-            as a handle for getting the routes out of the router (e.g., for URL
+            as a handle for getting the routes out of the router (e.g., for <acronym>URL</acronym>
             generation purposes). The second parameter being the route itself.
         </para>
 
@@ -206,7 +206,7 @@ $router->addRoute('user',
 
         <para>
             Routing is a simple process of iterating through all provided routes
-            and matching its definitions to current request URI. When a positive
+            and matching its definitions to current request <acronym>URI</acronym>. When a positive
             match is found, variable values are returned from the Route instance
             and are injected into the <classname>Zend_Controller_Request</classname>
             object for later use in the dispatcher as well as in user created
@@ -233,7 +233,7 @@ $router->addRoute('user',
         <note>
             <title>Returned Values</title>
             <para>
-                Values returned from routing come from URL parameters or user
+                Values returned from routing come from <acronym>URL</acronym> parameters or user
                 defined route defaults. These variables are later accessible
                 through the <methodname>Zend_Controller_Request::getParam()</methodname> or
                 <methodname>Zend_Controller_Action::_getParam()</methodname> methods.
@@ -265,11 +265,11 @@ $router->addRoute('user',
 
         <para>
             <classname>Zend_Controller_Router_Rewrite</classname> comes preconfigured with a default
-            route, which will match URIs in the shape of
+            route, which will match <acronym>URI</acronym>s in the shape of
             <filename>controller/action</filename>. Additionally, a module name may be
-            specified as the first path element, allowing URIs of the form
+            specified as the first path element, allowing <acronym>URI</acronym>s of the form
             <filename>module/controller/action</filename>. Finally, it will also match
-            any additional parameters appended to the URI by default -
+            any additional parameters appended to the <acronym>URI</acronym> by default -
             <filename>controller/action/var1/value1/var2/value2</filename>.
         </para>
 
@@ -349,14 +349,14 @@ $router->removeDefaultRoutes();
         <para>
             The rewrite router can be used in subdirectories (e.g.,
             <filename>http://domain.com/~user/application-root/</filename>) in which
-            case the base URL of the application
+            case the base <acronym>URL</acronym> of the application
             (<filename>/~user/application-root</filename>) should be automatically
             detected by <classname>Zend_Controller_Request_Http</classname> and used
             accordingly.
         </para>
 
         <para>
-            Should the base URL be detected incorrectly you can override it with
+            Should the base <acronym>URL</acronym> be detected incorrectly you can override it with
             your own base path by using
             <classname>Zend_Controller_Request_Http</classname> and calling the
             <methodname>setBaseUrl()</methodname> method (see <xref

+ 2 - 2
documentation/manual/en/module_specs/Zend_Currency-Migrating.xml

@@ -5,10 +5,10 @@
     <title>Migrating from Previous Versions</title>
 
     <para>
-        The API of <classname>Zend_Currency</classname> has changed in the past to enhance
+        The <acronym>API</acronym> of <classname>Zend_Currency</classname> has changed in the past to enhance
         usability. If you started using <classname>Zend_Currency</classname> with a
         version which is mentioned in this chapter follow the guidelines below
-        to migrate your scripts to the new API.
+        to migrate your scripts to the new <acronym>API</acronym>.
     </para>
 
     <sect2 id="zend.currency.usage.migration.fromonezerotwo">

+ 4 - 4
documentation/manual/en/module_specs/Zend_Date-Additional.xml

@@ -7,7 +7,7 @@
     <para>
         Within this chapter, we will describe several additional functions which are also available
         through <classname>Zend_Date</classname>. Of course all described functions have additional
-        examples to show the expected working and the simple API for the proper using of them.
+        examples to show the expected working and the simple <acronym>API</acronym> for the proper using of them.
     </para>
 
     <sect2 id="zend.date.additional.checking">
@@ -237,15 +237,15 @@ foreach ($info as $sun) {
             A <classname>Zend_Date</classname> object of course also stores the actual timezone.
             Even if the timezone is changed after the creation of the object it remembers the
             original timezone and works with it. It is also not necessary to change the timezone
-            within the code with PHP functions. <classname>Zend_Date</classname> has two built-in
+            within the code with <acronym>PHP</acronym> functions. <classname>Zend_Date</classname> has two built-in
             functions which makes it possible to handle this.
         </para>
 
         <para>
             <methodname>getTimezone()</methodname> returns the actual set timezone of within the
             <classname>Zend_Date</classname> object. Remember that <classname>Zend_Date</classname>
-            is not coupled with PHP internals. So the returned timezone is not the timezone of the
-            PHP script but the timezone of the object. <methodname>setTimezone($zone)</methodname>
+            is not coupled with <acronym>PHP</acronym> internals. So the returned timezone is not the timezone of the
+            <acronym>PHP</acronym> script but the timezone of the object. <methodname>setTimezone($zone)</methodname>
             is the second function and makes it possible to set new timezone for
             <classname>Zend_Date</classname>. A given timezone is always checked. If it does not
             exist an exception will be thrown. Additionally the actual scripts or systems timezone

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

@@ -28,9 +28,9 @@
 
         <para>
             Without any arguments, constructing an instance returns an object in the default locale
-            with the current, local date using PHP's <methodname>time()</methodname> function to
+            with the current, local date using <acronym>PHP</acronym>'s <methodname>time()</methodname> function to
             obtain the <ulink url="http://en.wikipedia.org/wiki/Unix_Time">UNIX timestamp</ulink>
-            for the object. Make sure your PHP environment has the correct
+            for the object. Make sure your <acronym>PHP</acronym> environment has the correct
             <link linkend="zend.date.setdefaulttimezone">default timezone</link>
             .
         </para>

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

@@ -725,11 +725,11 @@
         </para>
 
         <para>
-            The accepted format specifiers can be changed from ISO Format to PHP's date format if
+            The accepted format specifiers can be changed from ISO Format to <acronym>PHP</acronym>'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
+            supported with <acronym>PHP</acronym>'s date format specifiers. Use the
             <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
-            switch <classname>Zend_Date</classname> methods from supporting ISO format specifiers to PHP date() type
+            switch <classname>Zend_Date</classname> methods from supporting ISO format specifiers to <acronym>PHP</acronym> date() type
             specifiers (see <xref linkend="zend.date.constants.phpformats" /> below).
         </para>
 
@@ -1131,7 +1131,7 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
 
         <note>
             <para>
-                Note that the default ISO format differs from PHP's format which can be
+                Note that the default ISO format differs from <acronym>PHP</acronym>'s format which can be
                 irritating if you have not used in previous. Especially the format specifiers
                 for <emphasis>Year and Minute</emphasis> are often not used in the
                 intended way.
@@ -1153,7 +1153,7 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
             <para>
                 For <emphasis>minute</emphasis> the difference is not so big. ISO
                 uses the specifier <emphasis>m</emphasis> for the minute, unlike
-                PHP which uses <emphasis>i</emphasis>. So if you are getting no
+                <acronym>PHP</acronym> which uses <emphasis>i</emphasis>. So if you are getting no
                 minute in your format check if you have used the right specifier.
             </para>
         </note>
@@ -1164,15 +1164,15 @@ print $date->toString("'Era:GGGG='GGGG, ' Date:yy.MMMM.dd'yy.MMMM.dd");
         <title>Self-Defined OUTPUT Formats Using PHP's date() Format Specifiers</title>
 
         <para>
-            If you are more comfortable with PHP's date format specifier than with ISO format
+            If you are more comfortable with <acronym>PHP</acronym>'s date format specifier than with ISO format
             specifiers, then you can use the
             <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname> method to
-            switch <classname>Zend_Date</classname> methods from supporting ISO format specifiers to PHP date() type
+            switch <classname>Zend_Date</classname> methods from supporting ISO format specifiers to <acronym>PHP</acronym> date() type
             specifiers. Afterwards, all format parameters must be given with
             <ulink url="http://php.net/date">PHP's <methodname>date()</methodname> format
-                specifiers</ulink>. The PHP date format lacks some of the formats supported by the
+                specifiers</ulink>. The <acronym>PHP</acronym> date format lacks some of the formats supported by the
             ISO Format, and vice-versa. If you are not already comfortable with it, then use the
-            standard ISO format instead. Also, if you have legacy code using PHP's date format,
+            standard ISO format instead. Also, if you have legacy code using <acronym>PHP</acronym>'s date format,
             then either manually convert it to the ISO format using <link
                 linkend="zend.locale.date.normalize">Zend_Locale_Format::convertPhpToIsoFormat()</link>,
             or use <methodname>setOptions()</methodname>. The following examples illustrate the
@@ -1194,11 +1194,11 @@ print $date->toString("'Format:D M j G:i:s T Y='D M j G:i:s T Y");
         </example>
 
         <para>
-            The following table shows the list of PHP date format specifiers with their equivalent
+            The following table shows the list of <acronym>PHP</acronym> date format specifiers with their equivalent
             <classname>Zend_Date</classname> 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
+            CLDR/ISO format does not have an equivalent format specifier, the <acronym>PHP</acronym> format specifier
             is not altered by <methodname>Zend_Locale_Format::convertPhpToIsoFormat()</methodname>,
-            and the <classname>Zend_Date</classname> methods then recognize these "peculiar" PHP format specifiers, even
+            and the <classname>Zend_Date</classname> methods then recognize these "peculiar" <acronym>PHP</acronym> format specifiers, even
             when in the default "ISO" format mode.
         </para>
 

+ 8 - 8
documentation/manual/en/module_specs/Zend_Date-Introduction.xml

@@ -5,10 +5,10 @@
     <title>Introduction</title>
 
     <para>
-        The <classname>Zend_Date</classname> component offers a detailed, but simple API for
+        The <classname>Zend_Date</classname> component offers a detailed, but simple <acronym>API</acronym> for
         manipulating dates and times. Its methods accept a wide variety of types of information,
         including date parts, in numerous combinations yielding many features and possibilities
-        above and beyond the existing PHP date related functions. For the very latest manual
+        above and beyond the existing <acronym>PHP</acronym> date related functions. For the very latest manual
         updates, please see <ulink url="http://framework.zend.com/wiki/display/ZFDOCDEV/Home">our
             online manual (frequently synced to Subversion)</ulink>.
     </para>
@@ -72,16 +72,16 @@ date_default_timezone_set('Europe/Berlin');
 
         <para>
             <classname>Zend_Date</classname> offers the following features, which extend the scope
-            of PHP date functions:
+            of <acronym>PHP</acronym> date functions:
         </para>
 
         <itemizedlist mark='opencircle'>
             <listitem>
                 <para>
-                    Simple API
+                    Simple <acronym>API</acronym>
                 </para>
                 <para>
-                    <classname>Zend_Date</classname> offers a very simple API, which combines the
+                    <classname>Zend_Date</classname> offers a very simple <acronym>API</acronym>, which combines the
                     best of date/time functionality from four programming languages. It is possible,
                     for example, to add or compare two times within a single row.
                 </para>
@@ -102,7 +102,7 @@ date_default_timezone_set('Europe/Berlin');
                     Unlimited timestamps
                 </para>
                 <para>
-                    Although PHP 5.2 docs state, "The valid range of a timestamp is typically from
+                    Although <acronym>PHP</acronym> 5.2 docs state, "The valid range of a timestamp is typically from
                     Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT,"
                     <classname>Zend_Date</classname> supports a nearly unlimited range, with the
                     help of the BCMath extension. If BCMath is not available, then <classname>Zend_Date</classname> will
@@ -129,7 +129,7 @@ date_default_timezone_set('Europe/Berlin');
                     <classname>Zend_Date</classname> using the <link
                         linkend="zend.date.constants.list">Zend_Date::ISO_8601</link> format
                     specification constant. When date strings conform to "Y/m/d" or "Y-m-d H:i:s",
-                    according to PHP date() format tokens, use <classname>Zend_Date</classname>'s built-in support for ISO
+                    according to <acronym>PHP</acronym> date() format tokens, use <classname>Zend_Date</classname>'s built-in support for ISO
                     8601 formatted dates.
                 </para>
             </listitem>
@@ -139,7 +139,7 @@ date_default_timezone_set('Europe/Berlin');
                 </para>
                 <para>
                     For any place and day, the times for sunrise and sunset can be displayed, so
-                    that you won't miss a single daylight second for working on your favorite PHP
+                    that you won't miss a single daylight second for working on your favorite <acronym>PHP</acronym>
                     project :)
                 </para>
             </listitem>

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

@@ -5,7 +5,7 @@
     <title>Zend_Date API Overview</title>
 
     <para>
-        While the <classname>Zend_Date</classname> API remains simplistic and unitary, its design
+        While the <classname>Zend_Date</classname> <acronym>API</acronym> remains simplistic and unitary, its design
         remains flexible and powerful through the rich permutations of operations and operands.
     </para>
 
@@ -18,11 +18,11 @@
             <title>Selecting the Date Format Type</title>
 
             <para>
-                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
+                Several methods use date format strings, in a way similar to <acronym>PHP</acronym>'s
+                <methodname>date()</methodname>. If you are more comfortable with <acronym>PHP</acronym>'s date format
                 specifier than with ISO format specifiers, then you can use
                 <methodname>Zend_Date::setOptions(array('format_type' => 'php'))</methodname>.
-                Afterward, use PHP's date format specifiers for all functions which accept a
+                Afterward, use <acronym>PHP</acronym>'s date format specifiers for all functions which accept a
                 <varname>$format</varname> parameter. Use
                 <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
@@ -77,13 +77,13 @@
                 When adding or substracting months from an existing date, the resulting value for
                 the day of the month might be unexpected, if the original date fell on a day close
                 to the end of the month. For example, when adding one month to January 31st, people
-                familiar with SQL will expect February 28th as the result. On the other side, people
+                familiar with <acronym>SQL</acronym> will expect February 28th as the result. On the other side, people
                 familiar with Excel and OpenOffice will expect March 3rd as the result. The problem
                 only occurs, if the resulting month does not have the day, which is set in the
                 original date. For Zend Framework developers, the desired behavior is selectable
-                using the <code>extend_month</code> option to choose either the SQL behaviour, if
+                using the <code>extend_month</code> option to choose either the <acronym>SQL</acronym> behaviour, if
                 set to <constant>FALSE</constant>, or the spreadsheet behaviour when set to <constant>TRUE</constant>. The default behaviour
-                for <code>extend_month</code> is <constant>FALSE</constant>, providing behavior compatible to SQL. By
+                for <code>extend_month</code> is <constant>FALSE</constant>, providing behavior compatible to <acronym>SQL</acronym>. By
                 default, <classname>Zend_Date</classname> computes month calculations by truncating
                 dates to the end of the month (if necessary), without wrapping into the next month
                 when the original date designates a day of the month exceeding the number of days in
@@ -692,7 +692,7 @@ print $date;
                             </para>
                             <para>
                                 This method checks if a given date is a real date and returns <constant>TRUE</constant>
-                                if all checks are ok. It works like PHP's checkdate() function but
+                                if all checks are ok. It works like <acronym>PHP</acronym>'s checkdate() function but
                                 can also check for localized month names and for dates extending the
                                 range of checkdate() <constant>FALSE</constant>
                             </para>
@@ -749,7 +749,7 @@ print $date;
                             <para>
                                 Returns an array representation of the selected date according to
                                 the conventions of the object's locale. The returned array is
-                                equivalent to PHP's <ulink
+                                equivalent to <acronym>PHP</acronym>'s <ulink
                                     url="http://php.net/getdate">getdate()</ulink> function and
                                 includes:
                             </para>
@@ -846,9 +846,9 @@ print $date;
                                 <classname>Zend_Date::MONTH_NAME_SHORT</classname>.
                                 <emphasis>NOTE:</emphasis> This method calls <link
                                     linkend="id.date.basic.operations"><methodname>get()</methodname></link>
-                                and casts the result to a PHP integer, which will give
+                                and casts the result to a <acronym>PHP</acronym> integer, which will give
                                 unpredictable results, if <methodname>get()</methodname> returns a
-                                numeric string containing a number too large for a PHP integer on
+                                numeric string containing a number too large for a <acronym>PHP</acronym> integer on
                                 your system. Use <methodname>get()</methodname> instead.
                             </para>
                         </entry>

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

@@ -58,10 +58,10 @@
                 </listitem>
                 <listitem>
                     <para>
-                        PHP functions
+                        <acronym>PHP</acronym> functions
                     </para>
                     <para>
-                        Where possible, <classname>Zend_Date</classname> usually uses PHP functions
+                        Where possible, <classname>Zend_Date</classname> usually uses <acronym>PHP</acronym> functions
                         to improve performance.
                     </para>
                 </listitem>

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

@@ -5,59 +5,59 @@
     <title>Zend_Db_Adapter</title>
 
     <para>
-        <classname>Zend_Db</classname> and its related classes provide a simple SQL database
+        <classname>Zend_Db</classname> and its related classes provide a simple <acronym>SQL</acronym> database
         interface for Zend Framework. The <classname>Zend_Db_Adapter</classname> is the basic class
-        you use to connect your PHP application to an RDBMS. There is a different Adapter
-        class for each brand of RDBMS.
+        you use to connect your <acronym>PHP</acronym> application to an <acronym>RDBMS</acronym>. There is a different Adapter
+        class for each brand of <acronym>RDBMS</acronym>.
     </para>
 
     <para>
-        The <classname>Zend_Db</classname> adapters create a bridge from the vendor-specific PHP
-        extensions to a common interface to help you write PHP applications
-        once and deploy with multiple brands of RDBMS with very little effort.
+        The <classname>Zend_Db</classname> adapters create a bridge from the vendor-specific <acronym>PHP</acronym>
+        extensions to a common interface to help you write <acronym>PHP</acronym> applications
+        once and deploy with multiple brands of <acronym>RDBMS</acronym> with very little effort.
     </para>
 
     <para>
         The interface of the adapter class is similar to the interface of the
         <ulink url="http://www.php.net/pdo">PHP Data Objects</ulink> extension.
-        <classname>Zend_Db</classname> provides Adapter classes to PDO drivers for the following
-        RDBMS brands:
+        <classname>Zend_Db</classname> provides Adapter classes to <acronym>PDO</acronym> drivers for the following
+        <acronym>RDBMS</acronym> brands:
     </para>
 
     <itemizedlist>
         <listitem>
             <para>
                 IBM DB2 and Informix Dynamic Server (IDS), using the
-                <ulink url="http://www.php.net/pdo-ibm">pdo_ibm</ulink> PHP extension
+                <ulink url="http://www.php.net/pdo-ibm">pdo_ibm</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
-                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink> PHP
+                MySQL, using the <ulink url="http://www.php.net/pdo-mysql">pdo_mysql</ulink> <acronym>PHP</acronym>
                 extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Microsoft SQL Server, using the <ulink
-                url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> PHP extension
+                Microsoft <acronym>SQL</acronym> Server, using the <ulink
+                url="http://www.php.net/pdo-mssql">pdo_mssql</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink> PHP
+                Oracle, using the <ulink url="http://www.php.net/pdo-oci">pdo_oci</ulink> <acronym>PHP</acronym>
                 extension
             </para>
         </listitem>
         <listitem>
             <para>
                 PostgreSQL, using the <ulink url="http://www.php.net/pdo-pgsql">pdo_pgsql</ulink>
-                PHP extension
+                <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
-                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink> PHP
+                SQLite, using the <ulink url="http://www.php.net/pdo-sqlite">pdo_sqlite</ulink> <acronym>PHP</acronym>
                 extension
             </para>
         </listitem>
@@ -65,42 +65,42 @@
     </itemizedlist>
 
     <para>
-        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize PHP
-        database extensions for the following RDBMS brands:
+        In addition, <classname>Zend_Db</classname> provides Adapter classes that utilize <acronym>PHP</acronym>
+        database extensions for the following <acronym>RDBMS</acronym> brands:
     </para>
 
     <itemizedlist>
         <listitem>
             <para>
-                MySQL, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink> PHP extension
+                MySQL, using the <ulink url="http://www.php.net/mysqli">mysqli</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
-                Oracle, using the <ulink url="http://www.php.net/oci8">oci8</ulink> PHP extension
+                Oracle, using the <ulink url="http://www.php.net/oci8">oci8</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
                 IBM DB2 and DB2/i5, using the <ulink
-                    url="http://www.php.net/ibm_db2">ibm_db2</ulink> PHP extension
+                    url="http://www.php.net/ibm_db2">ibm_db2</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
         <listitem>
             <para>
                 Firebird/Interbase, using the <ulink
-                    url="http://www.php.net/ibase">php_interbase</ulink> PHP extension
+                    url="http://www.php.net/ibase">php_interbase</ulink> <acronym>PHP</acronym> extension
             </para>
         </listitem>
     </itemizedlist>
 
     <note>
         <para>
-            Each <classname>Zend_Db</classname> Adapter uses a PHP extension. You must have the
-            respective PHP extension enabled in your PHP environment to use a
-            <classname>Zend_Db</classname> Adapter. For example, if you use any of the PDO
-            <classname>Zend_Db</classname> Adapters, you need to enable both the PDO extension and
-            the PDO driver for the brand of RDBMS you use.
+            Each <classname>Zend_Db</classname> Adapter uses a <acronym>PHP</acronym> extension. You must have the
+            respective <acronym>PHP</acronym> extension enabled in your <acronym>PHP</acronym> environment to use a
+            <classname>Zend_Db</classname> Adapter. For example, if you use any of the <acronym>PDO</acronym>
+            <classname>Zend_Db</classname> Adapters, you need to enable both the <acronym>PDO</acronym> extension and
+            the <acronym>PDO</acronym> driver for the brand of <acronym>RDBMS</acronym> you use.
         </para>
     </note>
 
@@ -110,8 +110,8 @@
 
         <para>
             This section describes how to create an instance of a database Adapter.
-            This corresponds to making a connection to your RDBMS server from your
-            PHP application.
+            This corresponds to making a connection to your <acronym>RDBMS</acronym> server from your
+            <acronym>PHP</acronym> application.
         </para>
 
         <sect3 id="zend.db.adapter.connecting.constructor">
@@ -279,7 +279,7 @@ $db = Zend_Db::factory($config->database);
                         <emphasis>host</emphasis>:
                         a string containing a hostname or IP address of the
                         database server. If the database is running on the
-                        same host as the PHP application, you may use
+                        same host as the <acronym>PHP</acronym> application, you may use
                         'localhost' or '127.0.0.1'.
                     </para>
                 </listitem>
@@ -287,30 +287,30 @@ $db = Zend_Db::factory($config->database);
                     <para>
                         <emphasis>username</emphasis>:
                         account identifier for authenticating a connection to the
-                        RDBMS server.
+                        <acronym>RDBMS</acronym> server.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <emphasis>password</emphasis>:
                         account password credential for authenticating a
-                        connection to the RDBMS server.
+                        connection to the <acronym>RDBMS</acronym> server.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <emphasis>dbname</emphasis>:
-                        database instance name on the RDBMS server.
+                        database instance name on the <acronym>RDBMS</acronym> server.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <emphasis>port</emphasis>:
-                        some RDBMS servers can accept network connections on a
+                        some <acronym>RDBMS</acronym> servers can accept network connections on a
                         administrator-specified port number. The port
                         parameter allow you to specify the port to which your
-                        PHP application connects, to match the port configured
-                        on the RDBMS server.
+                        <acronym>PHP</acronym> application connects, to match the port configured
+                        on the <acronym>RDBMS</acronym> server.
                     </para>
                 </listitem>
                 <listitem>
@@ -332,7 +332,7 @@ $db = Zend_Db::factory($config->database);
                         this parameter is an associative array of additional
                         options that are specific to a given database
                         extension. One typical use of this parameter is to
-                        set attributes of a PDO driver.
+                        set attributes of a <acronym>PDO</acronym> driver.
                     </para>
                 </listitem>
                 <listitem>
@@ -352,7 +352,7 @@ $db = Zend_Db::factory($config->database);
                     You can specify this option by the constant
                     <classname>Zend_Db::CASE_FOLDING</classname>.
                     This corresponds to the <constant>ATTR_CASE</constant> attribute in
-                    PDO and IBM DB2 database drivers, adjusting the case of
+                    <acronym>PDO</acronym> and IBM DB2 database drivers, adjusting the case of
                     string keys in query result sets. The option takes values
                     <constant>Zend_Db::CASE_NATURAL</constant> (the default),
                     <constant>Zend_Db::CASE_UPPER</constant>, and
@@ -382,8 +382,8 @@ $db = Zend_Db::factory('Db2', $params);
                     <classname>Zend_Db::AUTO_QUOTE_IDENTIFIERS</classname>. If the value
                     is <constant>TRUE</constant> (the default), identifiers like table
                     names, column names, and even aliases are delimited in all
-                    SQL syntax generated by the Adapter object. This makes it
-                    simple to use identifiers that contain SQL keywords, or
+                    <acronym>SQL</acronym> syntax generated by the Adapter object. This makes it
+                    simple to use identifiers that contain <acronym>SQL</acronym> keywords, or
                     special characters. If the value is <constant>FALSE</constant>,
                     identifiers are not delimited automatically. If you need
                     to delimit identifiers, you must do so yourself using the
@@ -454,7 +454,7 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
 
             <para>
                 Creating an instance of an Adapter class does not immediately
-                connect to the RDBMS server. The Adapter saves the connection
+                connect to the <acronym>RDBMS</acronym> server. The Adapter saves the connection
                 parameters, and makes the actual connection on demand, the
                 first time you need to execute a query. This ensures that
                 creating an Adapter object is quick and inexpensive. You can
@@ -464,19 +464,19 @@ $db = Zend_Db::factory('Pdo_Mysql', $params);
             </para>
 
             <para>
-                If you need to force the Adapter to connect to the RDBMS, use
+                If you need to force the Adapter to connect to the <acronym>RDBMS</acronym>, use
                 the <methodname>getConnection()</methodname> method. This method returns
                 an object for the connection as represented by the respective
-                PHP database extension. For example, if you use any of the
-                Adapter classes for PDO drivers, then
-                <methodname>getConnection()</methodname> returns the PDO object, after
+                <acronym>PHP</acronym> database extension. For example, if you use any of the
+                Adapter classes for <acronym>PDO</acronym> drivers, then
+                <methodname>getConnection()</methodname> returns the <acronym>PDO</acronym> object, after
                 initiating it as a live connection to the specific database.
             </para>
 
             <para>
                 It can be useful to force the connection if you want to catch
                 any exceptions it throws as a result of invalid account
-                credentials, or other failure to connect to the RDBMS server.
+                credentials, or other failure to connect to the <acronym>RDBMS</acronym> server.
                 These exceptions are not thrown until the connection is made,
                 so it can help simplify your application code if you handle the
                 exceptions in one place, instead of at the time of
@@ -562,7 +562,7 @@ try {
         </itemizedlist>
 
         <para>
-            The following SQL data definition language pseudocode describes the
+            The following <acronym>SQL</acronym> data definition language pseudocode describes the
             tables in this example database. These example tables are used
             extensively by the automated unit tests for <classname>Zend_Db</classname>.
         </para>
@@ -626,7 +626,7 @@ CREATE TABLE bugs_products (
             <title>Fetching a Complete Result Set</title>
 
             <para>
-                You can run a SQL SELECT query and retrieve its results in one
+                You can run a <acronym>SQL</acronym> SELECT query and retrieve its results in one
                 step using the <methodname>fetchAll()</methodname> method.
             </para>
 
@@ -640,7 +640,7 @@ CREATE TABLE bugs_products (
 
             <para>
                 The second argument to <methodname>fetchAll()</methodname> is an array of
-                values to substitute for parameter placeholders in the SQL
+                values to substitute for parameter placeholders in the <acronym>SQL</acronym>
                 statement.
             </para>
 
@@ -692,7 +692,7 @@ $result = $db->fetchAll($sql, 2);
                     <para>
                         By default, these strings are returned as they are
                         returned by the database driver. This is typically the
-                        spelling of the column in the RDBMS server. You can
+                        spelling of the column in the <acronym>RDBMS</acronym> server. You can
                         specify the case for these strings, using the
                         <classname>Zend_Db::CASE_FOLDING</classname> option.
                         Specify this when instantiating the Adapter.
@@ -730,7 +730,7 @@ $result = $db->fetchAll($sql, 2);
                     <para>
                         <emphasis>Zend_Db::FETCH_OBJ</emphasis>:
                         return data in an array of objects. The default class
-                        is the PHP built-in class stdClass. Columns of the
+                        is the <acronym>PHP</acronym> built-in class stdClass. Columns of the
                         result set are available as public properties of the
                         object.
                     </para>
@@ -921,7 +921,7 @@ $db->insert('bugs', $data);
             <para>
                 Columns you exclude from the array of data are not specified to
                 the database. Therefore, they follow the same rules that an
-                SQL INSERT statement follows: if the column has a DEFAULT
+                <acronym>SQL</acronym> INSERT statement follows: if the column has a DEFAULT
                 clause, the column takes that value in the row created,
                 otherwise the column is left in a NULL state.
             </para>
@@ -934,10 +934,10 @@ $db->insert('bugs', $data);
             </para>
 
             <para>
-                You might need values in the data array to be treated as SQL
+                You might need values in the data array to be treated as <acronym>SQL</acronym>
                 expressions, in which case they should not be quoted. By
                 default, all data values passed as strings are treated as
-                string literals. To specify that the value is an SQL
+                string literals. To specify that the value is an <acronym>SQL</acronym>
                 expression and therefore should not be quoted, pass the value
                 in the data array as an object of type <classname>Zend_Db_Expr</classname> instead
                 of a plain string.
@@ -963,7 +963,7 @@ $db->insert('bugs', $data);
             <title>Retrieving a Generated Value</title>
 
             <para>
-                Some RDBMS brands support auto-incrementing primary keys.
+                Some <acronym>RDBMS</acronym> brands support auto-incrementing primary keys.
                 A table defined this way generates a primary key value
                 automatically during an INSERT of a new row. The return value
                 of the <methodname>insert()</methodname> method is <emphasis>not</emphasis>
@@ -990,7 +990,7 @@ $id = $db->lastInsertId();
             </example>
 
             <para>
-                Some RDBMS brands support a sequence object, which generates
+                Some <acronym>RDBMS</acronym> brands support a sequence object, which generates
                 unique values to serve as primary key values. To support
                 sequences, the <methodname>lastInsertId()</methodname> method accepts two
                 optional string arguments. These arguments name the table and
@@ -1034,11 +1034,11 @@ $id = $db->lastSequenceId('bugs_id_gen');
             </example>
 
             <para>
-                For RDBMS brands that don't support sequences, including MySQL,
-                Microsoft SQL Server, and SQLite, the arguments to the
+                For <acronym>RDBMS</acronym> brands that don't support sequences, including MySQL,
+                Microsoft <acronym>SQL</acronym> Server, and SQLite, the arguments to the
                 lastInsertId() method are ignored, and the value returned is the
                 most recent value generated for any table by INSERT operations
-                during the current connection. For these RDBMS brands, the
+                during the current connection. For these <acronym>RDBMS</acronym> brands, the
                 lastSequenceId() method always returns <constant>NULL</constant>.
             </para>
 
@@ -1059,7 +1059,7 @@ $id = $db->lastSequenceId('bugs_id_gen');
                 </para>
                 <para>
                     Using a strong transaction isolation mode such as
-                    "repeatable read" can mitigate this risk, but some RDBMS
+                    "repeatable read" can mitigate this risk, but some <acronym>RDBMS</acronym>
                     brands don't support the transaction isolation required for
                     this, or else your application may use a lower transaction
                     isolation mode by design.
@@ -1071,7 +1071,7 @@ $id = $db->lastSequenceId('bugs_id_gen');
                     calculated value for their next INSERT operation.
                 </para>
                 <para>
-                    All RDBMS brands provide mechanisms to generate unique
+                    All <acronym>RDBMS</acronym> brands provide mechanisms to generate unique
                     values, and to return the last value generated. These
                     mechanisms necessarily work outside of the scope of
                     transaction isolation, so there is no chance of two clients
@@ -1097,11 +1097,11 @@ $id = $db->lastSequenceId('bugs_id_gen');
             <para>
                 The values in the data array are treated as string literals.
                 See <xref linkend="zend.db.adapter.write.insert" />
-                for information on using SQL expressions in the data array.
+                for information on using <acronym>SQL</acronym> expressions in the data array.
             </para>
 
             <para>
-                The third argument is a string containing an SQL expression
+                The third argument is a string containing an <acronym>SQL</acronym> expression
                 that is used as criteria for the rows to change. The values
                 and identifiers in this argument are not quoted or escaped.
                 You are responsible for ensuring that any dynamic content is
@@ -1168,7 +1168,7 @@ $n = $db->update('bugs', $data, $where);
             </para>
 
             <para>
-                The second argument is a string containing an SQL expression
+                The second argument is a string containing an <acronym>SQL</acronym> expression
                 that is used as criteria for the rows to delete. The values
                 and identifiers in this argument are not quoted or escaped.
                 You are responsible for ensuring that any dynamic content is
@@ -1227,9 +1227,9 @@ echo $sql;
         <para>
             Even worse is the risk that such code mistakes might be exploited
             deliberately by a person who is trying to manipulate the function
-            of your web application. If they can specify the value of a PHP
-            variable through the use of an HTTP parameter or other mechanism,
-            they might be able to make your SQL queries do things that you
+            of your web application. If they can specify the value of a <acronym>PHP</acronym>
+            variable through the use of an <acronym>HTTP</acronym> parameter or other mechanism,
+            they might be able to make your <acronym>SQL</acronym> queries do things that you
             didn't intend them to do, such as return data to which the person
             should not have privilege to read. This is a serious and widespread
             technique for violating application security, known as "SQL Injection" (see <ulink
@@ -1238,11 +1238,11 @@ echo $sql;
 
         <para>
             The <classname>Zend_Db</classname> Adapter class provides convenient functions to help
-            you reduce vulnerabilities to SQL Injection attacks in your PHP code.
-            The solution is to escape special characters such as quotes in PHP
-            values before they are interpolated into your SQL strings.
+            you reduce vulnerabilities to <acronym>SQL</acronym> Injection attacks in your <acronym>PHP</acronym> code.
+            The solution is to escape special characters such as quotes in <acronym>PHP</acronym>
+            values before they are interpolated into your <acronym>SQL</acronym> strings.
             This protects against both accidental and deliberate manipulation
-            of SQL strings by PHP variables that contain special characters.
+            of <acronym>SQL</acronym> strings by <acronym>PHP</acronym> variables that contain special characters.
         </para>
 
         <sect3 id="zend.db.adapter.quoting.quote">
@@ -1252,9 +1252,9 @@ echo $sql;
             <para>
                 The <methodname>quote()</methodname> method accepts a single argument, a
                 scalar string value. It returns the value with special
-                characters escaped in a manner appropriate for the RDBMS you
+                characters escaped in a manner appropriate for the <acronym>RDBMS</acronym> you
                 are using, and surrounded by string value delimiters. The
-                standard SQL string value delimiter is the single-quote
+                standard <acronym>SQL</acronym> string value delimiter is the single-quote
                 (<code>'</code>).
             </para>
 
@@ -1297,7 +1297,7 @@ SELECT * FROM atable WHERE intColumn = '123'
             <para>
                 You can use the optional second argument to the
                 <methodname>quote()</methodname> method to apply quoting selectively for
-                the SQL datatype you specify.
+                the <acronym>SQL</acronym> datatype you specify.
             </para>
 
             <example id="zend.db.adapter.quoting.quote.example-2">
@@ -1311,16 +1311,16 @@ $sql = 'SELECT * FROM atable WHERE intColumn = '
 
             <para>
                 Each <classname>Zend_Db_Adapter</classname> class has encoded the names of numeric
-                SQL datatypes for the respective brand of RDBMS. You can also
+                <acronym>SQL</acronym> datatypes for the respective brand of <acronym>RDBMS</acronym>. You can also
                 use the constants <classname>Zend_Db::INT_TYPE</classname>,
                 <classname>Zend_Db::BIGINT_TYPE</classname>, and
                 <classname>Zend_Db::FLOAT_TYPE</classname> to write code in a more
-                RDBMS-independent way.
+                <acronym>RDBMS</acronym>-independent way.
             </para>
 
             <para>
-                <classname>Zend_Db_Table</classname> specifies SQL types to
-                <methodname>quote()</methodname> automatically when generating SQL queries that
+                <classname>Zend_Db_Table</classname> specifies <acronym>SQL</acronym> types to
+                <methodname>quote()</methodname> automatically when generating <acronym>SQL</acronym> queries that
                 reference a table's key columns.
             </para>
 
@@ -1331,24 +1331,24 @@ $sql = 'SELECT * FROM atable WHERE intColumn = '
             <title>Using quoteInto()</title>
 
             <para>
-                The most typical usage of quoting is to interpolate a PHP
-                variable into a SQL expression or statement. You can use the
+                The most typical usage of quoting is to interpolate a <acronym>PHP</acronym>
+                variable into a <acronym>SQL</acronym> expression or statement. You can use the
                 <methodname>quoteInto()</methodname> method to do this in one step. This
                 method takes two arguments: the first argument is a string
                 containing a placeholder symbol (<code>?</code>), and the
-                second argument is a value or PHP variable that should be
+                second argument is a value or <acronym>PHP</acronym> variable that should be
                 substituted for that placeholder.
             </para>
 
             <para>
-                The placeholder symbol is the same symbol used by many RDBMS
+                The placeholder symbol is the same symbol used by many <acronym>RDBMS</acronym>
                 brands for positional parameters, but the
                 <methodname>quoteInto()</methodname> method only emulates query parameters.
                 The method simply interpolates the value into the string,
                 escapes special characters, and applies quotes around it.
-                True query parameters maintain the separation between the SQL
+                True query parameters maintain the separation between the <acronym>SQL</acronym>
                 string and the parameters as the statement is parsed in the
-                RDBMS server.
+                <acronym>RDBMS</acronym> server.
             </para>
 
             <example id="zend.db.adapter.quoting.quote-into.example">
@@ -1363,7 +1363,7 @@ echo $sql;
 
             <para>
                 You can use the optional third parameter of
-                <methodname>quoteInto()</methodname> to specify the SQL datatype. Numeric
+                <methodname>quoteInto()</methodname> to specify the <acronym>SQL</acronym> datatype. Numeric
                 datatypes are not quoted, and other types are quoted.
             </para>
 
@@ -1384,24 +1384,24 @@ echo $sql;
             <title>Using quoteIdentifier()</title>
 
             <para>
-                Values are not the only part of SQL syntax that might need to
-                be variable. If you use PHP variables to name tables, columns,
-                or other identifiers in your SQL statements, you might need to
-                quote these strings too. By default, SQL identifiers have
-                syntax rules like PHP and most other programming languages.
+                Values are not the only part of <acronym>SQL</acronym> syntax that might need to
+                be variable. If you use <acronym>PHP</acronym> variables to name tables, columns,
+                or other identifiers in your <acronym>SQL</acronym> statements, you might need to
+                quote these strings too. By default, <acronym>SQL</acronym> identifiers have
+                syntax rules like <acronym>PHP</acronym> and most other programming languages.
                 For example, identifiers should not contain spaces, certain
                 punctuation or special characters, or international characters.
-                Also certain words are reserved for SQL syntax, and should not
+                Also certain words are reserved for <acronym>SQL</acronym> syntax, and should not
                 be used as identifiers.
             </para>
 
             <para>
-                However, SQL has a feature called <emphasis>delimited identifiers</emphasis>,
+                However, <acronym>SQL</acronym> has a feature called <emphasis>delimited identifiers</emphasis>,
                 which allows broader choices for the spelling of identifiers.
-                If you enclose a SQL identifier in the proper types of quotes,
+                If you enclose a <acronym>SQL</acronym> identifier in the proper types of quotes,
                 you can use identifiers with spellings that would be invalid
                 without the quotes. Delimited identifiers can contain spaces,
-                punctuation, or international characters. You can also use SQL
+                punctuation, or international characters. You can also use <acronym>SQL</acronym>
                 reserved words if you enclose them in identifier delimiters.
             </para>
 
@@ -1409,8 +1409,8 @@ echo $sql;
                 The <methodname>quoteIdentifier()</methodname> method works like
                 <methodname>quote()</methodname>, but it applies the identifier delimiter
                 characters to the string according to the type of Adapter you
-                use. For example, standard SQL uses double-quotes
-                (<code>"</code>) for identifier delimiters, and most RDBMS
+                use. For example, standard <acronym>SQL</acronym> uses double-quotes
+                (<code>"</code>) for identifier delimiters, and most <acronym>RDBMS</acronym>
                 brands use that symbol. MySQL uses back-quotes
                 (<code>`</code>) by default. The
                 <methodname>quoteIdentifier()</methodname> method also escapes special
@@ -1431,14 +1431,14 @@ echo $sql
             </example>
 
             <para>
-                SQL delimited identifiers are case-sensitive, unlike unquoted
+                <acronym>SQL</acronym> delimited identifiers are case-sensitive, unlike unquoted
                 identifiers. Therefore, if you use delimited identifiers, you
                 must use the spelling of the identifier exactly as it is stored
                 in your schema, including the case of the letters.
             </para>
 
             <para>
-                In most cases where SQL is generated within <classname>Zend_Db</classname> classes,
+                In most cases where <acronym>SQL</acronym> is generated within <classname>Zend_Db</classname> classes,
                 the default is that all identifiers are delimited
                 automatically. You can change this behavior with the option
                 <classname>Zend_Db::AUTO_QUOTE_IDENTIFIERS</classname>. Specify this
@@ -1462,16 +1462,16 @@ echo $sql
             them implicitly. This is called <emphasis>auto-commit</emphasis>
             mode, in which the database driver creates a transaction for every
             statement you execute, and commits that transaction after your
-            SQL statement has been executed. By default, all <classname>Zend_Db</classname> Adapter
+            <acronym>SQL</acronym> statement has been executed. By default, all <classname>Zend_Db</classname> Adapter
             classes operate in auto-commit mode.
         </para>
 
         <para>
             Alternatively, you can specify the beginning and resolution of a
-            transaction, and thus control how many SQL queries are included in
+            transaction, and thus control how many <acronym>SQL</acronym> queries are included in
             a single group that is committed (or rolled back) as a single
             operation. Use the <methodname>beginTransaction()</methodname> method to
-            initiate a transaction. Subsequent SQL statements are executed in
+            initiate a transaction. Subsequent <acronym>SQL</acronym> statements are executed in
             the context of the same transaction until you resolve it
             explicitly.
         </para>
@@ -1682,27 +1682,27 @@ try {
         <title>Closing a Connection</title>
 
         <para>
-            Normally it is not necessary to close a database connection. PHP
+            Normally it is not necessary to close a database connection. <acronym>PHP</acronym>
             automatically cleans up all resources and the end of a request.
             Database extensions are designed to close the connection as the
             reference to the resource object is cleaned up.
         </para>
 
         <para>
-            However, if you have a long-duration PHP script that initiates many
+            However, if you have a long-duration <acronym>PHP</acronym> script that initiates many
             database connections, you might need to close the connection, to avoid
-            exhausting the capacity of your RDBMS server. You can use the
+            exhausting the capacity of your <acronym>RDBMS</acronym> server. You can use the
             Adapter's <methodname>closeConnection()</methodname> method to explicitly close
             the underlying database connection.
         </para>
 
         <para>
-            Since release 1.7.2, you could check you are currently connected to the RDBMS
+            Since release 1.7.2, you could check you are currently connected to the <acronym>RDBMS</acronym>
             server with the method <methodname>isConnected()</methodname>. This means that a
             connection resource has been initiated and wasn't closed. This function is not
             currently able to test for example a server side closing of the connection. This is
             internally use to close the connection. It allow you to close the connection
-            multiple times without errors. It was already the case before 1.7.2 for PDO
+            multiple times without errors. It was already the case before 1.7.2 for <acronym>PDO</acronym>
             adapters but not for the others.
         </para>
 
@@ -1737,22 +1737,22 @@ $db = Zend_Db::factory('Oracle', array(
 
             <para>
                 Please note that using persistent connections can cause an
-                excess of idle connections on the RDBMS server, which causes
+                excess of idle connections on the <acronym>RDBMS</acronym> server, which causes
                 more problems than any performance gain you might achieve by
                 reducing the overhead of making connections.
             </para>
             <para>
                 Database connections have state. That is, some objects in the
-                RDBMS server exist in session scope. Examples are locks, user
+                <acronym>RDBMS</acronym> server exist in session scope. Examples are locks, user
                 variables, temporary tables, and information about the most
                 recently executed query, such as rows affected, and last
                 generated id value. If you use persistent connections, your
                 application could access invalid or privileged data that were
-                created in a previous PHP request.
+                created in a previous <acronym>PHP</acronym> request.
             </para>
             <para>
-                Currently, only Oracle, DB2, and the PDO adapters (where
-                specified by PHP) support persistence in <classname>Zend_Db</classname>.
+                Currently, only Oracle, DB2, and the <acronym>PDO</acronym> adapters (where
+                specified by <acronym>PHP</acronym>) support persistence in <classname>Zend_Db</classname>.
             </para>
         </note>
 
@@ -1764,25 +1764,25 @@ $db = Zend_Db::factory('Oracle', array(
 
         <para>
             There might be cases in which you need to access the connection
-            object directly, as provided by the PHP database extension. Some
+            object directly, as provided by the <acronym>PHP</acronym> database extension. Some
             of these extensions may offer features that are not surfaced by
             methods of <classname>Zend_Db_Adapter_Abstract</classname>.
         </para>
 
         <para>
-            For example, all SQL statements run by <classname>Zend_Db</classname> are prepared, then
+            For example, all <acronym>SQL</acronym> statements run by <classname>Zend_Db</classname> are prepared, then
             executed. However, some database features are incompatible with
             prepared statements. DDL statements like CREATE and ALTER cannot
-            be prepared in MySQL. Also, SQL statements don't benefit from the <ulink
+            be prepared in MySQL. Also, <acronym>SQL</acronym> statements don't benefit from the <ulink
                 url="http://dev.mysql.com/doc/refman/5.1/en/query-cache-how.html">MySQL Query
                 Cache</ulink>, prior to MySQL 5.1.17.
         </para>
 
         <para>
-            Most PHP database extensions provide a method to execute SQL
-            statements without preparing them. For example, in PDO, this
+            Most <acronym>PHP</acronym> database extensions provide a method to execute <acronym>SQL</acronym>
+            statements without preparing them. For example, in <acronym>PDO</acronym>, this
             method is <methodname>exec()</methodname>. You can access the connection
-            object in the PHP extension directly using getConnection().
+            object in the <acronym>PHP</acronym> extension directly using getConnection().
         </para>
 
         <example id="zend.db.adapter.other-statements.example">
@@ -1794,15 +1794,15 @@ $result = $db->getConnection()->exec('DROP TABLE bugs');
 
         <para>
             Similarly, you can access other methods or properties that are
-            specific to PHP database extensions. Be aware, though, that by
+            specific to <acronym>PHP</acronym> database extensions. Be aware, though, that by
             doing this you might constrain your application to the interface
-            provided by the extension for a specific brand of RDBMS.
+            provided by the extension for a specific brand of <acronym>RDBMS</acronym>.
         </para>
 
         <para>
             In future versions of <classname>Zend_Db</classname>, there will be opportunities to
             add method entry points for functionality that is common to
-            the supported PHP database extensions. This will not affect
+            the supported <acronym>PHP</acronym> database extensions. This will not affect
             backward compatibility.
         </para>
 
@@ -1812,7 +1812,7 @@ $result = $db->getConnection()->exec('DROP TABLE bugs');
         <title>Retrieving Server Version</title>
 
         <para>
-            Since release 1.7.2, you could retrieve the server version in PHP syntax
+            Since release 1.7.2, you could retrieve the server version in <acronym>PHP</acronym> syntax
             style to be able to use <methodname>version_compare()</methodname>. If the information
             isn't available, you will receive <constant>NULL</constant>.
         </para>
@@ -1854,7 +1854,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extension ibm_db2.
+                        This Adapter uses the <acronym>PHP</acronym> extension ibm_db2.
                     </para>
                 </listitem>
                 <listitem>
@@ -1883,7 +1883,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter utilizes the PHP extension mysqli.
+                        This Adapter utilizes the <acronym>PHP</acronym> extension mysqli.
                     </para>
                 </listitem>
                 <listitem>
@@ -1909,7 +1909,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extension oci8.
+                        This Adapter uses the <acronym>PHP</acronym> extension oci8.
                     </para>
                 </listitem>
                 <listitem>
@@ -1930,7 +1930,7 @@ if (!is_null($version)) {
                     <para>
                         Currently the <classname>Zend_Db::CASE_FOLDING</classname> option
                         is not supported by the Oracle adapter. To use this
-                        option with Oracle, you must use the PDO OCI adapter.
+                        option with Oracle, you must use the <acronym>PDO</acronym> OCI adapter.
                     </para>
                 </listitem>
                 <listitem>
@@ -1956,14 +1956,14 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_ibm.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_ibm.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        You must use at least PDO_IBM extension version 1.2.2.
+                        You must use at least <acronym>PDO</acronym>_IBM extension version 1.2.2.
                         If you have an earlier version of this extension, you
-                        must upgrade the PDO_IBM extension from PECL.
+                        must upgrade the <acronym>PDO</acronym>_IBM extension from PECL.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -1980,12 +1980,12 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_mssql.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_mssql.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        Microsoft SQL Server does not support sequences, so
+                        Microsoft <acronym>SQL</acronym> Server does not support sequences, so
                         <methodname>lastInsertId()</methodname> ignores its arguments and
                         always returns the last value generated for an
                         auto-increment key. The <methodname>lastSequenceId()</methodname>
@@ -2005,9 +2005,9 @@ if (!is_null($version)) {
                     <para>
                         <classname>Zend_Db_Adapter_Pdo_Mssql</classname> sets
                         <constant>QUOTED_IDENTIFIER ON</constant> immediately after connecting to a
-                        SQL Server database. This makes the driver use the standard SQL identifier
+                        <acronym>SQL</acronym> Server database. This makes the driver use the standard <acronym>SQL</acronym> identifier
                         delimiter symbol (<code>"</code>) instead of the
-                        proprietary square-brackets syntax SQL Server uses for
+                        proprietary square-brackets syntax <acronym>SQL</acronym> Server uses for
                         delimiting identifiers.
                     </para>
                 </listitem>
@@ -2041,7 +2041,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_mysql.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_mysql.
                     </para>
                 </listitem>
                 <listitem>
@@ -2067,7 +2067,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_oci.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_oci.
                     </para>
                 </listitem>
                 <listitem>
@@ -2092,7 +2092,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_pgsql.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_pgsql.
                     </para>
                 </listitem>
                 <listitem>
@@ -2121,7 +2121,7 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extensions pdo and pdo_sqlite.
+                        This Adapter uses the <acronym>PHP</acronym> extensions pdo and pdo_sqlite.
                     </para>
                 </listitem>
                 <listitem>
@@ -2151,13 +2151,13 @@ if (!is_null($version)) {
                 </listitem>
                 <listitem>
                     <para>
-                        Older versions of the SQLite driver for PHP do not seem
+                        Older versions of the SQLite driver for <acronym>PHP</acronym> do not seem
                         to support the PRAGMA commands necessary to ensure that
                         short column names are used in result sets. If you
                         have problems that your result sets are returned with
                         keys of the form "tablename.columnname" when you do a
                         join query, then you should upgrade to the current
-                        version of PHP.
+                        version of <acronym>PHP</acronym>.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -2168,7 +2168,7 @@ if (!is_null($version)) {
             <itemizedlist>
                 <listitem>
                     <para>
-                        This Adapter uses the PHP extension php_interbase.
+                        This Adapter uses the <acronym>PHP</acronym> extension php_interbase.
                     </para>
                 </listitem>
                 <listitem>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Db_Profiler-Firebug.xml

@@ -11,8 +11,8 @@
 
     <para>
         All data is sent via the <classname>Zend_Wildfire_Channel_HttpHeaders</classname>
-        component which uses HTTP headers to ensure the page content is not
-        disturbed. Debugging AJAX requests that require clean JSON and XML
+        component which uses <acronym>HTTP</acronym> headers to ensure the page content is not
+        disturbed. Debugging <acronym>AJAX</acronym> requests that require clean JSON and <acronym>XML</acronym>
         responses is possible with this approach.
     </para>
 

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

@@ -184,8 +184,8 @@ $profiler = $db->getProfiler();
         <itemizedlist>
             <listitem>
                 <para>
-                    <methodname>getQuery()</methodname> returns the SQL text of the query.
-                    The SQL text of a prepared statement with parameters is the
+                    <methodname>getQuery()</methodname> returns the <acronym>SQL</acronym> text of the query.
+                    The <acronym>SQL</acronym> text of a prepared statement with parameters is the
                     text at the time the query was prepared, so it contains
                     parameter placeholders, not the values used when the
                     statement is executed.
@@ -306,25 +306,25 @@ $profiler->setFilterElapsedSecs(null);
                 <listitem>
                     <para>
                         <classname>Zend_Db_Profiler::INSERT</classname>: any query that
-                        adds new data to the database, generally SQL INSERT.
+                        adds new data to the database, generally <acronym>SQL</acronym> INSERT.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <classname>Zend_Db_Profiler::UPDATE</classname>: any query that
-                        updates existing data, usually SQL UPDATE.
+                        updates existing data, usually <acronym>SQL</acronym> UPDATE.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <classname>Zend_Db_Profiler::DELETE</classname>: any query that
-                        deletes existing data, usually SQL DELETE.
+                        deletes existing data, usually <acronym>SQL</acronym> DELETE.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <classname>Zend_Db_Profiler::SELECT</classname>: any query that
-                        retrieves existing data, usually SQL SELECT.
+                        retrieves existing data, usually <acronym>SQL</acronym> SELECT.
                     </para>
                 </listitem>
                 <listitem>

+ 44 - 44
documentation/manual/en/module_specs/Zend_Db_Select.xml

@@ -9,10 +9,10 @@
         <title>Introduction</title>
 
         <para>
-            The <classname>Zend_Db_Select</classname> object represents a SQL <acronym>SELECT</acronym>
+            The <classname>Zend_Db_Select</classname> object represents a <acronym>SQL</acronym> <acronym>SELECT</acronym>
             query statement. The class has methods for adding individual parts to the query. You can
-            specify some parts of the query using PHP methods and data structures, and the class
-            forms the correct SQL syntax for you. After you build a query, you can execute the query
+            specify some parts of the query using <acronym>PHP</acronym> methods and data structures, and the class
+            forms the correct <acronym>SQL</acronym> syntax for you. After you build a query, you can execute the query
             as if you had written it as a string.
         </para>
 
@@ -23,33 +23,33 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    Object-oriented methods for specifying SQL queries in a piece-by-piece manner;
+                    Object-oriented methods for specifying <acronym>SQL</acronym> queries in a piece-by-piece manner;
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    Database-independent abstraction of some parts of the SQL query;
+                    Database-independent abstraction of some parts of the <acronym>SQL</acronym> query;
                 </para>
             </listitem>
 
             <listitem>
                 <para>
                     Automatic quoting of metadata identifiers in most cases, to support identifiers
-                    containing SQL reserved words and special characters;
+                    containing <acronym>SQL</acronym> reserved words and special characters;
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    Quoting identifiers and values, to help reduce risk of SQL injection attacks.
+                    Quoting identifiers and values, to help reduce risk of <acronym>SQL</acronym> injection attacks.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             Using <classname>Zend_Db_Select</classname> is not mandatory. For very simple SELECT
-            queries, it is usually simpler to specify the entire SQL query as a string and execute
+            queries, it is usually simpler to specify the entire <acronym>SQL</acronym> query as a string and execute
             it using Adapter methods like <methodname>query()</methodname> or
             <methodname>fetchAll()</methodname>. Using
             <classname>Zend_Db_Select</classname> is helpful if you need to assemble a SELECT query
@@ -182,7 +182,7 @@ $select = $db->select()
             <para>
                 You can also specify the correlation name (sometimes called the "table alias") for
                 a table. Instead of a simple string, use an associative array mapping the
-                correlation name to the table name. In other clauses of the SQL query, use this
+                correlation name to the table name. In other clauses of the <acronym>SQL</acronym> query, use this
                 correlation name. If your query joins more than one table,
                 <classname>Zend_Db_Select</classname> generates unique correlation names based on
                 the table names, for any tables for which you don't specify the correlation name.
@@ -204,7 +204,7 @@ $select = $db->select()
             </example>
 
             <para>
-                Some RDBMS brands support a leading schema specifier for a table. You can specify
+                Some <acronym>RDBMS</acronym> brands support a leading schema specifier for a table. You can specify
                 the table name as "<code>schemaName.tableName</code>", where
                 <classname>Zend_Db_Select</classname> quotes each part individually, or you may
                 specify the schema name separately. A schema name specified in the table name takes
@@ -240,7 +240,7 @@ $select = $db->select()
             <para>
                 In the second argument of the <methodname>from()</methodname> method, you can
                 specify the columns to select from the respective table. If you specify no columns,
-                the default is "<code>*</code>", the SQL wildcard for "all columns".
+                the default is "<code>*</code>", the <acronym>SQL</acronym> wildcard for "all columns".
             </para>
 
             <para>
@@ -303,7 +303,7 @@ $select = $db->select()
             <title>Adding Expression Columns</title>
 
             <para>
-                Columns in SQL queries are sometimes expressions, not simply column names from a
+                Columns in <acronym>SQL</acronym> queries are sometimes expressions, not simply column names from a
                 table. Expressions should not have correlation names or quoting applied. If your
                 column string contains parentheses, <classname>Zend_Db_Select</classname> recognizes
                 it as an expression.
@@ -375,17 +375,17 @@ $select = $db->select()
             </para>
 
             <para>
-                If your column names are SQL keywords or contain special characters, you should use
+                If your column names are <acronym>SQL</acronym> keywords or contain special characters, you should use
                 the Adapter's <methodname>quoteIdentifier()</methodname> method and interpolate the result into
-                the string. The <methodname>quoteIdentifier()</methodname> method uses SQL quoting to delimit
+                the string. The <methodname>quoteIdentifier()</methodname> method uses <acronym>SQL</acronym> quoting to delimit
                 the identifier, which makes it clear that it is an identifier for a table or a
-                column, and not any other part of SQL syntax.
+                column, and not any other part of <acronym>SQL</acronym> syntax.
             </para>
 
             <para>
                 Your code is more database-independent if you use the
                 <methodname>quoteIdentifier()</methodname> method instead of typing quotes literally in your
-                string, because some RDBMS brands use nonstandard symbols for quoting identifiers.
+                string, because some <acronym>RDBMS</acronym> brands use nonstandard symbols for quoting identifiers.
                 The <methodname>quoteIdentifier()</methodname> method is designed to use the appropriate
                 quoting symbols based on the adapter type. The <methodname>quoteIdentifier()</methodname>
                 method also escapes any quote characters that appear within the identifier name
@@ -541,7 +541,7 @@ $select = $db->select()
             </example>
 
             <para>
-                SQL has several types of joins. See the list below for the methods to support
+                <acronym>SQL</acronym> has several types of joins. See the list below for the methods to support
                 different join types in <classname>Zend_Db_Select</classname>.
             </para>
 
@@ -561,7 +561,7 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        All RDBMS brands support this join type.
+                        All <acronym>RDBMS</acronym> brands support this join type.
                     </para>
                 </listitem>
 
@@ -578,7 +578,7 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        All RDBMS brands support this join type.
+                        All <acronym>RDBMS</acronym> brands support this join type.
                     </para>
                 </listitem>
 
@@ -596,7 +596,7 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        Some RDBMS brands don't support this join type, but in general any right
+                        Some <acronym>RDBMS</acronym> brands don't support this join type, but in general any right
                         join can be represented as a left join by reversing the order of the
                         tables.
                     </para>
@@ -616,7 +616,7 @@ $select = $db->select()
                     </para>
 
                     <para>
-                        Some RDBMS brands don't support this join type.
+                        Some <acronym>RDBMS</acronym> brands don't support this join type.
                     </para>
                 </listitem>
 
@@ -631,12 +631,12 @@ $select = $db->select()
                         matched to every row in the second table. Therefore the number of rows in
                         the result set is equal to the product of the number of rows in each table.
                         You can filter the result set using conditions in a WHERE clause; in this
-                        way a cross join is similar to the old SQL-89 join syntax.
+                        way a cross join is similar to the old <acronym>SQL</acronym>-89 join syntax.
                     </para>
 
                     <para>
                         The <methodname>joinCross()</methodname> method has no parameter to specify the join
-                        condition. Some RDBMS brands don't support this join type.
+                        condition. Some <acronym>RDBMS</acronym> brands don't support this join type.
                     </para>
                 </listitem>
 
@@ -650,7 +650,7 @@ $select = $db->select()
                         A natural join compares any column(s) that appear with the same name in
                         both tables. The comparison is equality of all the column(s); comparing the
                         columns using inequality is not a natural join. Only natural inner joins
-                        are supported by this API, even though SQL permits natural outer joins as
+                        are supported by this <acronym>API</acronym>, even though <acronym>SQL</acronym> permits natural outer joins as
                         well.
                     </para>
 
@@ -728,8 +728,8 @@ $select = $db->select()
 
             <para>
                 You can specify criteria for restricting rows of the result set using the
-                <methodname>where()</methodname> method. The first argument of this method is a SQL expression,
-                and this expression is used in a SQL <acronym>WHERE</acronym> clause in the query.
+                <methodname>where()</methodname> method. The first argument of this method is a <acronym>SQL</acronym> expression,
+                and this expression is used in a <acronym>SQL</acronym> <acronym>WHERE</acronym> clause in the query.
             </para>
 
             <example id="zend.db.select.building.where.example">
@@ -899,7 +899,7 @@ $select = $db->select()
             <title>Adding a GROUP BY Clause</title>
 
             <para>
-                In SQL, the <command>GROUP BY</command> clause allows you to reduce the rows of a query
+                In <acronym>SQL</acronym>, the <command>GROUP BY</command> clause allows you to reduce the rows of a query
                 result set to one row per unique value found in the column(s) named in the
                 <command>GROUP BY</command> clause.
             </para>
@@ -947,7 +947,7 @@ $select = $db->select()
             <title>Adding a HAVING Clause</title>
 
             <para>
-                In SQL, the <constant>HAVING</constant> clause applies a restriction condition on groups of
+                In <acronym>SQL</acronym>, the <constant>HAVING</constant> clause applies a restriction condition on groups of
                 rows. This is similar to how a <constant>WHERE</constant> clause applies a restriction
                 condition on rows. But the two clauses are different because <constant>WHERE</constant>
                 conditions are applied before groups are defined, whereas <constant>HAVING</constant>
@@ -957,9 +957,9 @@ $select = $db->select()
             <para>
                 In <classname>Zend_Db_Select</classname>, you can specify conditions for restricting
                 groups using the <methodname>having()</methodname> method. Its usage is similar to that of the
-                <methodname>where()</methodname> method. The first argument is a string containing a SQL
+                <methodname>where()</methodname> method. The first argument is a string containing a <acronym>SQL</acronym>
                 expression. The optional second argument is a value that is used to replace a
-                positional parameter placeholder in the SQL expression. Expressions given in
+                positional parameter placeholder in the <acronym>SQL</acronym> expression. Expressions given in
                 multiple invocations of the <methodname>having()</methodname> method are combined using the
                 Boolean <constant>AND</constant> operator, or the <code>OR</code> operator if you use the
                 <methodname>orHaving()</methodname> method.
@@ -1007,7 +1007,7 @@ $select = $db->select()
             <title>Adding an ORDER BY Clause</title>
 
             <para>
-                In SQL, the <code>ORDER BY</code> clause specifies one or more columns or
+                In <acronym>SQL</acronym>, the <code>ORDER BY</code> clause specifies one or more columns or
                 expressions by which the result set of a query is sorted. If multiple columns are
                 listed, the secondary columns are used to resolve ties; the sort order is
                 determined by the secondary columns if the preceding columns contain identical
@@ -1061,7 +1061,7 @@ $select = $db->select()
             <title>Adding a LIMIT Clause</title>
 
             <para>
-                Some RDBMS brands extend SQL with a query clause known as the <constant>LIMIT</constant>
+                Some <acronym>RDBMS</acronym> brands extend <acronym>SQL</acronym> with a query clause known as the <constant>LIMIT</constant>
                 clause. This clause reduces the number of rows in the result set to at most a
                 number you specify. You can also specify to skip a number of rows before starting
                 to output. This feature makes it easy to take a subset of a result set, for example
@@ -1096,10 +1096,10 @@ $select = $db->select()
             <note>
 
                 <para>
-                    The <constant>LIMIT</constant> syntax is not supported by all RDBMS brands. Some RDBMS
+                    The <constant>LIMIT</constant> syntax is not supported by all <acronym>RDBMS</acronym> brands. Some <acronym>RDBMS</acronym>
                     require different syntax to support similar functionality. Each
                     <classname>Zend_Db_Adapter_Abstract</classname> class includes a method to
-                    produce SQL appropriate for that RDBMS.
+                    produce <acronym>SQL</acronym> appropriate for that <acronym>RDBMS</acronym>.
                 </para>
 
             </note>
@@ -1140,7 +1140,7 @@ $select = $db->select()
 
             <para>
                 The <methodname>distinct()</methodname> method enables you to add the <constant>DISTINCT</constant>
-                keyword to your SQL query.
+                keyword to your <acronym>SQL</acronym> query.
             </para>
 
             <example id="zend.db.select.building.distinct.example">
@@ -1167,7 +1167,7 @@ $select = $db->select()
 
             <para>
                 The <methodname>forUpdate()</methodname> method enables you to add the <code>FOR UPDATE</code>
-                modifier to your SQL query.
+                modifier to your <acronym>SQL</acronym> query.
             </para>
 
             <example id="zend.db.select.building.for-update.example">
@@ -1212,7 +1212,7 @@ $select = $db->select()
 
             <para>
                 The <methodname>query()</methodname> method returns an object of type
-                <classname>Zend_Db_Statement</classname> or PDOStatement, depending on the adapter
+                <classname>Zend_Db_Statement</classname> or <acronym>PDO</acronym>Statement, depending on the adapter
                 type.
             </para>
 
@@ -1240,7 +1240,7 @@ $result = $stmt->fetchAll();
                 As an alternative to using the <methodname>query()</methodname> method of the adapter object,
                 you can use the <methodname>query()</methodname> method of the
                 <classname>Zend_Db_Select</classname> object. Both methods return an object of type
-                <classname>Zend_Db_Statement</classname> or PDOStatement, depending on the adapter
+                <classname>Zend_Db_Statement</classname> or <acronym>PDO</acronym>Statement, depending on the adapter
                 type.
             </para>
 
@@ -1265,7 +1265,7 @@ $result = $stmt->fetchAll();
             <title>Converting a Select Object to a SQL String</title>
 
             <para>
-                If you need access to a string representation of the SQL query corresponding to the
+                If you need access to a string representation of the <acronym>SQL</acronym> query corresponding to the
                 <classname>Zend_Db_Select</classname> object, use the <methodname>__toString()</methodname>
                 method.
             </para>
@@ -1305,7 +1305,7 @@ echo "$sql\n";
             <title>Retrieving Parts of the Select Object</title>
 
             <para>
-                The <methodname>getPart()</methodname> method returns a representation of one part of your SQL
+                The <methodname>getPart()</methodname> method returns a representation of one part of your <acronym>SQL</acronym>
                 query. For example, you can use this method to return the array of expressions for
                 the <constant>WHERE</constant> clause, or the array of columns (or column expressions) that
                 are in the <constant>SELECT</constant> list, or the values of the count and offset for the
@@ -1313,7 +1313,7 @@ echo "$sql\n";
             </para>
 
             <para>
-                The return value is not a string containing a fragment of SQL syntax. The return
+                The return value is not a string containing a fragment of <acronym>SQL</acronym> syntax. The return
                 value is an internal representation, which is typically an array structure
                 containing values and expressions. Each part of the query has a different
                 structure.
@@ -1329,7 +1329,7 @@ echo "$sql\n";
 
             <para>
                 The <classname>Zend_Db_Select</classname> class defines constants you can use for
-                parts of the SQL query. You can use these constant definitions, or you can the
+                parts of the <acronym>SQL</acronym> query. You can use these constant definitions, or you can the
                 literal strings.
             </para>
 
@@ -1428,8 +1428,8 @@ print_r( $orderData );
             <title>Resetting Parts of the Select Object</title>
 
             <para>
-                The <methodname>reset()</methodname> method enables you to clear one specified part of the SQL
-                query, or else clear all parts of the SQL query if you omit the argument.
+                The <methodname>reset()</methodname> method enables you to clear one specified part of the <acronym>SQL</acronym>
+                query, or else clear all parts of the <acronym>SQL</acronym> query if you omit the argument.
             </para>
 
             <para>

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

@@ -13,7 +13,7 @@
     </para>
 
     <para>
-        <classname>Zend_Db_Statement</classname> is based on the PDOStatement object in the
+        <classname>Zend_Db_Statement</classname> is based on the <acronym>PDO</acronym>Statement object in the
         <ulink url="http://www.php.net/pdo">PHP Data Objects</ulink> extension.
     </para>
 
@@ -24,10 +24,10 @@
         <para>
             Typically, a statement object is returned by the
             <methodname>query()</methodname> method of the database Adapter class.
-            This method is a general way to prepare any SQL statement.
-            The first argument is a string containing an SQL statement.
+            This method is a general way to prepare any <acronym>SQL</acronym> statement.
+            The first argument is a string containing an <acronym>SQL</acronym> statement.
             The optional second argument is an array of values to bind
-            to parameter placeholders in the SQL string.
+            to parameter placeholders in the <acronym>SQL</acronym> string.
         </para>
 
         <example id="zend.db.statement.creating.example1">
@@ -41,7 +41,7 @@ $stmt = $db->query(
         </example>
 
         <para>
-            The statement object corresponds to a SQL statement that has been
+            The statement object corresponds to a <acronym>SQL</acronym> statement that has been
             prepared, and executed once with the bind-values specified.
             If the statement was a SELECT query or other type of statement
             that returns a result set, it is now ready to fetch results.
@@ -52,7 +52,7 @@ $stmt = $db->query(
             typical usage. There is no factory method to create this object,
             so you need to load the specific statement class and call its
             constructor. Pass the Adapter object as the first argument, and
-            a string containing an SQL statement as the second argument.
+            a string containing an <acronym>SQL</acronym> statement as the second argument.
             The statement is prepared, but not executed.
         </para>
 
@@ -116,8 +116,8 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
         </example>
 
         <para>
-            PDO statements support both positional parameters and named
-            parameters, but not both types in a single SQL statement. Some of
+            <acronym>PDO</acronym> statements support both positional parameters and named
+            parameters, but not both types in a single <acronym>SQL</acronym> statement. Some of
             the <classname>Zend_Db_Statement</classname> classes for non-PDO extensions may support
             only one type of parameter or the other.
         </para>
@@ -130,10 +130,10 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
 
         <para>
             You can call methods on the statement object to retrieve rows from
-            SQL statements that produce result set. SELECT, SHOW, DESCRIBE and
+            <acronym>SQL</acronym> statements that produce result set. SELECT, SHOW, DESCRIBE and
             EXPLAIN are examples of statements that produce a result set.
             INSERT, UPDATE, and DELETE are examples of statements that don't
-            produce a result set. You can execute the latter SQL statements
+            produce a result set. You can execute the latter <acronym>SQL</acronym> statements
             using <classname>Zend_Db_Statement</classname>, but you cannot call methods to fetch
             rows of results from them.
         </para>
@@ -165,7 +165,7 @@ $stmt->execute(array(':reporter' => 'goofy', ':status' => 'FIXED'));
                         is the second argument. The default is
                         Zend_Db::FETCH_ORI_NEXT, which simply means that each
                         call to <methodname>fetch()</methodname> returns the next row in
-                        the result set, in the order returned by the RDBMS.
+                        the result set, in the order returned by the <acronym>RDBMS</acronym>.
                     </para>
                 </listitem>
                 <listitem>

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

@@ -34,7 +34,7 @@
         </para>
 
         <para>
-            Below are the PHP class definitions for these tables:
+            Below are the <acronym>PHP</acronym> class definitions for these tables:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -99,14 +99,14 @@ class BugsProducts extends Zend_Db_Table_Abstract
             If you use <classname>Zend_Db_Table</classname> to emulate cascading UPDATE and DELETE
             operations, declare the <varname>$_dependentTables</varname> array in the class for the
             parent table. List the class name for each dependent table. Use the class name, not the
-            physical name of the SQL table.
+            physical name of the <acronym>SQL</acronym> table.
         </para>
 
         <note>
 
             <para>
                 Skip declaration of <varname>$_dependentTables</varname> if you use referential
-                integrity constraints in the RDBMS server to implement cascading operations. See
+                integrity constraints in the <acronym>RDBMS</acronym> server to implement cascading operations. See
                 <xref linkend="zend.db.table.relationships.cascading" /> for more information.
             </para>
 
@@ -122,12 +122,12 @@ class BugsProducts extends Zend_Db_Table_Abstract
         <para>
             The rule key is a string used as an index to the <varname>$_referenceMap</varname>
             array. This rule key is used to identify each reference relationship. Choose a
-            descriptive name for this rule key. It's best to use a string that can be part of a PHP
+            descriptive name for this rule key. It's best to use a string that can be part of a <acronym>PHP</acronym>
             method name, as you will see later.
         </para>
 
         <para>
-            In the example PHP code above, the rule keys in the Bugs table class are:
+            In the example <acronym>PHP</acronym> code above, the rule keys in the Bugs table class are:
             <code>'Reporter'</code>, <code>'Engineer'</code>, <code>'Verifier'</code>, and
             <code>'Product'</code>.
         </para>
@@ -153,7 +153,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
             <listitem>
                 <para>
                     <emphasis>refTableClass</emphasis> => The class name of the
-                    parent table. Use the class name, not the physical name of the SQL table.
+                    parent table. Use the class name, not the physical name of the <acronym>SQL</acronym> table.
                 </para>
 
                 <para>
@@ -717,7 +717,7 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
 
             <para>
                 Declaring cascading operations in <classname>Zend_Db_Table</classname> is intended
-                <emphasis>only</emphasis> for RDBMS brands that do not support
+                <emphasis>only</emphasis> for <acronym>RDBMS</acronym> brands that do not support
                 declarative referential integrity (DRI).
             </para>
 
@@ -728,15 +728,15 @@ $products = $bug1234->findProductsViaBugsProductsByBug();
             </para>
 
             <para>
-                If your RDBMS implements DRI and the <code>ON DELETE</code> and
+                If your <acronym>RDBMS</acronym> implements DRI and the <code>ON DELETE</code> and
                 <code>ON UPDATE</code> clauses, you should declare these clauses in your database
                 schema, instead of using the cascading feature in
-                <classname>Zend_Db_Table</classname>. Declaring cascading DRI rules in the RDBMS is
+                <classname>Zend_Db_Table</classname>. Declaring cascading DRI rules in the <acronym>RDBMS</acronym> is
                 better for database performance, consistency, and integrity.
             </para>
 
             <para>
-                Most importantly, do not declare cascading operations both in the RDBMS and in your
+                Most importantly, do not declare cascading operations both in the <acronym>RDBMS</acronym> and in your
                 <classname>Zend_Db_Table</classname> class.
             </para>
 
@@ -865,7 +865,7 @@ class BugsProducts extends Zend_Db_Table_Abstract
 
             <para>
                 The issue of non-atomic change can be mitigated by using transactions to isolate
-                your change. But some RDBMS brands don't support transactions, or allow clients to
+                your change. But some <acronym>RDBMS</acronym> brands don't support transactions, or allow clients to
                 read "dirty" changes that have not been committed yet.
             </para>
 

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

@@ -110,7 +110,7 @@ class bugs extends Zend_Db_Table_Abstract
                 <varname>$_schema</varname>, or with the schema prepended to the table name in the
                 <varname>$_name</varname> property. Any schema specified with the
                 <varname>$_name</varname> property takes precedence over a schema specified with the
-                <varname>$_schema</varname> property. In some RDBMS brands, the term for schema is
+                <varname>$_schema</varname> property. In some <acronym>RDBMS</acronym> brands, the term for schema is
                 "database" or "tablespace," but it is used similarly.
             </para>
 
@@ -343,7 +343,7 @@ class Bugs extends Zend_Db_Table_Abstract
             Before you use a Table class, create an instance using its constructor. The
             constructor's argument is an array of options. The most important option to a Table
             constructor is the database adapter instance, representing a live connection to an
-            RDBMS. There are three ways of specifying the database adapter to a Table class, and
+            <acronym>RDBMS</acronym>. There are three ways of specifying the database adapter to a Table class, and
             these three ways are described below:
         </para>
 
@@ -440,7 +440,7 @@ $table = new Bugs(array('db' => 'my_db'));
                 Like setting the default adapter, this gives you the means to ensure that the same
                 adapter instance is used throughout your application. Using the registry is more
                 flexible, because you can store more than one adapter instance. A given adapter
-                instance is specific to a certain RDBMS brand and database instance. If your
+                instance is specific to a certain <acronym>RDBMS</acronym> brand and database instance. If your
                 application needs access to multiple databases or even multiple database brands,
                 then you need to use multiple adapters.
             </para>
@@ -479,7 +479,7 @@ $table->insert($data);
 
         <para>
             By default, the values in your data array are inserted as literal values, using
-            parameters. If you need them to be treated as SQL expressions, you must make sure they
+            parameters. If you need them to be treated as <acronym>SQL</acronym> expressions, you must make sure they
             are distinct from plain strings. Use an object of type
             <classname>Zend_Db_Expr</classname> to do this.
         </para>
@@ -513,7 +513,7 @@ $data = array(
 
             <para>
                 An auto-incrementing primary key generates a unique integer value for you if you
-                omit the primary key column from your SQL <constant>INSERT</constant> statement.
+                omit the primary key column from your <acronym>SQL</acronym> <constant>INSERT</constant> statement.
             </para>
 
             <para>
@@ -541,7 +541,7 @@ class Bugs extends Zend_Db_Table_Abstract
             </example>
 
             <para>
-                MySQL, Microsoft SQL Server, and SQLite are examples of RDBMS brands that support
+                MySQL, Microsoft <acronym>SQL</acronym> Server, and SQLite are examples of <acronym>RDBMS</acronym> brands that support
                 auto-incrementing primary keys.
             </para>
 
@@ -589,7 +589,7 @@ class Bugs extends Zend_Db_Table_Abstract
             </example>
 
             <para>
-                Oracle, PostgreSQL, and IBM DB2 are examples of RDBMS brands that support sequence
+                Oracle, PostgreSQL, and IBM DB2 are examples of <acronym>RDBMS</acronym> brands that support sequence
                 objects in the database.
             </para>
 
@@ -638,7 +638,7 @@ class BugStatus extends Zend_Db_Table_Abstract
             <note>
 
                 <para>
-                    All RDBMS brands support tables with natural keys. Examples of tables that are
+                    All <acronym>RDBMS</acronym> brands support tables with natural keys. Examples of tables that are
                     often declared as having natural keys are lookup tables, intersection tables in
                     many-to-many relationships, or most tables with compound primary keys.
                 </para>
@@ -656,7 +656,7 @@ class BugStatus extends Zend_Db_Table_Abstract
         <para>
             You can update rows in a database table using the <code>update</code> method of a Table
             class. This method takes two arguments: an associative array of columns to change and
-            new values to assign to these columns; and an SQL expression that is used in a
+            new values to assign to these columns; and an <acronym>SQL</acronym> expression that is used in a
             <constant>WHERE</constant> clause, as criteria for the rows to change in the
             <constant>UPDATE</constant> operation.
         </para>
@@ -683,14 +683,14 @@ $table->update($data, $where);
         <para>
             Since the table <methodname>update()</methodname> method proxies to the database adapter
             <link linkend="zend.db.adapter.write.update"><methodname>update()</methodname></link> method, the
-            second argument can be an array of SQL expressions. The expressions are combined as
+            second argument can be an array of <acronym>SQL</acronym> expressions. The expressions are combined as
             Boolean terms using an <constant>AND</constant> operator.
         </para>
 
         <note>
 
             <para>
-                The values and identifiers in the SQL expression are not quoted for you. If you
+                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted for you. If you
                 have values or identifiers that require quoting, you are responsible for doing
                 this. Use the <methodname>quote()</methodname>, <methodname>quoteInto()</methodname>, and
                 <methodname>quoteIdentifier()</methodname> methods of the database adapter.
@@ -706,7 +706,7 @@ $table->update($data, $where);
 
         <para>
             You can delete rows from a database table using the <methodname>delete()</methodname> method. This
-            method takes one argument, which is an SQL expression that is used in a
+            method takes one argument, which is an <acronym>SQL</acronym> expression that is used in a
             <constant>WHERE</constant> clause, as criteria for the rows to delete.
         </para>
 
@@ -727,14 +727,14 @@ $table->delete($where);
         <para>
             Since the table <methodname>delete()</methodname> method proxies to the database adapter
             <link linkend="zend.db.adapter.write.delete"><methodname>delete()</methodname></link> method, the
-            argument can also be an array of SQL expressions. The expressions are combined as
+            argument can also be an array of <acronym>SQL</acronym> expressions. The expressions are combined as
             Boolean terms using an <constant>AND</constant> operator.
         </para>
 
         <note>
 
             <para>
-                The values and identifiers in the SQL expression are not quoted for you. If you
+                The values and identifiers in the <acronym>SQL</acronym> expression are not quoted for you. If you
                 have values or identifiers that require quoting, you are responsible for doing
                 this. Use the <methodname>quote()</methodname>, <methodname>quoteInto()</methodname>, and
                 <methodname>quoteIdentifier()</methodname> methods of the database adapter.
@@ -847,7 +847,7 @@ $rows = $table->find(array(1234, 5678), array('ABC', 'DEF'));
                 <warning>
 
                     <para>
-                        The API for fetch operations has been superseded to allow a
+                        The <acronym>API</acronym> for fetch operations has been superseded to allow a
                         <classname>Zend_Db_Table_Select</classname> object to modify the query.
                         However, the deprecated usage of the <methodname>fetchRow()</methodname> and
                         <methodname>fetchAll()</methodname> methods will continue to work without modification.
@@ -930,7 +930,7 @@ $row = $table->fetchRow(
                 <listitem>
                     <para>
                         You <emphasis>can not</emphasis> specify columns from a JOINed tabled to be
-                        returned in a row/rowset. Doing so will trigger a PHP error. This was done
+                        returned in a row/rowset. Doing so will trigger a <acronym>PHP</acronym> error. This was done
                         to ensure the integrity of the <classname>Zend_Db_Table</classname> is
                         retained. i.e. A <classname>Zend_Db_Table_Row</classname> should only
                         reference columns derived from its parent table.
@@ -1009,7 +1009,7 @@ $rows = $table->fetchAll($select);
                 You may also pass sorting criteria in an <code>ORDER BY</code> clause, as well as
                 count and offset integer values, used to make the query return a specific subset of
                 rows. These values are used in a <constant>LIMIT</constant> clause, or in equivalent logic
-                for RDBMS brands that do not support the <constant>LIMIT</constant> syntax.
+                for <acronym>RDBMS</acronym> brands that do not support the <constant>LIMIT</constant> syntax.
             </para>
 
             <example id="zend.db.table.fetch-all.example2">
@@ -1207,7 +1207,7 @@ $row = $table->fetchRow($select);
         <para>
             This method returns an object of type <classname>Zend_Db_Table_Row_Abstract</classname>.
             If the search criteria you specified match no rows in the database table, then
-            <methodname>fetchRow()</methodname> returns PHP's <constant>NULL</constant> value.
+            <methodname>fetchRow()</methodname> returns <acronym>PHP</acronym>'s <constant>NULL</constant> value.
         </para>
 
     </sect2>
@@ -1706,7 +1706,7 @@ class Bugs extends Zend_Db_Table_Abstract
             <title>Define Inflection in Zend_Db_Table</title>
 
             <para>
-                Some people prefer that the table class name match a table name in the RDBMS by
+                Some people prefer that the table class name match a table name in the <acronym>RDBMS</acronym> by
                 using a string transformation called <emphasis>inflection</emphasis>.
             </para>
 
@@ -1733,7 +1733,7 @@ class Bugs extends Zend_Db_Table_Abstract
 
             <para>
                 It is inappropriate to transform identifiers from the database, because this can
-                lead to ambiguity or make some identifiers inaccessible. Using the SQL identifiers
+                lead to ambiguity or make some identifiers inaccessible. Using the <acronym>SQL</acronym> identifiers
                 exactly as they appear in the database makes
                 <classname>Zend_Db_Table_Abstract</classname> both simpler and more flexible.
             </para>

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

@@ -346,7 +346,7 @@ $row->delete();
             <title>Serializing a Row</title>
 
             <para>
-                Simply use PHP's <methodname>serialize()</methodname> function to create a string containing a
+                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to create a string containing a
                 byte-stream representation of the Row object argument.
             </para>
 
@@ -373,7 +373,7 @@ $serializedRow = serialize($row);
             <title>Unserializing Row Data</title>
 
             <para>
-                Use PHP's <methodname>unserialize()</methodname> function to restore a string containing a
+                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to restore a string containing a
                 byte-stream representation of an object. The function returns the original object.
             </para>
 
@@ -640,7 +640,7 @@ class Products extends Zend_Db_Table_Abstract
             <title>Define Inflection in Zend_Db_Table_Row</title>
 
             <para>
-                Some people prefer that the table class name match a table name in the RDBMS by
+                Some people prefer that the table class name match a table name in the <acronym>RDBMS</acronym> by
                 using a string transformation called <emphasis>inflection</emphasis>.
             </para>
 

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

@@ -96,7 +96,7 @@ $row    = $rowset->current();
 
         <para>
             If the Rowset contains zero rows, <methodname>current()</methodname> returns
-            PHP's <constant>NULL</constant> value.
+            <acronym>PHP</acronym>'s <constant>NULL</constant> value.
         </para>
 
         <example id="zend.db.table.rowset.rows.iterate.example">
@@ -254,7 +254,7 @@ foreach ($rowsetArray as $rowArray) {
             <title>Serializing a Rowset</title>
 
             <para>
-                Simply use PHP's <methodname>serialize()</methodname> function to create a string containing a
+                Simply use <acronym>PHP</acronym>'s <methodname>serialize()</methodname> function to create a string containing a
                 byte-stream representation of the Rowset object argument.
             </para>
 
@@ -275,7 +275,7 @@ $serializedRowset = serialize($rowset);
             <title>Unserializing a Serialized Rowset</title>
 
             <para>
-                Use PHP's <methodname>unserialize()</methodname> function to restore a string containing a
+                Use <acronym>PHP</acronym>'s <methodname>unserialize()</methodname> function to restore a string containing a
                 byte-stream representation of an object. The function returns the original object.
             </para>
 

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

@@ -41,7 +41,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
 
     <para>
         It may be helpful to understand that internally,
-        <methodname>Zend_Debug::dump()</methodname> method wraps the PHP function
+        <methodname>Zend_Debug::dump()</methodname> method wraps the <acronym>PHP</acronym> 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

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

@@ -7,14 +7,14 @@
         Dojo provides data abstractions for data-enabled widgets via its
         dojo.data component. This component provides the ability to attach a
         data store, provide some metadata regarding the identity field and
-        optionally a label field, and an API for querying, sorting, and
+        optionally a label field, and an <acronym>API</acronym> for querying, sorting, and
         retrieving records and sets of records from the datastore.
     </para>
 
     <para>
         dojo.data is often used with XmlHttpRequest to pull dynamic data from
         the server. The primary mechanism for this is to extend the
-        QueryReadStore to point at a URL and specify the query information. The
+        QueryReadStore to point at a <acronym>URL</acronym> and specify the query information. The
         server side then returns data in the following JSON format:
     </para>
 

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

@@ -612,7 +612,7 @@ $form->addElement(
             <listitem>
                 <para>
                     <emphasis>styleSheets</emphasis> indicate what additional
-                    CSS stylesheets should be used to affect the display of the
+                    <acronym>CSS</acronym> stylesheets should be used to affect the display of the
                     Editor. By default, none are registered, and it inherits the
                     page styles. The following accessors and mutators are
                     available for manipulating editor stylesheets:
@@ -1035,7 +1035,7 @@ $form->addElement(
         <para>
             SimpleTextarea acts primarily like a standard HTML textarea. However, it
             does not support either the rows or cols settings. Instead, the
-            textarea width should be specified using standard CSS measurements.
+            textarea width should be specified using standard <acronym>CSS</acronym> measurements.
             Unlike Textarea, it will not grow automatically
         </para>
 
@@ -1213,7 +1213,7 @@ $form->addElement(
         <para>
             Textarea acts primarily like a standard HTML textarea. However, it
             does not support either the rows or cols settings. Instead, the
-            textarea width should be specified using standard CSS measurements;
+            textarea width should be specified using standard <acronym>CSS</acronym> measurements;
             rows should be omitted entirely. The textarea will then grow
             vertically as text is added to it.
         </para>
@@ -1335,7 +1335,7 @@ $form->addElement(
                 <methodname>setRegExp($regexp)</methodname> and <methodname>getRegExp()</methodname>:
                 set and retrieve the regular expression to use for validating
                 the element. The regular expression does not need boundaries
-                (unlike PHP's preg* family of functions).
+                (unlike <acronym>PHP</acronym>'s preg* family of functions).
             </para></listitem>
 
             <listitem><para>

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

@@ -124,7 +124,7 @@ $this->dojo()->enable()
 
         <para>
             <emphasis>Programmatic</emphasis> usage allows the developer to
-            decorate existing elements by pulling them by ID or CSS selectors
+            decorate existing elements by pulling them by ID or <acronym>CSS</acronym> selectors
             and passing them to the appropriate object constructors in Dojo.
             Because no non-standard HTML attributes are used, pages continue to
             validate.
@@ -200,7 +200,7 @@ $view->dojo()->addStylesheetModule('dijit.themes.tundra');
         <para>
             The module path is discovered by using the character '.' as a
             directory separator and using the last value in the list as the name
-            of the CSS file in that theme directory to use; in the example
+            of the <acronym>CSS</acronym> file in that theme directory to use; in the example
             above, Dojo will look for the theme in
             'dijit/themes/tundra/tundra.css'.
         </para>
@@ -306,11 +306,11 @@ $view->dojo()->addLayer('/js/foo/foo.js');
             <listitem><para><methodname>removeLayer($path)</methodname>: remove the layer
                     that matches <varname>$path</varname> from the list of registered
                     layers (custom builds).</para></listitem>
-            <listitem><para><methodname>setCdnBase($url)</methodname>: set the base URL for
+            <listitem><para><methodname>setCdnBase($url)</methodname>: set the base <acronym>URL</acronym> for
                     a CDN; typically, one of the
                     <classname>Zend_Dojo::CDN_BASE_AOL</classname> or
                     <classname>Zend_Dojo::CDN_BASE_GOOGLE</classname>, but it only needs
-                    to be the URL string prior to the version number.</para></listitem>
+                    to be the <acronym>URL</acronym> string prior to the version number.</para></listitem>
             <listitem><para><methodname>getCdnBase()</methodname>: retrieve the base CDN url
                     to utilize.</para></listitem>
             <listitem><para><methodname>setCdnVersion($version = null)</methodname>: set

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

@@ -1111,7 +1111,7 @@ echo $view->validationTextBox(
         </para>
 
         <para>
-            The <code>CustomDijit</code> view helper's API is exactly that of
+            The <code>CustomDijit</code> view helper's <acronym>API</acronym> is exactly that of
             any other dijit, with one major difference: the third "params"
             argument <emphasis>must</emphasis> contain the attribute "dojotype".
             The value of this attribute should be the Dijit class you plan to
@@ -1198,7 +1198,7 @@ class My_View_Helper_FooContentPane
 ]]></programlisting>
 
             <para>
-                As long as your custom dijit follows the same basic API as
+                As long as your custom dijit follows the same basic <acronym>API</acronym> as
                 official dijits, using or extending <code>CustomDijit</code>
                 should work correctly.
             </para>

+ 13 - 13
documentation/manual/en/module_specs/Zend_Dom-Query.xml

@@ -4,18 +4,18 @@
     <title>Zend_Dom_Query</title>
 
     <para>
-        <classname>Zend_Dom_Query</classname> provides mechanisms for querying XML and
-        (X)HTML documents utilizing either XPath or CSS selectors. It was
-        developed to aid with functional testing of MVC applications, but could
+        <classname>Zend_Dom_Query</classname> provides mechanisms for querying <acronym>XML</acronym> and
+        (X)HTML documents utilizing either XPath or <acronym>CSS</acronym> selectors. It was
+        developed to aid with functional testing of <acronym>MVC</acronym> applications, but could
         also be used for rapid development of screen scrapers.
     </para>
 
     <para>
-        CSS selector notation is provided as a simpler and more familiar
-        notation for web developers to utilize when querying documents with XML
+        <acronym>CSS</acronym> selector notation is provided as a simpler and more familiar
+        notation for web developers to utilize when querying documents with <acronym>XML</acronym>
         structures. The notation should be familiar to anybody who has developed
         Cascading Style Sheets or who utilizes Javascript toolkits that provide
-        functionality for selecting nodes utilizing CSS selectors
+        functionality for selecting nodes utilizing <acronym>CSS</acronym> selectors
         (<ulink url="http://prototypejs.org/api/utility/dollar-dollar">Prototype's
             $$()</ulink> and
         <ulink url="http://api.dojotoolkit.org/jsdoc/dojo/HEAD/dojo.query">Dojo's
@@ -36,7 +36,7 @@
 
         <para>
             The primary difference between <classname>Zend_Dom_Query</classname> and using
-            DOMDocument + DOMXPath is the ability to select against CSS
+            DOMDocument + DOMXPath is the ability to select against <acronym>CSS</acronym>
             selectors. You can utilize any of the following, in any combination:
         </para>
 
@@ -47,7 +47,7 @@
             </para></listitem>
 
             <listitem><para>
-                <emphasis>style attributes</emphasis>: CSS style attributes to
+                <emphasis>style attributes</emphasis>: <acronym>CSS</acronym> style attributes to
                 match: '.error', 'div.error', 'label.required', etc. If an
                 element defines more than one style, this will match as long as
                 the named style is present anywhere in the style declaration.
@@ -177,12 +177,12 @@ foreach ($results as $result) {
 
             <itemizedlist>
                 <listitem><para>
-                    <methodname>setDocumentXml($document)</methodname>: specify an XML
+                    <methodname>setDocumentXml($document)</methodname>: specify an <acronym>XML</acronym>
                     string to query against.
                 </para></listitem>
 
                 <listitem><para>
-                    <methodname>setDocumentXhtml($document)</methodname>: specify an XHTML
+                    <methodname>setDocumentXhtml($document)</methodname>: specify an <acronym>XHTML</acronym>
                     string to query against.
                 </para></listitem>
 
@@ -210,7 +210,7 @@ foreach ($results as $result) {
                 </para></listitem>
 
                 <listitem><para>
-                    <methodname>query($query)</methodname>: query the document using CSS
+                    <methodname>query($query)</methodname>: query the document using <acronym>CSS</acronym>
                     selector notation.
                 </para></listitem>
 
@@ -235,14 +235,14 @@ foreach ($results as $result) {
 
             <itemizedlist>
                 <listitem><para>
-                    <methodname>getCssQuery()</methodname>: return the CSS selector query
+                    <methodname>getCssQuery()</methodname>: return the <acronym>CSS</acronym> selector query
                     used to produce the result (if any).
                 </para></listitem>
 
                 <listitem><para>
                     <methodname>getXpathQuery()</methodname>: return the XPath query
                     used to produce the result. Internally,
-                    <classname>Zend_Dom_Query</classname> converts CSS selector queries to
+                    <classname>Zend_Dom_Query</classname> converts <acronym>CSS</acronym> selector queries to
                     XPath, so this value will always be populated.
                 </para></listitem>
 

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

@@ -7,7 +7,7 @@
         <classname>Zend_Dom</classname> provides tools for working with DOM documents and
         structures. Currently, we offer <classname>Zend_Dom_Query</classname>, which
         provides a unified interface for querying DOM documents utilizing both
-        XPath and CSS selectors.
+        XPath and <acronym>CSS</acronym> selectors.
     </para>
 </sect1>
 <!--

+ 2 - 2
documentation/manual/en/module_specs/Zend_Feed-ConsumingAtomSingle.xml

@@ -5,8 +5,8 @@
 
     <para>
         Single Atom <code>&lt;entry&gt;</code> elements are also valid by themselves. Usually the
-        URL for an entry is the feed's URL followed by <code>/&lt;entryId&gt;</code>, such as
-        <code>http://atom.example.com/feed/1</code>, using the example URL we used above.
+        <acronym>URL</acronym> for an entry is the feed's <acronym>URL</acronym> followed by <code>/&lt;entryId&gt;</code>, such as
+        <code>http://atom.example.com/feed/1</code>, using the example <acronym>URL</acronym> we used above.
     </para>
 
     <para>

+ 8 - 8
documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml

@@ -4,7 +4,7 @@
     <title>Consuming an RSS Feed</title>
     <para>
         Reading an RSS feed is as simple as instantiating a <classname>Zend_Feed_Rss</classname>
-        object with the URL of the feed:
+        object with the <acronym>URL</acronym> of the feed:
     </para>
     <programlisting language="php"><![CDATA[
 $channel = new Zend_Feed_Rss('http://rss.example.com/channelName');
@@ -23,26 +23,26 @@ echo $channel->title();
 ]]></programlisting>
     <para>
         Note the function syntax. <classname>Zend_Feed</classname> uses a convention of treating
-        properties as XML object if they are requested with variable "getter" syntax
+        properties as <acronym>XML</acronym> object if they are requested with variable "getter" syntax
         (<code>$obj->property</code>) and as strings if they are access with method syntax
         (<code>$obj->property()</code>). This enables access to the full text of any individual node
         while still allowing full access to all children.
     </para>
 
     <para>
-        If channel properties have attributes, they are accessible using PHP's array syntax:
+        If channel properties have attributes, they are accessible using <acronym>PHP</acronym>'s array syntax:
     </para>
     <programlisting language="php"><![CDATA[
 echo $channel->category['domain'];
 ]]></programlisting>
     <para>
-        Since XML attributes cannot have children, method syntax is not necessary for accessing
+        Since <acronym>XML</acronym> attributes cannot have children, method syntax is not necessary for accessing
         attribute values.
     </para>
 
     <para>
         Most commonly you'll want to loop through the feed and do something with its entries.
-        <classname>Zend_Feed_Abstract</classname> implements PHP's <code>Iterator</code> interface,
+        <classname>Zend_Feed_Abstract</classname> implements <acronym>PHP</acronym>'s <code>Iterator</code> interface,
         so printing all titles of articles in a channel is just a matter of:
     </para>
     <programlisting language="php"><![CDATA[
@@ -66,7 +66,7 @@ foreach ($channel as $item) {
             </listitem>
             <listitem>
                 <para>
-                    <code>link</code> - The URL of the web site corresponding to the channel
+                    <code>link</code> - The <acronym>URL</acronym> of the web site corresponding to the channel
                 </para>
             </listitem>
             <listitem>
@@ -114,7 +114,7 @@ foreach ($channel as $item) {
                 <para><code>title</code> - The title of the item</para>
             </listitem>
             <listitem>
-                <para><code>link</code> - The URL of the item</para>
+                <para><code>link</code> - The <acronym>URL</acronym> of the item</para>
             </listitem>
             <listitem>
                 <para><code>description</code> - A synopsis of the item</para>
@@ -128,7 +128,7 @@ foreach ($channel as $item) {
                 </para>
             </listitem>
             <listitem>
-                <para><code>comments</code> - URL of comments relating to this item</para>
+                <para><code>comments</code> - <acronym>URL</acronym> of comments relating to this item</para>
             </listitem>
             <listitem>
                 <para>

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

@@ -17,7 +17,7 @@ $feedArray = Zend_Feed::findFeeds('http://www.example.com/news.html');
         feed, each respective entry in the <varname>$feedArray</varname> array may be a
         <classname>Zend_Feed_Rss</classname> or <classname>Zend_Feed_Atom</classname> instance.
         <classname>Zend_Feed</classname> will throw a <classname>Zend_Feed_Exception</classname>
-        upon failure, such as an HTTP 404 response code or a malformed feed.
+        upon failure, such as an <acronym>HTTP</acronym> 404 response code or a malformed feed.
     </para>
 </sect1>
 <!--

+ 2 - 2
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 <methodname>Zend_Feed::import()</methodname> method:
+        know the <acronym>URI</acronym> of a feed, simply use the <methodname>Zend_Feed::import()</methodname> method:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -15,7 +15,7 @@ $feed = Zend_Feed::import('http://feeds.example.com/feedName');
 
     <para>
         You can also use <classname>Zend_Feed</classname> to fetch the contents of a feed from a
-        file or the contents of a PHP string variable:
+        file or the contents of a <acronym>PHP</acronym> string variable:
     </para>
 
     <programlisting language="php"><![CDATA[

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

@@ -6,7 +6,7 @@
         <classname>Zend_Feed</classname> provides functionality for consuming RSS and Atom feeds.
         It provides a natural syntax for accessing elements of feeds, feed attributes, and entry
         attributes. <classname>Zend_Feed</classname> also has extensive support for modifying feed
-        and entry structure with the same natural syntax, and turning the result back into XML. In
+        and entry structure with the same natural syntax, and turning the result back into <acronym>XML</acronym>. In
         the future, this modification support could provide support for the Atom Publishing
         Protocol.
     </para>
@@ -21,7 +21,7 @@
 
     <para>
         In the example below, we demonstrate a simple use case of retrieving an RSS feed and
-        saving relevant portions of the feed data to a simple PHP array, which could then be used
+        saving relevant portions of the feed data to a simple <acronym>PHP</acronym> array, which could then be used
         for printing the data, storing to a database, etc.
     </para>
 

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

@@ -6,7 +6,7 @@
     <para>
         <classname>Zend_Feed</classname>'s natural syntax extends to constructing and modifying
         feeds and entries as well as reading them. You can easily turn your new or modified objects
-        back into well-formed XML for saving to a file or sending to a server.
+        back into well-formed <acronym>XML</acronym> for saving to a file or sending to a server.
     </para>
 
     <example id="zend.feed.modifying-feed.example.modifying">
@@ -21,8 +21,8 @@ $entry->author->email = 'my_email@example.com';
 echo $entry->saveXML();
 ]]></programlisting>
         <para>
-            This will output a full (includes <code>&lt;?xml ... &gt;</code> prologue) XML
-            representation of the new entry, including any necessary XML namespaces.
+            This will output a full (includes <code>&lt;?xml ... &gt;</code> prologue) <acronym>XML</acronym>
+            representation of the new entry, including any necessary <acronym>XML</acronym> namespaces.
         </para>
         <para>
             Note that the above will work even if the existing entry does not already have an author

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

@@ -1175,7 +1175,7 @@ $updatePeriod = $feed->current()->getUpdatePeriod();
 
         <para>
             As you can also notice, the new methods from Extensions are accessible from the main
-            <acronym>API</acronym> using PHP's magic methods. As an alternative, you can also
+            <acronym>API</acronym> using <acronym>PHP</acronym>'s magic methods. As an alternative, you can also
             directly access any Extension object for a similar result as seen below.
         </para>
 

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

@@ -201,7 +201,7 @@ $upload->addFilter('Rename', 'C:\picture\newjpg', 'file1')
 
         <para>
             This filter makes use of <classname>Zend_Filter_Decrypt</classname>. It supports the
-            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from PHP. Please read the
+            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from <acronym>PHP</acronym>. Please read the
             related section for details about how to set the options for decryption and which
             options are supported.
         </para>
@@ -253,7 +253,7 @@ $upload->addFilter('Decrypt',
 
         <para>
             This filter makes use of <classname>Zend_Filter_Encrypt</classname>. It supports the
-            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from PHP. Please read the
+            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from <acronym>PHP</acronym>. Please read the
             related section for details about how to set the options for encryption and which
             options are supported.
         </para>

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

@@ -8,14 +8,14 @@
         <classname>Zend_File_Transfer</classname> provides extensive support for file uploads and
         downloads. It comes with built-in validators for files plus functionality to change files
         with filters. Protocol adapters allow <classname>Zend_File_Transfer</classname> to expose
-        the same API for transport protocols like HTTP, FTP, WEBDAV and more.
+        the same <acronym>API</acronym> for transport protocols like <acronym>HTTP</acronym>, FTP, WEBDAV and more.
     </para>
 
     <note>
         <title>Limitation</title>
         <para>
             The current implementation of <classname>Zend_File_Transfer</classname> is limited to
-            HTTP Post Uploads. Other adapters supporting downloads and other protocols will be added
+            <acronym>HTTP</acronym> Post Uploads. Other adapters supporting downloads and other protocols will be added
             in future releases. Unimplemented methods will throw an exception. For now, you should
             use <classname>Zend_File_Transfer_Adapter_Http</classname> directly. As soon as
             there are multiple adapters available you can use a common interface.
@@ -25,7 +25,7 @@
     <note>
         <title>Forms</title>
         <para>
-            When you are using <classname>Zend_Form</classname> you should use the APIs provided by
+            When you are using <classname>Zend_Form</classname> you should use the <acronym>API</acronym>s provided by
             <classname>Zend_Form</classname> and not <classname>Zend_File_Transfer</classname>
             directly. The file transfer support in <classname>Zend_Form</classname> is implemented
             with <classname>Zend_File_Transfer</classname>, so the information in this chapter may
@@ -35,7 +35,7 @@
 
     <para>
         The usage of <classname>Zend_File_Transfer</classname> is relatively simple. It consists of
-        two parts. The HTTP form does the upload, while the
+        two parts. The <acronym>HTTP</acronym> form does the upload, while the
         <classname>Zend_File_Transfer</classname> handles the uploaded files. See the following
         example:
     </para>
@@ -86,7 +86,7 @@ if (!$adapter->receive()) {
     <note>
         <title>Attention</title>
         <para>
-            This example is suitable only for demonstrating the basic API of
+            This example is suitable only for demonstrating the basic <acronym>API</acronym> of
             <classname>Zend_File_Transfer</classname>. You should <emphasis>never</emphasis> use
             this code listing in a production environment, because severe security issues may be
             introduced. You should always use validators to increase security.
@@ -368,7 +368,7 @@ $names = $upload->getMimeType('foo');
         <para>
             <classname>Zend_File_Transfer</classname> can give you the actual state of a fileupload
             in progress. To use this feature you need either the <acronym>APC</acronym> extension which is
-            provided with most default PHP installations, or the <code>uploadprogress</code>
+            provided with most default <acronym>PHP</acronym> installations, or the <code>uploadprogress</code>
             extension. Both extensions are detected and used automatically. To be able to get the
             progress you need to meet some prerequisites.
         </para>
@@ -441,7 +441,7 @@ while (!$upload['done']) {
 
             <para>
                 Call <methodname>getProgress()</methodname> without settings. It will return you an array with
-                several keys. They differ according to the used PHP extension. But the following
+                several keys. They differ according to the used <acronym>PHP</acronym> extension. But the following
                 keys are given independently of the extension:
             </para>
 

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

@@ -5,10 +5,10 @@
     <title>Migrating from previous versions</title>
 
     <para>
-        The API of <classname>Zend_File_Transfer</classname> has changed from time to time.
+        The <acronym>API</acronym> of <classname>Zend_File_Transfer</classname> has changed from time to time.
         If you started to use <classname>Zend_File_Transfer</classname> and it's subcomponents
         in earlier versions follow the guidelines below to migrate your scripts to
-        use the new API.
+        use the new <acronym>API</acronym>.
     </para>
 
     <sect2 id="zend.file.transfer.migration.fromonesixtooneseven">
@@ -25,7 +25,7 @@
             <para>
                 Therefor, all filters and validators for <classname>Zend_File_Transfer</classname>
                 have been reworked. While the old signatures continue to work,
-                they have been marked as deprecated, and will emit a PHP notice
+                they have been marked as deprecated, and will emit a <acronym>PHP</acronym> notice
                 asking you to fix them.
             </para>
 
@@ -39,12 +39,12 @@
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Filter_File_Rename($oldfile, $newfile,
+                        Old method <acronym>API</acronym>: <classname>Zend_Filter_File_Rename($oldfile, $newfile,
                             $overwrite)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <methodname>Zend_Filter_File_Rename($options)</methodname>
+                        New method <acronym>API</acronym>: <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: <methodname>Zend_Validate_File_Count($min, $max)</methodname>
+                        Old method <acronym>API</acronym>: <methodname>Zend_Validate_File_Count($min, $max)</methodname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <methodname>Zend_Validate_File_Count($options)</methodname>
+                        New method <acronym>API</acronym>: <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,
@@ -111,12 +111,12 @@ $upload->addValidator('Count',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Extension($extension,
+                        Old method <acronym>API</acronym>: <classname>Zend_Validate_File_Extension($extension,
                             $case)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API:
+                        New method <acronym>API</acronym>:
                         <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,
@@ -148,12 +148,12 @@ $upload->addValidator('Extension',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_FilesSize($min, $max,
+                        Old method <acronym>API</acronym>: <classname>Zend_Validate_File_FilesSize($min, $max,
                             $bytestring)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API:
+                        New method <acronym>API</acronym>:
                         <methodname>Zend_Validate_File_FilesSize($options)</methodname> where $options
                         accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
@@ -201,12 +201,12 @@ $upload->setUseByteSting(true); // set flag
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Hash($hash,
+                        Old method <acronym>API</acronym>: <classname>Zend_Validate_File_Hash($hash,
                             $algorithm)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <methodname>Zend_Validate_File_Hash($options)</methodname>
+                        New method <acronym>API</acronym>: <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,
@@ -237,12 +237,12 @@ $upload->addValidator('Hash',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_ImageSize($minwidth,
+                        Old method <acronym>API</acronym>: <classname>Zend_Validate_File_ImageSize($minwidth,
                             $minheight, $maxwidth, $maxheight)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API:
+                        New method <acronym>API</acronym>:
                         <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,
@@ -277,12 +277,12 @@ $upload->addValidator('ImageSize',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Size($min, $max,
+                        Old method <acronym>API</acronym>: <classname>Zend_Validate_File_Size($min, $max,
                             $bytestring)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <methodname>Zend_Validate_File_Size($options)</methodname>
+                        New method <acronym>API</acronym>: <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,
@@ -332,17 +332,17 @@ $upload->addValidator('Size',
 
             <itemizedlist>
                 <listitem><para>
-                    Old method API: <methodname>addValidator($validator, $options, $files)</methodname>.
+                    Old method <acronym>API</acronym>: <methodname>addValidator($validator, $options, $files)</methodname>.
                 </para></listitem>
 
                 <listitem><para>
-                    New method API: <code>addValidator($validator, $breakChainOnFailure, $options,
+                    New method <acronym>API</acronym>: <code>addValidator($validator, $breakChainOnFailure, $options,
                         $files)</code>.
                 </para></listitem>
             </itemizedlist>
 
             <para>
-                To migrate your scripts to the new API, simply add a <constant>FALSE</constant>
+                To migrate your scripts to the new <acronym>API</acronym>, simply add a <constant>FALSE</constant>
                 after defining the wished validator.
             </para>
 

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

@@ -436,7 +436,7 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
 
         <para>
             The <code>Crc32</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension from PHP with the crc32 algorithm.
+            This validator uses the hash extension from <acronym>PHP</acronym> with the crc32 algorithm.
             It supports the following options:
         </para>
 
@@ -957,7 +957,7 @@ $upload->addValidator('IsImage', false, 'jpeg');
 
         <para>
             The <code>Hash</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension from PHP. It supports the following options:
+            This validator uses the hash extension from <acronym>PHP</acronym>. It supports the following options:
         </para>
 
         <itemizedlist>
@@ -1020,7 +1020,7 @@ $upload->addValidator('Hash',
 
         <para>
             The <code>Md5</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension for PHP with the md5 algorithm.
+            This validator uses the hash extension for <acronym>PHP</acronym> with the md5 algorithm.
             It supports the following options:
         </para>
 
@@ -1145,13 +1145,13 @@ $upload->addValidator('MimeType',
             <para>
                 This component will use the <code>fileinfo</code> extension if it is available. If
                 it's not, it will degrade to the <code>mime_content_type</code> function. And if the
-                function call fails it will use the MIME type which is given by HTTP.
+                function call fails it will use the MIME type which is given by <acronym>HTTP</acronym>.
             </para>
 
             <para>
                 You should be aware of possible security problems when you have whether
                 <code>fileinfo</code> nor <code>mime_content_type</code> available. The MIME type
-                given by HTTP is not secure and can be easily manipulated.
+                given by <acronym>HTTP</acronym> is not secure and can be easily manipulated.
             </para>
         </note>
     </sect2>
@@ -1211,7 +1211,7 @@ $upload->addValidator('NotExists', false,
 
         <para>
             The <code>Sha1</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension for PHP with the sha1 algorithm.
+            This validator uses the hash extension for <acronym>PHP</acronym> with the sha1 algorithm.
             It supports the following options:
         </para>
 

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

@@ -114,7 +114,7 @@
     <sect2 id="zend.filter.set.striptags">
         <title>StripTags</title>
         <para>
-            This filter returns the input string, with all HTML and PHP tags stripped from it,
+            This filter returns the input string, with all HTML and <acronym>PHP</acronym> tags stripped from it,
             except those that have been explicitly allowed. In addition to the ability to specify
             which tags are allowed, developers can specify which attributes are allowed across all
             allowed tags and for specific tags only. Finally, this filter offers control over

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

@@ -13,8 +13,8 @@
 
     <para>
         Consider the metaphor that this class is a cage for external data.
-        Data enter the application from external sources, such as HTTP request
-        parameters, HTTP headers, a web service, or even read from a database
+        Data enter the application from external sources, such as <acronym>HTTP</acronym> request
+        parameters, <acronym>HTTP</acronym> headers, a web service, or even read from a database
         or another file. Data are first put into the cage, and subsequently
         the application can access data only by telling the cage what the data
         should be and how they plan to use it. The cage inspects the data for
@@ -224,7 +224,7 @@ $input = new Zend_Filter_Input($filters, $validators);
             You can specify input data as the third constructor argument. The
             data structure is an associative array. The keys are field names,
             and the values are data values. The standard <varname>$_GET</varname>
-            and <varname>$_POST</varname> superglobal variables in PHP are examples
+            and <varname>$_POST</varname> superglobal variables in <acronym>PHP</acronym> are examples
             of this format. You can use either of these variables as input
             data for <classname>Zend_Filter_Input</classname>.
         </para>
@@ -1033,7 +1033,7 @@ $input->addFilterPrefixPath('Foo_Namespace', 'Foo/Namespace');
                 As of version 1.0.4, <constant>Zend_Filter_Input::NAMESPACE</constant>, having
                 value <code>namespace</code>, was changed to
                 <constant>Zend_Filter_Input::INPUT_NAMESPACE</constant>, having value
-                <code>inputNamespace</code>, in order to comply with the PHP 5.3 reservation of the
+                <code>inputNamespace</code>, in order to comply with the <acronym>PHP</acronym> 5.3 reservation of the
                 keyword <code>namespace</code>.
             </para>
         </note>

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

@@ -38,7 +38,7 @@
         The base class, <classname>Zend_Form_Element</classname>, has reasonable defaults
         for many cases, but it is best to extend the class for commonly used
         special purpose elements. Additionally, Zend Framework ships with a
-        number of standard XHTML elements; you can read about them <link
+        number of standard <acronym>XHTML</acronym> elements; you can read about them <link
             linkend="zend.form.standardElements">in the Standard Elements
             chapter</link>.
     </para>
@@ -786,7 +786,7 @@ $messages = $element->getMessages();
 
         <para>
             One particular pain point for many web developers is the creation
-            of the XHTML forms themselves. For each element, the developer
+            of the <acronym>XHTML</acronym> forms themselves. For each element, the developer
             needs to create markup for the element itself (typically a label)
             and special markup for displaying
             validation error messages. The more elements on the page, the less
@@ -1090,7 +1090,7 @@ echo $element->renderHtmlTag("This is the html tag content");
         </itemizedlist>
 
         <para>
-            Form elements may require additional metadata. For XHTML form
+            Form elements may require additional metadata. For <acronym>XHTML</acronym> form
             elements, for instance, you may want to specify attributes such as
             the class or id. To facilitate this are a set of accessors:
         </para>
@@ -1508,7 +1508,7 @@ class My_Element_Text extends Zend_Form_Element
 ]]></programlisting>
 
         <para>
-            There are many ways to customize elements. Read the API
+            There are many ways to customize elements. Read the <acronym>API</acronym>
             documentation of <classname>Zend_Form_Element</classname> to learn about all of the
             available methods.
         </para>

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

@@ -1403,7 +1403,7 @@ if (!$form->isValidPartial($data)) {
         </para>
 
         <para>
-            When validating elements or groups of elements for an AJAX request,
+            When validating elements or groups of elements for an <acronym>AJAX</acronym> request,
             you will typically be validating a subset of the form, and want the
             response back in JSON. <methodname>processAjax()</methodname> does precisely
             that:
@@ -1952,7 +1952,7 @@ decorators.form.decorator = "Form"
 ]]></programlisting>
 
         <para>
-            The above could easily be abstracted to an XML or PHP array-based
+            The above could easily be abstracted to an <acronym>XML</acronym> or <acronym>PHP</acronym> array-based
             configuration file.
         </para>
     </sect2>

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

@@ -39,8 +39,8 @@ $form->setAction('/resource/process')
 ]]></programlisting>
 
         <para>
-            The above code sets the form action to the partial URL
-            "/resource/process" and the form method to HTTP POST. This will be
+            The above code sets the form action to the partial <acronym>URL</acronym>
+            "/resource/process" and the form method to <acronym>HTTP</acronym> POST. This will be
             reflected during final rendering.
         </para>
 
@@ -61,7 +61,7 @@ $form->setAttrib('id', 'login');
 
         <para>
             A form is nothing without its elements. <classname>Zend_Form</classname>
-            ships with some default elements that render XHTML via
+            ships with some default elements that render <acronym>XHTML</acronym> via
             <classname>Zend_View</classname> helpers. These are as follows:
         </para>
 
@@ -267,7 +267,7 @@ echo $form;
             By default, <classname>Zend_Form</classname> and
             <classname>Zend_Form_Element</classname> will attempt to use the view object
             initialized in the <code>ViewRenderer</code>, which means you won't
-            need to set the view manually when using the Zend Framework MVC.
+            need to set the view manually when using the Zend Framework <acronym>MVC</acronym>.
             To render a form in a view, you simply have to do the following:
         </para>
 
@@ -377,7 +377,7 @@ if ($form->isValid($_POST)) {
 ]]></programlisting>
 
         <para>
-            With AJAX requests, you can sometimes get away with validating
+            With <acronym>AJAX</acronym> requests, you can sometimes get away with validating
             a single element, or groups of elements.
             <methodname>isValidPartial()</methodname> will validate a partial form. Unlike
             <methodname>isValid()</methodname>, however, if a particular key is not

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

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

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

@@ -247,7 +247,7 @@ $location = $form->foo->getFileName();
             <title>File values</title>
 
             <para>
-                Within HTTP a file element has no value. For this reason and because of
+                Within <acronym>HTTP</acronym> a file element has no value. For this reason and because of
                 security concerns <methodname>getValue()</methodname> returns only the uploaded filename
                 and not the complete path. If you need the file path, call
                 <methodname>getFileName()</methodname>, which returns both the path and the name of the file.
@@ -603,7 +603,7 @@ $element->setValue(array('bar', 'bat'));
         <title>Zend_Form_Element_Multiselect</title>
 
         <para>
-            XHTML <code>select</code> elements allow a 'multiple' attribute,
+            <acronym>XHTML</acronym> <code>select</code> elements allow a 'multiple' attribute,
             indicating multiple options may be selected for submission, instead
             of the usual one. <classname>Zend_Form_Element_Multiselect</classname> extends
             <link
@@ -822,7 +822,7 @@ $element->setValue(array('bar', 'bat'));
         <para>
             Textareas are used when large quantities of text are expected, and
             place no limits on the amount of text submitted (other than maximum
-            size limits as dictated by your server or PHP).
+            size limits as dictated by your server or <acronym>PHP</acronym>).
             <classname>Zend_Form_Element_Textarea</classname> uses the 'textArea' view
             helper to display such elements, placing the value as the content of
             the element.

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

@@ -3,22 +3,22 @@
 <sect1 id="zend.gdata.introduction">
     <title>Introduction</title>
     <para>
-        Google Data APIs provide programmatic interface to some of Google's
+        Google Data <acronym>API</acronym>s provide programmatic interface to some of Google's
         online services. The Google data Protocol is based upon the
         <ulink url="http://ietfreport.isoc.org/idref/draft-ietf-atompub-protocol/">Atom Publishing Protocol</ulink>
         and allows client applications to retrieve data matching queries,
-        post data, update data and delete data using standard HTTP and the
+        post data, update data and delete data using standard <acronym>HTTP</acronym> and the
         Atom syndication formation.
 
-        The <classname>Zend_Gdata</classname> component is a PHP 5 interface for accessing Google Data
-        from PHP. The <classname>Zend_Gdata</classname> component also supports accessing other services
+        The <classname>Zend_Gdata</classname> component is a <acronym>PHP</acronym> 5 interface for accessing Google Data
+        from <acronym>PHP</acronym>. The <classname>Zend_Gdata</classname> component also supports accessing other services
         implementing the Atom Publishing Protocol.
     </para>
 
     <para>
         See
         <ulink url="http://code.google.com/apis/gdata/">http://code.google.com/apis/gdata/</ulink>
-        for more information about Google Data API.
+        for more information about Google Data <acronym>API</acronym>.
     </para>
 
     <para>
@@ -102,7 +102,7 @@
         <para>
             <classname>Zend_Gdata</classname> does not provide an interface to any other Google
             service, such as Search, Gmail, Translation, or Maps.
-            Only services that support the Google Data API are supported.
+            Only services that support the Google Data <acronym>API</acronym> are supported.
         </para>
     </note>
 
@@ -132,9 +132,9 @@
                         getters and setters like <methodname>setUpdatedMin()</methodname>,
                         <methodname>setStartIndex()</methodname>, and
                         <methodname>getPublishedMin()</methodname>. The query classes also
-                        have a method to generate a URL representing the
+                        have a method to generate a <acronym>URL</acronym> representing the
                         constructed query -- <code>getQueryUrl</code>.
-                        Alternatively, the query string component of the URL
+                        Alternatively, the query string component of the <acronym>URL</acronym>
                         can be retrieved used the <methodname>getQueryString()</methodname>
                         method.
                     </para>
@@ -173,11 +173,11 @@
                         Other Data model classes - inheriting from
                         <classname>Zend_Gdata_App_Extension</classname>. These include classes such
                         as <classname>Zend_Gdata_App_Extension_Title</classname> (representing the
-                        atom:title XML element), <classname>Zend_Gdata_Extension_When</classname>
-                        (representing the gd:when XML element used by the
+                        atom:title <acronym>XML</acronym> element), <classname>Zend_Gdata_Extension_When</classname>
+                        (representing the gd:when <acronym>XML</acronym> element used by the
                         GData Event "Kind"), and
                         <classname>Zend_Gdata_Extension_Cell</classname> (representing the gs:cell
-                        XML element used by Google Spreadsheets). These
+                        <acronym>XML</acronym> element used by Google Spreadsheets). These
                         classes are used purely to store the data retrieved
                         back from services and for constructing data to be
                         sent to services. These include getters and setters
@@ -294,7 +294,7 @@ $entry->cell = $cell;
         </para>
 
         <para>
-            <classname>Zend_Gdata</classname> assumes your PHP application is running on a host that
+            <classname>Zend_Gdata</classname> assumes your <acronym>PHP</acronym> application is running on a host that
             has a direct connection to the Internet.
             The <classname>Zend_Gdata</classname> client operates by contacting Google Data servers.
         </para>
@@ -396,7 +396,7 @@ $gdata->setMinorProtocolVersion(null);
                     atom feed format can be processed using
                     <classname>Zend_Gdata</classname>.
                     The <classname>Zend_Http_Client</classname> could be used to retrieve
-                    feeds in other formats, using query URLs generated by the
+                    feeds in other formats, using query <acronym>URL</acronym>s generated by the
                     <classname>Zend_Gdata_Query</classname> class and its subclasses.
                 </para>
                 <para>
@@ -498,7 +498,7 @@ $query->resetParameters();      // clears all parameters
 
         <para>
             Use the <methodname>getFeed()</methodname> function to retrieve
-            a feed from a specified URI.
+            a feed from a specified <acronym>URI</acronym>.
             This function returns an instance of class specified
             as the second argument to getFeed, which defaults to
             <classname>Zend_Gdata_Feed</classname>.
@@ -515,7 +515,7 @@ $feed = $gdata->getFeed($query);
         <para>
             See later sections for special functions in each
             helper class for Google Data services. These
-            functions help you to get feeds from the URI that is
+            functions help you to get feeds from the <acronym>URI</acronym> that is
             appropriate for the respective service.
         </para>
 
@@ -561,7 +561,7 @@ $feed = $gdata->retrieveAllEntriesForFeed($gdata->getFeed($query));
 
         <para>
             Keep in mind when calling this function that it may take a long
-            time to complete on large feeds. You may need to increase PHP's
+            time to complete on large feeds. You may need to increase <acronym>PHP</acronym>'s
             execution time limit by calling <methodname>set_time_limit()</methodname>.
         </para>
 
@@ -640,7 +640,7 @@ foreach ($feed as $entry) {
         </para>
 
         <para>
-            Alternatively, you could construct the XML structure for an entry
+            Alternatively, you could construct the <acronym>XML</acronym> structure for an entry
             as a string and pass the string to the <methodname>insertEntry()</methodname>
             function.
         </para>
@@ -675,7 +675,7 @@ echo 'The <id> of the resulting entry is: ' . $entryResult->id->text;
         <para>
             Option 1: The <classname>Zend_Gdata</classname> object has a function <methodname>delete()</methodname>
             with which you can delete entries from Google Data
-            services. Pass the edit URL value from
+            services. Pass the edit <acronym>URL</acronym> value from
             a feed entry to the <methodname>delete()</methodname> method.
         </para>
 

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

@@ -19,7 +19,7 @@
         for "installed applications" whereas the AuthSub mechanism is
         for "web applications." The difference is that AuthSub requires
         interaction from the user, and a browser interface that can react
-        to redirection requests. The ClientLogin solution uses PHP code to
+        to redirection requests. The ClientLogin solution uses <acronym>PHP</acronym> code to
         supply the account credentials; the user is not required to enter her
         credentials interactively.
     </para>
@@ -43,11 +43,11 @@
         <title>Creating an AuthSub authenticated Http Client</title>
 
         <para>
-            Your PHP application should provide a hyperlink to the
-            Google URL that performs authentication. The static function
+            Your <acronym>PHP</acronym> application should provide a hyperlink to the
+            Google <acronym>URL</acronym> that performs authentication. The static function
             <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
+            provides the correct <acronym>URL</acronym>. The arguments to this function include
+            the <acronym>URL</acronym> to your <acronym>PHP</acronym> application so that Google can redirect the
             user's browser back to your application after the user's
             credentials have been verified.
         </para>
@@ -71,7 +71,7 @@
         </para>
 
         <para>
-            Below is an example of PHP code for a web application
+            Below is an example of <acronym>PHP</acronym> code for a web application
             to acquire authentication to use the Google Calendar service
             and create a <classname>Zend_Gdata</classname> client object using that authenticated
             Http Client.

+ 17 - 17
documentation/manual/en/module_specs/Zend_Gdata_Books.xml

@@ -4,12 +4,12 @@
     <title>Using the Book Search Data API</title>
 
     <para>
-        The Google Book Search Data API allows client applications to view
-        and update Book Search content in the form of Google Data API feeds.
+        The Google Book Search Data <acronym>API</acronym> allows client applications to view
+        and update Book Search content in the form of Google Data <acronym>API</acronym> feeds.
     </para>
 
     <para>
-        Your client application can use the Book Search Data API to issue
+        Your client application can use the Book Search Data <acronym>API</acronym> to issue
         full-text searches for books and to retrieve standard book information,
         ratings, and reviews. You can also access individual users'
         <ulink url="http://books.google.com/googlebooks/mylibrary/">library collections and
@@ -19,7 +19,7 @@
     </para>
 
     <para>
-        For more information on the Book Search Data API, please refer to the official
+        For more information on the Book Search Data <acronym>API</acronym>, please refer to the official
         <ulink url="http://code.google.com/apis/books/gdata/developers_guide_php.html">PHP
         Developer's Guide</ulink> on code.google.com.
     </para>
@@ -30,14 +30,14 @@
 
         <para>
             You can access both public and private feeds using the Book Search
-            Data API. Public feeds don't require any authentication, but they are
+            Data <acronym>API</acronym>. Public feeds don't require any authentication, but they are
             read-only. If you want to modify user libraries, submit reviews or
             ratings, or add labels, then your client needs to authenticate before
             requesting private feeds. It can authenticate using either of two
             approaches: AuthSub proxy authentication or ClientLogin username/password
             authentication. Please refer to the <ulink
             url="http://code.google.com/apis/books/gdata/developers_guide_php.html#Authentication">
-            Authentication section in the PHP Developer's Guide</ulink> for more detail.
+            Authentication section in the <acronym>PHP</acronym> Developer's Guide</ulink> for more detail.
         </para>
 
     </sect2>
@@ -47,7 +47,7 @@
         <title>Searching for books</title>
 
         <para>
-            The Book Search Data API provides a number of feeds that list collections of books.
+            The Book Search Data <acronym>API</acronym> provides a number of feeds that list collections of books.
         </para>
 
         <para>
@@ -84,7 +84,7 @@ foreach ($feed as $entry) {
         <para>
             The <code>Query</code> class, and subclasses like
             <code>VolumeQuery</code>, are responsible for constructing feed
-            URLs. The VolumeQuery shown above constructs a URL equivalent to the
+            <acronym>URL</acronym>s. The VolumeQuery shown above constructs a <acronym>URL</acronym> equivalent to the
             following:
         </para>
 
@@ -108,7 +108,7 @@ http://www.google.com/books/feeds/volumes?q=keyword&amp;min-viewability=partial
             books matching the term. Book metadata includes titles, keywords,
             descriptions, author names, and subjects.
             Note that any spaces, quotes or other punctuation in the parameter
-            value must be URL-escaped. (Use a plus (<code>+</code>) for a space.)
+            value must be <acronym>URL</acronym>-escaped. (Use a plus (<code>+</code>) for a space.)
             To search for an exact phrase, enclose the phrase in quotation marks.
             For example, to search for books matching the phrase "spy plane", set
             the <code>q</code> parameter to <code>%22spy+plane%22</code>.
@@ -172,9 +172,9 @@ http://www.google.com/books/feeds/volumes?q=keyword&amp;min-viewability=partial
 
             <para>
                 If you are a partner who wants to do Co-Branded Search using the
-                Book Search Data API, you may do so by modifying the feed URL above to
+                Book Search Data <acronym>API</acronym>, you may do so by modifying the feed <acronym>URL</acronym> above to
                 point to your Co-Branded Search implementation. If, for example, a
-                Co-Branded Search is available at the following URL:
+                Co-Branded Search is available at the following <acronym>URL</acronym>:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -182,8 +182,8 @@ http://www.google.com/books/p/PARTNER_COBRAND_ID?q=ball
 ]]></programlisting>
 
             <para>
-                then you can obtain the same results using the Book Search Data API at the
-                following URL:
+                then you can obtain the same results using the Book Search Data <acronym>API</acronym> at the
+                following <acronym>URL</acronym>:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -191,7 +191,7 @@ http://www.google.com/books/feeds/p/PARTNER_COBRAND_ID/volumes?q=ball+-soccer
 ]]></programlisting>
 
             <para>
-                To specify an alternate URL when querying a volume feed, you can
+                To specify an alternate <acronym>URL</acronym> when querying a volume feed, you can
                 provide an extra parameter to <code>newVolumeQuery</code>
             </para>
 
@@ -299,7 +299,7 @@ $books->updateVolume($entry, $entryUrl);
             <title>Labels</title>
 
             <para>
-                You can use the Book Search Data API to label volumes with
+                You can use the Book Search Data <acronym>API</acronym> to label volumes with
                 keywords. A user can submit, retrieve and modify labels. See
                 <ulink url="#zend.gdata.books.retrieving_annotations">Retrieving
                 annotations</ulink> for how to read previously submitted labels.
@@ -333,7 +333,7 @@ $books->insertVolume($entry, Zend_Gdata_Books::MY_ANNOTATION_FEED_URI);
             <title>Retrieving annotations: reviews, ratings, and labels</title>
 
             <para>
-                You can use the Book Search Data API to retrieve annotations
+                You can use the Book Search Data <acronym>API</acronym> to retrieve annotations
                 submitted by a given user. Annotations include reviews, ratings, and
                 labels. To retrieve any user's annotations, you can send an
                 unauthenticated request that includes the user's user ID. To retrieve the
@@ -487,7 +487,7 @@ $feed = $books->getVolumeFeed($query);
             <title>Updating books in a user's library</title>
 
             <para>
-                You can use the Book Search Data API to add a book to, or remove a
+                You can use the Book Search Data <acronym>API</acronym> to add a book to, or remove a
                 book from, a user's library. Ratings, reviews, and labels are valid
                 across all the collections of a user, and are thus edited using the
                 annotation feed (see <ulink

+ 24 - 24
documentation/manual/en/module_specs/Zend_Gdata_Calendar.xml

@@ -11,25 +11,25 @@
         See <ulink
         url="http://code.google.com/apis/calendar/overview.html">
         http://code.google.com/apis/calendar/overview.html</ulink>
-        for more information about the Google Calendar API.
+        for more information about the Google Calendar <acronym>API</acronym>.
     </para>
     <sect2 id="zend.gdata.calendar.connecting">
         <title>Connecting To The Calendar Service</title>
         <para>
-            The Google Calendar API, like all GData APIs, is based off of the Atom Publishing
-            Protocol (APP), an XML based format for managing web-based resources. Traffic between
-            a client and the Google Calendar servers occurs over HTTP and allows for both
+            The Google Calendar <acronym>API</acronym>, like all GData <acronym>API</acronym>s, is based off of the Atom Publishing
+            Protocol (APP), an <acronym>XML</acronym> based format for managing web-based resources. Traffic between
+            a client and the Google Calendar servers occurs over <acronym>HTTP</acronym> and allows for both
             authenticated and unauthenticated connections.
         </para>
         <para>
             Before any transactions can occur, this connection needs to be made. Creating a
-            connection to the calendar servers involves two steps: creating an HTTP client and
+            connection to the calendar servers involves two steps: creating an <acronym>HTTP</acronym> client and
             binding a <classname>Zend_Gdata_Calendar</classname> service instance to that client.
         </para>
         <sect3 id="zend.gdata.calendar.connecting.authentication">
             <title>Authentication</title>
             <para>
-                The Google Calendar API allows access to both public and private calendar feeds.
+                The Google Calendar <acronym>API</acronym> allows access to both public and private calendar feeds.
                 Public feeds do not require authentication, but are read-only and offer reduced
                 functionality. Private feeds offers the most complete functionality but requires
                 an authenticated connection to the calendar servers. There are three authentication
@@ -59,11 +59,11 @@
                 <listitem>
                     <para>
                         <firstterm>MagicCookie</firstterm>
-                        allows authentication based on a semi-random URL
+                        allows authentication based on a semi-random <acronym>URL</acronym>
                         available from within the Google Calendar interface.
                         This is the simplest authentication scheme to
                         implement, but requires that users manually retrieve
-                        their secure URL before they can authenticate, doesn't
+                        their secure <acronym>URL</acronym> before they can authenticate, doesn't
                         provide access to calendar lists, and is limited to
                         read-only access.
                     </para>
@@ -80,7 +80,7 @@
                 linkend="zend.gdata.introduction.authentication">Authentication section</link>
                 of this manual or the <ulink
                 url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the
-                Google Data API Developer's Guide</ulink>.
+                Google Data <acronym>API</acronym> Developer's Guide</ulink>.
             </para>
         </sect3>
         <sect3 id="zend.gdata.calendar.connecting.service">
@@ -96,7 +96,7 @@
                 of <classname>Zend_Gdata_Calendar</classname>. The class constructor takes an instance of
                 <classname>Zend_Http_Client</classname> as a single argument. This provides an interface for
                 AuthSub and ClientAuth authentication, as both of these require creation of a
-                special authenticated HTTP client. If no arguments are provided, an unauthenticated
+                special authenticated <acronym>HTTP</acronym> client. If no arguments are provided, an unauthenticated
                 instance of <classname>Zend_Http_Client</classname> will be automatically created.
             </para>
             <para>
@@ -217,7 +217,7 @@ $service = new Zend_Gdata_Calendar(getAuthSubHttpClient());
 $service = new Zend_Gdata_Calendar();
 ]]></programlisting>
             <para>
-                Note that MagicCookie authentication is not supplied with the HTTP connection, but
+                Note that MagicCookie authentication is not supplied with the <acronym>HTTP</acronym> connection, but
                 is instead specified along with the desired visibility when submitting queries. See
                 the section on retrieving events below for an example.
             </para>
@@ -277,13 +277,13 @@ echo "</ul>";
         <sect3 id="zend.gdata.event_retrieval.queries">
             <title>Queries</title>
             <para>
-                When retrieving events using the Calendar API, specially constructed query URLs are
+                When retrieving events using the Calendar <acronym>API</acronym>, specially constructed query <acronym>URL</acronym>s are
                 used to describe what events should be returned. The
                 <classname>Zend_Gdata_Calendar_EventQuery</classname> class simplifies this task by
-                automatically constructing a query URL based on provided parameters. A full list of
+                automatically constructing a query <acronym>URL</acronym> based on provided parameters. A full list of
                 these parameters is available at the <ulink
                 url="http://code.google.com/apis/gdata/reference.html#Queries">Queries section of
-                the Google Data APIs Protocol Reference</ulink>. However, there are three
+                the Google Data <acronym>API</acronym>s Protocol Reference</ulink>. However, there are three
                 parameters that are worth special attention:
             </para>
             <itemizedlist>
@@ -329,7 +329,7 @@ echo "</ul>";
                 connection is available to the calendar servers. If a MagicCookie is being used for
                 authentication, the visibility should be instead set to
                 "<code>private-magicCookieValue</code>", where magicCookieValue is the random
-                string obtained when viewing the private XML address in the Google Calendar UI.
+                string obtained when viewing the private <acronym>XML</acronym> address in the Google Calendar UI.
                 Events are requested chronologically by start time and only events occurring in the
                 future are returned.
             </para>
@@ -361,7 +361,7 @@ echo "</ul>";
                 Additional properties such as ID, author, when, event status, visibility, web
                 content, and content, among others are available within
                 <classname>Zend_Gdata_Calendar_EventEntry</classname>. Refer to the
-                <ulink url="http://framework.zend.com/apidoc/core/">Zend Framework API
+                <ulink url="http://framework.zend.com/apidoc/core/">Zend Framework <acronym>API</acronym>
                 Documentation</ulink> and the
                 <ulink url="http://code.google.com/apis/gdata/reference.html">Calendar Protocol
                 Reference</ulink> for a complete list.
@@ -416,9 +416,9 @@ try {
 }
 ]]></programlisting>
             <para>
-                In a similar fashion, if the event URL is known, it can be passed directly into
+                In a similar fashion, if the event <acronym>URL</acronym> is known, it can be passed directly into
                 <methodname>getCalendarEntry()</methodname> to retrieve a specific event. In this case, no
-                query object is required since the event URL contains all the necessary information
+                query object is required since the event <acronym>URL</acronym> contains all the necessary information
                 to retrieve the event.
             </para>
             <programlisting language="php"><![CDATA[
@@ -441,7 +441,7 @@ try {
                 Events are added to a calendar by creating an instance of
                 <classname>Zend_Gdata_EventEntry</classname> and populating it with the appropriate data.
                 The calendar service instance (<classname>Zend_Gdata_Calendar</classname>) is then used to
-                used to transparently covert the event into XML and POST it to the calendar server.
+                used to transparently covert the event into <acronym>XML</acronym> and POST it to the calendar server.
                 Creating events requires either an AuthSub or ClientAuth authenticated connection
                 to the calendar server.
             </para>
@@ -523,13 +523,13 @@ try {
             </itemizedlist>
             <para>
                 For a complete list of event attributes, refer to the
-                <ulink url="http://framework.zend.com/apidoc/core/">Zend Framework API
+                <ulink url="http://framework.zend.com/apidoc/core/">Zend Framework <acronym>API</acronym>
                 Documentation</ulink> and the
                 <ulink url="http://code.google.com/apis/gdata/reference.html">Calendar Protocol
                 Reference</ulink>. Attributes that can contain multiple values, such as where, are
                 implemented as arrays and need to be created accordingly. Be aware that all of
                 these attributes require objects as parameters. Trying instead to populate them
-                using strings or primitives will result in errors during conversion to XML.
+                using strings or primitives will result in errors during conversion to <acronym>XML</acronym>.
             </para>
             <para>
                 Once the event has been populated, it can be uploaded to the calendar server by
@@ -636,7 +636,7 @@ $when->reminders = array($reminder);
                 Due to the complexity of parsing recurrence patterns, further information on this
                 them is outside the scope of this document. However, more information can be found
                 in the <ulink url="http://code.google.com/apis/gdata/elements.html#gdRecurrence">
-                Common Elements section of the Google Data APIs Developer Guide</ulink>, as well as
+                Common Elements section of the Google Data <acronym>API</acronym>s Developer Guide</ulink>, as well as
                 in RFC 2445.
             </para>
             <programlisting language="php"><![CDATA[
@@ -721,7 +721,7 @@ try {
         <title>Deleting Events</title>
         <para>
             Calendar events can be deleted either by calling the calendar service's
-            <methodname>delete()</methodname> method and providing the edit URL of an event or by calling an
+            <methodname>delete()</methodname> method and providing the edit <acronym>URL</acronym> of an event or by calling an
             existing event's own <methodname>delete()</methodname> method.
         </para>
         <para>
@@ -744,7 +744,7 @@ $service->delete($event->getEditLink()->href);
         <title>Accessing Event Comments</title>
         <para>
             When using the full event view, comments are not directly stored within an entry.
-            Instead, each event contains a URL to its associated comment feed which must be
+            Instead, each event contains a <acronym>URL</acronym> to its associated comment feed which must be
             manually requested.
         </para>
         <para>

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

@@ -4,7 +4,7 @@
     <title>Authenticating with ClientLogin</title>
 
     <para>
-        The ClientLogin mechanism enables you to write PHP application
+        The ClientLogin mechanism enables you to write <acronym>PHP</acronym> application
         that acquire authenticated access to Google Services,
         specifying a user's credentials in the Http Client.
     </para>
@@ -20,7 +20,7 @@
         for "installed applications" whereas the AuthSub mechanism is
         for "web applications." The difference is that AuthSub requires
         interaction from the user, and a browser interface that can react
-        to redirection requests. The ClientLogin solution uses PHP code to
+        to redirection requests. The ClientLogin solution uses <acronym>PHP</acronym> code to
         supply the account credentials; the user is not required to enter her
         credentials interactively.
     </para>
@@ -28,7 +28,7 @@
     <para>
         The account credentials supplied via the ClientLogin mechanism must
         be valid credentials for Google services, but they are not required
-        to be those of the user who is using the PHP application.
+        to be those of the user who is using the <acronym>PHP</acronym> application.
     </para>
 
     <sect2 id="zend.gdata.clientlogin.login">
@@ -80,7 +80,7 @@
         </para>
 
         <para>
-            Below is an example of PHP code for a web application
+            Below is an example of <acronym>PHP</acronym> code for a web application
             to acquire authentication to use the Google Calendar service
             and create a <classname>Zend_Gdata</classname> client object using that authenticated
             <classname>Zend_Http_Client</classname>.

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

@@ -4,9 +4,9 @@
     <title>Using Google Documents List Data API</title>
 
     <para>
-        The Google Documents List Data API allows client applications to
+        The Google Documents List Data <acronym>API</acronym> allows client applications to
         upload documents to Google Documents and list them in the form of
-        Google Data API ("GData") feeds. Your client application can request
+        Google Data <acronym>API</acronym> ("GData") feeds. Your client application can request
         a list of a user's documents, and query the content in an existing
         document.
     </para>
@@ -14,7 +14,7 @@
     <para>
         See
         <ulink url="http://code.google.com/apis/documents/overview.html">http://code.google.com/apis/documents/overview.html</ulink>
-        for more information about the Google Documents List API.
+        for more information about the Google Documents List <acronym>API</acronym>.
     </para>
 
     <sect2 id="zend.gdata.docs.listdocuments">
@@ -108,13 +108,13 @@ function uploadDocument($docs, $html, $originalFileName,
         <para>
             You can search the Document List using some of the <ulink
             url="http://code.google.com/apis/gdata/reference.html#Queries">standard
-            Google Data API query parameters</ulink>. Categories are used to
+            Google Data <acronym>API</acronym> query parameters</ulink>. Categories are used to
             restrict the
             type of document (word processor document, spreadsheet) returned.
             The full-text query string is used to search the content of all
             the documents. More detailed information on parameters specific
             to the Documents List can be found in the <ulink
-            url="http://code.google.com/apis/documents/reference.html#Parameters">Documents List Data API Reference Guide</ulink>.
+            url="http://code.google.com/apis/documents/reference.html#Parameters">Documents List Data <acronym>API</acronym> Reference Guide</ulink>.
         </para>
 
         <sect3 id="zend.gdata.docs.listwpdocuments">
@@ -146,7 +146,7 @@ $feed = $docs->getDocumentListFeed(
             <para>
                 You can search the content of documents by using a
                 <classname>Zend_Gdata_Docs_Query</classname> in your request. A Query object
-                can be used to construct the query URI, with the search term being
+                can be used to construct the query <acronym>URI</acronym>, with the search term being
                 passed in as a parameter. Here is an example method which queries
                 the documents list for documents which contain the search string:
             </para>

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

@@ -40,7 +40,7 @@ try {
             <listitem>
                 <para>
                     <classname>Zend_Gdata_App_HttpException</classname>
-                    indicates that an HTTP request was not successful.
+                    indicates that an <acronym>HTTP</acronym> request was not successful.
                     Provides the ability to get the full <classname>Zend_Http_Response</classname>
                     object to determine the exact cause of the failure in
                     cases where <code>$e->getMessage()</code> does not provide
@@ -63,7 +63,7 @@ try {
                   is thrown when a ClientLogin attempt receives a
                   <trademark>CAPTCHA</trademark> challenge from the
                   authentication service. This exception contains a token
-                  ID and a URL to a <trademark>CAPTCHA</trademark>
+                  ID and a <acronym>URL</acronym> to a <trademark>CAPTCHA</trademark>
                   challenge image. The image is a visual puzzle that
                   should be displayed to the user. After
                   collecting the user's response to the challenge
@@ -80,7 +80,7 @@ try {
 
     <para>
         You can use these exception subclasses to handle specific exceptions
-        differently. See the API documentation for information on which
+        differently. See the <acronym>API</acronym> documentation for information on which
         exception subclasses are thrown by which methods in <classname>Zend_Gdata</classname>.
     </para>
 

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

@@ -6,31 +6,31 @@
     <para>
         Google Apps is a service which allows domain administrators to offer
         their users managed access to Google services such as Mail, Calendar,
-        and Docs &amp; Spreadsheets. The Provisioning API offers a programmatic
-        interface to configure this service. Specifically, this API allows
+        and Docs &amp; Spreadsheets. The Provisioning <acronym>API</acronym> offers a programmatic
+        interface to configure this service. Specifically, this <acronym>API</acronym> allows
         administrators the ability to create, retrieve, update, and delete
         user accounts, nicknames, and email lists.
     </para>
 
     <para>
-        This library implements version 2.0 of the Provisioning API. Access to
-        your account via the Provisioning API must be manually enabled for
+        This library implements version 2.0 of the Provisioning <acronym>API</acronym>. Access to
+        your account via the Provisioning <acronym>API</acronym> must be manually enabled for
         each domain using the Google Apps control panel. Only certain
         account types are able to enable this feature.
     </para>
 
     <para>
-        For more information on the Google Apps Provisioning API, including
-        instructions for enabling API access, refer to the <ulink
+        For more information on the Google Apps Provisioning <acronym>API</acronym>, including
+        instructions for enabling <acronym>API</acronym> access, refer to the <ulink
         url="http://code.google.com/apis/calendar/overview.html">Provisioning
-        API V2.0 Reference</ulink>.
+        <acronym>API</acronym> V2.0 Reference</ulink>.
     </para>
 
     <note>
         <title>Authentication</title>
         <para>
-            The Provisioning API does not support authentication via AuthSub
-            and anonymous access is not permitted. All HTTP connections must
+            The Provisioning <acronym>API</acronym> does not support authentication via AuthSub
+            and anonymous access is not permitted. All <acronym>HTTP</acronym> connections must
             be authenticated using ClientAuth authentication.
             </para>
     </note>
@@ -39,8 +39,8 @@
         <title>Setting the current domain</title>
 
         <para>
-            In order to use the Provisioning API, the domain being
-            administered needs to be specified in all request URIs. In order
+            In order to use the Provisioning <acronym>API</acronym>, the domain being
+            administered needs to be specified in all request <acronym>URI</acronym>s. In order
             to ease development, this information is stored within both the
             Gapps service and query classes to use when constructing
             requests.
@@ -273,7 +273,7 @@ $user = $user->save();
                 <para>
                     Note that it is not possible to recover a password in this
                     manner as stored passwords are not made available via the
-                    Provisioning API for security reasons.
+                    Provisioning <acronym>API</acronym> for security reasons.
                 </para>
 
             </sect4>
@@ -802,9 +802,9 @@ $gdata->removeRecipientFromEmailList('baz@somewhere.com', 'friends');
 
         <para>
             In addition to the standard suite of exceptions thrown by
-            <classname>Zend_Gdata</classname>, requests using the Provisioning API may also throw a
+            <classname>Zend_Gdata</classname>, requests using the Provisioning <acronym>API</acronym> may also throw a
             <classname>Zend_Gdata_Gapps_ServiceException</classname>. These exceptions
-            indicate that a API specific error occurred which prevents the
+            indicate that a <acronym>API</acronym> specific error occurred which prevents the
             request from completing.
         </para>
 
@@ -812,11 +812,11 @@ $gdata->removeRecipientFromEmailList('baz@somewhere.com', 'friends');
             Each ServiceException instance may hold one or more Error objects.
             Each of these objects contains an error code, reason, and
             (optionally) the input which triggered the exception. A complete
-            list of known error codes is provided in the Zend Framework API
+            list of known error codes is provided in the Zend Framework <acronym>API</acronym>
             documentation under <classname>Zend_Gdata_Gapps_Error</classname>. Additionally, the
             authoritative error list is available online at <ulink
             url="http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_d">Google
-            Apps Provisioning API V2.0 Reference: Appendix D</ulink>.
+            Apps Provisioning <acronym>API</acronym> V2.0 Reference: Appendix D</ulink>.
         </para>
 
         <para>

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

@@ -3,7 +3,7 @@
 <sect1 id="zend.gdata.gbase">
     <title>Using Google Base</title>
     <para>
-        The Google Base data API is designed to enable developers to do two things:
+        The Google Base data <acronym>API</acronym> is designed to enable developers to do two things:
         <itemizedlist>
             <listitem>
                 <para>
@@ -22,21 +22,21 @@
     </para>
     <para>
         See <ulink url="http://code.google.com/apis/base/">http://code.google.com/apis/base</ulink>
-        for more information about the Google Base API.
+        for more information about the Google Base <acronym>API</acronym>.
     </para>
     <sect2 id="zend.gdata.gbase.connect">
         <title>Connect To The Base Service</title>
         <para>
-            The Google Base API, like all GData APIs, is based off of the Atom Publishing Protocol (APP), an XML based format for managing web-based resources. Traffic between a client and the Google Base servers occurs over HTTP and allows for both authenticated and unauthenticated connections.
+            The Google Base <acronym>API</acronym>, like all GData <acronym>API</acronym>s, is based off of the Atom Publishing Protocol (APP), an <acronym>XML</acronym> based format for managing web-based resources. Traffic between a client and the Google Base servers occurs over <acronym>HTTP</acronym> and allows for both authenticated and unauthenticated connections.
         </para>
         <para>
-            Before any transactions can occur, this connection needs to be made. Creating a connection to the base servers involves two steps: creating an HTTP client and binding a
+            Before any transactions can occur, this connection needs to be made. Creating a connection to the base servers involves two steps: creating an <acronym>HTTP</acronym> client and binding a
             <classname>Zend_Gdata_Gbase</classname> service instance to that client.
         </para>
         <sect3 id="zend.gdata.gbase.connect.authentication">
             <title>Authentication</title>
             <para>
-                The Google Base API allows access to both public and private base feeds. Public feeds do not require authentication, but are read-only and offer reduced functionality. Private feeds offers the most complete functionality but requires an authenticated connection to the base servers. There are three authentication schemes that are supported by Google Base:
+                The Google Base <acronym>API</acronym> allows access to both public and private base feeds. Public feeds do not require authentication, but are read-only and offer reduced functionality. Private feeds offers the most complete functionality but requires an authenticated connection to the base servers. There are three authentication schemes that are supported by Google Base:
             </para>
             <itemizedlist>
                 <listitem>
@@ -56,7 +56,7 @@
                 The <classname>Zend_Gdata</classname>
                 library provides support for all three authentication schemes. The rest of this chapter will assume that you are familiar the authentication schemes available and how to create an appropriate authenticated connection. For more information, please see section <xref linkend="zend.gdata.introduction.authentication" />.
                 or the
-                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data API Developer's Guide</ulink>.
+                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data <acronym>API</acronym> Developer's Guide</ulink>.
             </para>
         </sect3>
         <sect3 id="zend.gdata.gbase.connect.service">
@@ -71,7 +71,7 @@
                 <classname>Zend_Gdata_Gbase</classname>
                 . This class takes in an instance of
                 <classname>Zend_Http_Client</classname>
-                as a single argument. This provides an interface for AuthSub and ClientAuth authentication, as both of these creation of a special authenticated HTTP client. If no arguments are provided, an unauthenticated instance of
+                as a single argument. This provides an interface for AuthSub and ClientAuth authentication, as both of these creation of a special authenticated <acronym>HTTP</acronym> client. If no arguments are provided, an unauthenticated instance of
                 <classname>Zend_Http_Client</classname>
                 will be automatically created.
             </para>
@@ -197,11 +197,11 @@ $service = new Zend_Gdata_Gbase();
                 You can send a structured query to retrieve items from your own customer items feed or from the public snippets feed.
             </para>
             <para>
-                When retrieving items using the Base API, specially constructed query URLs are used
+                When retrieving items using the Base <acronym>API</acronym>, specially constructed query <acronym>URL</acronym>s are used
                 to describe what events should be returned. The
                 <classname>Zend_Gdata_Gbase_ItemQuery</classname> and
                 <classname>Zend_Gdata_Gbase_SnippetQuery</classname> classes simplify this task by
-                automatically constructing a query URL based on provided parameters.
+                automatically constructing a query <acronym>URL</acronym> based on provided parameters.
             </para>
             <sect4 id="zend.gdata.gbase.retrieve.query.customeritems">
                 <title>Query Customer Items Feed</title>

+ 20 - 20
documentation/manual/en/module_specs/Zend_Gdata_Health.xml

@@ -3,7 +3,7 @@
 <sect1 id="zend.gdata.health">
     <title>Using Google Health</title>
     <para>
-        The Google Health Data API is designed to enable developers to do two things:
+        The Google Health Data <acronym>API</acronym> is designed to enable developers to do two things:
         <itemizedlist>
             <listitem>
                 <para>
@@ -13,15 +13,15 @@
                 </listitem>
             <listitem>
                 <para>
-                    Add new medical records to a user's profile by including CCR data when sending a notice to a user's profile. Note: The CCR data is stored as an XML blob
+                    Add new medical records to a user's profile by including CCR data when sending a notice to a user's profile. Note: The CCR data is stored as an <acronym>XML</acronym> blob
                     within the &lt;atom&gt; entry. The library does not provide direct accessors to the object model but it does have helpers for extracting specific fields.
                 </para>
             </listitem>
         </itemizedlist>
     </para>
     <para>
-        There are three main feeds, each of which requires authentication. Unlike other Google Data APIs, each Google Health feed has a limited set of
-        HTTP operations you can perform on it, depending on which authentication method you are using (ClientLogin or AuthSub/OAuth).
+        There are three main feeds, each of which requires authentication. Unlike other Google Data <acronym>API</acronym>s, each Google Health feed has a limited set of
+        <acronym>HTTP</acronym> operations you can perform on it, depending on which authentication method you are using (ClientLogin or AuthSub/OAuth).
         For a list of permitted operations, see <ulink url="http://code.google.com/apis/health/reference.html#Authentication">http://code.google.com/apis/health/reference.html#Authentication</ulink>.
         <itemizedlist>
             <listitem>
@@ -47,22 +47,22 @@
     </para>
     <para>
         See <ulink url="http://code.google.com/apis/health/">http://code.google.com/apis/health</ulink>
-        for more information about the Google Health API.
+        for more information about the Google Health <acronym>API</acronym>.
     </para>
     <sect2 id="zend.gdata.health.connect">
         <title>Connect To The Health Service</title>
         <para>
-            The Google Health API, like all Google Data APIs, is based off of the Atom Publishing Protocol (APP), an XML based format for managing web-based resources.
-            Traffic between a client and the Google Health servers occurs over HTTP and allows for authenticated connections.
+            The Google Health <acronym>API</acronym>, like all Google Data <acronym>API</acronym>s, is based off of the Atom Publishing Protocol (APP), an <acronym>XML</acronym> based format for managing web-based resources.
+            Traffic between a client and the Google Health servers occurs over <acronym>HTTP</acronym> and allows for authenticated connections.
         </para>
         <para>
-            Before any transactions can occur, a connection needs to be made. Creating a connection to the Health servers involves two steps: creating an HTTP client
+            Before any transactions can occur, a connection needs to be made. Creating a connection to the Health servers involves two steps: creating an <acronym>HTTP</acronym> client
             and binding a <classname>Zend_Gdata_Health</classname> service instance to that client.
         </para>
         <sect3 id="zend.gdata.health.connect.authentication">
             <title>Authentication</title>
             <para>
-                The Google Health API allows programmatic access to a user's Health profile. There are three authentication schemes that are supported by Google Health:
+                The Google Health <acronym>API</acronym> allows programmatic access to a user's Health profile. There are three authentication schemes that are supported by Google Health:
             </para>
             <itemizedlist>
                 <listitem>
@@ -77,20 +77,20 @@
                         <firstterm>AuthSub</firstterm>
                         allows a user to authorize the sharing of their private data. This provides the same level of convenience as ClientLogin but without the
                         security risk, making it an ideal choice for web-based applications. For Google Health, AuthSub must be used
-                        in registered and secure mode--meaning that all requests to the API must be digitally signed.
+                        in registered and secure mode--meaning that all requests to the <acronym>API</acronym> must be digitally signed.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <firstterm>OAuth</firstterm>
                         is an alternative to AuthSub. Although this authentication scheme is not discussed in this document, more information can
-                        be found in the <ulink url="http://code.google.com/apis/health/developers_guide_protocol.html#OAuth">Health Data API Developer's Guide</ulink>.
+                        be found in the <ulink url="http://code.google.com/apis/health/developers_guide_protocol.html#OAuth">Health Data <acronym>API</acronym> Developer's Guide</ulink>.
                     </para>
                 </listitem>
             </itemizedlist>
             <para>
                 See
-                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data API documentation</ulink> for more
+                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data <acronym>API</acronym> documentation</ulink> for more
                 information on each authentication method.
             </para>
         </sect3>
@@ -100,14 +100,14 @@
                 In order to interact with Google Health, the client library provides the
                 <classname>Zend_Gdata_Health</classname>
                 service class. This class provides a common interface to the Google Data and Atom Publishing Protocol models and assists in marshaling
-                requests to and from the Health API.
+                requests to and from the Health <acronym>API</acronym>.
             </para>
             <para>
                 Once you've decided on an authentication scheme, the next step is to create an instance of
                 <classname>Zend_Gdata_Health</classname>
                 . This class should be passed an instance of
                 <classname>Zend_Gdata_HttpClient</classname>. This provides an interface for AuthSub/OAuth and ClientLogin to create a special
-                authenticated HTTP client.
+                authenticated <acronym>HTTP</acronym> client.
             </para>
             <para>
                 To test against the H9 Developer's (/h9) instead of Google Health (/health), the
@@ -134,7 +134,7 @@ $service = new Zend_Gdata_Health($client);
             <para>
               A Health service using AuthSub can be created in a similar, though slightly more lengthy fashion. AuthSub is the
               recommend interface to communicate with Google Health because each token is directly linked to a specific profile in
-              the user's account. Unlike other Google Data APIs, it is required that all requests from your application be digitally signed.
+              the user's account. Unlike other Google Data <acronym>API</acronym>s, it is required that all requests from your application be digitally signed.
             </para>
             <programlisting language="php"><![CDATA[
 /*
@@ -236,9 +236,9 @@ $healthService = new Zend_Gdata_Health($client,
                 You can send structured queries to retrieve specific records from a user's profile.
             </para>
             <para>
-                When retrieving the profile using the Health API, specifically constructed query URLs are used to describe what (CCR) data
+                When retrieving the profile using the Health <acronym>API</acronym>, specifically constructed query <acronym>URL</acronym>s are used to describe what (CCR) data
                 should be returned. The <classname>Zend_Gdata_Health_Query</classname> class helps simplify this task by automatically constructing a query
-                URL based on the parameters you set.
+                <acronym>URL</acronym> based on the parameters you set.
             </para>
             <sect4 id="zend.gdata.health.profilefeed.query.construct">
                 <title>Query The Feed</title>
@@ -265,7 +265,7 @@ $profileFeed = $healthService->getHealthProfileFeed($query);
                 methodology can be applied to other categories such as conditions, allergies, lab results, etc.</para>
                 <para>
                     A full list of supported query parameters is available in the <ulink url="http://code.google.com/apis/health/reference.html#Parameters">query parameters section</ulink>
-                    of the Health API Reference Guide.
+                    of the Health <acronym>API</acronym> Reference Guide.
                 </para>
             </sect4>
         </sect3>
@@ -350,7 +350,7 @@ foreach ($entries as $entry) {
 ]]></programlisting>
             <para>
               Once you've determined which profile to use, call <methodname>setProfileID()</methodname> with the profileID as an argument.
-              This will restrict subsequent API requests to be against that particular profile:
+              This will restrict subsequent <acronym>API</acronym> requests to be against that particular profile:
             </para>
             <programlisting language="php"><![CDATA[
 // use the first profile
@@ -369,7 +369,7 @@ echo '<p><b>Queried profileID</b>: ' . $profileID . '</p>';
         <para>
             Individual posts to the register feed are known as notices. Notice are sent from third-party applications to inform the user
             of a new event. With AuthSub/OAuth, notices are the single means by which your application can add new CCR information
-            into a user's profile. Notices can contain plain text (including certain XHTML elements), a CCR document, or both. As an example,
+            into a user's profile. Notices can contain plain text (including certain <acronym>XHTML</acronym> elements), a CCR document, or both. As an example,
             notices might be sent to remind users to pick up a prescription, or they might contain lab results in the CCR format.
         </para>
             <sect3 id="zend.gdata.health.notice.send">

+ 13 - 13
documentation/manual/en/module_specs/Zend_Gdata_Photos.xml

@@ -6,7 +6,7 @@
     <para>
         Picasa Web Albums is a service which allows users to maintain albums of
         their own pictures, and browse the albums and pictures of others.
-        The API offers a programmatic interface to this service, allowing
+        The <acronym>API</acronym> offers a programmatic interface to this service, allowing
         users to add to, update, and remove from their albums, as well as
         providing the ability to tag and comment on photos.
     </para>
@@ -17,17 +17,17 @@
     </para>
 
     <para>
-        For more information on the API, including
-        instructions for enabling API access, refer to the <ulink
+        For more information on the <acronym>API</acronym>, including
+        instructions for enabling <acronym>API</acronym> access, refer to the <ulink
         url="http://code.google.com/apis/picasaweb/overview.html">Picasa
-        Web Albums Data API Overview</ulink>.
+        Web Albums Data <acronym>API</acronym> Overview</ulink>.
     </para>
 
     <note>
         <title>Authentication</title>
         <para>
-            The API provides authentication via AuthSub (recommended)
-            and ClientAuth. HTTP connections must be authenticated for write
+            The <acronym>API</acronym> provides authentication via AuthSub (recommended)
+            and ClientAuth. <acronym>HTTP</acronym> connections must be authenticated for write
             support, but non-authenticated connections have read-only access.
         </para>
     </note>
@@ -35,14 +35,14 @@
     <sect2 id="zend.gdata.photos.connecting">
         <title>Connecting To The Service</title>
         <para>
-            The Picasa Web Albums API, like all GData APIs, is based off of the Atom Publishing Protocol (APP),
-            an XML based format for managing web-based resources. Traffic between a client and the
-            servers occurs over HTTP and allows for both authenticated and unauthenticated connections.
+            The Picasa Web Albums <acronym>API</acronym>, like all GData <acronym>API</acronym>s, is based off of the Atom Publishing Protocol (APP),
+            an <acronym>XML</acronym> based format for managing web-based resources. Traffic between a client and the
+            servers occurs over <acronym>HTTP</acronym> and allows for both authenticated and unauthenticated connections.
         </para>
 
         <para>
             Before any transactions can occur, this connection needs to be made. Creating a connection to the
-            Picasa servers involves two steps: creating an HTTP client and binding a
+            Picasa servers involves two steps: creating an <acronym>HTTP</acronym> client and binding a
             <classname>Zend_Gdata_Photos</classname>
             service instance to that client.
         </para>
@@ -50,7 +50,7 @@
         <sect3 id="zend.gdata.photos.connecting.authentication">
             <title>Authentication</title>
             <para>
-                The Google Picasa API allows access to both public and private photo feeds. Public feeds
+                The Google Picasa <acronym>API</acronym> allows access to both public and private photo feeds. Public feeds
                 do not require authentication, but are read-only and offer reduced functionality. Private feeds
                 offers the most complete functionality but requires an authenticated connection to the Picasa
                 servers. There are three authentication schemes that are supported by Google Picasa :
@@ -89,7 +89,7 @@
                 please see section the
                 <link linkend="zend.gdata.introduction.authentication">Authentication section</link>
                 of this manual or the
-                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data API Developer's Guide</ulink>.
+                <ulink url="http://code.google.com/apis/gdata/auth.html">Authentication Overview in the Google Data <acronym>API</acronym> Developer's Guide</ulink>.
             </para>
         </sect3>
 
@@ -107,7 +107,7 @@
                 <classname>Zend_Gdata_Photos</classname>. The class constructor takes an instance of
                 <classname>Zend_Http_Client</classname> as a single argument. This provides an interface for AuthSub
                 and ClientAuth authentication, as both of these require creation of a special authenticated
-                HTTP client. If no arguments are provided, an unauthenticated instance of
+                <acronym>HTTP</acronym> client. If no arguments are provided, an unauthenticated instance of
                 <classname>Zend_Http_Client</classname> will be automatically created.
             </para>
 

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

@@ -4,8 +4,8 @@
     <title>Using Google Spreadsheets</title>
 
     <para>
-        The Google Spreadsheets data API allows client applications to view
-        and update Spreadsheets content in the form of Google data API feeds.
+        The Google Spreadsheets data <acronym>API</acronym> allows client applications to view
+        and update Spreadsheets content in the form of Google data <acronym>API</acronym> feeds.
         Your client application can request a list of a user's spreadsheets,
         edit or delete content in an existing Spreadsheets worksheet, and
         query the content in an existing Spreadsheets worksheet.
@@ -14,13 +14,13 @@
     <para>
         See
         <ulink url="http://code.google.com/apis/spreadsheets/overview.html">http://code.google.com/apis/spreadsheets/overview.html</ulink>
-        for more information about the Google Spreadsheets API.
+        for more information about the Google Spreadsheets <acronym>API</acronym>.
     </para>
 
     <sect2 id="zend.gdata.spreadsheets.creating">
         <title>Create a Spreadsheet</title>
         <para>
-            The Spreadsheets data API does not currently provide a way to
+            The Spreadsheets data <acronym>API</acronym> does not currently provide a way to
             programmatically create or delete a spreadsheet.
         </para>
     </sect2>
@@ -101,7 +101,7 @@ $feed = $spreadsheetService->getWorksheetFeed($query);
         <para>
             In particular, the list feed treats the first row of the
             worksheet as a header row; Spreadsheets dynamically creates
-            XML elements named after the contents of header-row cells.
+            <acronym>XML</acronym> elements named after the contents of header-row cells.
             Users who want to provide Gdata feeds should not put any data
             other than column headers in the first row of a worksheet.
         </para>

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

@@ -4,24 +4,24 @@
     <title>Using the YouTube Data API</title>
 
     <para>
-        The YouTube Data API offers read and write access to YouTube's content.
+        The YouTube Data <acronym>API</acronym> offers read and write access to YouTube's content.
         Users can perform unauthenticated requests to Google Data feeds to
         retrieve feeds of popular videos, comments, public information about
         YouTube user profiles, user playlists, favorites, subscriptions and so on.
     </para>
 
     <para>
-      For more information on the YouTube Data API, please refer
+      For more information on the YouTube Data <acronym>API</acronym>, please refer
       to the official <ulink url="http://code.google.com/apis/youtube/developers_guide_php.html">
-        PHP Developer's Guide</ulink> on code.google.com.
+        <acronym>PHP</acronym> Developer's Guide</ulink> on code.google.com.
     </para>
 
     <sect2 id="zend.gdata.youtube.authentication">
         <title>Authentication</title>
         <para>
-          The YouTube Data API allows read-only access to public data, which
+          The YouTube Data <acronym>API</acronym> allows read-only access to public data, which
           does not require authentication. For any write requests, a user
-          needs to authenticate either using ClientLogin or AuthSub authentication. Please refer to the <ulink url="http://code.google.com/apis/youtube/developers_guide_php.html#Authentication">Authentication section in the PHP Developer's Guide</ulink> for more detail.
+          needs to authenticate either using ClientLogin or AuthSub authentication. Please refer to the <ulink url="http://code.google.com/apis/youtube/developers_guide_php.html#Authentication">Authentication section in the <acronym>PHP</acronym> Developer's Guide</ulink> for more detail.
         </para>
     </sect2>
 
@@ -29,7 +29,7 @@
         <title>Developer Keys and Client ID</title>
         <para>
             A developer key identifies the YouTube developer that is submitting
-            an API request. A client ID identifies your application for logging
+            an <acronym>API</acronym> request. A client ID identifies your application for logging
             and debugging purposes. Please visit <ulink url="http://code.google.com/apis/youtube/dashboard/">http://code.google.com/apis/youtube/dashboard/</ulink> to obtain a developer key and client ID. The example below demonstrates how to pass the developer key and client ID to the <ulink url="http://framework.zend.com/apidoc/core/Zend_Gdata/Zend_Gdata_YouTube.html">Zend_Gdata_YouTube</ulink> service object.
         </para>
         <example id="zend.gdata.youtube.developer_key.example">
@@ -47,12 +47,12 @@ $yt = new Zend_Gdata_YouTube($httpClient,
         <title>Retrieving public video feeds</title>
 
         <para>
-          The YouTube Data API provides numerous feeds that return a list of
+          The YouTube Data <acronym>API</acronym> provides numerous feeds that return a list of
             videos, such as standard feeds, related videos, video responses,
             user's uploads, and user's favorites. For example, the
             user's uploads feed returns all videos uploaded by a specific user.
             See the <ulink url="http://code.google.com/apis/youtube/reference.html#Video_Feeds">
-            YouTube API reference guide</ulink> for a detailed list of available feeds.
+            YouTube <acronym>API</acronym> reference guide</ulink> for a detailed list of available feeds.
         </para>
 
         <sect3 id="zend.gdata.youtube.videos.searching">
@@ -104,7 +104,7 @@ foreach ($videoFeed as $videoEntry) {
             <para>
                 Searching for videos in specific categories is done by
                 generating a <ulink url="http://code.google.com/apis/youtube/reference.html#Category_search">
-                specially formatted URL</ulink>. For example, to search for
+                specially formatted <acronym>URL</acronym></ulink>. For example, to search for
                 comedy videos which contain the keyword dog:
             </para>
              <example id="zend.gdata.youtube.videos.searchingcategories.example">
@@ -124,11 +124,11 @@ $videoFeed = $yt->getVideoFeed($query);
             <title>Retrieving standard feeds</title>
 
             <para>
-              The YouTube Data API has a number of
+              The YouTube Data <acronym>API</acronym> has a number of
                 <ulink url="http://code.google.com/apis/youtube/reference.html#Standard_feeds">
                 standard feeds</ulink>. These standard feeds can be retrieved
                 as <ulink url="http://framework.zend.com/apidoc/core/Zend_Gdata/Zend_Gdata_YouTube_VideoFeed.html">Zend_Gdata_YouTube_VideoFeed</ulink> objects using the specified
-                URLs, using the predefined constants within the <ulink url="http://framework.zend.com/apidoc/core/Zend_Gdata/Zend_Gdata_YouTube.html">Zend_Gdata_YouTube</ulink> class
+                <acronym>URL</acronym>s, using the predefined constants within the <ulink url="http://framework.zend.com/apidoc/core/Zend_Gdata/Zend_Gdata_YouTube.html">Zend_Gdata_YouTube</ulink> class
                 (Zend_Gdata_YouTube::STANDARD_TOP_RATED_URI for example) or
                 using the predefined helper methods (see code listing below).
             </para>
@@ -162,7 +162,7 @@ $videoFeed = $yt->getTopRatedVideoFeed($query);
             </example>
             <para>
                 Alternatively, you could just retrieve the feed using the
-                URL:
+                <acronym>URL</acronym>:
             </para>
 
 <example id="zend.gdata.youtube.videos.standard.example-3">
@@ -272,7 +272,7 @@ $commentFeed = $yt->getVideoCommentFeed(null,
         <title>Retrieving playlist feeds</title>
 
         <para>
-          The YouTube Data API provides information about users, including
+          The YouTube Data <acronym>API</acronym> provides information about users, including
             profiles, playlists, subscriptions, and more.
         </para>
 
@@ -540,7 +540,7 @@ $postUrl = $tokenArray['url'];
       append a $nextUrl parameter to the $postUrl above, which functions in the
       same way as the $next parameter of an AuthSub link. The only difference is
       that here, instead of a single-use token, a status and an id variable are
-      returned in the URL.
+      returned in the <acronym>URL</acronym>.
     </para>
           <example id="zend.gdata.youtube.uploads.browser.example-2">
           <title>Browser-based upload: Creating the HTML form</title>
@@ -601,10 +601,10 @@ if ($control instanceof Zend_Gdata_App_Extension_Control) {
       <title>Other Functions</title>
 
       <para>
-        In addition to the functionality described above, the YouTube API
+        In addition to the functionality described above, the YouTube <acronym>API</acronym>
         contains many other functions that allow you to modify video meta-data,
         delete video entries and use the full range of community features on the site.
-        Some of the community features that can be modified through the API include:
+        Some of the community features that can be modified through the <acronym>API</acronym> include:
         ratings, comments, playlists, subscriptions, user profiles, contacts and messages.
       </para>
       <para>

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

@@ -12,7 +12,7 @@
             and reading responses.
             This connection adapter can be replaced, and you can create and
             extend the default connection adapters to suite your special needs,
-            without the need to extend or replace the entire HTTP client
+            without the need to extend or replace the entire <acronym>HTTP</acronym> client
             class, and with the same interface.
         </para>
         <para>
@@ -57,7 +57,7 @@
         <para>
             The default connection adapter is the <classname>Zend_Http_Client_Adapter_Socket</classname>
             adapter - this adapter will be used unless you explicitly set the
-            connection adapter. The Socket adapter is based on PHP's built-in
+            connection adapter. The Socket adapter is based on <acronym>PHP</acronym>'s built-in
             fsockopen() function, and does not require any special extensions or
             compilation flags.
         </para>
@@ -109,8 +109,8 @@
                 <title>Persistent TCP Connections</title>
                 <para>
                     Using persistent TCP connections can potentially speed up
-                    HTTP requests - but in most use cases, will have little
-                    positive effect and might overload the HTTP server you are
+                    <acronym>HTTP</acronym> requests - but in most use cases, will have little
+                    positive effect and might overload the <acronym>HTTP</acronym> server you are
                     connecting to.
                 </para>
                 <para>
@@ -123,7 +123,7 @@
                 </para>
                 <para>
                     Additionally, when using persistent connections it is
-                    recommended to enable Keep-Alive HTTP requests as described
+                    recommended to enable Keep-Alive <acronym>HTTP</acronym> requests as described
                     in <xref linkend="zend.http.client.configuration" /> -
                     otherwise persistent connections might have little or no
                     effect.
@@ -134,7 +134,7 @@
                 <title>HTTPS SSL Stream Parameters</title>
                 <para>
                     <code>ssltransport, sslcert</code> and <code>sslpassphrase</code>
-                    are only relevant when connecting using HTTPS.
+                    are only relevant when connecting using <acronym>HTTP</acronym>S.
                 </para>
                 <para>
                     While the default SSL settings should work for most
@@ -163,7 +163,7 @@ $response = $client->request();
         </example>
         <para>
             The result of the example above will be similar to opening a TCP
-            connection using the following PHP command:
+            connection using the following <acronym>PHP</acronym> command:
         </para>
         <para>
             <methodname>fsockopen('tls://www.example.com', 443)</methodname>
@@ -176,7 +176,7 @@ $response = $client->request();
                 provides direct access to the underlying <ulink url="http://php.net/manual/en/stream.contexts.php">stream context</ulink>
                 used to connect to the remote server. This allows the user to pass
                 specific options and parameters to the TCP stream, and to the SSL wrapper in
-                case of HTTPS connections.
+                case of <acronym>HTTP</acronym>S connections.
             </para>
 
             <para>
@@ -188,7 +188,7 @@ $response = $client->request();
                             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"><methodname>stream_context_create()</methodname></ulink>
-                            PHP function, or an array of stream context options, in the same format provided to this function.
+                            <acronym>PHP</acronym> 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>
@@ -197,7 +197,7 @@ $response = $client->request();
                             <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
+                            or get the value of different context options using regular <acronym>PHP</acronym> stream
                             context functions.
                         </para>
                     </listitem>
@@ -251,7 +251,7 @@ echo $opts['ssl']['peer_certificate'];
         <note>
             <para>
                 Note that you must set any stream context options before using the adapter
-                to preform actual requests. If no context is set before preforming HTTP requests
+                to preform actual requests. If no context is set before preforming <acronym>HTTP</acronym> requests
                 with the Socket adapter, a default stream context will be created. This context
                 resource could be accessed after preforming any requests using the
                 <methodname>getStreamContext()</methodname> method.
@@ -264,7 +264,7 @@ echo $opts['ssl']['peer_certificate'];
         <title>The Proxy Adapter</title>
         <para>
             The <classname>Zend_Http_Client_Adapter_Proxy</classname> adapter is similar to the default
-            Socket adapter - only the connection is made through an HTTP proxy
+            Socket adapter - only the connection is made through an <acronym>HTTP</acronym> proxy
             server instead of a direct connection to the target server. This
             allows usage of <classname>Zend_Http_Client</classname> behind proxy servers - which is
             sometimes needed for security or performance reasons.
@@ -311,7 +311,7 @@ echo $opts['ssl']['peer_certificate'];
                         </row>
                         <row>
                             <entry>proxy_auth</entry>
-                            <entry>Proxy HTTP authentication type</entry>
+                            <entry>Proxy <acronym>HTTP</acronym> authentication type</entry>
                             <entry>string</entry>
                             <entry>Zend_Http_Client::AUTH_BASIC (default)</entry>
                         </row>
@@ -374,10 +374,10 @@ $client = new Zend_Http_Client('http://www.example.com', $config);
     <sect2 id="zend.http.client.adapters.curl">
         <title>The cURL Adapter</title>
         <para>
-            cURL is a standard HTTP client library that is distributed with many
-            operating systems and can be used in PHP via the cURL extension. It
-            offers functionality for many special cases which can occur for a HTTP
-            client and make it a perfect choice for a HTTP adapter. It supports
+            cURL is a standard <acronym>HTTP</acronym> client library that is distributed with many
+            operating systems and can be used in <acronym>PHP</acronym> via the cURL extension. It
+            offers functionality for many special cases which can occur for a <acronym>HTTP</acronym>
+            client and make it a perfect choice for a <acronym>HTTP</acronym> adapter. It supports
             secure connections, proxy, all sorts of authentication mechanisms
             and shines in applications that move large files around between servers.
         </para>
@@ -407,7 +407,7 @@ $client = new Zend_Http_Client($uri, $config);
             <title>Transfering Files by Handle</title>
 
             <para>
-                You can use cURL to transfer very large files over HTTP by filehandle.
+                You can use cURL to transfer very large files over <acronym>HTTP</acronym> by filehandle.
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -431,7 +431,7 @@ $client->request("PUT");
     <sect2 id="zend.http.client.adapters.test">
         <title>The Test Adapter</title>
         <para>
-            Sometimes, it is very hard to test code that relies on HTTP connections.
+            Sometimes, it is very hard to test code that relies on <acronym>HTTP</acronym> connections.
             For example, testing an application that pulls an RSS feed from a remote
             server will require a network connection, which is not always available.
         </para>
@@ -446,9 +446,9 @@ $client->request("PUT");
         <para>
             The <classname>Zend_Http_Client_Adapter_Test</classname> adapter provides an additional
             method, setResponse() method. This method takes one parameter,
-            which represents an HTTP response as either text or a <classname>Zend_Http_Response</classname>
+            which represents an <acronym>HTTP</acronym> response as either text or a <classname>Zend_Http_Response</classname>
             object. Once set, your Test adapter will always return this response,
-            without even performing an actual HTTP request.
+            without even performing an actual <acronym>HTTP</acronym> request.
         </para>
         <example id="zend.http.client.adapters.test.example-1">
             <title>Testing Against a Single HTTP Response Stub</title>
@@ -479,16 +479,16 @@ $response = $client->request('GET');
 ]]></programlisting>
         </example>
         <para>
-            The above example shows how you can preset your HTTP client to
+            The above example shows how you can preset your <acronym>HTTP</acronym> client to
             return the response you need. Then, you can continue testing your
             own code, without being dependent on a network connection, the server's
             response, etc. In this case, the test would continue to check how
-            the application parses the XML in the response body.
+            the application parses the <acronym>XML</acronym> in the response body.
         </para>
 
         <para>
             Sometimes, a single method call to an object can result in that
-            object performing multiple HTTP transactions. In this case, it's
+            object performing multiple <acronym>HTTP</acronym> transactions. In this case, it's
             not possible to use setResponse() alone because there's no
             opportunity to set the next response(s) your program might need
             before returning to the caller.
@@ -548,7 +548,7 @@ $adapter->addResponse(
             The initial 302 response is set up with the setResponse() method
             and the 200 response to be returned next is added with the
             addResponse() method. After configuring the test adapter, inject
-            the HTTP client containing the adapter into your object under test
+            the <acronym>HTTP</acronym> client containing the adapter into your object under test
             and test its behavior.
         </para>
     </sect2>

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

@@ -6,7 +6,7 @@
     <sect2 id="zend.http.client.redirections">
         <title>HTTP Redirections</title>
         <para>
-            By default, <classname>Zend_Http_Client</classname> automatically handles HTTP redirections,
+            By default, <classname>Zend_Http_Client</classname> automatically handles <acronym>HTTP</acronym> redirections,
             and will follow up to 5 redirections. This can be changed by setting
             the 'maxredirects' configuration parameter.
         </para>
@@ -184,7 +184,7 @@ $client->request('POST');
         <note>
             <title>Uploading files</title>
             <para>
-                When uploading files, the HTTP request content-type is
+                When uploading files, the <acronym>HTTP</acronym> request content-type is
                 automatically set to multipart/form-data. Keep in mind that
                 you must send a POST or PUT request in order to upload files.
                 Most servers will ignore the requests body on other request
@@ -258,7 +258,7 @@ $client->setAuth('shahar', 'myPassword!');
             <classname>Zend_Http_Client</classname> was also designed specifically to handle several
             consecutive requests with the same object. This is useful in cases
             where a script requires data to be fetched from several places, or
-            when accessing a specific HTTP resource requires logging in and
+            when accessing a specific <acronym>HTTP</acronym> resource requires logging in and
             obtaining a session cookie, for example.
         </para>
         <para>

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

@@ -5,7 +5,7 @@
     <title>Migrating from previous versions</title>
 
     <para>
-        While the external API of <classname>Zend_Http_Client</classname> has remained
+        While the external <acronym>API</acronym> of <classname>Zend_Http_Client</classname> has remained
         consistent throughout the 1.x branch of Zend Framework, some changes were introduced
         to the internal structure of <classname>Zend_Http_Client</classname> and its related
         classes.
@@ -13,7 +13,7 @@
 
     <para>
         These changes should have no affect on code using <classname>Zend_Http_Client</classname>
-        - but may have an effect on PHP classes overloading or extending it. If your application
+        - but may have an effect on <acronym>PHP</acronym> classes overloading or extending it. If your application
         subclasses <classname>Zend_Http_Client</classname>, it is highly recommended to review
         the following changes before upgrading Zend Framework.
     </para>
@@ -90,7 +90,7 @@ $client->setFileUpload('file2.txt',
             <para>
                 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.
+                Using it will cause an E_NOTICE message to be emitted by <acronym>PHP</acronym>.
             </para>
 
             <para>

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

@@ -5,8 +5,8 @@
     <para>
         <classname>Zend_Http_Client</classname> provides an easy interface for preforming Hyper-Text
         Transfer Protocol (HTTP) requests. <classname>Zend_Http_Client</classname> supports most simple
-        features expected from an HTTP client, as well as some more complex
-        features such as HTTP authentication and file uploads. Successful
+        features expected from an <acronym>HTTP</acronym> client, as well as some more complex
+        features such as <acronym>HTTP</acronym> authentication and file uploads. Successful
         requests (and most unsuccessful ones too) return a <classname>Zend_Http_Response</classname>
         object, which provides access to the response's headers and body (see
         <xref linkend="zend.http.response" />).
@@ -233,9 +233,9 @@ $client->setParameterPost(array(
             <classname>Zend_Http_Client</classname> provides methods of accessing the last request
             sent and last response received by the client object.
             <classname>Zend_Http_Client->getLastRequest()</classname> takes no parameters
-            and returns the last HTTP request sent by the client as a string.
+            and returns the last <acronym>HTTP</acronym> request sent by the client as a string.
             Similarly, <classname>Zend_Http_Client->getLastResponse()</classname> returns
-            the last HTTP response received by the client as a
+            the last <acronym>HTTP</acronym> response received by the client as a
             <link linkend="zend.http.response">Zend_Http_Response</link> object.
         </para>
     </sect2>

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

@@ -6,22 +6,22 @@
     <sect2 id="zend.http.cookies.introduction">
         <title>Introduction</title>
         <para>
-            <classname>Zend_Http_Cookie</classname>, as expected, is a class that represents an HTTP
-            cookie. It provides methods for parsing HTTP response strings,
+            <classname>Zend_Http_Cookie</classname>, as expected, is a class that represents an <acronym>HTTP</acronym>
+            cookie. It provides methods for parsing <acronym>HTTP</acronym> response strings,
             collecting cookies, and easily accessing their properties. It also
             allows checking if a cookie matches against a specific scenario, IE
-            a request URL, expiration time, secure connection, etc.
+            a request <acronym>URL</acronym>, expiration time, secure connection, etc.
         </para>
         <para>
             <classname>Zend_Http_CookieJar</classname> is an object usually used by <classname>Zend_Http_Client</classname> to
             hold a set of <classname>Zend_Http_Cookie</classname> objects. The idea is that if a
             <classname>Zend_Http_CookieJar</classname> object is attached to a <classname>Zend_Http_Client</classname> object,
-            all cookies going from and into the client through HTTP requests and
+            all cookies going from and into the client through <acronym>HTTP</acronym> requests and
             responses will be stored by the CookieJar object. Then, when the client
             will send another request, it will first ask the CookieJar object for
             all cookies matching the request. These will be added to the request
             headers automatically. This is highly useful in cases where you need to
-            maintain a user session over consecutive HTTP requests, automatically
+            maintain a user session over consecutive <acronym>HTTP</acronym> requests, automatically
             sending the session ID cookies when required. Additionally, the
             <classname>Zend_Http_CookieJar</classname> object can be serialized and stored in $_SESSION
             when needed.
@@ -76,9 +76,9 @@
                 <listitem>
                     <para>
                     By calling the fromString() static method, with a cookie string as represented in the
-                    'Set-Cookie' HTTP response header or 'Cookie' HTTP request header. In this case, the
+                    'Set-Cookie' <acronym>HTTP</acronym> response header or 'Cookie' <acronym>HTTP</acronym> request header. In this case, the
                     cookie value must already be encoded. When the cookie string does not contain a 'domain'
-                    part, you must provide a reference URI according to which the cookie's domain and path
+                    part, you must provide a reference <acronym>URI</acronym> according to which the cookie's domain and path
                     will be set.
                     </para>
                 </listitem>
@@ -107,7 +107,7 @@ $cookie = Zend_Http_Cookie::fromString('foo=bar; secure;',
             <note>
                 <para>
                 When instantiating a cookie object using the <classname>Zend_Http_Cookie</classname>::fromString() method, the
-                cookie value is expected to be URL encoded, as cookie strings should be. However, when
+                cookie value is expected to be <acronym>URL</acronym> encoded, as cookie strings should be. However, when
                 using the constructor, the cookie value string is expected to be the real, decoded value.
                 </para>
             </note>
@@ -144,7 +144,7 @@ echo $cookie;
         <title>Zend_Http_Cookie getter methods</title>
         <para>
             Once a <classname>Zend_Http_Cookie</classname> object is instantiated, it provides several getter methods to get
-            the different properties of the HTTP cookie:
+            the different properties of the <acronym>HTTP</acronym> cookie:
             <itemizedlist>
                 <listitem>
                     <para>
@@ -180,7 +180,7 @@ echo $cookie;
                 <listitem>
                     <para>
                     <code>boolean isSecure()</code>: Check whether the cookie is set to be sent over secure
-                    connections only. Generally speaking, if true the cookie should only be sent over HTTPS.
+                    connections only. Generally speaking, if true the cookie should only be sent over <acronym>HTTP</acronym>S.
                     </para>
                 </listitem>
                 <listitem>
@@ -235,7 +235,7 @@ echo ($cookie->isSessionCookie() ? 'Yes' : 'No');
         <title>Zend_Http_Cookie: Matching against a scenario</title>
         <para>
             The only real logic contained in a <classname>Zend_Http_Cookie</classname> object, is in the match() method.
-            This method is used to test a cookie against a given HTTP request scenario, in order
+            This method is used to test a cookie against a given <acronym>HTTP</acronym> request scenario, in order
             to tell whether the cookie should be sent in this request or not. The method has
             the following syntax and parameters:
             <code>boolean Zend_Http_Cookie->match(mixed $uri, [boolean $matchSessionCookies, [int $now]]);</code>
@@ -243,8 +243,8 @@ echo ($cookie->isSessionCookie() ? 'Yes' : 'No');
                 <listitem>
                     <para>
                     <code>mixed $uri</code>: A <classname>Zend_Uri_Http</classname> object with a domain name and path to be checked.
-                    Optionally, a string representing a valid HTTP URL can be passed instead. The cookie will
-                    match if the URL's scheme (HTTP or HTTPS), domain and path all match.
+                    Optionally, a string representing a valid <acronym>HTTP</acronym> URL can be passed instead. The cookie will
+                    match if the <acronym>URL</acronym>'s scheme (HTTP or <acronym>HTTP</acronym>S), domain and path all match.
                     </para>
                 </listitem>
                 <listitem>
@@ -328,10 +328,10 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
             constructor method does not take any parameters. Another way to
             instantiate a CookieJar object is to use the static Zend_Http_CookieJar::fromResponse()
             method. This method takes two parameters: a <classname>Zend_Http_Response</classname> object,
-            and a reference URI, as either a string or a <classname>Zend_Uri_Http</classname> object.
+            and a reference <acronym>URI</acronym>, as either a string or a <classname>Zend_Uri_Http</classname> object.
             This method will return a new <classname>Zend_Http_CookieJar</classname> object, already
-            containing the cookies set by the passed HTTP response. The reference
-            URI will be used to set the cookie's domain and path, if they are
+            containing the cookies set by the passed <acronym>HTTP</acronym> response. The reference
+            <acronym>URI</acronym> will be used to set the cookie's domain and path, if they are
             not defined in the Set-Cookie headers.
         </para>
     </sect2>
@@ -340,7 +340,7 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
         <title>Adding Cookies to a Zend_Http_CookieJar object</title>
         <para>
             Usually, the <classname>Zend_Http_Client</classname> object you attached your CookieJar object
-            to will automatically add cookies set by HTTP responses to your jar. If
+            to will automatically add cookies set by <acronym>HTTP</acronym> responses to your jar. If
             you wish to manually add cookies to your jar, this can be done by using
             two methods:
             <itemizedlist>
@@ -350,16 +350,16 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                     single cookie to the jar. $cookie can be either a <classname>Zend_Http_Cookie</classname>
                     object or a string, which will be converted automatically into a
                     Cookie object. If a string is provided, you should also provide
-                    $ref_uri - which is a reference URI either as a string or
+                    $ref_uri - which is a reference <acronym>URI</acronym> either as a string or
                     <classname>Zend_Uri_Http</classname> object, to use as the cookie's default domain and path.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                     <classname>Zend_Http_CookieJar->addCookiesFromResponse($response, $ref_uri)</classname>:
-                    Add all cookies set in a single HTTP response to the jar. $response is
+                    Add all cookies set in a single <acronym>HTTP</acronym> response to the jar. $response is
                     expected to be a <classname>Zend_Http_Response</classname> object with Set-Cookie headers. $ref_uri
-                    is the request URI, either as a string or a <classname>Zend_Uri_Http</classname> object, according
+                    is the request <acronym>URI</acronym>, either as a string or a <classname>Zend_Uri_Http</classname> object, according
                     to which the cookies' default domain and path will be set.
                     </para>
                 </listitem>
@@ -372,7 +372,7 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
         <para>
             Just like with adding cookies, there is usually no need to manually
             fetch cookies from a CookieJar object. Your <classname>Zend_Http_Client</classname> object
-            will automatically fetch the cookies required for an HTTP request
+            will automatically fetch the cookies required for an <acronym>HTTP</acronym> request
             for you. However, you can still use 3 provided methods to fetch
             cookies from the jar object: <methodname>getCookie()</methodname>,
             <methodname>getAllCookies()</methodname>, and <methodname>getMatchingCookies()</methodname>.
@@ -395,7 +395,7 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                     <para>
                     <classname>Zend_Http_CookieJar::COOKIE_STRING_ARRAY</classname>: Return
                     cookies as strings, in a "foo=bar" format, suitable for sending
-                    in a HTTP request "Cookie" header. If more than one cookie is
+                    in a <acronym>HTTP</acronym> request "Cookie" header. If more than one cookie is
                     returned, an array of strings is returned.
                     </para>
                 </listitem>
@@ -405,7 +405,7 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                     COOKIE_STRING_ARRAY, but if more than one cookie is returned, this
                     method will concatenate all cookies into a single, long string
                     separated by semicolons (;), and return it. This is especially useful
-                    if you want to directly send all matching cookies in a single HTTP
+                    if you want to directly send all matching cookies in a single <acronym>HTTP</acronym>
                     request "Cookie" header.
                     </para>
                 </listitem>
@@ -417,9 +417,9 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                 <listitem>
                     <para>
                     <classname>Zend_Http_CookieJar->getCookie($uri, $cookie_name[, $ret_as])</classname>:
-                    Get a single cookie from the jar, according to its URI (domain and path)
+                    Get a single cookie from the jar, according to its <acronym>URI</acronym> (domain and path)
                     and name. $uri is either a string or a <classname>Zend_Uri_Http</classname> object representing the
-                    URI. $cookie_name is a string identifying the cookie name. $ret_as
+                    <acronym>URI</acronym>. $cookie_name is a string identifying the cookie name. $ret_as
                     specifies the return type as described above. $ret_type is optional, and
                     defaults to COOKIE_OBJECT.
                     </para>
@@ -434,7 +434,7 @@ $cookie->match('http://www.example.com/', true, time() + (3 * 3600));
                 <listitem>
                     <para>
                     <classname>Zend_Http_CookieJar->getMatchingCookies($uri[, $matchSessionCookies[, $ret_as[, $now]]])</classname>:
-                    Get all cookies from the jar that match a specified scenario, that is a URI and expiration time.
+                    Get all cookies from the jar that match a specified scenario, that is a <acronym>URI</acronym> and expiration time.
                     <itemizedlist>
                         <listitem>
                             <para>

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

@@ -6,8 +6,8 @@
     <sect2 id="zend.http.response.introduction">
         <title>Introduction</title>
         <para>
-            <classname>Zend_Http_Response</classname> provides easy access to an HTTP responses
-            message, as well as a set of static methods for parsing HTTP
+            <classname>Zend_Http_Response</classname> provides easy access to an <acronym>HTTP</acronym> responses
+            message, as well as a set of static methods for parsing <acronym>HTTP</acronym>
             response messages. Usually, <classname>Zend_Http_Response</classname> is used as an object
             returned by a <classname>Zend_Http_Client</classname> request.
         </para>
@@ -45,12 +45,12 @@ $response = Zend_Http_Response::factory($str);
         <itemizedlist>
             <listitem>
                 <para>
-                    <varname>$code</varname>: The HTTP response code (eg. 200, 404, etc.)
+                    <varname>$code</varname>: The <acronym>HTTP</acronym> response code (eg. 200, 404, etc.)
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <varname>$headers</varname>: An associative array of HTTP response headers (eg. 'Host' => 'example.com')
+                    <varname>$headers</varname>: An associative array of <acronym>HTTP</acronym> response headers (eg. 'Host' => 'example.com')
                 </para>
             </listitem>
             <listitem>
@@ -60,12 +60,12 @@ $response = Zend_Http_Response::factory($str);
             </listitem>
             <listitem>
                 <para>
-                    <varname>$version</varname>: The HTTP response version (usually 1.0 or 1.1)
+                    <varname>$version</varname>: The <acronym>HTTP</acronym> response version (usually 1.0 or 1.1)
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <varname>$message</varname>: The HTTP response message (eg 'OK', 'Internal Server Error').
+                    <varname>$message</varname>: The <acronym>HTTP</acronym> response message (eg 'OK', 'Internal Server Error').
                     If not specified, the message will be set according to the response code
                 </para>
             </listitem>
@@ -81,19 +81,19 @@ $response = Zend_Http_Response::factory($str);
                 <listitem>
                     <para>
                         <code>Boolean isSuccessful()</code>: Whether the request was successful or not. Returns
-                        TRUE for HTTP 1xx and 2xx response codes
+                        TRUE for <acronym>HTTP</acronym> 1xx and 2xx response codes
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>Boolean isError()</code>: Whether the response code implies an error or not. Returns
-                        TRUE for HTTP 4xx (client errors) and 5xx (server errors) response codes
+                        TRUE for <acronym>HTTP</acronym> 4xx (client errors) and 5xx (server errors) response codes
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>Boolean isRedirect()</code>: Whether the response is a redirection response or not. Returns
-                        TRUE for HTTP 3xx response codes
+                        TRUE for <acronym>HTTP</acronym> 3xx response codes
                     </para>
                 </listitem>
             </itemizedlist>
@@ -118,35 +118,35 @@ if ($response->isError()) {
             <itemizedlist>
                 <listitem>
                     <para>
-                        <code>int getStatus()</code>: Get the HTTP response status code (eg. 200, 504, etc.)
+                        <code>int getStatus()</code>: Get the <acronym>HTTP</acronym> response status code (eg. 200, 504, etc.)
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>string getMessage()</code>: Get the HTTP response status message (eg. "Not Found",
+                        <code>string getMessage()</code>: Get the <acronym>HTTP</acronym> response status message (eg. "Not Found",
                         "Authorization Required")
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>string getBody()</code>: Get the fully decoded HTTP response body
+                        <code>string getBody()</code>: Get the fully decoded <acronym>HTTP</acronym> response body
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>string getRawBody()</code>: Get the raw, possibly encoded HTTP response body. If
+                        <code>string getRawBody()</code>: Get the raw, possibly encoded <acronym>HTTP</acronym> response body. If
                         the body was decoded using GZIP encoding for example, it will not be decoded.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>array getHeaders()</code>: Get the HTTP response headers as an associative array
+                        <code>array getHeaders()</code>: Get the <acronym>HTTP</acronym> response headers as an associative array
                         (eg. 'Content-type' => 'text/html')
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <code>string|array getHeader($header)</code>: Get a specific HTTP response header, specified
+                        <code>string|array getHeader($header)</code>: Get a specific <acronym>HTTP</acronym> response header, specified
                         by $header
                     </para>
                 </listitem>
@@ -209,7 +209,7 @@ echo $body;
         <title>Static HTTP Response Parsers</title>
         <para>
             The <classname>Zend_Http_Response</classname> class also includes several internally-used
-            methods for processing and parsing HTTP response messages. These
+            methods for processing and parsing <acronym>HTTP</acronym> response messages. These
             methods are all exposed as static methods, which means they can be
             used externally, even if you do not need to instantiate a response
             object, and just want to extract a specific part of the response.
@@ -217,47 +217,47 @@ echo $body;
                 <listitem>
                     <para>
                         <code>int Zend_Http_Response::extractCode($response_str)</code>: Extract
-                        and return the HTTP response code (eg. 200 or 404) from $response_str
+                        and return the <acronym>HTTP</acronym> response code (eg. 200 or 404) from $response_str
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>string Zend_Http_Response::extractMessage($response_str)</code>: Extract
-                        and return the HTTP response message (eg. "OK" or "File Not Found") from $response_str
+                        and return the <acronym>HTTP</acronym> response message (eg. "OK" or "File Not Found") from $response_str
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>string Zend_Http_Response::extractVersion($response_str)</code>: : Extract
-                        and return the HTTP version (eg. 1.1 or 1.0) from $response_str
+                        and return the <acronym>HTTP</acronym> version (eg. 1.1 or 1.0) from $response_str
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>array Zend_Http_Response::extractHeaders($response_str)</code>: Extract
-                        and return the HTTP response headers from $response_str as an array
+                        and return the <acronym>HTTP</acronym> response headers from $response_str as an array
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>string Zend_Http_Response::extractBody($response_str)</code>: Extract
-                        and return the HTTP response body from $response_str
+                        and return the <acronym>HTTP</acronym> response body from $response_str
                     </para>
                 </listitem>
                 <listitem>
                     <para>
                         <code>string Zend_Http_Response::responseCodeAsText($code = null, $http11 = true)</code>:
-                        Get the standard HTTP response message for a response code $code. For example,
+                        Get the standard <acronym>HTTP</acronym> response message for a response code $code. For example,
                         will return "Internal Server Error" if $code is 500. If $http11 is true (default),
-                        will return HTTP/1.1 standard messages - otherwise HTTP/1.0 messages will be returned.
-                        If $code is not specified, this method will return all known HTTP response codes as an
+                        will return <acronym>HTTP</acronym>/1.1 standard messages - otherwise <acronym>HTTP</acronym>/1.0 messages will be returned.
+                        If $code is not specified, this method will return all known <acronym>HTTP</acronym> response codes as an
                         associative (code => message) array.
                     </para>
                 </listitem>
             </itemizedlist>
         </para>
         <para>
-            Apart from parser methods, the class also includes a set of decoders for common HTTP
+            Apart from parser methods, the class also includes a set of decoders for common <acronym>HTTP</acronym>
             response transfer encodings:
             <itemizedlist>
                 <listitem>

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

@@ -50,7 +50,7 @@
             information known as claims (i.e. person's first name, last name)
             which the web site (a.k.a "relying party") needs in order a user to
             authenticate using an information card. For your reference, the full
-            URI (for instance the <code>givenname</code> claim) is as follows:
+            <acronym>URI</acronym> (for instance the <code>givenname</code> claim) is as follows:
             <code>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname</code>
         </para>
 
@@ -59,14 +59,14 @@
             browser will bring up a card selection program which not only shows
             them which information cards meet the requirements of the site, but
             also allows them to select which information card to use if multiple
-            meet the criteria. This information card is transmitted as an XML
-            document to the specified POST URL and is ready to be
+            meet the criteria. This information card is transmitted as an <acronym>XML</acronym>
+            document to the specified POST <acronym>URL</acronym> and is ready to be
             processed by the <classname>Zend_InfoCard</classname> component.
         </para>
 
         <para>
             Note, Information cards can only be <code>HTTP POST</code>ed to
-            SSL-encrypted URLs. Please consult your web server's documentation
+            SSL-encrypted <acronym>URL</acronym>s. Please consult your web server's documentation
             on how to set up SSL encryption.
         </para>
     </sect2>
@@ -140,7 +140,7 @@ if (isset($_POST['xmlToken'])) {
 
         <para>
             In the example above, we first create an instance of the
-            <classname>Zend_Auth_Adapter_InfoCard</classname> and pass the XML data posted
+            <classname>Zend_Auth_Adapter_InfoCard</classname> and pass the <acronym>XML</acronym> data posted
             by the card selector into it. Once an instance has been created you
             must then provide at least one SSL certificate public/private key
             pair used by the web server that received the <code>HTTP
@@ -240,9 +240,9 @@ if (isset($_POST['xmlToken'])) {
             method. However, if your <code>requiredClaims</code> mandate that
             you request claims from multiple different sources/namespaces then
             you will need to extract them explicitly using this method (simply
-            pass it the full URI of the claim to retrieve its value from within
+            pass it the full <acronym>URI</acronym> of the claim to retrieve its value from within
             the information card). Generally speaking however, the
-            <classname>Zend_InfoCard</classname> component will set the default URI for
+            <classname>Zend_InfoCard</classname> component will set the default <acronym>URI</acronym> for
             claims to be the one used the most frequently within the information
             card itself and the simplified property-access method can be used.
         </para>
@@ -253,7 +253,7 @@ if (isset($_POST['xmlToken'])) {
             information card and to decide if that source is a trusted source of
             information. To do so, the <methodname>getIssuer()</methodname> method is
             provided within the <classname>Zend_InfoCard_Claims</classname> object which
-            returns the URI of the issuer of the information card claims.
+            returns the <acronym>URI</acronym> of the issuer of the information card claims.
         </para>
     </sect2>
 

+ 6 - 6
documentation/manual/en/module_specs/Zend_Json-Introduction.xml

@@ -4,7 +4,7 @@
     <title>Introduction</title>
     <para>
         <classname>Zend_Json</classname> provides convenience methods for serializing
-        native PHP to JSON and decoding JSON to native PHP. For more information
+        native <acronym>PHP</acronym> to JSON and decoding JSON to native <acronym>PHP</acronym>. For more information
         on JSON, <ulink url="http://www.json.org/">visit the JSON project
         site</ulink>.
     </para>
@@ -12,16 +12,16 @@
         JSON, JavaScript Object Notation, can be used for data
         interchange between JavaScript and other languages. Since JSON can be
         directly evaluated by JavaScript, it is a more efficient and lightweight
-        format than XML for exchanging data with JavaScript clients.
+        format than <acronym>XML</acronym> for exchanging data with JavaScript clients.
     </para>
 
     <para>
         In addition, <classname>Zend_Json</classname> provides a useful way to convert any
-        arbitrary XML formatted string into a JSON formatted string. This built-in
-        feature will enable PHP developers to transform the enterprise data
-        encoded in XML format into JSON format before sending it to browser-based
+        arbitrary <acronym>XML</acronym> formatted string into a JSON formatted string. This built-in
+        feature will enable <acronym>PHP</acronym> developers to transform the enterprise data
+        encoded in <acronym>XML</acronym> format into JSON format before sending it to browser-based
         Ajax client applications. It provides an easy way to do dynamic data
-        conversion on the server-side code thereby avoiding unnecessary XML
+        conversion on the server-side code thereby avoiding unnecessary <acronym>XML</acronym>
         parsing in the browser-side applications. It offers a nice utility
         function that results in easier application-specific data processing techniques.
     </para>

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

@@ -6,7 +6,7 @@
     <sect2 id="zend.json.advanced.objects1">
         <title>JSON Objects</title>
         <para>
-            When encoding PHP objects as JSON, all public properties of that object
+            When encoding <acronym>PHP</acronym> objects as JSON, all public properties of that object
             will be encoded in a JSON object.
         </para>
         <para>
@@ -19,7 +19,7 @@
         </para>
         <para>
             Decoding JSON objects poses an additional difficulty, however, since
-            Javascript objects correspond most closely to PHP's associative array.
+            Javascript objects correspond most closely to <acronym>PHP</acronym>'s associative array.
             Some suggest that a class identifier should be passed, and an object
             instance of that class should be created and populated with the
             key/value pairs of the JSON object; others feel this could pose a
@@ -51,7 +51,7 @@ $phpNative = Zend_Json::decode($encodedValue, Zend_Json::TYPE_OBJECT);
         <title>Encoding PHP objects</title>
 
         <para>
-            If you are encoding PHP objects by default the encoding mechanism
+            If you are encoding <acronym>PHP</acronym> objects by default the encoding mechanism
             can only access public properties of these objects. When a method
             <methodname>toJson()</methodname> is implemented on an object to encode, <classname>Zend_Json</classname>
             calls this method and expects the object to return a JSON representation
@@ -64,10 +64,10 @@ $phpNative = Zend_Json::decode($encodedValue, Zend_Json::TYPE_OBJECT);
 
         <para>
             <classname>Zend_Json</classname> has two different modes depending if ext/json is enabled in
-            your PHP installation or not. If ext/json is installed by default
+            your <acronym>PHP</acronym> installation or not. If ext/json is installed by default
             <methodname>json_encode()</methodname> and <methodname>json_decode()</methodname> functions
             are used for encoding and decoding JSON. If ext/json is not installed
-            a Zend Framework implementation in PHP code is used for en-/decoding.
+            a Zend Framework implementation in <acronym>PHP</acronym> code is used for en-/decoding.
             This is considerably slower than using the php extension, but behaves
             exactly the same.
         </para>

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

@@ -10,7 +10,7 @@
         <ulink url="http://json-rpc.org/wiki/specification">JSON-RPC
             version 1 specification</ulink> as well as the
         <ulink url="http://groups.google.com/group/json-rpc/web/json-rpc-1-2-proposal">version 2 specification</ulink>;
-        additionally, it provides a PHP implementation of the
+        additionally, it provides a <acronym>PHP</acronym> implementation of the
         <ulink url="http://groups.google.com/group/json-schema/web/service-mapping-description-proposal">Service
             Mapping Description (SMD) specification</ulink>
         for providing service metadata to service consumers.
@@ -19,9 +19,9 @@
     <para>
         JSON-RPC is a lightweight Remote Procedure Call protocol that utilizes
         JSON for its messaging envelopes. This JSON-RPC implementation follows
-        PHP's <ulink
+        <acronym>PHP</acronym>'s <ulink
             url="http://us.php.net/manual/en/function.soap-soapserver-construct.php">SoapServer</ulink>
-        API. This means that in a typical situation, you will simply:
+        <acronym>API</acronym>. This means that in a typical situation, you will simply:
     </para>
 
     <itemizedlist>
@@ -36,7 +36,7 @@
         perform reflection on any attached classes or functions, and uses that
         information to build both the SMD and enforce method call signatures. As
         such, it is imperative that any attached functions and/or class methods
-        have full PHP docblocks documenting, minimally:
+        have full <acronym>PHP</acronym> docblocks documenting, minimally:
     </para>
 
     <itemizedlist>
@@ -142,7 +142,7 @@ $server->handle();
         <para>
             However, this will not address the issue of returning an SMD so that
             the JSON-RPC client can autodiscover methods. That can be
-            accomplished by determining the HTTP request method, and then
+            accomplished by determining the <acronym>HTTP</acronym> request method, and then
             specifying some server metadata:
         </para>
 
@@ -312,7 +312,7 @@ $server->handle();
             </itemizedlist>
 
             <para>
-                An HTTP specific version is available via
+                An <acronym>HTTP</acronym> specific version is available via
                 <classname>Zend_Json_Server_Request_Http</classname>. This class will
                 retrieve the request via <code>php://input</code>, and allows
                 access to the raw JSON via the <methodname>getRawJson()</methodname> method.
@@ -366,9 +366,9 @@ $server->handle();
             </itemizedlist>
 
             <para>
-                An HTTP specific version is available via
+                An <acronym>HTTP</acronym> specific version is available via
                 <classname>Zend_Json_Server_Response_Http</classname>. This class will
-                send the appropriate HTTP headers as well as serialize the
+                send the appropriate <acronym>HTTP</acronym> headers as well as serialize the
                 response as JSON.
             </para>
         </sect3>
@@ -386,7 +386,7 @@ $server->handle();
             <para>
                 Error codes are derived from those recommended by <ulink
                     url="http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php">the
-                    XML-RPC EPI project</ulink>. <classname>Zend_Json_Server</classname>
+                    <acronym>XML</acronym>-RPC EPI project</ulink>. <classname>Zend_Json_Server</classname>
                 appropriately assigns the code based on the error condition. For
                 application exceptions, the code '-32000' is used.
             </para>
@@ -398,7 +398,7 @@ $server->handle();
 
             <itemizedlist>
                 <listitem><para><methodname>setCode($code)</methodname>: Set the error code;
-                    if the code is not in the accepted XML-RPC error code range,
+                    if the code is not in the accepted <acronym>XML</acronym>-RPC error code range,
                     -32000 will be assigned.</para></listitem>
                 <listitem><para><methodname>getCode()</methodname>: Retrieve the current
                     error code.</para></listitem>
@@ -435,7 +435,7 @@ $server->handle();
                 At its most basic, a Service Mapping Description indicates the
                 method of transport (POST, GET, TCP/IP, etc), the request
                 envelope type (usually based on the protocol of the server), the
-                target URL of the service provider, and a map of services
+                target <acronym>URL</acronym> of the service provider, and a map of services
                 available. In the case of JSON-RPC, the service map is a list of
                 available methods, which each method documenting the available
                 parameters and their types, as well as the expected return value
@@ -495,15 +495,15 @@ $server->handle();
                         'application/json').</para></listitem>
                 <listitem><para><methodname>getContentType()</methodname>: Get the current
                         content type for requests to the service.</para></listitem>
-                <listitem><para><methodname>setTarget($target)</methodname>: Set the URL
+                <listitem><para><methodname>setTarget($target)</methodname>: Set the <acronym>URL</acronym>
                         endpoint for the service.</para></listitem>
-                <listitem><para><methodname>getTarget()</methodname>: Get the URL endpoint
+                <listitem><para><methodname>getTarget()</methodname>: Get the <acronym>URL</acronym> endpoint
                         for the service.</para></listitem>
                 <listitem><para><methodname>setId($id)</methodname>: Typically, this is the
-                        URL endpoint of the service (same as the
+                        <acronym>URL</acronym> endpoint of the service (same as the
                         target).</para></listitem>
                 <listitem><para><methodname>getId()</methodname>: Retrieve the service ID
-                        (typically the URL endpoint of the
+                        (typically the <acronym>URL</acronym> endpoint of the
                         service).</para></listitem>
                 <listitem><para><methodname>setDescription($description)</methodname>: Set a
                         service description (typically narrative information
@@ -561,11 +561,11 @@ $server->handle();
                         by <classname>Zend_Json_Server_Smd</classname> are allowed).</para></listitem>
                 <listitem><para><methodname>getTransport()</methodname>: Retrieve the
                         current transport.</para></listitem>
-                <listitem><para><methodname>setTarget($target)</methodname>: Set the URL
+                <listitem><para><methodname>setTarget($target)</methodname>: Set the <acronym>URL</acronym>
                         endpoint of the service (typically, this will be the
                         same as the overall SMD to which the service is
                         attached).</para></listitem>
-                <listitem><para><methodname>getTarget()</methodname>: Get the URL endpoint
+                <listitem><para><methodname>getTarget()</methodname>: Get the <acronym>URL</acronym> endpoint
                         of the service.</para></listitem>
                 <listitem><para><methodname>setEnvelope($envelopeType)</methodname>: Set the
                         service envelope (currently, only envelopes supported

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

@@ -4,17 +4,17 @@
     <title>XML to JSON conversion</title>
     <para>
         <classname>Zend_Json</classname> provides a convenience method for transforming
-        XML formatted data into JSON format. This feature was inspired from an
+        <acronym>XML</acronym> formatted data into JSON format. This feature was inspired from an
         <ulink url="http://www.ibm.com/developerworks/xml/library/x-xml2jsonphp/">
         IBM developerWorks article</ulink>.
     </para>
 
     <para>
         <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
-        optional input parameter is not given, then the default behavior is to ignore the XML attributes.
+        This function will generate JSON from a given <acronym>XML</acronym> input. This function takes any arbitrary
+        <acronym>XML</acronym> string as an input parameter. It also takes an optional boolean input parameter to instruct the
+        conversion logic to ignore or not ignore the <acronym>XML</acronym> attributes during the conversion process. If this
+        optional input parameter is not given, then the default behavior is to ignore the <acronym>XML</acronym> attributes.
         This function call is made as shown below:
     </para>
     <programlisting language="php"><![CDATA[
@@ -24,25 +24,25 @@ $jsonContents = Zend_Json::fromXml($xmlStringContents, true);
 ]]></programlisting>
 
     <para>
-        <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
+        <methodname>Zend_Json::fromXml()</methodname> function does the conversion of the <acronym>XML</acronym> formatted string input
+        parameter and returns the equivalent JSON formatted string output. In case of any <acronym>XML</acronym> 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.
-        Beyond that depth, it will throw a <classname>Zend_Json_Exception</classname>. There are several XML files with varying
+        uses recursive techniques to traverse the <acronym>XML</acronym> tree. It supports recursion upto 25 levels deep.
+        Beyond that depth, it will throw a <classname>Zend_Json_Exception</classname>. There are several <acronym>XML</acronym> files with varying
         degree of complexity provided in the tests directory of Zend Framework. They can be used to
         test the functionality of the xml2json feature.
     </para>
 
     <para>
-        The following is a simple example that shows both the XML input string passed to
+        The following is a simple example that shows both the <acronym>XML</acronym> input string passed to
         and the JSON output string returned as a result from the
         <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.
+        not to ignore the <acronym>XML</acronym> attributes during the conversion. Hence, you can notice that the
+        resulting JSON string includes a representation of the <acronym>XML</acronym> attributes present in the <acronym>XML</acronym> input string.
     </para>
 
     <para>
-        XML input string passed to <methodname>Zend_Json::fromXml()</methodname> function:
+        <acronym>XML</acronym> input string passed to <methodname>Zend_Json::fromXml()</methodname> function:
     </para>
 
     <programlisting language="php"><![CDATA[

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

@@ -102,7 +102,7 @@ $layoutVars   = $placeholders->placeholder('Zend_Layout')->getArrayCopy();
         <title>Custom Front Controller Plugins</title>
 
         <para>
-            When used with the MVC components, <classname>Zend_Layout</classname>
+            When used with the <acronym>MVC</acronym> components, <classname>Zend_Layout</classname>
             registers a front controller plugin that renders the layout as the
             last action prior to exiting the dispatch loop. In most cases, the
             default plugin will be suitable, but should you desire to write
@@ -128,7 +128,7 @@ $layoutVars   = $placeholders->placeholder('Zend_Layout')->getArrayCopy();
         <title>Custom Action Helpers</title>
 
         <para>
-            When used with the MVC components, <classname>Zend_Layout</classname>
+            When used with the <acronym>MVC</acronym> components, <classname>Zend_Layout</classname>
             registers an action controller helper with the helper broker. The
             default helper,
             <classname>Zend_Layout_Controller_Action_Helper_Layout</classname>, acts as a

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

@@ -18,7 +18,7 @@
     <itemizedlist>
         <listitem><para>
                 Automate selection and rendering of layouts when used with the
-                Zend Framework MVC components.
+                Zend Framework <acronym>MVC</acronym> components.
         </para></listitem>
 
         <listitem><para>
@@ -43,7 +43,7 @@
         </para></listitem>
 
         <listitem><para>
-                Allow usage without Zend Framework MVC components.
+                Allow usage without Zend Framework <acronym>MVC</acronym> components.
         </para></listitem>
     </itemizedlist>
 </sect1>

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

@@ -29,14 +29,14 @@
 
         <listitem><para>
                 <emphasis>contentKey</emphasis>: the layout variable used for
-                default content (when used with the MVC). Default value is
+                default content (when used with the <acronym>MVC</acronym>). Default value is
                 'content'. Accessors are <methodname>setContentKey()</methodname> and
                 <methodname>getContentKey()</methodname>.
         </para></listitem>
 
         <listitem><para>
                 <emphasis>mvcSuccessfulActionOnly</emphasis>: when using the
-                MVC, if an action throws an exception and this flag is true, the
+                <acronym>MVC</acronym>, if an action throws an exception and this flag is true, the
                 layout will not be rendered (this is to prevent double-rendering
                 of the layout when the <link linkend="zend.controller.plugins.standard.errorhandler">ErrorHandler
                 plugin</link> is in use). By default, the flat is true.
@@ -46,7 +46,7 @@
 
         <listitem><para>
                 <emphasis>view</emphasis>: the view object to use when
-                rendering. When used with the MVC, <classname>Zend_Layout</classname> will
+                rendering. When used with the <acronym>MVC</acronym>, <classname>Zend_Layout</classname> will
                 attempt to use the view object registered with <link
                     linkend="zend.controller.actionhelpers.viewrenderer">the
                     ViewRenderer</link> if no view object has been passed to it
@@ -56,7 +56,7 @@
 
         <listitem><para>
                 <emphasis>helperClass</emphasis>: the action helper class to use
-                when using <classname>Zend_Layout</classname> with the MVC components. By
+                when using <classname>Zend_Layout</classname> with the <acronym>MVC</acronym> components. By
                 default, this is
                 <classname>Zend_Layout_Controller_Action_Helper_Layout</classname>.
                 Accessors are <methodname>setHelperClass()</methodname> and
@@ -65,7 +65,7 @@
 
         <listitem><para>
                 <emphasis>pluginClass</emphasis>: the front controller plugin
-                class to use when using <classname>Zend_Layout</classname> with the MVC
+                class to use when using <classname>Zend_Layout</classname> with the <acronym>MVC</acronym>
                 components. By default, this is
                 <classname>Zend_Layout_Controller_Plugin_Layout</classname>. Accessors
                 are <methodname>setPluginClass()</methodname> and

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

@@ -5,7 +5,7 @@
 
     <para>
         There are two primary use cases for <classname>Zend_Layout</classname>: with the
-        Zend Framework MVC, and without.
+        Zend Framework <acronym>MVC</acronym>, and without.
     </para>
 
     <sect2 id="zend.layout.quickstart.layouts">
@@ -96,7 +96,7 @@
             helpers</link>. <classname>Zend_View</classname> also has <link
             linkend="zend.view.helpers">helpers</link>. <classname>Zend_Layout</classname>
             takes advantage of these various extension points when used with the
-            MVC components.
+            <acronym>MVC</acronym> components.
         </para>
 
         <para>
@@ -112,7 +112,7 @@
 
         <para>
             First, let's look at how to initialize <classname>Zend_Layout</classname> for use with the
-            MVC:
+            <acronym>MVC</acronym>:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -162,7 +162,7 @@ class FooController extends Zend_Controller_Action
 
         <para>
             At any time, you can fetch the <classname>Zend_Layout</classname> instance
-            registered with the MVC via the <methodname>getMvcInstance()</methodname> static
+            registered with the <acronym>MVC</acronym> via the <methodname>getMvcInstance()</methodname> static
             method:
         </para>
 
@@ -217,7 +217,7 @@ $layout = Zend_Layout::getMvcInstance();
 
         <para>
             As a standalone component, <classname>Zend_Layout</classname> does not offer nearly as many
-            features or as much convenience as when used with the MVC. However,
+            features or as much convenience as when used with the <acronym>MVC</acronym>. However,
             it still has two chief benefits:
         </para>
 
@@ -269,7 +269,7 @@ echo $layout->render();
         </para>
 
         <para>
-            The actual order of elements may vary, depending on the CSS you've
+            The actual order of elements may vary, depending on the <acronym>CSS</acronym> you've
             setup; for instance, if you're using absolute positioning, you may
             be able to have the navigation displayed later in the document, but
             still show up at the top; the same could be said for the sidebar or

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

@@ -7,7 +7,7 @@
         <classname>Zend_Ldap_Attribute</classname> is a helper class providing only static
         methods to manipulate arrays suitable to the structure used in
         <classname>Zend_Ldap</classname> data modification methods and to the data format required by
-        the <acronym>LDAP</acronym> server. PHP data types are converted the following way:
+        the <acronym>LDAP</acronym> server. <acronym>PHP</acronym> data types are converted the following way:
     </para>
 
     <variablelist>

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

@@ -5,7 +5,7 @@
 
     <para>
         <classname>Zend_Ldap</classname> is the base interface into a <acronym>LDAP</acronym> server. It provides
-        connection and binding methods as well as methods to operate on the LDAP
+        connection and binding methods as well as methods to operate on the <acronym>LDAP</acronym>
         tree.
     </para>
 

+ 1 - 1
documentation/manual/en/module_specs/Zend_Loader-Autoloader-Resource.xml

@@ -145,7 +145,7 @@ $resourceLoader = new Zend_Loader_Autoloader_Resource(array(
             Zend Framework ships with a concrete implementation of
             <classname>Zend_Loader_Autoloader_Resource</classname> that contains resource
             type mappings that cover the default recommended directory structure
-            for Zend Framework MVC applications. This loader,
+            for Zend Framework <acronym>MVC</acronym> applications. This loader,
             <classname>Zend_Application_Module_Autoloader</classname>, comes with the
             following mappings:
         </para>

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

@@ -226,7 +226,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                             </para></listitem>
                         </itemizedlist></entry>
                         <entry><para>
-                            Specify an alternate PHP callback to use for the
+                            Specify an alternate <acronym>PHP</acronym> callback to use for the
                             default autoloader implementation.
                         </para></entry>
                     </row>
@@ -253,7 +253,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><para>
                             Set a list of concrete autoloaders to use in the
                             autoloader stack. Each item in the autoloaders array
-                            must be a PHP callback.
+                            must be a <acronym>PHP</acronym> callback.
                         </para></entry>
                     </row>
 
@@ -391,7 +391,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><itemizedlist>
                             <listitem><para>
                                 <varname>$callback</varname>, <emphasis>required</emphasis>.
-                                A valid PHP callback
+                                A valid <acronym>PHP</acronym> callback
                             </para></listitem>
 
                             <listitem><para>
@@ -414,7 +414,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><itemizedlist>
                             <listitem><para>
                                 <varname>$callback</varname>, <emphasis>required</emphasis>.
-                                A valid PHP callback
+                                A valid <acronym>PHP</acronym> callback
                             </para></listitem>
 
                             <listitem><para>
@@ -437,7 +437,7 @@ $autoloader->pushAutoloader($foo, 'Foo_');
                         <entry><itemizedlist>
                             <listitem><para>
                                 <varname>$callback</varname>, <emphasis>required</emphasis>.
-                                A valid PHP callback
+                                A valid <acronym>PHP</acronym> callback
                             </para></listitem>
 
                             <listitem><para>

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

@@ -201,7 +201,7 @@ if ($loader->isLoaded('Adapter')) {
             to loop through each prefix, then each path on the prefix, until it
             finds a file that matches -- and which defines the class expected.
             In cases where the file exists but does not define the class, an
-            error will be added to the PHP error stack, which is also an
+            error will be added to the <acronym>PHP</acronym> error stack, which is also an
             expensive operation. The question then turns to: how can you keep
             the flexibility of plugins and also address performance?
         </para>

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

@@ -15,7 +15,7 @@
             load is variable. For example, if it is based on a parameter from
             user input or method argument. If you are loading a file or a
             class whose name is constant, there is no benefit to using
-            <classname>Zend_Loader</classname> over using traditional PHP functions such as
+            <classname>Zend_Loader</classname> over using traditional <acronym>PHP</acronym> functions such as
             <ulink url="http://php.net/require_once"><methodname>require_once()</methodname></ulink>.
         </para>
     </tip>
@@ -25,9 +25,9 @@
         <title>Loading Files</title>
 
         <para>
-            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
+            The static method <methodname>Zend_Loader::loadFile()</methodname> loads a <acronym>PHP</acronym>
+            file. The file loaded may contain any <acronym>PHP</acronym> code.
+            The method is a wrapper for the <acronym>PHP</acronym> function
             <ulink url="http://php.net/include"><methodname>include()</methodname></ulink>.
             This method returns boolean false on failure, for example
             if the specified file does not exist.
@@ -58,9 +58,9 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
 
         <para>
             The <varname>$once</varname> argument is a boolean. If <constant>TRUE</constant>,
-            <methodname>Zend_Loader::loadFile()</methodname> uses the PHP function
+            <methodname>Zend_Loader::loadFile()</methodname> uses the <acronym>PHP</acronym> function
             <ulink url="http://php.net/include"><methodname>include_once()</methodname></ulink>
-            for loading the file, otherwise the PHP function
+            for loading the file, otherwise the <acronym>PHP</acronym> function
             <ulink url="http://php.net/include_once"><methodname>include()</methodname></ulink>
             is used.
         </para>
@@ -73,7 +73,7 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
 
         <para>
             The static method <methodname>Zend_Loader::loadClass($class, $dirs)</methodname>
-            loads a PHP file and then checks for the existence of the class.
+            loads a <acronym>PHP</acronym> file and then checks for the existence of the class.
         </para>
 
         <example id="zend.loader.load.class.example">
@@ -99,7 +99,7 @@ Zend_Loader::loadClass('Container_Tree',
             <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.
+            <code>include_path</code> for the <acronym>PHP</acronym> environment is searched.
         </para>
 
         <para>
@@ -137,9 +137,9 @@ if (Zend_Loader::isReadable($filename)) {
         <para>
             The <varname>$filename</varname> argument specifies the filename to
             check. This may contain path information.
-            This method is a wrapper for the PHP function
+            This method is a wrapper for the <acronym>PHP</acronym> function
             <ulink url="http://php.net/is_readable"><methodname>is_readable()</methodname></ulink>.
-            The PHP function does not search the <code>include_path</code>,
+            The <acronym>PHP</acronym> function does not search the <code>include_path</code>,
             while <methodname>Zend_Loader::isReadable()</methodname> does.
         </para>
 
@@ -151,11 +151,11 @@ if (Zend_Loader::isReadable($filename)) {
 
         <para>
             The <classname>Zend_Loader</classname> class contains a method you can register with the
-            PHP SPL autoloader. <methodname>Zend_Loader::autoload()</methodname> is the
+            <acronym>PHP</acronym> 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>
-            extension is not present in your PHP environment, then the
+            extension is not present in your <acronym>PHP</acronym> environment, then the
             <methodname>registerAutoload()</methodname> method throws a <classname>Zend_Exception</classname>.
         </para>
 
@@ -184,7 +184,7 @@ Zend_Loader::registerAutoload();
             <title>Example of registering the autoload callback method from an
                 extended class</title>
             <para>
-                Because of the semantics of static function references in PHP,
+                Because of the semantics of static function references in <acronym>PHP</acronym>,
                 you must implement code for both <methodname>loadClass()</methodname>
                 and <methodname>autoload()</methodname>, and the <methodname>autoload()</methodname>
                 must call <methodname>self::loadClass()</methodname>. If your

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

@@ -72,17 +72,17 @@
 
         <para>
             For those needing to specify explicitly the format of the date string, the following format token specifiers
-            are supported. If an invalid format specifier is used, such as the PHP 'i' specifier when in ISO format
+            are supported. If an invalid format specifier is used, such as the <acronym>PHP</acronym> 'i' specifier when in ISO format
             mode, then an error will be thrown by the methods in <classname>Zend_Locale_Format</classname> that support user-defined formats.
         </para>
 
         <para>
             These specifiers (below) are a small subset of the full "ISO" set supported by <classname>Zend_Date</classname>'s
-            <methodname>toString()</methodname>. If you need to use PHP <methodname>date()</methodname> compatible format specifiers, then first
+            <methodname>toString()</methodname>. If you need to use <acronym>PHP</acronym> <methodname>date()</methodname> compatible format specifiers, then first
             call <methodname>setOptions(array('format_type' => 'php'))</methodname>. And if you want to convert only one special format
-            string from PHP <methodname>date()</methodname> compatible format to "ISO" format use <methodname>convertPhpToIsoFormat()</methodname>.
+            string from <acronym>PHP</acronym> <methodname>date()</methodname> compatible format to "ISO" format use <methodname>convertPhpToIsoFormat()</methodname>.
             Currently, the only practical difference relates to the specifier for minutes ('m' using the ISO default,
-            and 'i' using the PHP date format).
+            and 'i' using the <acronym>PHP</acronym> date format).
         </para>
 
         <table id="zend.locale.date.normalize.table-2">

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

@@ -1316,7 +1316,7 @@ if (Zend_Locale::isLocale($input)) {
             As you can see, the output of this method is always a boolean. There is only one reason you could
             get an exception when calling this method. When your system does not provide any locale and
             Zend Framework is not able to detect it automatically. Normally this shows that there is a problem
-            with your OS in combination with PHP's <methodname>setlocale()</methodname>.
+            with your OS in combination with <acronym>PHP</acronym>'s <methodname>setlocale()</methodname>.
         </para>
 
         <para>

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

@@ -38,7 +38,7 @@
         </para>
         <para>
             When you are using <classname>Zend_Locale</classname> you will not have this limitations, because
-            <classname>Zend_Locale</classname> is not related to or coupled with PHP's <methodname>setlocale()</methodname>.
+            <classname>Zend_Locale</classname> is not related to or coupled with <acronym>PHP</acronym>'s <methodname>setlocale()</methodname>.
         </para>
     </tip>
 
@@ -216,14 +216,14 @@ $locale3 = new Zend_Locale(Zend_Locale::FRAMEWORK);
                 <listitem>
                     <para>
                         const <classname>Zend_Locale::BROWSER</classname> - The user's Web browser provides information with each
-                        request, which is published by PHP in the global variable <constant>HTTP_ACCEPT_LANGUAGE</constant>. If
+                        request, which is published by <acronym>PHP</acronym> in the global variable <constant>HTTP_ACCEPT_LANGUAGE</constant>. If
                         no matching locale can be found, then preference is given to <constant>ENVIRONMENT</constant> and lastly
                         <constant>FRAMEWORK</constant>.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        const <classname>Zend_Locale::ENVIRONMENT</classname> - PHP publishes the host server's locale via the PHP
+                        const <classname>Zend_Locale::ENVIRONMENT</classname> - <acronym>PHP</acronym> publishes the host server's locale via the <acronym>PHP</acronym>
                         internal function <methodname>setlocale()</methodname>. If no matching locale can be found, then preference
                         is given to <constant>FRAMEWORK</constant> and lastly <constant>BROWSER</constant>.
                     </para>
@@ -262,7 +262,7 @@ $locale3 = new Zend_Locale(Zend_Locale::FRAMEWORK);
                 <listitem>
                     <para>
                         <code>'browser'</code> - <classname>Zend_Locale</classname> should work with the information
-                        which is provided by the user's Web browser. It is published by PHP in the global
+                        which is provided by the user's Web browser. It is published by <acronym>PHP</acronym> in the global
                         variable <constant>HTTP_ACCEPT_LANGUAGE</constant>.
                     </para>
                     <para>
@@ -275,7 +275,7 @@ $locale3 = new Zend_Locale(Zend_Locale::FRAMEWORK);
                 <listitem>
                     <para>
                         <code>'environment'</code> - <classname>Zend_Locale</classname> should work with the information
-                        which is provided by the host server. It is published by PHP via the internal function
+                        which is provided by the host server. It is published by <acronym>PHP</acronym> via the internal function
                         <methodname>setlocale()</methodname>.
                     </para>
                     <para>
@@ -465,7 +465,7 @@ echo $date->getDate();
             The 'precision' option of a value is used to truncate or stretch extra digits. A value of '-1' disables
             modification of the number of digits in the fractional part of the value. The 'locale' option helps when
             parsing numbers and dates using separators and month names. The date format 'format_type' option selects between
-            CLDR/ISO date format specifier tokens and PHP's date() tokens. The 'fix_date' option enables or disables
+            CLDR/ISO date format specifier tokens and <acronym>PHP</acronym>'s date() tokens. The 'fix_date' option enables or disables
             heuristics that attempt to correct invalid dates. The 'number_format' option specifies a default number
             format for use with <methodname>toNumber()</methodname> (see
             <xref

+ 4 - 4
documentation/manual/en/module_specs/Zend_Locale-Migration.xml

@@ -5,10 +5,10 @@
     <title>Migrating from previous versions</title>
 
     <para>
-        The API of <classname>Zend_Locale</classname> has changed from time to time.
+        The <acronym>API</acronym> of <classname>Zend_Locale</classname> has changed from time to time.
         If you started to use <classname>Zend_Locale</classname> and its subcomponents
         in earlier versions follow the guidelines below to migrate your scripts to
-        use the new API.
+        use the new <acronym>API</acronym>.
     </para>
 
     <sect2 id="zend.locale.migration.fromoneeighttoonenine">
@@ -117,7 +117,7 @@ Zend_Locale::disableCache(true);
             </para>
 
             <para>
-                To migrate your scripts to the new API, simply use the method as shown below.
+                To migrate your scripts to the new <acronym>API</acronym>, simply use the method as shown below.
             </para>
 
             <example id="zend.locale.migration.fromonesixtooneseven.example">
@@ -179,7 +179,7 @@ if (Zend_Locale::isLocale($locale, false)) {
             </para>
 
             <para>
-                To migrate your scripts to the new API, simply use the method as shown below.
+                To migrate your scripts to the new <acronym>API</acronym>, simply use the method as shown below.
             </para>
 
             <example id="zend.locale.migration.fromonesixtooneseven.getdefault.example">

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

@@ -8,7 +8,7 @@
         <classname>Zend_Locale_Format</classname> is a internal component used by <classname>Zend_Locale</classname>. All locale aware classes use
         <classname>Zend_Locale_Format</classname> for normalization and localization of numbers and dates. Normalization involves
         parsing input from a variety of data representations, like dates, into a standardized, structured
-        representation, such as a PHP array with year, month, and day elements.
+        representation, such as a <acronym>PHP</acronym> array with year, month, and day elements.
     </para>
 
     <para>
@@ -61,18 +61,18 @@ print $number; // will return 13524.678
 
             <para>
                 Since <methodname>getNumber($value, array $options = array())</methodname> can normalize extremely large numbers,
-                check the result carefully before using finite precision calculations, such as ordinary PHP math
+                check the result carefully before using finite precision calculations, such as ordinary <acronym>PHP</acronym> math
                 operations. For example, <code>if ((string)int_val($number) != $number) { use
                 <ulink url="http://www.php.net/bc">BCMath</ulink>
                 or
                 <ulink url="http://www.php.net/gmp">GMP</ulink>
-                </code>. Most PHP installations support the BCMath extension.
+                </code>. Most <acronym>PHP</acronym> installations support the BCMath extension.
             </para>
 
             <para>
                 Also, the precision of the resulting decimal representation can be rounded to a desired length with
                 <methodname>getNumber()</methodname> with the option <code>'precision'</code>. If no precision is given,
-                no rounding occurs. Use only PHP integers to specify the precision.
+                no rounding occurs. Use only <acronym>PHP</acronym> integers to specify the precision.
             </para>
 
             <para>
@@ -425,7 +425,7 @@ if (Zend_Locale_Format::isInteger('13.445', array('locale' => $locale)) {
 
         <para>
             Suppose a web form collected a numeric input expressed using Eastern Arabic digits "١‎٠٠".
-            Most software and PHP functions expect input using Arabic numerals. Fortunately, converting this input
+            Most software and <acronym>PHP</acronym> functions expect input using Arabic numerals. Fortunately, converting this input
             to its equivalent Latin numerals "100" requires little effort using
             <methodname>convertNumerals($inputNumeralString, $sourceNumeralSystem, $destNumeralSystem)</methodname>
             , which returns the <varname>$input</varname> with numerals in the script <varname>$sourceNumeralSystem</varname>

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

@@ -141,7 +141,7 @@ DEBUG   = 7;  // Debug: debug messages
       The priorities are not arbitrary. They come from the BSD <code>syslog</code> protocol,
       which is described in <ulink url="http://tools.ietf.org/html/rfc3164">RFC-3164</ulink>.
       The names and corresponding priority numbers are also
-      compatible with another PHP logging system,
+      compatible with another <acronym>PHP</acronym> logging system,
       <ulink url="http://pear.php.net/package/log">PEAR Log</ulink>,
       which perhaps promotes interoperability between it and <classname>Zend_Log</classname>.
     </para>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Log-Writers-Firebug.xml

@@ -12,8 +12,8 @@
     </para>
     <para>
       All data is sent via the <classname>Zend_Wildfire_Channel_HttpHeaders</classname> component
-      which uses HTTP headers to ensure the page content is not disturbed.
-      Debugging AJAX requests that require clean JSON and XML responses is possible with this approach.
+      which uses <acronym>HTTP</acronym> headers to ensure the page content is not disturbed.
+      Debugging <acronym>AJAX</acronym> requests that require clean JSON and <acronym>XML</acronym> responses is possible with this approach.
     </para>
     <para>
       Requirements:
@@ -146,7 +146,7 @@ $writer->setDefaultPriorityStyle('TRACE');
       <title>Preparing data for Logging</title>
 
       <para>
-        While any PHP variable can be logged with the built-in priorities, some special formatting
+        While any <acronym>PHP</acronym> variable can be logged with the built-in priorities, some special formatting
         is required if using some of the more specialized log styles.
       </para>
       <para>

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

@@ -13,7 +13,7 @@
     <para>
         The primary use case for <classname>Zend_Log_Writer_Mail</classname> is notifying
         developers, systems administrators, or any concerned parties of errors
-        that might be occurring with PHP-based scripts.
+        that might be occurring with <acronym>PHP</acronym>-based scripts.
         <classname>Zend_Log_Writer_Mail</classname> was born out of the idea that if
         something is broken, a human being needs to be alerted of it immediately
         so they can take corrective action.

+ 3 - 3
documentation/manual/en/module_specs/Zend_Mail-Introduction.xml

@@ -44,7 +44,7 @@ $mail->send();
 
         <para>
             For most mail attributes there are "get" methods to read the information stored in the mail object. For
-            further details, please refer to the API documentation. A special one is <methodname>getRecipients()</methodname>.
+            further details, please refer to the <acronym>API</acronym> documentation. A special one is <methodname>getRecipients()</methodname>.
             It returns an array with all recipient e-mail addresses that were added prior to the method call.
         </para>
 
@@ -76,7 +76,7 @@ $mail->setBodyText('This is the text of the mail.')
 
         <para>
             The default transport for a <classname>Zend_Mail</classname> instance is <classname>Zend_Mail_Transport_Sendmail</classname>.
-            It is essentially a wrapper to the PHP <ulink url="http://php.net/mail"><methodname>mail()</methodname></ulink> function.
+            It is essentially a wrapper to the <acronym>PHP</acronym> <ulink url="http://php.net/mail"><methodname>mail()</methodname></ulink> function.
             If you wish to pass additional parameters to the <ulink url="http://php.net/mail"><methodname>mail()</methodname></ulink> function,
             simply create a new transport instance and pass your parameters to the constructor. The new transport instance
             can then act as the default <classname>Zend_Mail</classname> transport, or it can be passed to the <methodname>send()</methodname>
@@ -110,7 +110,7 @@ $mail->send();
             <title>Safe mode restrictions</title>
             <para>
                 The optional additional parameters will be cause the <ulink url="http://php.net/mail"><methodname>mail()</methodname></ulink> function to fail
-                if PHP is running in safe mode.
+                if <acronym>PHP</acronym> is running in safe mode.
             </para>
         </note>
 

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

@@ -5,7 +5,7 @@
 
     <para>
         <classname>Zend_Mail</classname> can read mail messages from several local or remote mail storages. All of them have the
-        same basic API to count and fetch messages and some of them implement additional interfaces for not so common
+        same basic <acronym>API</acronym> to count and fetch messages and some of them implement additional interfaces for not so common
         features. For a feature overview of the implemented storages see the following table.
     </para>
 
@@ -595,7 +595,7 @@ $cache->set($cache_id, $mail);
             <para>
                 Remote storages use two classes: <classname>Zend_Mail_Storage_&lt;Name&gt;</classname> and
                 <classname>Zend_Mail_Protocol_&lt;Name&gt;</classname>. The protocol class translates the protocol commands and
-                responses from and to PHP, like methods for the commands or variables with different structures for
+                responses from and to <acronym>PHP</acronym>, like methods for the commands or variables with different structures for
                 data. The other/main class implements the common interface.
             </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_Measure-Creation.xml

@@ -54,12 +54,12 @@ echo $unit;
             Many measurements received as input to Zend Framework applications can only be passed
             to <classname>Zend_Measure_*</classname> classes as strings, such as numbers written
             using <ulink url="http://en.wikipedia.org/wiki/Roman_numerals">roman numerals</ulink>
-            or extremely large binary values that exceed the precision of PHP's native integer
+            or extremely large binary values that exceed the precision of <acronym>PHP</acronym>'s native integer
             and float types. Since integers can be denoted using strings, if there is any risk of
-            losing precision due to limitations of PHP's native integer and float types, using
+            losing precision due to limitations of <acronym>PHP</acronym>'s native integer and float types, using
             strings instead. <classname>Zend_Measure_Number</classname> uses the BCMath extension
             to support arbitrary precision, as shown in the example below, to avoid limitations in
-            many PHP functions, such as
+            many <acronym>PHP</acronym> functions, such as
             <ulink url="http://php.net/bin2dec"><methodname>bin2dec()</methodname></ulink>.
         </para>
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Memory-MemoryObjects.xml

@@ -89,7 +89,7 @@ $memObject->value = substr($memObject->value, $start, $length);
         <para>
             An alternative way to access memory object data is to use the
             <link linkend="zend.memory.memory-objects.api.getRef"><methodname>getRef()</methodname></link>
-            method. This method <emphasis>must</emphasis> be used for PHP
+            method. This method <emphasis>must</emphasis> be used for <acronym>PHP</acronym>
             versions before 5.2. It also may have to be used in some other
             cases for performance reasons.
         </para>
@@ -125,7 +125,7 @@ public function &getRef();
 
             <para>
                 The <methodname>getRef()</methodname> method <emphasis>must</emphasis> be
-                used to access memory object data for PHP versions before 5.2.
+                used to access memory object data for <acronym>PHP</acronym> versions before 5.2.
             </para>
 
             <para>

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

@@ -126,7 +126,7 @@ $memObject->value = substr($memObject->value, $start, $length);
 
             <note>
                 <para>
-                    If you are using a PHP version earlier than 5.2, use the
+                    If you are using a <acronym>PHP</acronym> version earlier than 5.2, use the
                     <link linkend="zend.memory.memory-objects.api.getRef">getRef()</link>
                     method instead of accessing the value property directly.
                 </para>

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

@@ -92,7 +92,7 @@ public $language;
             <listitem>
                 <para>
                     <varname>$location</varname>
-                    can be used as resource URI that has relation to the content.
+                    can be used as resource <acronym>URI</acronym> that has relation to the content.
                 </para>
             </listitem>
             <listitem>

Some files were not shown because too many files changed in this diff