Browse Source

[MANUAL] English:

- unified the wording "PHP"

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21740 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
0aaf5591e5
39 changed files with 183 additions and 163 deletions
  1. 2 2
      documentation/manual/en/module_specs/Zend_Db_Adapter.xml
  2. 6 6
      documentation/manual/en/module_specs/Zend_Feed_Pubsubhubbub.xml
  3. 2 2
      documentation/manual/en/module_specs/Zend_Feed_Reader.xml
  4. 1 1
      documentation/manual/en/module_specs/Zend_Filter-Decryption.xml
  5. 1 1
      documentation/manual/en/module_specs/Zend_Filter-Encryption.xml
  6. 6 6
      documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml
  7. 1 1
      documentation/manual/en/module_specs/Zend_Json-Objects.xml
  8. 3 3
      documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml
  9. 3 3
      documentation/manual/en/module_specs/Zend_Loader.xml
  10. 1 1
      documentation/manual/en/module_specs/Zend_Log-Factory.xml
  11. 6 5
      documentation/manual/en/module_specs/Zend_Log-Overview.xml
  12. 2 2
      documentation/manual/en/module_specs/Zend_Log-Writers-ZendMonitor.xml
  13. 3 3
      documentation/manual/en/module_specs/Zend_Log-Writers.xml
  14. 6 5
      documentation/manual/en/module_specs/Zend_Mail-Introduction.xml
  15. 2 2
      documentation/manual/en/module_specs/Zend_Paginator-Advanced.xml
  16. 2 2
      documentation/manual/en/module_specs/Zend_Search_Lucene-QueryLanguage.xml
  17. 26 24
      documentation/manual/en/module_specs/Zend_Serializer-Adapter.xml
  18. 2 1
      documentation/manual/en/module_specs/Zend_Serializer-Introduction.xml
  19. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon_S3.xml
  20. 10 9
      documentation/manual/en/module_specs/Zend_Service_LiveDocx.xml
  21. 3 2
      documentation/manual/en/module_specs/Zend_Service_StrikeIron-Overview.xml
  22. 15 13
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Blob.xml
  23. 1 1
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Queue.xml
  24. 11 8
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml
  25. 1 1
      documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml
  26. 1 1
      documentation/manual/en/module_specs/Zend_Soap_Wsdl.xml
  27. 7 2
      documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml
  28. 8 7
      documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml
  29. 4 3
      documentation/manual/en/module_specs/Zend_Validate-Callback.xml
  30. 2 2
      documentation/manual/en/module_specs/Zend_Validate-Ip.xml
  31. 1 1
      documentation/manual/en/module_specs/Zend_View-Helpers.xml
  32. 2 2
      documentation/manual/en/module_specs/Zend_View-Introduction.xml
  33. 1 1
      documentation/manual/en/module_specs/Zend_XmlRpc_Server.xml
  34. 6 6
      documentation/manual/en/ref/coding_standard.xml
  35. 3 3
      documentation/manual/en/ref/overview.xml
  36. 4 4
      documentation/manual/en/tutorials/form-decorators-composite.xml
  37. 9 9
      documentation/manual/en/tutorials/multiuser-sessions.xml
  38. 4 4
      documentation/manual/en/tutorials/quickstart-create-model.xml
  39. 13 12
      documentation/manual/en/tutorials/quickstart-create-project.xml

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

@@ -2433,8 +2433,8 @@ if (!is_null($version)) {
 
                     <para>
                         We recommend to update the <filename>gds32.dll</filename> (or linux
-                        equivalent) bundled with php, to the same version of the server. For
-                        Firebird the equivalent <filename>gds32.dll</filename> is
+                        equivalent) bundled with <acronym>PHP</acronym>, to the same version of the
+                        server. For Firebird the equivalent <filename>gds32.dll</filename> is
                         <filename>fbclient.dll</filename>.
                     </para>
 

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

@@ -6,7 +6,7 @@
     <para>
         <classname>Zend_Feed_Pubsubhubbub</classname> is an implementation of the PubSubHubbub Core
         0.2 Specification (Working Draft). It offers implementations of a Pubsubhubbub Publisher and
-        Subscriber suited to Zend Framework and other PHP applications.
+        Subscriber suited to Zend Framework and other <acronym>PHP</acronym> applications.
     </para>
 
     <sect2 id="zend.feed.pubsubhubbub.what.is.pubsubhubbub">
@@ -544,11 +544,11 @@ if ($callback->hasFeedUpdate()) {
                     It should be noted that
                     <classname>Zend_Feed_Pubsubhubbub_Subscriber_Callback</classname> may
                     independently parse any incoming query string and other parameters.  This is
-                    necessary since PHP alters the structure and keys of a query string when it is
-                    parsed into the <varname>$_GET</varname> or <varname>$_POST</varname>
-                    superglobals.  For example, all duplicate keys are ignored and periods are
-                    converted to underscores. Pubsubhubbub features both of these in the query
-                    strings it generates.
+                    necessary since <acronym>PHP</acronym> alters the structure and keys of a query
+                    string when it is parsed into the <varname>$_GET</varname> or
+                    <varname>$_POST</varname> superglobals.  For example, all duplicate keys are
+                    ignored and periods are converted to underscores. Pubsubhubbub features both of
+                    these in the query strings it generates.
                 </para>
             </note>
 

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

@@ -1087,8 +1087,8 @@ $labels = $categories->getValues();
                 follow <acronym>RFC</acronym> 822 or <acronym>RFC</acronym> 2822
                 which is also common. Date methods
                 will throw an exception if <classname>Zend_Date</classname>
-                cannot load the date string using one of the above standards, or
-                the PHP recognised possibilities for <acronym>RSS</acronym> dates.
+                cannot load the date string using one of the above standards, or the
+                <acronym>PHP</acronym> recognised possibilities for <acronym>RSS</acronym> dates.
             </para>
         </caution>
 

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

@@ -6,7 +6,7 @@
     <para>
         This filter will decrypt any given string with the provided setting. Therefor it makes use
         of Adapters. Actually there are adapters for the <classname>Mcrypt</classname> and
-        <classname>OpenSSL</classname> extensions from php.
+        <classname>OpenSSL</classname> extensions from <acronym>PHP</acronym>.
     </para>
 
     <para>

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

@@ -6,7 +6,7 @@
     <para>
         This filter will encrypt any given string with the provided setting. Therefor it makes use
         of Adapters. Actually there are adapters for the <classname>Mcrypt</classname> and
-        <classname>OpenSSL</classname> extensions from php.
+        <classname>OpenSSL</classname> extensions from <acronym>PHP</acronym>.
     </para>
 
     <para>

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

@@ -243,7 +243,7 @@ $client->setRawData($xml)->setEncType('text/xml')->request('POST');
 ]]></programlisting>
             </example>
 
-            The data should be available on the server side through PHP's
+            The data should be available on the server side through <acronym>PHP</acronym>'s
             $HTTP_RAW_POST_DATA variable or through the php://input stream.
         </para>
 
@@ -394,11 +394,11 @@ $_SESSION['cookiejar'] = $client->getCookieJar();
         <title>Data Streaming</title>
 
         <para>
-            By default, <classname>Zend_Http_Client</classname> accepts and returns data as PHP
-            strings. However, in many cases there are big files to be sent or received, thus keeping
-            them in memory might be unnecessary or too expensive. For these cases,
-            <classname>Zend_Http_Client</classname> supports reading data from files (and in
-            general, PHP streams) and writing data to files (streams).
+            By default, <classname>Zend_Http_Client</classname> accepts and returns data as
+            <acronym>PHP</acronym> strings. However, in many cases there are big files to be sent or
+            received, thus keeping them in memory might be unnecessary or too expensive. For these
+            cases, <classname>Zend_Http_Client</classname> supports reading data from files (and in
+            general, <acronym>PHP</acronym> streams) and writing data to files (streams).
         </para>
 
         <para>

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

@@ -75,7 +75,7 @@ $phpNative = Zend_Json::decode($encodedValue, Zend_Json::TYPE_OBJECT);
             <methodname>json_decode()</methodname> functions are used for encoding and decoding
             <acronym>JSON</acronym>. If ext/json is not installed 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.
+            using the <acronym>PHP</acronym> extension, but behaves exactly the same.
         </para>
 
         <para>

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

@@ -136,9 +136,9 @@ $autoloader->setFallbackAutoloader(true);
             <title>Loading Classes from PHP Namespaces</title>
 
             <para>
-                Starting in version 1.10.0, Zend Framework now allows loading classes from PHP
-                namespaces. This support follows the same guidelines and implementation as that
-                found in the <ulink
+                Starting in version 1.10.0, Zend Framework now allows loading classes from
+                <acronym>PHP</acronym> namespaces. This support follows the same guidelines and
+                implementation as that found in the <ulink
                     url="http://groups.google.com/group/php-standards/web/psr-0-final-proposal">PHP
                 Framework Interop Group PSR-0</ulink> reference implementation.
             </para>

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

@@ -120,9 +120,9 @@ Zend_Loader::loadClass('Container_Tree',
             <title>Loading Classes from PHP Namespaces</title>
 
             <para>
-                Starting in version 1.10.0, Zend Framework now allows loading classes from PHP
-                namespaces. This support follows the same guidelines and implementation as that
-                found in the <ulink
+                Starting in version 1.10.0, Zend Framework now allows loading classes from
+                <acronym>PHP</acronym> namespaces. This support follows the same guidelines and
+                implementation as that found in the <ulink
                     url="http://groups.google.com/group/php-standards/web/psr-0-final-proposal">PHP
                 Framework Interop Group PSR-0</ulink> reference implementation.
             </para>

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

@@ -208,7 +208,7 @@ $logger = Zend_Log::factory(array(
 
                     <listitem>
                         <para>
-                            A valid PHP stream identifier to which to log.
+                            A valid <acronym>PHP</acronym> stream identifier to which to log.
                         </para>
                     </listitem>
                 </varlistentry>

+ 6 - 5
documentation/manual/en/module_specs/Zend_Log-Overview.xml

@@ -121,7 +121,7 @@ $logger = null;
 ]]></programlisting>
 
             Explicitly destroying the log in this way is optional and is performed
-            automatically at PHP shutdown.
+            automatically at <acronym>PHP</acronym> shutdown.
         </para>
     </sect2>
 
@@ -235,12 +235,13 @@ $logger->setEventItem('pid', getmypid());
         <title>Log PHP Errors</title>
 
         <para>
-            Zend_Log can also be used to log php errors.  Calling <methodname>registerErrorHandler()</methodname> will
-            add Zend_Log before the current error handler, and will pass the error along as well.
+            Zend_Log can also be used to log <acronym>PHP</acronym> errors.  Calling
+            <methodname>registerErrorHandler()</methodname> will add Zend_Log before the current
+            error handler, and will pass the error along as well.
         </para>
-        
+
         <table id="zend.log.overview.as-errorHandler.properties.table-1">
-            <title>Zend_Log events from php errors have the additional fields matching 
+            <title>Zend_Log events from PHP errors have the additional fields matching
             <methodname>handler  ( int $errno  , string $errstr  [, string $errfile  [, int $errline  [, array $errcontext  ]]] )</methodname>
             from <ulink url="http://us3.php.net/manual/en/function.set-error-handler.php">set_error_handler</ulink></title>
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Log-Writers-ZendMonitor.xml

@@ -113,8 +113,8 @@ $log->info('Exception occurred', array(
         </para>
 
         <para>
-            As noted previously, if the Monitor API is not detected in your PHP installation, the
-            logger will simply act as a <constant>NULL</constant> logger.
+            As noted previously, if the Monitor API is not detected in your <acronym>PHP</acronym>
+            installation, the logger will simply act as a <constant>NULL</constant> logger.
         </para>
     </note>
 </sect2>

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

@@ -17,9 +17,9 @@
         </para>
 
         <para>
-            To write log data to the PHP output buffer, use the URL <code>php://output</code>.
-            Alternatively, you can send log data directly to a stream like
-            <constant>STDERR</constant> (<code>php://stderr</code>).
+            To write log data to the <acronym>PHP</acronym> output buffer, use the URL
+            <code>php://output</code>. Alternatively, you can send log data directly to a stream
+            like <constant>STDERR</constant> (<code>php://stderr</code>).
 
             <programlisting language="php"><![CDATA[
 $writer = new Zend_Log_Writer_Stream('php://output');

+ 6 - 5
documentation/manual/en/module_specs/Zend_Mail-Introduction.xml

@@ -126,11 +126,12 @@ $mail->send();
             <title>Sendmail Transport and Windows</title>
 
             <para>
-                As the PHP manual states the <methodname>mail()</methodname> function has different
-                behaviour on Windows and on *nix based systems. Using the Sendmail Transport
-                on Windows will not work in combination with <methodname>addBcc()</methodname>.
-                The <methodname>mail()</methodname> function will sent to the BCC recipient such
-                that all the other recipients can see him as recipient!
+                As the <acronym>PHP</acronym> manual states the <methodname>mail()</methodname>
+                function has different behaviour on Windows and on *nix based systems. Using the
+                Sendmail Transport on Windows will not work in combination with
+                <methodname>addBcc()</methodname>. The <methodname>mail()</methodname> function will
+                sent to the BCC recipient such that all the other recipients can see him as
+                recipient!
             </para>
 
             <para>

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

@@ -233,8 +233,8 @@ var_dump($paginator->getPageItemCache());
             "has-an adapter" relationship, rather than the "is-an adapter" relationsship that
             <classname>Zend_Paginator_Adapter_Abstract</classname> promotes. For this cases you can
             use the <classname>Zend_Paginator_AdapterAggregate</classname> interface that behaves
-            much like the <classname>IteratorAggregate</classname> interface of the PHP SPL
-            extension.
+            much like the <classname>IteratorAggregate</classname> interface of the
+            <acronym>PHP</acronym> SPL extension.
         </para>
 
         <para>

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

@@ -319,8 +319,8 @@ PHP framework
 PHP^4 framework
 ]]></programlisting>
 
-            This will make documents with the term PHP appear more relevant. You can also boost
-            phrase terms and subqueries as in the example:
+            This will make documents with the term <acronym>PHP</acronym> appear more relevant. You
+            can also boost phrase terms and subqueries as in the example:
 
             <programlisting language="querystring"><![CDATA[
 "PHP framework"^4 "Zend Framework"

+ 26 - 24
documentation/manual/en/module_specs/Zend_Serializer-Adapter.xml

@@ -9,11 +9,11 @@
     </para>
 
     <para>
-        Every adapter has different pros and cons. In some cases, not every PHP datatype (e.g.,
-        objects) can be converted to a string representation. In most such cases, the type will be
-        converted to a similar type that is serializable -- as an example, PHP objects will often be
-        cast to arrays.  If this fails, a <classname>Zend_Serializer_Exception</classname> will be
-        thrown.
+        Every adapter has different pros and cons. In some cases, not every <acronym>PHP</acronym>
+        datatype (e.g., objects) can be converted to a string representation. In most such cases,
+        the type will be converted to a similar type that is serializable -- as an example,
+        <acronym>PHP</acronym> objects will often be cast to arrays.  If this fails, a
+        <classname>Zend_Serializer_Exception</classname> will be thrown.
     </para>
 
     <para>
@@ -24,8 +24,8 @@
         <title>Zend_Serializer_Adapter_PhpSerialize</title>
 
         <para>
-            This adapter uses the built-in <methodname>un/serialize</methodname> PHP functions, and
-            is a good default adapter choice.
+            This adapter uses the built-in <methodname>un/serialize</methodname>
+            <acronym>PHP</acronym> functions, and is a good default adapter choice.
         </para>
 
         <para>
@@ -38,15 +38,16 @@
 
         <para>
             <ulink url="http://opensource.dynamoid.com">Igbinary</ulink> is Open Source Software
-            released by Sulake Dynamoid Oy. It's a drop-in replacement for the standard PHP
-            serializer. Instead of time and space consuming textual representation, igbinary stores
-            PHP data structures in a compact binary form. Savings are significant when using
-            memcached or similar memory based storages for serialized data.
+            released by Sulake Dynamoid Oy. It's a drop-in replacement for the standard
+            <acronym>PHP</acronym> serializer. Instead of time and space consuming textual
+            representation, igbinary stores <acronym>PHP</acronym> data structures in a compact
+            binary form. Savings are significant when using memcached or similar memory based
+            storages for serialized data.
         </para>
 
         <para>
-            You need the igbinary PHP extension installed on your system in order to use this
-            adapter.
+            You need the igbinary <acronym>PHP</acronym> extension installed on your system in order
+            to use this adapter.
         </para>
 
         <para>
@@ -65,16 +66,17 @@
 
         <para>
             The adapter simply uses the <ulink
-                url="http://php.net/manual/book.wddx.php">wddx_*()</ulink> PHP functions. Please
-            read the php manual to determine how you may enable them in your PHP installation.
+                url="http://php.net/manual/book.wddx.php">wddx_*()</ulink> <acronym>PHP</acronym>
+            functions. Please read the <acronym>PHP</acronym> manual to determine how you may enable
+            them in your <acronym>PHP</acronym> installation.
         </para>
 
         <para>
             Additionally, the <ulink
-                url="http://php.net/manual/book.simplexml.php">SimpleXML</ulink> PHP extension is
-            used to check if a returned <constant>NULL</constant> value from
-            <methodname>wddx_unserialize()</methodname> is based on a serialized
-            <constant>NULL</constant> or on invalid data.
+                url="http://php.net/manual/book.simplexml.php">SimpleXML</ulink>
+            <acronym>PHP</acronym> extension is used to check if a returned
+            <constant>NULL</constant> value from <methodname>wddx_unserialize()</methodname> is
+            based on a serialized <constant>NULL</constant> or on invalid data.
         </para>
 
         <para>
@@ -179,10 +181,10 @@
         <title>Zend_Serializer_Adapter_PythonPickle</title>
 
         <para>
-            This adapter converts PHP types to a <ulink
+            This adapter converts <acronym>PHP</acronym> types to a <ulink
                 url="http://docs.python.org/library/pickle.html">Python Pickle</ulink> string
             representation.  With it, you can read the serialized data with Python and read Pickled
-            data of Python with PHP.
+            data of Python with <acronym>PHP</acronym>.
         </para>
 
         <para>
@@ -277,7 +279,7 @@
         </table>
 
         <para>
-            Datatype merging (Python to PHP) occurs per the following:
+            Datatype merging (Python to <acronym>PHP</acronym>) occurs per the following:
         </para>
 
         <table id="zend.serializer.adapter.pythonpickle.table.python2php">
@@ -364,8 +366,8 @@
         <title>Zend_Serializer_Adapter_PhpCode</title>
 
         <para>
-            This adapter generates a parsable PHP code representation using <ulink
-                url="http://php.net/manual/function.var-export.php">var_export()</ulink>. On
+            This adapter generates a parsable <acronym>PHP</acronym> code representation using
+            <ulink url="http://php.net/manual/function.var-export.php">var_export()</ulink>. On
             restoring, the data will be executed using <ulink
                 url="http://php.net/manual/function.eval.php">eval</ulink>.
         </para>

+ 2 - 1
documentation/manual/en/module_specs/Zend_Serializer-Introduction.xml

@@ -5,7 +5,8 @@
 
     <para>
         <classname>Zend_Serializer</classname> provides an adapter based interface to simply
-        generate storable representation of php types by different facilities, and recover.
+        generate storable representation of <acronym>PHP</acronym> types by different facilities,
+        and recover.
     </para>
 
     <example id="zend.serializer.introduction.example.dynamic">

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

@@ -459,8 +459,8 @@ foreach($list as $name) {
 
         <para>
             It is possible to get and put objects using not stream data held in memory but files or
-            PHP streams. This is especially useful when file sizes are large in order not to
-            overcome memory limits.
+            <acronym>PHP</acronym> streams. This is especially useful when file sizes are large in
+            order not to overcome memory limits.
         </para>
 
         <para>

+ 10 - 9
documentation/manual/en/module_specs/Zend_Service_LiveDocx.xml

@@ -8,11 +8,12 @@
 
         <para>
             LiveDocx is a <acronym>SOAP</acronym> service that allows developers to generate word
-            processing documents by combining structured data from PHP with a template, created in a
-            word processor. The resulting document can be saved as a <acronym>PDF</acronym>,
-            <acronym>DOCX</acronym>, <acronym>DOC</acronym>, <acronym>HTML</acronym> or
-            <acronym>RTF</acronym> file. LiveDocx implements <ulink
-                    url="http://en.wikipedia.org/wiki/Mail_merge">mail-merge</ulink> in PHP.
+            processing documents by combining structured data from <acronym>PHP</acronym> with a
+            template, created in a word processor. The resulting document can be saved as a
+            <acronym>PDF</acronym>, <acronym>DOCX</acronym>, <acronym>DOC</acronym>,
+            <acronym>HTML</acronym> or <acronym>RTF</acronym> file. LiveDocx implements <ulink
+                url="http://en.wikipedia.org/wiki/Mail_merge">mail-merge</ulink> in
+            <acronym>PHP</acronym>.
         </para>
 
         <para>
@@ -346,7 +347,7 @@
 
             <para>
                  In the next step, we are going to populate the merge fields with textual data from
-                 PHP.
+                 <acronym>PHP</acronym>.
             </para>
 
             <para>
@@ -457,8 +458,8 @@ blockEnd_block1
 
             <para>
                 The content of a block is repeated, until all data assigned in the block fields has
-                been injected into the template. The data for block fields is specified in PHP as a
-                multi-assoc array.
+                been injected into the template. The data for block fields is specified in
+                <acronym>PHP</acronym> as a multi-assoc array.
             </para>
 
             <para>
@@ -623,7 +624,7 @@ foreach ($bitmaps as $pageNumber => $bitmapData) {
             <para>
                 This produces two files (<filename>documentPage1.png</filename> and
                 <filename>documentPage2.png</filename>) and writes them to disk in the same
-                directory as the executable PHP file.
+                directory as the executable <acronym>PHP</acronym> file.
             </para>
 
             <para>

+ 3 - 2
documentation/manual/en/module_specs/Zend_Service_StrikeIron-Overview.xml

@@ -205,7 +205,7 @@ $taxBasic = $strikeIron->getService(array('class' => 'SalesUseTaxBasic'));
         <para>
             Once you have used the <methodname>getService()</methodname> method to get a client
             for a particular StrikeIron service, you can utilize that client
-            by calling methods on it just like any other PHP object.
+            by calling methods on it just like any other <acronym>PHP</acronym> object.
 
             <programlisting language="php"><![CDATA[
 $strikeIron = new Zend_Service_StrikeIron(array('username' => 'your-username',
@@ -260,7 +260,8 @@ echo $rateInfo->GST;
 
         <para>
             The simplest way to examine a result from the service is to use the built-in
-            PHP functions like <ulink url="http://www.php.net/print_r">print_r()</ulink>:
+            <acronym>PHP</acronym> functions like <ulink
+                url="http://www.php.net/print_r">print_r()</ulink>:
 
             <programlisting language="php"><![CDATA[
 <?php

+ 15 - 13
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Blob.xml

@@ -12,7 +12,7 @@
     <para>
         Blob Storage is offered by Windows Azure as a <acronym>REST</acronym> API which is
         wrapped by the <classname>Zend_Service_WindowsAzure_Storage_Blob</classname> class in
-        order to provide a native PHP interface to the storage account.
+        order to provide a native <acronym>PHP</acronym> interface to the storage account.
     </para>
 
     <sect3 id="zend.service.windowsazure.storage.blob.api">
@@ -185,10 +185,10 @@ $storageClient->setContainerAcl('testcontainer', Zend_Service_WindowsAzure_Stora
         <title>Blob storage stream wrapper</title>
 
         <para>
-            The Windows Azure SDK for PHP provides support for registering a blob storage
-            client as a PHP file stream wrapper. The blob storage stream wrapper provides
-            support for using regular file operations on Windows Azure Blob Storage.
-            For example, one can open a file from Windows Azure Blob Storage with
+            The Windows Azure SDK for <acronym>PHP</acronym> provides support for registering a blob
+            storage client as a <acronym>PHP</acronym> file stream wrapper. The blob storage stream
+            wrapper provides support for using regular file operations on Windows Azure Blob
+            Storage. For example, one can open a file from Windows Azure Blob Storage with
             the <methodname>fopen()</methodname> function:
         </para>
 
@@ -205,8 +205,8 @@ fclose($fileHandle);
         </example>
 
         <para>
-            In order to do this, the Windows Azure SDK for PHP blob storage client
-            must be registered as a stream wrapper. This can be done by calling the
+            In order to do this, the Windows Azure SDK for <acronym>PHP</acronym> blob storage
+            client must be registered as a stream wrapper. This can be done by calling the
             <methodname>registerStreamWrapper()</methodname> method:
         </para>
 
@@ -314,8 +314,9 @@ $sharedAccessUrl = $storageClient->generateSharedAccessUrl(
 
             <para>
                 When you receive a Shared Access Signature from someone else, you can use the
-                Windows Azure SDK for PHP to work with the addressed resource.  For example, the
-                following signature can be retrieved from the owner of a storage account:
+                Windows Azure SDK for <acronym>PHP</acronym> to work with the addressed resource.
+                For example, the following signature can be retrieved from the owner of a storage
+                account:
             </para>
 
             <literallayout>
@@ -349,10 +350,11 @@ $storageClient->putBlob(
 
             <para>
                 Note that there was no explicit permission to write to a specific blob. Instead, the
-                Windows Azure SDK for PHP determined that a permission was required to either write
-                to that specific blob, or to write to its container. Since only a signature was
-                available for the latter, the Windows Azure SDK for PHP chose those credentials to
-                perform the request on Windows Azure blob storage.
+                Windows Azure SDK for <acronym>PHP</acronym> determined that a permission was
+                required to either write to that specific blob, or to write to its container. Since
+                only a signature was available for the latter, the Windows Azure SDK for
+                <acronym>PHP</acronym> chose those credentials to perform the request on Windows
+                Azure blob storage.
             </para>
         </sect4>
     </sect3>

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

@@ -19,7 +19,7 @@
     <para>
         Queue Storage is offered by Windows Azure as a <acronym>REST</acronym> API which is wrapped
         by the <classname>Zend_Service_WindowsAzure_Storage_Queue</classname> class in order to
-        provide a native PHP interface to the storage account.
+        provide a native <acronym>PHP</acronym> interface to the storage account.
     </para>
 
     <sect3 id="zend.service.windowsazure.storage.queue.api">

+ 11 - 8
documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml

@@ -10,7 +10,7 @@
     <para>
         Table Storage is offered by Windows Azure as a REST API which is wrapped by the
         <classname>Zend_Service_WindowsAzure_Storage_Table</classname> class in order to provide a
-        native PHP interface to the storage account.
+        native <acronym>PHP</acronym> interface to the storage account.
     </para>
 
     <para>
@@ -673,17 +673,19 @@ $batch->commit();
         <title>Table storage session handler</title>
 
         <para>
-            When running a PHP application on the Windows Azure platform in a load-balanced mode
-            (running 2 Web Role instances or more), it is important that PHP session data can be
-            shared between multiple Web Role instances. The Windows Azure SDK for PHP provides the
+            When running a <acronym>PHP</acronym> application on the Windows Azure platform in a
+            load-balanced mode (running 2 Web Role instances or more), it is important that
+            <acronym>PHP</acronym> session data can be shared between multiple Web Role instances.
+            The Windows Azure SDK for <acronym>PHP</acronym> provides the
             <classname>Zend_Service_WindowsAzure_SessionHandler</classname> class, which uses
-            Windows Azure Table Storage as a session handler for PHP applications.
+            Windows Azure Table Storage as a session handler for <acronym>PHP</acronym>
+            applications.
         </para>
 
         <para>
             To use the <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session
-            handler, it should be registered as the default session handler for your PHP
-            application:
+            handler, it should be registered as the default session handler for your
+            <acronym>PHP</acronym> application:
         </para>
 
         <example id="zend.service.windowsazure.storage.table.api.sessionhandler-register">
@@ -710,7 +712,8 @@ $sessionHandler->register();
         <para>
             After registration of the
             <classname>Zend_Service_WindowsAzure_SessionHandler</classname> session handler,
-            sessions can be started and used in the same way as a normal PHP session:
+            sessions can be started and used in the same way as a normal <acronym>PHP</acronym>
+            session:
         </para>
 
         <example id="zend.service.windowsazure.storage.table.api.sessionhandler-usage">

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

@@ -42,7 +42,7 @@ Zend_Session::start();
         <orderedlist>
             <listitem>
                 <para>
-                    Wrong: Do not enable PHP's <ulink
+                    Wrong: Do not enable <acronym>PHP</acronym>'s <ulink
                         url="http://www.php.net/manual/en/ref.session.php#ini.session.auto-start">
                         <code>session.auto_start</code> setting</ulink>. If you do not have the
                     ability to disable this setting in php.ini, you are using mod_php (or

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

@@ -429,7 +429,7 @@
 
             <para>
                 <methodname>getType($type)</methodname> method may be used to get mapping for a
-                specified PHP type:
+                specified <acronym>PHP</acronym> type:
 
                <programlisting language="php"><![CDATA[
 ...

+ 7 - 2
documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml

@@ -30,7 +30,8 @@
                 it on your system.  The next step is to make the zf command available to your
                 system. The easiest way to do this, is to copy the proper files from the bin/
                 directory of the download, and place these files within the
-                <emphasis>same</emphasis> directory as the location of the php cli binary.
+                <emphasis>same</emphasis> directory as the location of the <acronym>PHP</acronym>
+                cli binary.
             </para>
         </sect3>
 
@@ -562,7 +563,11 @@ zf --setup config-file
                             <para>original behavior:</para>
 
                             <itemizedlist>
-                                <listitem><para>use php's include_path to find ZF</para></listitem>
+                                <listitem>
+                                    <para>
+                                        use <acronym>PHP</acronym>'s include_path to find ZF
+                                    </para>
+                                </listitem>
 
                                 <listitem>
                                     <para>use the ZF_INCLUDE_PATH environment variable</para>

+ 8 - 7
documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml

@@ -126,7 +126,7 @@
                 <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the
                 location of the configuration file to use with the Console Client. The
                 <constant>ZF_CONFIG_FILE</constant> can point to any Zend_Config readable INI, XML
-                or PHP File.
+                or <acronym>PHP</acronym> File.
             </para>
 
             <para>
@@ -154,10 +154,11 @@ project.profile = some/path/to/some-directory
 
             <para>
                 The only reserved ini prefix is the value "php". The "php" prefix to values will be
-                reserved to store names and values of runtime settable php values, such as
-                <property>include_path</property> or <property>error_reporting</property>. To
-                override the <property>include_path</property> and
-                <property>error_reporting</property> with an ini value, a developer would set:
+                reserved to store names and values of runtime settable <acronym>PHP</acronym>
+                values, such as <property>include_path</property> or
+                <property>error_reporting</property>. To override the
+                <property>include_path</property> and <property>error_reporting</property> with an
+                ini value, a developer would set:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -167,8 +168,8 @@ php.error_reporting = 1
 
             <important>
                 <para>
-                    The reserved prefix "php" only works with INI files. You can't set PHP INI
-                    values with PHP or XML config.
+                    The reserved prefix "php" only works with INI files. You can't set
+                    <acronym>PHP</acronym> INI values with <acronym>PHP</acronym> or XML config.
                 </para>
             </important>
         </sect3>

+ 4 - 3
documentation/manual/en/module_specs/Zend_Validate-Callback.xml

@@ -67,8 +67,9 @@ if ($valid->isValid($input)) {
         <title>Usage with closures</title>
 
         <para>
-            PHP 5.3 introduces <ulink url="http://php.net/functions.anonymous">closures</ulink>,
-            which are basically self-contained or <emphasis>anonymous</emphasis> functions. PHP
+            <acronym>PHP</acronym> 5.3 introduces <ulink
+                url="http://php.net/functions.anonymous">closures</ulink>, which are basically
+            self-contained or <emphasis>anonymous</emphasis> functions. <acronym>PHP</acronym>
             considers closures another form of callback, and, as such, may be used with
             <classname>Zend_Validate_Callback</classname>. As an example:
         </para>
@@ -145,7 +146,7 @@ if ($valid->isValid($input)) {
 ]]></programlisting>
 
         <para>
-            Finally, if you are using PHP 5.3, you may define the magic method
+            Finally, if you are using <acronym>PHP</acronym> 5.3, you may define the magic method
             <methodname>__invoke()</methodname> in your class. If you do so, simply providing an
             instance of the class as the callback will also work:
         </para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Validate-Ip.xml

@@ -64,8 +64,8 @@ if ($validator->isValid($ip)) {
 
             <para>
                 <classname>Zend_Validate_Ip</classname> validates IPv6 addresses with regex. The
-                reason is that the filters and methods from PHP itself don't follow the RFC. Many
-                other available classes also don't follow it.
+                reason is that the filters and methods from <acronym>PHP</acronym> itself don't
+                follow the RFC. Many other available classes also don't follow it.
             </para>
         </note>
     </sect3>

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

@@ -633,7 +633,7 @@ $view->registerHelper($helper, 'foo');
                 The second argument to <methodname>registerHelper()</methodname> is the name of the
                 helper. A corresponding method name should exist in the helper; otherwise,
                 <classname>Zend_View</classname> will call a non-existent method when invoking the
-                helper, raising a fatal PHP error.
+                helper, raising a fatal <acronym>PHP</acronym> error.
             </para>
         </note>
     </sect2>

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

@@ -200,8 +200,8 @@ base/path/
             hosts -- making their use not terribly portable. If you use template
             <acronym>XML</acronym> in view scripts, short open tags will cause the templates to fail
             validation. Finally, if you use short tags when <constant>short_open_tag</constant> is
-            off, the view scripts will either cause errors or simply echo PHP code back to the
-            viewer.
+            off, the view scripts will either cause errors or simply echo <acronym>PHP</acronym>
+            code back to the viewer.
         </para>
 
         <para>

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

@@ -724,7 +724,7 @@ $server = new Zend_XmlRpc_Server();
             <para>
                 Performance is determined by a lot of parameters and
                 benchmarks only apply for the specific test case. Differences
-                come from PHP version, installed extensions, webserver and
+                come from <acronym>PHP</acronym> version, installed extensions, webserver and
                 operating system just to name a few. Please make sure to
                 benchmark your application on your own and decide which
                 generator to use based on <emphasis>your</emphasis> numbers.

+ 6 - 6
documentation/manual/en/ref/coding_standard.xml

@@ -192,12 +192,12 @@
 
                 <para>
                     The rationale for the change is due to namespace usage. As we look towards Zend
-                    Framework 2.0 and usage of PHP 5.3, we will be using namespaces. The easiest way
-                    to automate conversion to namespaces is to simply convert underscores to the
-                    namespace separator -- but under the old naming conventions, this leaves the
-                    classname as simply "Abstract" or "Interface" -- both of which are reserved
-                    keywords in PHP. If we prepend the (sub)component name to the classname, we can
-                    avoid these issues.
+                    Framework 2.0 and usage of <acronym>PHP</acronym> 5.3, we will be using
+                    namespaces. The easiest way to automate conversion to namespaces is to simply
+                    convert underscores to the namespace separator -- but under the old naming
+                    conventions, this leaves the classname as simply "Abstract" or "Interface" --
+                    both of which are reserved keywords in <acronym>PHP</acronym>. If we prepend the
+                    (sub)component name to the classname, we can avoid these issues.
                 </para>
 
                 <para>

+ 3 - 3
documentation/manual/en/ref/overview.xml

@@ -6,9 +6,9 @@
 
     <para>
         Zend Framework is an open source framework for developing web applications and services
-        with PHP 5. Zend Framework is implemented using 100% object-oriented code. The component
-        structure of Zend Framework is somewhat unique; each component is designed
-        with few dependencies on other components. This loosely coupled architecture allows
+        with <acronym>PHP</acronym> 5. Zend Framework is implemented using 100% object-oriented
+        code. The component structure of Zend Framework is somewhat unique; each component is
+        designed with few dependencies on other components. This loosely coupled architecture allows
         developers to use components individually. We often call this a "use-at-will" design.
     </para>
 

+ 4 - 4
documentation/manual/en/tutorials/form-decorators-composite.xml

@@ -196,10 +196,10 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
 
         <para>
             Revisiting the example from the last section, let's assume that we want users to input
-            each of the year, month, and day separately. PHP fortunately allows us to use array
-            notation when creating elements, so it's still possible to capture these three entities
-            into a single value -- and we've now created a <classname>Zend_Form</classname> element
-            that can handle such an array value.
+            each of the year, month, and day separately. <acronym>PHP</acronym> fortunately allows
+            us to use array notation when creating elements, so it's still possible to capture these
+            three entities into a single value -- and we've now created a
+            <classname>Zend_Form</classname> element that can handle such an array value.
         </para>
 
         <para>

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

@@ -22,11 +22,11 @@
         </para>
 
         <para>
-            In PHP, the session problem is solved by the session extension which utilizes some state
-            tracking, typically cookies, and some form of local storage which is exposed via the
-            $_SESSION superglobal.  In Zend Framework, the component Zend_Session adds value to the
-            php session extension making it easier to use and depend on inside object-oriented
-            applications.
+            In <acronym>PHP</acronym>, the session problem is solved by the session extension which
+            utilizes some state tracking, typically cookies, and some form of local storage which is
+            exposed via the $_SESSION superglobal.  In Zend Framework, the component Zend_Session
+            adds value to the <acronym>PHP</acronym> session extension making it easier to use and
+            depend on inside object-oriented applications.
         </para>
     </sect2>
 
@@ -61,10 +61,10 @@ resources.session.remember_me_seconds = 864000
 
         <para>
             As you can see, the options passed in are the same options that you'd expect to find
-            in the ext/session extension in PHP.  Those options setup the path to the session
-            files where data will be stored within the project.  Since ini files can additionally
-            use constants, the above will use the APPLICATION_PATH constant and relatively point
-            to a data session directory.
+            in the ext/session extension in <acronym>PHP</acronym>.  Those options setup the path
+            to the session files where data will be stored within the project.  Since ini files can
+            additionally use constants, the above will use the APPLICATION_PATH constant and
+            relatively point to a data session directory.
         </para>
 
         <para>

+ 4 - 4
documentation/manual/en/tutorials/quickstart-create-model.xml

@@ -536,10 +536,10 @@ Updating project profile '.zfproject.xml'
 ]]></programlisting>
 
     <para>
-        We'll modify this empty PHP class to make it easy to populate the model by passing an array
-        of data either to the constructor or a <methodname>setOptions()</methodname> method. The
-        final model class, located in <filename>application/models/Guestbook.php</filename>, should
-        look like this:
+        We'll modify this empty <acronym>PHP</acronym> class to make it easy to populate the model
+        by passing an array of data either to the constructor or a
+        <methodname>setOptions()</methodname> method. The final model class, located in
+        <filename>application/models/Guestbook.php</filename>, should look like this:
     </para>
 
     <programlisting language="php"><![CDATA[

+ 13 - 12
documentation/manual/en/tutorials/quickstart-create-project.xml

@@ -11,10 +11,11 @@
         <title>Install Zend Framework</title>
 
         <para>
-            The easiest way to get Zend Framework along with a complete PHP stack is by installing
-            <ulink url="http://www.zend.com/en/products/server-ce/downloads">Zend Server</ulink>.
-            Zend Server has native installers for Mac OSX, Windows, Fedora Core, and Ubuntu, as well
-            as a universal installation package compatible with most Linux distributions.
+            The easiest way to get Zend Framework along with a complete <acronym>PHP</acronym> stack
+            is by installing <ulink url="http://www.zend.com/en/products/server-ce/downloads">Zend
+                Server</ulink>. Zend Server has native installers for Mac OSX, Windows, Fedora Core,
+            and Ubuntu, as well as a universal installation package compatible with most Linux
+            distributions.
         </para>
 
         <para>
@@ -171,9 +172,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             While Zend Framework is itself configurationless, you often need to configure your
             application. The default configuration is placed in
             <filename>application/configs/application.ini</filename>, and contains some basic
-            directives for setting your PHP environment (for instance, turning error reporting on
-            and off), indicating the path to your bootstrap class (as well as its class name), and
-            the path to your action controllers. It looks as follows:
+            directives for setting your <acronym>PHP</acronym> environment (for instance, turning
+            error reporting on and off), indicating the path to your bootstrap class (as well as its
+            class name), and the path to your action controllers. It looks as follows:
         </para>
 
         <programlisting language="ini"><![CDATA[
@@ -303,9 +304,9 @@ class ErrorController extends Zend_Controller_Action
         <title>Views</title>
 
         <para>
-            Views in Zend Framework are written in plain old PHP. View scripts are placed in
-            <filename>application/views/scripts/</filename>, where they are further categorized
-            using the controller names. In our case, we have an
+            Views in Zend Framework are written in plain old <acronym>PHP</acronym>. View scripts
+            are placed in <filename>application/views/scripts/</filename>, where they are further
+            categorized using the controller names. In our case, we have an
             <classname>IndexController</classname> and an <classname>ErrorController</classname>,
             and thus we have corresponding <filename>index/</filename> and
             <filename>error/</filename> subdirectories within our view scripts directory. Within
@@ -316,7 +317,7 @@ class ErrorController extends Zend_Controller_Action
 
         <para>
             View scripts may contain any markup you want, and use the <code>&lt;?php</code> opening
-            tag and <code>?&gt;</code> closing tag to insert PHP directives.
+            tag and <code>?&gt;</code> closing tag to insert <acronym>PHP</acronym> directives.
         </para>
 
         <para>
@@ -377,7 +378,7 @@ class ErrorController extends Zend_Controller_Action
 
         <para>
             The <filename>error/error.phtml</filename> view script is slightly more interesting as
-            it uses some PHP conditionals:
+            it uses some <acronym>PHP</acronym> conditionals:
         </para>
 
         <programlisting language="php"><![CDATA[