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

[MANUAL] English:

- erased double spaces

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21818 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 15 лет назад
Родитель
Сommit
2f18bde181
24 измененных файлов с 153 добавлено и 159 удалено
  1. 79 85
      documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml
  2. 8 8
      documentation/manual/en/module_specs/Zend_Feed_Pubsubhubbub.xml
  3. 1 1
      documentation/manual/en/module_specs/Zend_Loader-Autoloader.xml
  4. 1 1
      documentation/manual/en/module_specs/Zend_Loader.xml
  5. 1 1
      documentation/manual/en/module_specs/Zend_Log-Factory.xml
  6. 1 1
      documentation/manual/en/module_specs/Zend_Log-Overview.xml
  7. 1 1
      documentation/manual/en/module_specs/Zend_Mail-AddingRecipients.xml
  8. 1 1
      documentation/manual/en/module_specs/Zend_Markup-Getting-Started.xml
  9. 2 2
      documentation/manual/en/module_specs/Zend_Oauth-Introduction.xml
  10. 2 2
      documentation/manual/en/module_specs/Zend_Oauth-ProtocolWorkflow.xml
  11. 2 2
      documentation/manual/en/module_specs/Zend_Oauth-SecurityArchitecture.xml
  12. 2 2
      documentation/manual/en/module_specs/Zend_Serializer-Adapter.xml
  13. 1 1
      documentation/manual/en/module_specs/Zend_Service_DeveloperGarden.xml
  14. 4 4
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Blob.xml
  15. 4 4
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Queue.xml
  16. 8 8
      documentation/manual/en/module_specs/Zend_Service_WindowsAzure_Table.xml
  17. 12 12
      documentation/manual/en/module_specs/Zend_Tool-Usage-CLI.xml
  18. 2 2
      documentation/manual/en/module_specs/Zend_Validate-Barcode.xml
  19. 3 3
      documentation/manual/en/module_specs/Zend_View-Helpers-Currency.xml
  20. 1 1
      documentation/manual/en/tutorials/form-decorators-composite.xml
  21. 2 2
      documentation/manual/en/tutorials/form-decorators-individual.xml
  22. 10 10
      documentation/manual/en/tutorials/multiuser-sessions.xml
  23. 1 1
      documentation/manual/en/tutorials/plugins-usage.xml
  24. 4 4
      documentation/manual/en/tutorials/quickstart-create-model.xml

+ 79 - 85
documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml

@@ -29,9 +29,9 @@ echo $channel->title();
     <para>
         Note the function syntax. <classname>Zend_Feed</classname> uses a convention of treating
         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.
+        syntax (<command>$obj->property</command>) and as strings if they are access with method
+        syntax (<command>$obj->property()</command>). This enables access to the full text of any
+        individual node while still allowing full access to all children.
     </para>
 
     <para>
@@ -71,52 +71,48 @@ foreach ($channel as $item) {
         Required channel elements:
     </para>
 
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para><property>title</property> - The name of the channel</para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>link</property> - The <acronym>URL</acronym> of the web site
-                    corresponding to the channel
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>description</property> - A sentence or several describing the channel
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+    <itemizedlist>
+        <listitem>
+            <para><property>title</property> - The name of the channel</para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>link</property> - The <acronym>URL</acronym> of the web site
+                corresponding to the channel
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>description</property> - A sentence or several describing the channel
+            </para>
+        </listitem>
+    </itemizedlist>
 
     <para>
         Common optional channel elements:
     </para>
 
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <property>pubDate</property> - The publication date of this set of content, in
-                    <acronym>RFC</acronym> 822 date format
-                </para>
-            </listitem>
-
-            <listitem>
-                <para><property>language</property> - The language the channel is written in</para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>category</property> - One or more (specified by multiple tags)
-                    categories the channel belongs to
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+    <itemizedlist>
+        <listitem>
+            <para>
+                <property>pubDate</property> - The publication date of this set of content, in
+                <acronym>RFC</acronym> 822 date format
+            </para>
+        </listitem>
+
+        <listitem>
+            <para><property>language</property> - The language the channel is written in</para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>category</property> - One or more (specified by multiple tags)
+                categories the channel belongs to
+            </para>
+        </listitem>
+    </itemizedlist>
 
     <para>
         <acronym>RSS</acronym> <emphasis>&lt;item&gt;</emphasis> elements do not have any strictly
@@ -128,45 +124,43 @@ foreach ($channel as $item) {
         Common item elements:
     </para>
 
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para><property>title</property> - The title of the item</para>
-            </listitem>
-
-            <listitem>
-                <para><property>link</property> - The <acronym>URL</acronym> of the item</para>
-            </listitem>
-
-            <listitem>
-                <para><property>description</property> - A synopsis of the item</para>
-            </listitem>
-
-            <listitem>
-                <para><property>author</property> - The author's email address</para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>category</property> - One more categories that the item belongs to
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>comments</property> - <acronym>URL</acronym> of comments relating to
-                    this item
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>pubDate</property> - The date the item was published, in
-                    <acronym>RFC</acronym> 822 date format
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+    <itemizedlist>
+        <listitem>
+            <para><property>title</property> - The title of the item</para>
+        </listitem>
+
+        <listitem>
+            <para><property>link</property> - The <acronym>URL</acronym> of the item</para>
+        </listitem>
+
+        <listitem>
+            <para><property>description</property> - A synopsis of the item</para>
+        </listitem>
+
+        <listitem>
+            <para><property>author</property> - The author's email address</para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>category</property> - One more categories that the item belongs to
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>comments</property> - <acronym>URL</acronym> of comments relating to
+                this item
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>pubDate</property> - The date the item was published, in
+                <acronym>RFC</acronym> 822 date format
+            </para>
+        </listitem>
+    </itemizedlist>
 
     <para>
         In your code you can always test to see if an element is non-empty with:
@@ -179,8 +173,8 @@ if ($item->propname()) {
 ]]></programlisting>
 
     <para>
-        If you use <code>$item->propname</code> instead, you will always get an empty object which
-        will evaluate to <constant>TRUE</constant>, so your check will fail.
+        If you use <command>$item->propname</command> instead, you will always get an empty object
+        which will evaluate to <constant>TRUE</constant>, so your check will fail.
     </para>
 
     <para>

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

@@ -25,7 +25,7 @@
             Pubsubhubbub has garnered attention because it is a pubsub protocol which is easy to
             implement and which operates over HTTP. Its philosophy is to replace the traditional
             model where blog feeds have been polled at regular intervals to detect and retrieve
-            updates.  Depending on the frequency of polling, this can take a lot of time to
+            updates. Depending on the frequency of polling, this can take a lot of time to
             propagate updates to interested parties from planet aggregators to desktop readers. With
             a pubsub system in place, updates are not simply polled by Subscribers, they are pushed
             to Subscribers, elimenating any delay. For this reason, Pubsubhubbub forms part of what
@@ -35,7 +35,7 @@
         <para>
             The protocol does not exist in isolation. Pubsub systems have been around for a while,
             such as the familiar Jabber Publish-Subscribe protocol, XEP-0060, or the less well known
-            rssCloud (described in 2001).  However these have not achieved widespread adoption
+            rssCloud (described in 2001). However these have not achieved widespread adoption
             typically due to either their complexity, poor timing or lack of suitability for web
             applications. rssCloud, which was recently revived as a response to the appearance of
             Pubsubhubbub, has also seen its usage increase significantly though it lacks a formal
@@ -88,7 +88,7 @@
             classes <classname>Zend_Feed_Pubsubhubbub_Publisher</classname> and
             <classname>Zend_Feed_Pubsubhubbub_Subscriber</classname>. In addition, the Subscriber
             implementation may handle any feed updates forwarded from a Hub by using
-            <classname>Zend_Feed_Pubsubhubbub_Subscriber_Callback</classname>.  These classes, their
+            <classname>Zend_Feed_Pubsubhubbub_Subscriber_Callback</classname>. These classes, their
             use cases, and APIs are covered in subsequent sections.
         </para>
     </sect2>
@@ -159,7 +159,7 @@ if (!$publisher->isSuccess()) {
             If you prefer having more concrete control over the Publisher, the methods
             <methodname>addHubUrls()</methodname> and <methodname>addUpdatedTopicUrls()</methodname>
             pass each array value to the singular <methodname>addHubUrl()</methodname> and
-            <methodname>addUpdatedTopicUrl()</methodname> public methods.  There are also matching
+            <methodname>addUpdatedTopicUrl()</methodname> public methods. There are also matching
             <methodname>removeUpdatedTopicUrl()</methodname> and
             <methodname>removeHubUrl()</methodname> methods.
         </para>
@@ -233,7 +233,7 @@ if (!$publisher->isSuccess()) {
             <para>
                 <classname>Zend_Feed_Pubsubhubbub_Subscriber</classname> implements a full
                 Pubsubhubbub Subscriber capable of subscribing to, or unsubscribing from, any Topic
-                via any Hub advertised by that Topic.  It operates in conjunction with
+                via any Hub advertised by that Topic. It operates in conjunction with
                 <classname>Zend_Feed_Pubsubhubbub_Subscriber_Callback</classname> which accepts
                 requests from a Hub to confirm all subscription or unsubscription attempts (to
                 prevent third-party misuse).
@@ -343,7 +343,7 @@ CREATE TABLE IF NOT EXISTS `subscription` (
                                     a query string parameter preserved by the Hub and resent with
                                     all Subscriber requests. Its purpose is to allow the Subscriber
                                     to identify and look up the subscription associated with any Hub
-                                    request in a backend storage medium.  This is a non-standard
+                                    request in a backend storage medium. This is a non-standard
                                     parameter used by this component in preference to encoding a
                                     subscription key in the URI path which is more difficult to
                                     implement in a Zend Framework application.
@@ -543,10 +543,10 @@ if ($callback->hasFeedUpdate()) {
                 <para>
                     It should be noted that
                     <classname>Zend_Feed_Pubsubhubbub_Subscriber_Callback</classname> may
-                    independently parse any incoming query string and other parameters.  This is
+                    independently parse any incoming query string and other parameters. This is
                     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
+                    <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>

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

@@ -158,7 +158,7 @@ $autoloader->setFallbackAutoloader(true);
                 <listitem>
                     <para>
                         Each "_" character in the <emphasis>CLASS NAME</emphasis> is converted to a
-                        <constant>DIRECTORY_SEPARATOR</constant>.  The "_" character has no special
+                        <constant>DIRECTORY_SEPARATOR</constant>. The "_" character has no special
                         meaning in the namespace.
                     </para>
                 </listitem>

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

@@ -142,7 +142,7 @@ Zend_Loader::loadClass('Container_Tree',
                 <listitem>
                     <para>
                         Each "_" character in the <emphasis>CLASS NAME</emphasis> is converted to a
-                        <constant>DIRECTORY_SEPARATOR</constant>.  The "_" character has no special
+                        <constant>DIRECTORY_SEPARATOR</constant>. The "_" character has no special
                         meaning in the namespace.
                     </para>
                 </listitem>

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

@@ -91,7 +91,7 @@ $logger = Zend_Log::factory(array(
                 <para>
                     The "short" name of a filter to use with the given log writer; the name of the
                     filter minus the leading class prefix/namespace. See the "filterNamespace" entry
-                    below for more details.  Examples: "Message", "Priority".
+                    below for more details. Examples: "Message", "Priority".
                 </para>
             </listitem>
         </varlistentry>

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

@@ -235,7 +235,7 @@ $logger->setEventItem('pid', getmypid());
         <title>Log PHP Errors</title>
 
         <para>
-            Zend_Log can also be used to log <acronym>PHP</acronym> errors.  Calling
+            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>

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

@@ -49,7 +49,7 @@
 
         <para>
             All three of these methods can also accept an array of email addresses
-            to add instead of one at a time.  In the case of <methodname>addTo()</methodname> and
+            to add instead of one at a time. In the case of <methodname>addTo()</methodname> and
             <methodname>addCc()</methodname>, they can be associative arrays where the key is the
             human readable name for the recipient.
         </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Markup-Getting-Started.xml

@@ -14,7 +14,7 @@
 
         <para>
             We will first instantiate a <classname>Zend_Markup_Renderer_Html</classname> object
-            using the <methodname>Zend_Markup::factory()</methodname> method.  This will also create
+            using the <methodname>Zend_Markup::factory()</methodname> method. This will also create
             a <classname>Zend_Markup_Parser_Bbcode</classname> object which will be added to the
             renderer object.
         </para>

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

@@ -8,8 +8,8 @@
         without being forced to disclose your username or password. If you think about it, the
         practice of handing over your username and password for sites like Yahoo Mail or Twitter has
         been endemic for quite a while. This has raised some serious concerns because there's
-        nothing to prevent other applications from misusing this data.  Yes, some services may
-        appear trustworthy but that is never guaranteed.  OAuth resolves this problem by eliminating
+        nothing to prevent other applications from misusing this data. Yes, some services may
+        appear trustworthy but that is never guaranteed. OAuth resolves this problem by eliminating
         the need for any username and password sharing, replacing it with a user controlled
         authorization process.
     </para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Oauth-ProtocolWorkflow.xml

@@ -52,7 +52,7 @@
         TweetExpress' callback URL will trigger an examination of the response to determine whether
         the User has granted their approval to Twitter. Assuming so, it may now exchange it's
         unauthorized Request Token for a fully authorized Access Token by sending a request back to
-        Twitter including the Request Token and the received verification code.  Twitter should now
+        Twitter including the Request Token and the received verification code. Twitter should now
         send back a response containing this Access Token which must be used in all requests used to
         access Twitter's API on behalf of the User. Twitter will only do this once they have
         confirmed the attached Request Token has not already been used to retrieve another Access
@@ -69,7 +69,7 @@
 
     <para>
         Although Twitter do not currently expire Access Tokens, the User is free to deauthorize
-        TweetExpress from their Twitter account settings.  Once deauthorized, TweetExpress' access
+        TweetExpress from their Twitter account settings. Once deauthorized, TweetExpress' access
         will be cut off and their Access Token rendered invalid.
     </para>
 </sect2>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Oauth-SecurityArchitecture.xml

@@ -48,7 +48,7 @@
         RSA-SHA1 operates on similar principles except that the shared secret is, as you would
         expect, each parties' RSA private key. Both sides would have the other's public key with
         which to verify digital signatures. This does pose a level of risk compared to HMAC-SHA1
-        since the RSA method does not use the Access Key as part of the shared secret.  This means
+        since the RSA method does not use the Access Key as part of the shared secret. This means
         that if the RSA private key of any Consumer is compromised, then all Access Tokens assigned
         to that Consumer are also. RSA imposes an all or nothing scheme. In general, the majority of
         service providers offering OAuth authorization have therefore tended to use HMAC-SHA1 by
@@ -58,7 +58,7 @@
     <para>
         While digital signatures add to OAuth's security they are still vulnerable to other forms of
         attack, such as replay attacks which copy earlier requests which were intercepted and
-        validly signed at that time.  An attacker can now resend the exact same request to a
+        validly signed at that time. An attacker can now resend the exact same request to a
         Provider at will at any time and intercept its results. This poses a significant risk but it
         is quiet simple to defend against - add a unique string (i.e. a nonce) to all requests which
         changes per request (thus continually changing the signature string) but which can never be

+ 2 - 2
documentation/manual/en/module_specs/Zend_Serializer-Adapter.xml

@@ -12,7 +12,7 @@
         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
+        <acronym>PHP</acronym> objects will often be cast to arrays. If this fails, a
         <classname>Zend_Serializer_Exception</classname> will be thrown.
     </para>
 
@@ -183,7 +183,7 @@
         <para>
             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
+            representation. With it, you can read the serialized data with Python and read Pickled
             data of Python with <acronym>PHP</acronym>.
         </para>
 

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

@@ -269,7 +269,7 @@ echo 'Quota Level: ', $result->getQuotaLevel(), '<br />';
 
             <para>
                 To change the current quota use one of the <methodname>changeQuotaPool</methodname>
-                methods.  First parameter is the new pool value and the second one is the
+                methods. First parameter is the new pool value and the second one is the
                 environment.
             </para>
 

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

@@ -5,7 +5,7 @@
 
     <para>
         Blob Storage stores sets of binary data. Blob storage offers the following three
-        resources: the storage account, containers, and blobs.  Within your storage account,
+        resources: the storage account, containers, and blobs. Within your storage account,
         containers provide a way to organize sets of blobs within your storage account.
     </para>
 
@@ -20,7 +20,7 @@
 
         <para>
             This topic lists some examples of using the
-            <classname>Zend_Service_WindowsAzure_Storage_Blob</classname> class.  Other features are
+            <classname>Zend_Service_WindowsAzure_Storage_Blob</classname> class. Other features are
             available in the download package, as well as a detailed API documentation of those
             features.
         </para>
@@ -91,7 +91,7 @@ echo 'Blob name is: ' . $result->Name;
             <title>Copying a blob</title>
 
             <para>
-                Using the following code, a blob can be copied from inside the storage account.  The
+                Using the following code, a blob can be copied from inside the storage account. The
                 advantage of using this method is that the copy operation occurs in the Azure cloud
                 and does not involve downloading the blob. Note that the container has already been
                 created before.
@@ -176,7 +176,7 @@ $storageClient->setContainerAcl('testcontainer', Zend_Service_WindowsAzure_Stora
         <para>
             In order to work with the root container, it should first be created using the
             <methodname>createContainer()</methodname> method, naming the container
-            <varname>$root</varname>.  All other operations on the root container should be issued
+            <varname>$root</varname>. All other operations on the root container should be issued
             with the container name set to <varname>$root</varname>.
         </para>
     </sect3>

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

@@ -27,7 +27,7 @@
 
         <para>
             This topic lists some examples of using the
-            <classname>Zend_Service_WindowsAzure_Storage_Queue</classname> class.  Other features
+            <classname>Zend_Service_WindowsAzure_Storage_Queue</classname> class. Other features
             are available in the download package, as well as a detailed API documentation of those
             features.
         </para>
@@ -114,7 +114,7 @@ foreach ($messages as $message) {
             <para>
                 The messages that are read using <methodname>getMessages()</methodname> will be
                 invisible in the queue for 30 seconds, after which the messages will re-appear in
-                the queue.  To mark a message as processed and remove it from the queue, use the
+                the queue. To mark a message as processed and remove it from the queue, use the
                 <methodname>deleteMessage()</methodname> method.
             </para>
 
@@ -141,7 +141,7 @@ foreach ($messages as $message) {
             <title>Check if there are messages in a queue</title>
 
             <para>
-                Using the following code, a queue can be checked for new messages.  Note that the
+                Using the following code, a queue can be checked for new messages. Note that the
                 queue and message have already been created before.
             </para>
 
@@ -163,7 +163,7 @@ foreach ($messages as $message) {
             <para>
                 Note that messages that are read using <methodname>peekMessages()</methodname> will
                 not become invisible in the queue, nor can they be marked as processed using the
-                <methodname>deleteMessage()</methodname> method.  To do this, use
+                <methodname>deleteMessage()</methodname> method. To do this, use
                 <methodname>getMessages()</methodname> instead.
             </para>
         </sect4>

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

@@ -15,7 +15,7 @@
 
     <para>
         This topic lists some examples of using the
-        <classname>Zend_Service_WindowsAzure_Storage_Table</classname> class.  Other features are
+        <classname>Zend_Service_WindowsAzure_Storage_Table</classname> class. Other features are
         available in the download package, as well as a detailed API documentation of those
         features.
     </para>
@@ -83,7 +83,7 @@ foreach ($result as $table) {
         <title>Operations on entities</title>
 
         <para>
-            Tables store data as collections of entities. Entities are similar to rows.  An entity
+            Tables store data as collections of entities. Entities are similar to rows. An entity
             has a primary key and a set of properties. A property is a named, typed-value pair,
             similar to a column.
         </para>
@@ -154,7 +154,7 @@ class SampleEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
                 To enforce a schema on the client side using the
                 <classname>Zend_Service_WindowsAzure_Storage_Table</classname> class, you can create
                 a class which inherits
-                <classname>Zend_Service_WindowsAzure_Storage_TableEntity</classname>.  This class
+                <classname>Zend_Service_WindowsAzure_Storage_TableEntity</classname>. This class
                 provides some basic functionality for the
                 <classname>Zend_Service_WindowsAzure_Storage_Table</classname> class to work with a
                 client-side schema.
@@ -432,7 +432,7 @@ $target->setAzurePropertyType('Age', 'Edm.Int64');
 
                 <para>
                     Using the following code, an entity can be inserted into a table named
-                    "testtable".  Note that the table has already been created before.
+                    "testtable". Note that the table has already been created before.
                 </para>
 
                 <example id="zend.service.windowsazure.storage.table.api.entities.insert.example">
@@ -461,7 +461,7 @@ echo 'Etag: ' . $result->getEtag() . "\n";
 
                 <para>
                     Using the following code, an entity can be retrieved by partition key and row
-                    key.  Note that the table and entity have already been created before.
+                    key. Note that the table and entity have already been created before.
                 </para>
 
                 <example
@@ -534,7 +534,7 @@ $result = $storageClient->updateEntity('testtable', $entity, true);
                 <title>Deleting an entity</title>
 
                 <para>
-                    Using the following code, an entity can be deleted.  Note that the table and
+                    Using the following code, an entity can be deleted. Note that the table and
                     entity have already been created before.
                 </para>
 
@@ -579,7 +579,7 @@ $result = $storageClient->deleteEntity('testtable', $entity);
             </itemizedlist>
 
             <para>
-                Using the following code, a table can be queried using a filter condition.  Note
+                Using the following code, a table can be queried using a filter condition. Note
                 that the table and entities have already been created before.
             </para>
 
@@ -603,7 +603,7 @@ foreach ($entities as $entity) {
             </example>
 
             <para>
-                Using the following code, a table can be queried using a fluent interface.  Note
+                Using the following code, a table can be queried using a fluent interface. Note
                 that the table and entities have already been created before.
             </para>
 

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

@@ -25,9 +25,9 @@
             <title>Download And Go</title>
 
             <para>
-                First download Zend Framework.  This can be done by going to framework.zend.com
-                and downloading the latest release.  After you've downloaded the package and placed
-                it on your system.  The next step is to make the zf command available to your
+                First download Zend Framework. This can be done by going to framework.zend.com
+                and downloading the latest release. After you've downloaded the package and placed
+                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 <acronym>PHP</acronym>
@@ -40,8 +40,8 @@
 
             <para>
                 To install via PEAR, you must use the 3rd party zfcampus.org site to retrieve the
-                latest Zend Framework PEAR package.  These packages are typically built within a day
-                of an official Zend Framework release.  The benefit of installing via the PEAR
+                latest Zend Framework PEAR package. These packages are typically built within a day
+                of an official Zend Framework release. The benefit of installing via the PEAR
                 package manager is that during the install process, the ZF library will end up on
                 the include_path, and the zf.php and zf scripts will end up in a place on your
                 system that will allow you to run them without any additional setup.
@@ -54,7 +54,7 @@ pear install zfcampus/zf
 
             <para>
                 That is it. After the initial install, you should be able to continue on by
-                running the zf command.  Go good way to check to see if it't there is to run
+                running the zf command. Go good way to check to see if it't there is to run
                 zf --help
             </para>
         </sect3>
@@ -71,7 +71,7 @@ pear install zfcampus/zf
 
             <para>
                 If you are on a *nix or mac system, you can also create a link from somewhere in
-                your path to the zf.sh file.  If you do this, you do not need to worry about having
+                your path to the zf.sh file. If you do this, you do not need to worry about having
                 Zend Framework's library on your include_path, as the zf.php and zf.sh files will
                 be able to access the library relative to where they are (meaning the ./bin/ files
                 are ../library/ relative to the Zend Framework library).
@@ -79,9 +79,9 @@ pear install zfcampus/zf
 
             <para>
                 There are a number of other options available for setting up the zf.php and library
-                on your system.  These options revolve around setting specific environment
+                on your system. These options revolve around setting specific environment
                 variables. These are described in the later section on "customizing the CLI
-                environement".  The environment variables for setting the zf.php include_path,
+                environement". The environment variables for setting the zf.php include_path,
                 ZF_INCLUDE_PATH and ZF_INCLUDE_PATH_PREPEND, are the ones of most interest.
             </para>
         </sect3>
@@ -108,9 +108,9 @@ zf show version
 
             <para>
                 The built-in help system is the primary place where you can get up-to-date
-                information on what your system is capable of doing.  The help system is dynamic in
+                information on what your system is capable of doing. The help system is dynamic in
                 that as providers are added to your system, they are automatically dispatchable, and
-                as such, the parameters required to run them will be in the help screen.  The
+                as such, the parameters required to run them will be in the help screen. The
                 easiest way to retrieve the help screen is the following:
             </para>
 
@@ -224,7 +224,7 @@ zf create module Blog
 
             <para>
                 The controller provider is responsible for creating (mostly) empty controllers as
-                well as their corresponding view script directories and files.  To utilize it to
+                well as their corresponding view script directories and files. To utilize it to
                 create an 'Auth' controlller, for example, execute:
             </para>
 

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

@@ -387,7 +387,7 @@
         <title>Basic usage</title>
 
         <para>
-            To validate if a given string is a barcode you just need to know its type.  See the
+            To validate if a given string is a barcode you just need to know its type. See the
             following example for an EAN13 barcode:
         </para>
 
@@ -442,7 +442,7 @@ if ($valid->isValid($input)) {
         <para>
             You may write custom barcode validators for usage with
             <classname>Zend_Validate_Barcode</classname>; this is often necessary when dealing with
-            proprietary barcode types.  To write your own barcode validator, you need the following
+            proprietary barcode types. To write your own barcode validator, you need the following
             information.
         </para>
 

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

@@ -5,7 +5,7 @@
 
     <para>
         Displaying localized currency values is a common task; the
-        <classname>Zend_Currency</classname> view helper is intended to simply this task.  See the
+        <classname>Zend_Currency</classname> view helper is intended to simply this task. See the
         <link linkend="zend.currency.introduction">Zend_Currency documentation</link> for specifics
         on this localization feature. In this section, we will focus simply on usage of the view
         helper.
@@ -44,7 +44,7 @@
 
     <para>
         There are several ways to select the desired currency. First, you may simply provide a
-        currency string; alternately, you may specify a locale.  The preferred way is to use a
+        currency string; alternately, you may specify a locale. The preferred way is to use a
         locale as this information is automatically detected and selected via the HTTP client
         headers provided when a user accesses your application, and ensures the currency provided
         will match their locale.
@@ -123,7 +123,7 @@ echo $helper->currency(1234.56); // this returns '€ 1.234,56'
 
     <para>
         As already seen, the <methodname>currency()</methodname> method is used to return the
-        currency string. Just call it with the value you want to display as a currency.  It also
+        currency string. Just call it with the value you want to display as a currency. It also
         accepts some options which may be used to change the behaviour and output of the helper.
     </para>
 

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

@@ -184,7 +184,7 @@ class My_Form_Element_Date extends Zend_Form_Element_Xhtml
 
         <para>
             This class gives some nice flexibility -- we can set default values from our database,
-            and be certain that the value will be stored and represented correctly.  Additionally,
+            and be certain that the value will be stored and represented correctly. Additionally,
             we can allow for the value to be set from an array passed via form input. Finally, we
             have discrete accessors for each date segment, which we can now use in a decorator to
             create a composite element.

+ 2 - 2
documentation/manual/en/tutorials/form-decorators-individual.xml

@@ -80,7 +80,7 @@ echo $element->renderSimpleInput();
     <para>
         First, let's define a form. Our form will capture a user's demographic details. The markup
         will be highly customized, and in some cases use view helpers directly instead of form
-        elements in order to achieve its goals.  Here is the basic form definition:
+        elements in order to achieve its goals. Here is the basic form definition:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -128,7 +128,7 @@ class My_Form_UserDemographics extends Zend_Form
     <para>
         With that out of the way, let's consider how we might want to display this form. One common
         idiom with first/last names is to display them on a single line; when a title is provided,
-        that is often on the same line as well.  Dates, when not using a JavaScript date chooser,
+        that is often on the same line as well. Dates, when not using a JavaScript date chooser,
         will often be separated into three fields displayed side by side.
     </para>
 

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

@@ -7,16 +7,16 @@
         <title>Introduction to Sessions</title>
 
         <para>
-            The success of the web is deeply rooted in the protocol that drives the web: HTTP.  HTTP
+            The success of the web is deeply rooted in the protocol that drives the web: HTTP. HTTP
             over TCP is by its very nature stateless, which means that inherently the web is also
-            stateless.  While this very aspect is one of the dominating factors for why the web has
+            stateless. While this very aspect is one of the dominating factors for why the web has
             become such a popular medium, it also causes an interesting problem for developers that
             want to use the web as an application platform.
         </para>
 
         <para>
             The act of interacting with a web application is typically defined by the sum
-            of all requests sent to a web server.  Since there can be many consumers being served
+            of all requests sent to a web server. Since there can be many consumers being served
             simultaneously, the application must decide which requests belong to which consumer.
             These requests are typically known as a "session".
         </para>
@@ -24,7 +24,7 @@
         <para>
             In <acronym>PHP</acronym>, the session problem is solved by the session extension which
             utilizes some state tracking, typically cookies, and some form of local storage which is
-            exposed via the $_SESSION superglobal.  In Zend Framework, the component Zend_Session
+            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>
@@ -35,7 +35,7 @@
 
         <para>
             The Zend_Session component is both a session manager as well as an API for
-            storing data into a session object for long-term persistence.  The Zend_Session API is
+            storing data into a session object for long-term persistence. The Zend_Session API is
             for managing the options and behavior of a session, like options, starting and stopping
             a session, whereas Zend_Session_Namespace is the actual object used to store data.
         </para>
@@ -48,7 +48,7 @@
 
         <para>
             Zend_Application is capable of configuring Zend_Session for you as part of the
-            Zend_Application_Resource system.  To use this, assuming your project uses
+            Zend_Application_Resource system. To use this, assuming your project uses
             Zend_Application to bootstrap, you would add the following code to your
             application.ini file:
         </para>
@@ -61,8 +61,8 @@ 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 <acronym>PHP</acronym>.  Those options setup the path
-            to the session files where data will be stored within the project.  Since ini files can
+            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>
@@ -75,9 +75,9 @@ resources.session.remember_me_seconds = 864000
 
         <para>
             Zend_Session_Namespace is a simple class that proxies data via an easy to use API
-            into the Zend_Session managed $_SESSION superglobal.  The reason it is called
+            into the Zend_Session managed $_SESSION superglobal. The reason it is called
             Zend_Session_Namespace is that it effectively namespaces the data inside $_SESSION, thus
-            allowing multiple components and objects to safely store and retrieve data.  In the
+            allowing multiple components and objects to safely store and retrieve data. In the
             following code, we'll explore how to build a simple session incrementing counter,
             starting at 1000 and resetting itself after 1999.
         </para>

+ 1 - 1
documentation/manual/en/tutorials/plugins-usage.xml

@@ -106,7 +106,7 @@ $element->addValidator('NotEmpty')
             For example, let's consider <classname>Zend_View_Helper_FormButton</classname> (view
             helpers are one form of plugin). This view helper accepts three arguments, an element
             name (also used as the element's DOM identifier), a value (used as the button label),
-            and an optional array of attributes.  The helper then generates HTML markup for a form
+            and an optional array of attributes. The helper then generates HTML markup for a form
             input element.
         </para>
 

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

@@ -13,9 +13,9 @@
 
     <para>
         <classname>Zend_Controller_Front</classname> has a notion of "modules", which are individual
-        mini-applications.  Modules mimic the directory structure that the <command>zf</command>
+        mini-applications. Modules mimic the directory structure that the <command>zf</command>
         tool sets up under <filename>application/</filename>, and all classes inside them are
-        assumed to begin with a common prefix, the module name.  <filename>application/</filename>
+        assumed to begin with a common prefix, the module name. <filename>application/</filename>
         is itself a module -- the "default" or "application" module. As such, we'll want to setup
         autoloading for resources within this directory.
     </para>
@@ -659,7 +659,7 @@ Updating project profile '.zfproject.xml'
     <para>
         This will create a new controller, <classname>GuestbookController</classname>, in
         <filename>application/controllers/GuestbookController.php</filename>, with a single action
-        method, <methodname>indexAction()</methodname>.  It will also create a view script directory
+        method, <methodname>indexAction()</methodname>. It will also create a view script directory
         for the controller, <filename>application/views/scripts/guestbook/</filename>, with a view
         script for the index action.
     </para>
@@ -749,7 +749,7 @@ Usage: load.sqlite.php [ options ]
         <para>
             The "-e" switch allows you to specify the value to use for the constant
             <constant>APPLICATION_ENV</constant> -- which in turn allows you to create a SQLite
-            database for each environment you define.  Be sure to run the script for the environment
+            database for each environment you define. Be sure to run the script for the environment
             you choose for your application when deploying.
         </para>
     </note>