فهرست منبع

[DOCUMENTATION] English:

- removed double spaces

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15343 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 سال پیش
والد
کامیت
e374d20e8d
40فایلهای تغییر یافته به همراه219 افزوده شده و 216 حذف شده
  1. 3 0
      documentation/manual/en/manual.xml.in
  2. 1 1
      documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml
  3. 2 2
      documentation/manual/en/module_specs/Zend_Auth_Adapter_DbTable.xml
  4. 1 1
      documentation/manual/en/module_specs/Zend_CodeGenerator-Reference.xml
  5. 1 1
      documentation/manual/en/module_specs/Zend_Currency-Usage.xml
  6. 2 2
      documentation/manual/en/module_specs/Zend_Date-Introduction.xml
  7. 14 14
      documentation/manual/en/module_specs/Zend_Date-Overview.xml
  8. 1 1
      documentation/manual/en/module_specs/Zend_Date-Theory.xml
  9. 3 3
      documentation/manual/en/module_specs/Zend_Debug.xml
  10. 2 2
      documentation/manual/en/module_specs/Zend_Dom-Query.xml
  11. 3 3
      documentation/manual/en/module_specs/Zend_Filter-Inflector.xml
  12. 4 4
      documentation/manual/en/module_specs/Zend_Filter.xml
  13. 63 63
      documentation/manual/en/module_specs/Zend_Filter_Input.xml
  14. 2 2
      documentation/manual/en/module_specs/Zend_Http_Client-Adapters.xml
  15. 2 2
      documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml
  16. 1 1
      documentation/manual/en/module_specs/Zend_Layout-Advanced.xml
  17. 1 1
      documentation/manual/en/module_specs/Zend_Layout-Options.xml
  18. 1 1
      documentation/manual/en/module_specs/Zend_Loader-Autoloader-Resource.xml
  19. 3 3
      documentation/manual/en/module_specs/Zend_Loader-PluginLoader.xml
  20. 15 15
      documentation/manual/en/module_specs/Zend_Loader.xml
  21. 1 1
      documentation/manual/en/module_specs/Zend_Mime_Message.xml
  22. 1 1
      documentation/manual/en/module_specs/Zend_Navigation-Containers.xml
  23. 7 7
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml
  24. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Image.xml
  25. 4 4
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Instance.xml
  26. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Keypair.xml
  27. 2 2
      documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-RegionsAndAvalibilityZones.xml
  28. 1 1
      documentation/manual/en/module_specs/Zend_Service_Amazon_S3.xml
  29. 1 1
      documentation/manual/en/module_specs/Zend_Session-GlobalSessionManagement.xml
  30. 14 14
      documentation/manual/en/module_specs/Zend_Tool_Framework-Architecture.xml
  31. 20 20
      documentation/manual/en/module_specs/Zend_Tool_Framework-CliTool.xml
  32. 1 1
      documentation/manual/en/module_specs/Zend_Tool_Framework-Introduction.xml
  33. 3 3
      documentation/manual/en/module_specs/Zend_Tool_Framework-SystemProviders.xml
  34. 11 11
      documentation/manual/en/module_specs/Zend_Tool_Framework-WritingProviders.xml
  35. 2 2
      documentation/manual/en/module_specs/Zend_Tool_Project-CreateProject.xml
  36. 1 1
      documentation/manual/en/module_specs/Zend_Tool_Project.xml
  37. 3 3
      documentation/manual/en/module_specs/Zend_Uri.xml
  38. 11 11
      documentation/manual/en/module_specs/Zend_Validate.xml
  39. 1 1
      documentation/manual/en/module_specs/Zend_View-Helpers-Json.xml
  40. 6 6
      documentation/manual/en/ref/coding_standard.xml

+ 3 - 0
documentation/manual/en/manual.xml.in

@@ -516,6 +516,9 @@
         <xi:include href="module_specs/Zend_Translate-Introduction.xml" />
         <xi:include href="module_specs/Zend_Translate-Adapters.xml" />
         <xi:include href="module_specs/Zend_Translate-Using.xml" />
+        <xi:include href="module_specs/Zend_Translate-SourceCreation.xml" />
+        <xi:include href="module_specs/Zend_Translate-Plurals.xml" />
+        <xi:include href="module_specs/Zend_Translate-Additional.xml" />
         <xi:include href="module_specs/Zend_Translate-Migration.xml" />
     </chapter>
     <chapter id="zend.uri">

+ 1 - 1
documentation/manual/en/module_specs/Zend_Application-TheoryOfOperation.xml

@@ -302,7 +302,7 @@ interface Zend_Application_Bootstrap_ResourceBootstrapper
                 options passed to the application object and/or bootstrap. These
                 options may come from a configuration file, or be passed in
                 manually. Options will be of key/options pairs, with the key
-                representing the resource name.  The resource name will be the
+                representing the resource name. The resource name will be the
                 segment following the class prefix. For example, the resources
                 shipped with Zend Framework have the class prefix
                 "Zend_Application_Resource_"; anything following this would be

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

@@ -294,9 +294,9 @@ $adapter = new Zend_Auth_Adapter_DbTable(
             Another alternative is to use the <code>getDbSelect()</code> method
             of the Zend_Auth_Adapter_DbTable after the adapter has been constructed.
             This method will return the Zend_Db_Select object instance it will use
-            to complete the authenticate() routine.  It is important to note that
+            to complete the authenticate() routine. It is important to note that
             this method will always return the same object regardless if authenticate()
-            has been called or not.  This object <emphasis>will not</emphasis> have any of the
+            has been called or not. This object <emphasis>will not</emphasis> have any of the
             identity or credential information in it as those values are placed
             into the select object at authenticate() time.
         </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_CodeGenerator-Reference.xml

@@ -143,7 +143,7 @@ class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Php_Abstract
                 generating PHP classes. The basic functionality just generates
                 the PHP class itself, as well as optionally the related PHP
                 DocBlock. Classes may implement or inherit from other classes,
-                and may be marked as abstract.  Utilizing other code generator
+                and may be marked as abstract. Utilizing other code generator
                 classes, you can also attach class constants, properties, and
                 methods.
             </para>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Currency-Usage.xml

@@ -410,7 +410,7 @@ echo $currency->toCurrency(1000);
                     <emphasis role="strong">getShortName()</emphasis>:
                 </para>
                 <para>
-                    Returns the abbreviation of the set currency or a given currency.  For example
+                    Returns the abbreviation of the set currency or a given currency. For example
                     <emphasis role="strong">USD</emphasis> for the US Dollar within the locale
                     '<emphasis role="strong">en_US</emphasis>.
                 </para>

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

@@ -106,8 +106,8 @@ date_default_timezone_set('Europe/Berlin');
                     your server. "The size of a float is platform-dependent, although a maximum of ~1.8e308 with a
                     precision of roughly 14 decimal digits is a common value (that's 64 bit IEEE format)." [
                     <ulink url="http://www.php.net/float">http://www.php.net/float</ulink>
-                    ].  Additionally, inherent limitations of float data types, and rounding error of float numbers
-                    may introduce errors into calculations.  To avoid these problems, the ZF I18n components use
+                    ]. Additionally, inherent limitations of float data types, and rounding error of float numbers
+                    may introduce errors into calculations. To avoid these problems, the ZF I18n components use
                     BCMath extension, if available.
                 </para>
             </listitem>

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

@@ -35,15 +35,15 @@
 
             <para>
                 When dates are manipulated, sometimes they cross over a DST change, normally resulting in the date
-                losing or gaining an hour.  For exmaple, when adding months to a date before a DST change, if the
+                losing or gaining an hour. For exmaple, when adding months to a date before a DST change, if the
                 resulting date is after the DST change, then the resulting date will appear to lose or gain an hour,
-                resulting in the time value of the date changing.  For boundary dates, such as midnight of the first
+                resulting in the time value of the date changing. For boundary dates, such as midnight of the first
                 or last day of a month, adding enough months to cross a date boundary results in the date losing
                 an hour and becoming the last hour of the preceding month, giving the appearance of an "off by 1"
-                error.  To avoid this situation, the DST change ignored by using the <code>fix_dst</code> option.
+                error. To avoid this situation, the DST change ignored by using the <code>fix_dst</code> option.
                 When crossing the Summer/Winter DST boundary, normally an hour is substracted or added depending
-                on the date.  For example, date math crossing the Spring DST leads to a date having a day value
-                one less than expected, if the time part of the date was originally 00:00:00.  Since Zend_Date
+                on the date. For example, date math crossing the Spring DST leads to a date having a day value
+                one less than expected, if the time part of the date was originally 00:00:00. Since Zend_Date
                 is based on timestamps, and not calendar dates with a time component, the timestamp loses an hour,
                 resulting in the date having a calendar day value one less than expected.
                 To prevent such problems use the option <code>fix_dst</code>, which defaults to true, causing DST
@@ -71,13 +71,13 @@
                 For example, when adding one month to January 31st, people familiar with SQL will expect February
                 28th as the result. On the other side, people familiar with Excel and OpenOffice will expect
                 March 3rd as the result. The problem only occurs, if the resulting month does not have the day,
-                which is set in the original date.  For ZF developers, the desired behavior is selectable using
+                which is set in the original date. For ZF developers, the desired behavior is selectable using
                 the <code>extend_month</code> option to choose either the SQL behaviour, if set to false,
                 or the spreadsheet behaviour when set to true. The default behaviour for <code>extend_month</code>
-                is false, providing behavior compatible to SQL.  By default, <classname>Zend_Date</classname> computes month
+                is false, providing behavior compatible to SQL. By default, <classname>Zend_Date</classname> computes month
                 calculations by truncating dates to the end of the month (if necessary), without wrapping into the
                 next month when the original date designates a day of the month exceeding the number of days in
-                the resulting month.  Use <classname>Zend_Date::setOptions(array('extend_month' => true));</classname>
+                the resulting month. Use <classname>Zend_Date::setOptions(array('extend_month' => true));</classname>
                 to make month calculations work like popular spreadsheet programs.
             </para>
 
@@ -300,14 +300,14 @@ print $date;
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Millisecond">millisecond</ulink>
                             </entry>
-                            <entry>Milliseconds denote thousandths of a second (0-999). <classname>Zend_Date</classname> supports two additional methods for working with time units smaller than seconds. By default, <classname>Zend_Date</classname> instances use a precision defaulting to milliseconds, as seen using <code>getFractionalPrecision()</code>. To change the precision use <code>setFractionalPrecision($precision)</code>.  However, precision is limited practically to microseconds, since <classname>Zend_Date</classname> uses <code>
+                            <entry>Milliseconds denote thousandths of a second (0-999). <classname>Zend_Date</classname> supports two additional methods for working with time units smaller than seconds. By default, <classname>Zend_Date</classname> instances use a precision defaulting to milliseconds, as seen using <code>getFractionalPrecision()</code>. To change the precision use <code>setFractionalPrecision($precision)</code>. However, precision is limited practically to microseconds, since <classname>Zend_Date</classname> uses <code>
                                 <ulink url="http://php.net/microtime">microtime()</ulink></code>.</entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://en.wikipedia.org/wiki/Day">Day</ulink>
                             </entry>
-                            <entry><classname>Zend_Date::DAY_SHORT</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string.  Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry><classname>Zend_Date::DAY_SHORT</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
                         </row>
                         <row>
                             <entry>
@@ -317,22 +317,22 @@ print $date;
                         </row>
                         <row>
                             <entry>Date</entry>
-                            <entry><classname>Zend_Date::DAY_MEDIUM</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname>.  Otherwise, an attempt is made to normalize the <code>$date</code> string into a Zend_Date::DATE_MEDIUM formatted date. The format of <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's locale.</entry>
+                            <entry><classname>Zend_Date::DAY_MEDIUM</classname> is extracted from <code>$date</code> if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname>. Otherwise, an attempt is made to normalize the <code>$date</code> string into a Zend_Date::DATE_MEDIUM formatted date. The format of <classname>Zend_Date::DAY_MEDIUM</classname> depends on the object's locale.</entry>
                         </row>
                         <row>
                             <entry>Weekday</entry>
-                            <entry>Weekdays are represented numerically as 0 (for Sunday) through 6 (for Saturday).  <classname>Zend_Date::WEEKDAY_DIGIT</classname> is extracted from <code>$date</code>, if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string.  Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
+                            <entry>Weekdays are represented numerically as 0 (for Sunday) through 6 (for Saturday). <classname>Zend_Date::WEEKDAY_DIGIT</classname> is extracted from <code>$date</code>, if the <code>$date</code> operand is an instance of <classname>Zend_Date</classname> or a numeric string. Otherwise, an attempt is made to extract the day according to the conventions documented for these constants: <classname>Zend_Date::WEEKDAY_NARROW</classname>, <classname>Zend_Date::WEEKDAY_NAME</classname>, <classname>Zend_Date::WEEKDAY_SHORT</classname>, <classname>Zend_Date::WEEKDAY</classname> (Gregorian calendar assumed)</entry>
                         </row>
                         <row>
                             <entry>DayOfYear</entry>
-                            <entry>In <classname>Zend_Date</classname>, the day of the year represents the number of calendar days elapsed since the start of the year (0-365).  As with other units above, fractions are rounded down to the nearest whole number. (Gregorian calendar assumed)
+                            <entry>In <classname>Zend_Date</classname>, the day of the year represents the number of calendar days elapsed since the start of the year (0-365). As with other units above, fractions are rounded down to the nearest whole number. (Gregorian calendar assumed)
                         </entry>
                         </row>
                         <row>
                             <entry>
                                 <ulink url="http://www.faqs.org/rfcs/rfc822.html">Arpa</ulink>
                             </entry>
-                            <entry>Arpa dates (i.e. RFC 822 formatted dates) are supported. Output uses either a "GMT" or "Local differential hours+min" format (see section 5 of RFC 822).  Before PHP 5.2.2, using the DATE_RFC822 constant with PHP date functions sometimes produces <ulink url="http://bugs.php.net/bug.php?id=40308">incorrect results</ulink>.  Zend_Date's results are correct.  Example: <code>Mon, 31 Dec 06 23:59:59 GMT</code>
+                            <entry>Arpa dates (i.e. RFC 822 formatted dates) are supported. Output uses either a "GMT" or "Local differential hours+min" format (see section 5 of RFC 822). Before PHP 5.2.2, using the DATE_RFC822 constant with PHP date functions sometimes produces <ulink url="http://bugs.php.net/bug.php?id=40308">incorrect results</ulink>. Zend_Date's results are correct. Example: <code>Mon, 31 Dec 06 23:59:59 GMT</code>
                             </entry>
                         </row>
                         <row>

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

@@ -36,7 +36,7 @@
                         time and January 1st, 1970 00:00:00 GMT/UTC. This was only possible, because
                         <classname>Zend_Date</classname> is not limited to UNIX timestamps nor integer values. The BCMath
                         extension is required to support extremely large dates outside of the range Fri, 13 Dec 1901
-                        20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT.  Additional, tiny math errors may arise due to
+                        20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT. Additional, tiny math errors may arise due to
                         the inherent limitations of float data types and rounding, unless using the BCMath extension.
                     </para>
                 </listitem>

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

@@ -6,7 +6,7 @@
 
     <para>
         The static method <classname>Zend_Debug::dump()</classname> prints or returns
-        information about an expression.  This simple technique of debugging is
+        information about an expression. This simple technique of debugging is
         common, because it is easy to use in an ad hoc fashion, and requires no
         initialization, special tools, or debugging environment.
     </para>
@@ -27,7 +27,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
 
     <para>
         The <code>$label</code> argument is a string to be prepended to the
-        output of <classname>Zend_Debug::dump()</classname>.  It may be useful, for
+        output of <classname>Zend_Debug::dump()</classname>. It may be useful, for
         example, to use labels if you are dumping information about multiple
         variables on a given screen.
     </para>
@@ -54,7 +54,7 @@ Zend_Debug::dump($var, $label=null, $echo=true);
         <title>Debugging with Zend_Log</title>
         <para>
             Using <classname>Zend_Debug::dump()</classname> is best for ad hoc
-            debugging during software development.  You can add code to dump
+            debugging during software development. You can add code to dump
             a variable and then remove the code very quickly.
         </para>
         <para>

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

@@ -101,7 +101,7 @@
                 <para>
                     <emphasis>descendents</emphasis>: string together
                     multiple selectors to indicate a hierarchy along which
-                    to search.  'div .foo span #one' would select an element
+                    to search. 'div .foo span #one' would select an element
                     of id 'one' that is a descendent of arbitrary depth
                     beneath a 'span' element, which is in turn a descendent
                     of arbitrary depth beneath an element with a class of
@@ -137,7 +137,7 @@
             them and/or their content directly for examination and manipulation.
             <classname>Zend_Dom_Query_Result</classname> implements <code>Countable</code>
             and <code>Iterator</code>, and store the results internally as
-            DOMNodes/DOMElements.  As an example, consider the following call,
+            DOMNodes/DOMElements. As an example, consider the following call,
             that selects against the HTML above:
         </para>
 

+ 3 - 3
documentation/manual/en/module_specs/Zend_Filter-Inflector.xml

@@ -208,10 +208,10 @@ class Foo
             <para>
                 It is important to note that regardless of the method in which you add
                 rules to the inflector, either one-by-one, or all-at-once; the order is very
-                important.  More specific names, or names that might contain other rule names,
-                must be added before least specific names.  For example, assuming the two rule
+                important. More specific names, or names that might contain other rule names,
+                must be added before least specific names. For example, assuming the two rule
                 names 'moduleDir' and 'module', the 'moduleDir' rule should appear before module
-                since 'module' is contained within 'moduleDir'.  If 'module' were added before
+                since 'module' is contained within 'moduleDir'. If 'module' were added before
                 'moduleDir', 'module' will match part of 'moduleDir' and process it leaving 'Dir'
                 inside of the target uninflected.
             </para>

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

@@ -26,7 +26,7 @@
 
         <para>
             This basic definition of a filter may be extended to include
-            generalized transformations upon input.  A common transformation
+            generalized transformations upon input. A common transformation
             applied in web applications is the escaping of HTML entities. For
             example, if a form field is automatically populated with untrusted
             input (e.g., from a web browser), this value should either be free
@@ -82,9 +82,9 @@ echo $htmlEntities->filter('"'); // &quot;
             instance of the filter, you can use the static method
             <classname>Zend_Filter::get()</classname> as an alternative invocation style.
             The first argument of this method is a data input value, that you
-            would pass to the <code>filter()</code> method.  The second
+            would pass to the <code>filter()</code> method. The second
             argument is a string, which corresponds to the basename of the
-            filter class, relative to the Zend_Filter namespace.  The
+            filter class, relative to the Zend_Filter namespace. The
             <code>get()</code> method automatically loads the class, creates an
             instance, and applies the <code>filter()</code> method to the data
             input.
@@ -116,7 +116,7 @@ echo Zend_Filter::get('"', 'HtmlEntities', array(ENT_QUOTES));
         <para>
             Also, the Zend_Filter_Input class allows you to instantiate and run
             multiple filter and validator classes on demand to process
-            sets of input data.  See <xref linkend="zend.filter.input" />.
+            sets of input data. See <xref linkend="zend.filter.input" />.
         </para>
 
     </sect2>

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

@@ -7,7 +7,7 @@
         Zend_Filter_Input provides a declarative interface to associate
         multiple filters and validators, apply them to collections of data, and
         to retrieve input values after they have been processed by the filters
-        and validators.  Values are returned in escaped format by default for
+        and validators. Values are returned in escaped format by default for
         safe HTML output.
     </para>
 
@@ -15,12 +15,12 @@
         Consider the metaphor that this class is a cage for external data.
         Data enter the application from external sources, such as HTTP request
         parameters, HTTP headers, a web service, or even read from a database
-        or another file.  Data are first put into the cage, and subsequently
+        or another file. Data are first put into the cage, and subsequently
         the application can access data only by telling the cage what the data
-        should be and how they plan to use it.  The cage inspects the data for
-        validity.  It might apply escaping to the data values for the
-        appropriate context.  The cage releases data only if it can fulfill
-        these responsibilities.  With a simple and convenient interface, it
+        should be and how they plan to use it. The cage inspects the data for
+        validity. It might apply escaping to the data values for the
+        appropriate context. The cage releases data only if it can fulfill
+        these responsibilities. With a simple and convenient interface, it
         encourages good programming habits and makes developers think about how
         data are used.
     </para>
@@ -31,7 +31,7 @@
                 <emphasis role="strong">Filters</emphasis> transform input
                 values, by removing or changing characters within the value.
                 The goal is to "normalize" input values until they match an
-                expected format.  For example, if a string of numeric digits is
+                expected format. For example, if a string of numeric digits is
                 needed, and the input value is "abc123", then it might be a
                 reasonable transformation to change the value to the string
                 "123".
@@ -41,7 +41,7 @@
             <para>
                 <emphasis role="strong">Validators</emphasis> check input
                 values against criteria and report whether they passed the test
-                or not.  The value is not changed, but the check may fail.  For
+                or not. The value is not changed, but the check may fail. For
                 example, if a string must look like an email address, and the
                 input value is "abc123", then the value is not considered
                 valid.
@@ -50,12 +50,12 @@
         <listitem>
             <para>
                 <emphasis role="strong">Escapers</emphasis> transform a value
-                by removing magic behavior of certain characters.  In some
-                output contexts, special characters have meaning.  For example,
+                by removing magic behavior of certain characters. In some
+                output contexts, special characters have meaning. For example,
                 the characters '&lt;' and '&gt;' delimit HTML tags, and if a
                 string containing those characters is output in an HTML
                 context, the content between them might affect the output or
-                functionality of the HTML presentation.  Escaping the
+                functionality of the HTML presentation. Escaping the
                 characters removes the special meaning, so they are output as
                 literal characters.
             </para>
@@ -107,7 +107,7 @@
         <para>
             The following example filter rule set that declares the field
             'month' is filtered by Zend_Filter_Digits, and the field 'account'
-            is filtered by Zend_Filter_StringTrim.  Then a validation rule set
+            is filtered by Zend_Filter_StringTrim. Then a validation rule set
             declares that the field 'account' is valid only if it contains only
             alphabetical characters.
         </para>
@@ -125,7 +125,7 @@ $validators = array(
 
         <para>
             Each key in the <code>$filters</code> array above is the name of a rule for applying a
-            filter to a specific data field.  By default, the name of the rule
+            filter to a specific data field. By default, the name of the rule
             is also the name of the input data field to which to apply the
             rule.
         </para>
@@ -163,7 +163,7 @@ $validators = array(
                     An array, to declare a chain of filters or validators.
                     The elements of this array can be strings mapping to class
                     names or filter/validator objects, as in the cases
-                    described above.  In addition, you can use a third choice:
+                    described above. In addition, you can use a third choice:
                     an array containing a string mapping to the class name
                     followed by arguments to pass to its constructor.
 
@@ -190,9 +190,9 @@ $validators = array(
 
         <para>
             You can use a special "wildcard" rule key <code>'*'</code> in
-            either the filters array or the validators array.  This means that
+            either the filters array or the validators array. This means that
             the filters or validators declared in this rule will be applied to
-            all input data fields.  Note that the order of entries in the
+            all input data fields. Note that the order of entries in the
             filters array or validators array is significant; the rules are
             applied in the same order in which you declare them.
         </para>
@@ -212,7 +212,7 @@ $filters = array(
 
         <para>
             After declaring the filters and validators arrays, use them as
-            arguments in the constructor of Zend_Filter_Input.  This returns an
+            arguments in the constructor of Zend_Filter_Input. This returns an
             object that knows all your filtering and validating rules, and you
             can use this object to process one or more sets of input data.
         </para>
@@ -222,11 +222,11 @@ $input = new Zend_Filter_Input($filters, $validators);
 ]]></programlisting>
 
         <para>
-            You can specify input data as the third constructor argument.  The
-            data structure is an associative array.  The keys are field names,
-            and the values are data values.  The standard <code>$_GET</code>
+            You can specify input data as the third constructor argument. The
+            data structure is an associative array. The keys are field names,
+            and the values are data values. The standard <code>$_GET</code>
             and <code>$_POST</code> superglobal variables in PHP are examples
-            of this format.  You can use either of these variables as input
+            of this format. You can use either of these variables as input
             data for Zend_Filter_Input.
         </para>
 
@@ -250,7 +250,7 @@ $input->setData($newData);
         <para>
             The <code>setData()</code> method redefines data in an existing
             Zend_Filter_Input object without changing the filtering and
-            validation rules.  Using this method, you can run the same rules
+            validation rules. Using this method, you can run the same rules
             against different sets of input data.
         </para>
 
@@ -263,7 +263,7 @@ $input->setData($newData);
         <para>
             After you have declared filters and validators and created the
             input processor, you can retrieve reports of missing, unknown, and
-            invalid fields.  You also can get the values of fields after
+            invalid fields. You also can get the values of fields after
             filters have been applied.
         </para>
 
@@ -286,7 +286,7 @@ if ($input->isValid()) {
 
             <para>
                 This method accepts an optional string argument, naming
-                an individual field.  If the specified field passed validation
+                an individual field. If the specified field passed validation
                 and is ready for fetching, <code>isValid('fieldName')</code>
                 returns <code>true</code>.
             </para>
@@ -354,7 +354,7 @@ if ($input->hasUnknown()) {
             <para>
                 The results of the <code>getMessages()</code> method is an
                 associative array, mapping a rule name to an array of error
-                messages related to that rule.  Note that the index of this
+                messages related to that rule. Note that the index of this
                 array is the rule name used in the rule declaration, which may
                 be different from the names of fields checked by the rule.
             </para>
@@ -362,14 +362,14 @@ if ($input->hasUnknown()) {
             <para>
                 The <code>getMessages()</code> method returns the merge of the
                 arrays returned by the <code>getInvalid()</code> and
-                <code>getMissing()</code>.  These methods return subsets of the
+                <code>getMissing()</code>. These methods return subsets of the
                 messages, related to validation failures, or fields that were
                 declared as required but missing from the input.
             </para>
 
             <para>
                 The <code>getErrors()</code> method returns an associative array,
-                mapping a rule name to an array of error identifiers.  Error
+                mapping a rule name to an array of error identifiers. Error
                 identifiers are fixed strings, to identify the reason for a
                 validation failure, while messages can be customized.
                 See <xref linkend="zend.validate.introduction.using" /> for
@@ -398,7 +398,7 @@ $input->setOptions($options);
 
             <para>
                 The results of the <code>getUnknown()</code> method is an
-                associative array, mapping field names to field values.  Field
+                associative array, mapping field names to field values. Field
                 names are used as the array keys in this case, instead of rule
                 names, because no rule mentions the fields considered to be
                 unknown fields.
@@ -412,8 +412,8 @@ $input->setOptions($options);
 
             <para>
                 All fields that are neither invalid, missing, nor unknown are
-                considered valid.  You can get values for valid fields using a
-                magic accessor.  There are also non-magic accessor methods
+                considered valid. You can get values for valid fields using a
+                magic accessor. There are also non-magic accessor methods
                 <code>getEscaped()</code> and <code>getUnescaped()</code>.
             </para>
 
@@ -425,9 +425,9 @@ $m = $input->getUnescaped('month'); // not escaped
 
             <para>
                 By default, when retrieving a value, it is filtered with the
-                Zend_Filter_HtmlEntities.  This is the default because it is
+                Zend_Filter_HtmlEntities. This is the default because it is
                 considered the most common usage to output the value of a field
-                in HTML.  The HtmlEntities filter helps prevent unintentional
+                in HTML. The HtmlEntities filter helps prevent unintentional
                 output of code, which can result in security problems.
             </para>
 
@@ -463,18 +463,18 @@ $input->setDefaultEscapeFilter(new Zend_Filter_StringTrim());
             <para>
                 In either usage, you can specify the escape filter as a string
                 base name of the filter class, or as an object instance of a
-                filter class.  The escape filter can be an instance of a filter
+                filter class. The escape filter can be an instance of a filter
                 chain, an object of the class Zend_Filter.
             </para>
 
             <para>
                 Filters to escape output should be run in this way, to make
-                sure they run after validation.  Other filters you declare in
+                sure they run after validation. Other filters you declare in
                 the array of filter rules are applied to input data before data
-                are validated.  If escaping filters were run before validation,
+                are validated. If escaping filters were run before validation,
                 the process of validation would be more complex, and it would
                 be harder to provide both escaped and unescaped versions of the
-                data.  So it is recommended to declare filters to escape output
+                data. So it is recommended to declare filters to escape output
                 using <code>setDefaultEscapeFilter()</code>, not in the
                 <code>$filters</code> array.
             </para>
@@ -482,7 +482,7 @@ $input->setDefaultEscapeFilter(new Zend_Filter_StringTrim());
             <para>
                 There is only one method <code>getEscaped()</code>, and
                 therefore you can specify only one filter for escaping
-                (although this filter can be a filter chain).  If you need a
+                (although this filter can be a filter chain). If you need a
                 single instance of Zend_Filter_Input to return escaped output
                 using more than one filtering method, you should extend
                 Zend_Filter_Input and implement new methods in your subclass to
@@ -501,7 +501,7 @@ $input->setDefaultEscapeFilter(new Zend_Filter_StringTrim());
             In addition to declaring the mapping from fields to filters
             or validators, you can specify some "metacommands" in the array
             declarations, to control some optional behavior of
-            Zend_Filter_Input.  Metacommands appear as string-indexed
+            Zend_Filter_Input. Metacommands appear as string-indexed
             entries in a given filter or validator array value.
         </para>
 
@@ -532,7 +532,7 @@ $filters = array(
 
             <para>
                 In the example above, the filter rule applies the 'digits'
-                filter to the input field named 'mo'.  The string 'month'
+                filter to the input field named 'mo'. The string 'month'
                 simply becomes a mnemonic key for this filtering rule; it is
                 not used as the field name if the field is specified with the
                 'fields' metacommand, but it is used as the rule name.
@@ -540,7 +540,7 @@ $filters = array(
 
             <para>
                 The default value of the 'fields' metacommand is the index of
-                the current rule.  In the example above, if the 'fields'
+                the current rule. In the example above, if the 'fields'
                 metacommand is not specified, the rule would apply to the input
                 field named 'month'.
             </para>
@@ -548,11 +548,11 @@ $filters = array(
             <para>
                 Another use of the 'fields' metacommand is to specify fields
                 for filters or validators that require multiple fields as
-                input.  If the 'fields' metacommand is an array, the argument
+                input. If the 'fields' metacommand is an array, the argument
                 to the corresponding filter or validator is an array of the
-                values of those fields.  For example, it is common for users to
+                values of those fields. For example, it is common for users to
                 specify a password string in two fields, and they must type the
-                same string in both fields.  Suppose you implement a validator
+                same string in both fields. Suppose you implement a validator
                 class that takes an array argument, and returns
                 <code>true</code> if all the values in the array are equal to
                 each other.
@@ -585,7 +585,7 @@ $validators = array(
 
             <para>
                 Each entry in the validator array may have a metacommand called
-                'presence'.  If the value of this metacommand is 'required'
+                'presence'. If the value of this metacommand is 'required'
                 then the field must exist in the input data, or else it is
                 reported as a missing field.
             </para>
@@ -629,10 +629,10 @@ $validators = array(
 
             <para>
                 This default value is assigned to the field before any of the
-                validators are invoked.  The default value is applied to the
+                validators are invoked. The default value is applied to the
                 field only for the current rule; if the same field is
                 referenced in a subsequent rule, the field has no value when
-                evaluating that rule.  Thus different rules can declare
+                evaluating that rule. Thus different rules can declare
                 different default values for a given field.
             </para>
 
@@ -656,7 +656,7 @@ echo $input->month; // echoes 1
                 to define an array of multiple fields, you can define
                 an array for the <code>DEFAULT_VALUE</code> metacommand
                 and the defaults of corresponding keys are used for any
-                missing fields.  If <code>FIELDS</code> defines multiple
+                missing fields. If <code>FIELDS</code> defines multiple
                 fields but <code>DEFAULT_VALUE</code> is a scalar, then
                 that default value is used as the value for any missing
                 fields in the array.
@@ -675,8 +675,8 @@ echo $input->month; // echoes 1
             <para>
                 By default, if a field exists in the input data, then
                 validators are applied to it, even if the value of the field is
-                an empty string (<code>''</code>).  This is likely to result in
-                a failure to validate.  For example, if the validator checks
+                an empty string (<code>''</code>). This is likely to result in
+                a failure to validate. For example, if the validator checks
                 for digit characters, and there are none because a zero-length
                 string has no characters, then the validator reports the data
                 as invalid.
@@ -713,7 +713,7 @@ $validators = array(
                 no validators, but the 'allowEmpty' metacommand is
                 <code>false</code> (that is, the field is considered invalid if
                 it is empty), Zend_Filter_Input returns a default error message
-                that you can retrieve with <code>getMessages()</code>.  You can
+                that you can retrieve with <code>getMessages()</code>. You can
                 specify this message using the 'notEmptyMessage' option, as an
                 argument to the Zend_Filter_Input constructor or using the
                 <code>setOptions()</code> method.
@@ -747,7 +747,7 @@ $input->setOptions($options);
             <para>
                 Alternatively, if the value of the 'breakChainOnFailure'
                 metacommand is <code>true</code>, the validator chain
-                terminates after the first validator fails.  The input data is
+                terminates after the first validator fails. The input data is
                 not checked against subsequent validators in the chain, so it
                 might cause more violations even if you correct the one
                 reported.
@@ -782,7 +782,7 @@ $input = new Zend_Filter_Input(null, $validators);
                 chain on failure independently for each validator in the chain.
                 With the latter class, the defined value of the
                 'breakChainOnFailure' metacommand for a rule applies uniformly
-                for all validators in the rule.  If you require the more
+                for all validators in the rule. If you require the more
                 flexible usage, you should create the validator chain yourself,
                 and use it as an object in the validator rule
                 definition:
@@ -811,7 +811,7 @@ $input = new Zend_Filter_Input(null, $validators);
 
             <para>
                 You can specify error messages for each validator in a rule
-                using the metacommand 'messages'.  The value of this metacommand
+                using the metacommand 'messages'. The value of this metacommand
                 varies based on whether you have multiple validators in the
                 rule, or if you want to set the message for a specific error
                 condition in a given validator.
@@ -845,9 +845,9 @@ $validators = array(
 
             <para>
                 Each element of this array is applied to the validator at the
-                same index position.  You can specify a message for the
+                same index position. You can specify a message for the
                 validator at position <emphasis>n</emphasis> by using the value
-                <emphasis>n</emphasis> as the array index.  Thus you can allow
+                <emphasis>n</emphasis> as the array index. Thus you can allow
                 some validators to use their default message, while setting the
                 message for a subsequent validator in the chain.
             </para>
@@ -868,10 +868,10 @@ $validators = array(
 
             <para>
                 If one of your validators has multiple error messages, they are
-                identified by a message key.  There are different keys in each
+                identified by a message key. There are different keys in each
                 validator class, serving as identifiers for error messages that
-                the respective validator class might generate.  Each validate
-                class defines constants for its message keys.  You can use
+                the respective validator class might generate. Each validate
+                class defines constants for its message keys. You can use
                 these keys in the 'messages' metacommand by passing an
                 associative array instead of a string.
             </para>
@@ -911,7 +911,7 @@ $validators = array(
                 The default value for 'allowEmpty', 'breakChainOnFailure', and
                 'presence' metacommands can be set for all rules using the
                 <code>$options</code> argument to the constructor of
-                Zend_Filter_Input.  This allows you to set the default value
+                Zend_Filter_Input. This allows you to set the default value
                 for all rules, without requiring you to set the metacommand for
                 every rule.
             </para>
@@ -948,7 +948,7 @@ $input = new Zend_Filter_Input($filters, $validators, $data, $options);
         <para>
             By default, when you declare a filter or validator as a string,
             Zend_Filter_Input searches for the corresponding classes under
-            the Zend_Filter or Zend_Validate namespaces.  For example,
+            the Zend_Filter or Zend_Validate namespaces. For example,
             a filter named by the string 'digits' is found in the class
             Zend_Filter_Digits.
         </para>
@@ -956,8 +956,8 @@ $input = new Zend_Filter_Input($filters, $validators, $data, $options);
         <para>
             If you write your own filter or validator classes, or use filters
             or validators provided by a third-party, the classes may exist in
-            different namespaces than Zend_Filter or Zend_Validate.  You can
-            tell Zend_Filter_Input to search more namespaces.  You can specify
+            different namespaces than Zend_Filter or Zend_Validate. You can
+            tell Zend_Filter_Input to search more namespaces. You can specify
             namespaces in the constructor options:
         </para>
 
@@ -990,7 +990,7 @@ $input->addFilterPrefixPath('Foo_Namespace', 'Foo/Namespace');
 
         <para>
             You cannot remove Zend_Filter and Zend_Validate as namespaces, you
-            only can add namespaces.  User-defined namespaces are searched
+            only can add namespaces. User-defined namespaces are searched
             first, Zend namespaces are searched last.
         </para>
 

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

@@ -375,12 +375,12 @@ $adapter->addResponse(
         <para>
             The setResponse() method clears any responses in the
             Zend_Http_Client_Adapter_Test's buffer and sets the
-            first response that will be returned.  The addResponse()
+            first response that will be returned. The addResponse()
             method will add successive responses.
         </para>
         <para>
             The responses will be replayed in the order that they
-            were added.  If more requests are made than the number
+            were added. If more requests are made than the number
             of responses stored, the responses will cycle again
             in order.
         </para>

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

@@ -144,7 +144,7 @@ if (isset($_POST['xmlToken'])) {
             by the card selector into it. Once an instance has been created you
             must then provide at least one SSL certificate public/private key
             pair used by the web server that received the <code>HTTP
-            POST</code>.  These files are used to validate the destination
+            POST</code>. These files are used to validate the destination
             of the information posted to the server and are a requirement when
             using Information Cards.
         </para>
@@ -340,7 +340,7 @@ public function submitinfocardAction()
             The <classname>Zend_InfoCard</classname> adapter is used as a callback
             mechanism within the component to perform various tasks, such as
             storing and retrieving Assertion IDs for information cards when they
-            are processed by the component.  While storing the assertion IDs of
+            are processed by the component. While storing the assertion IDs of
             submitted information cards is not necessary, failing to do so opens
             up the possibility of the authentication scheme being compromised
             through a replay attack.

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

@@ -141,7 +141,7 @@ $layoutVars   = $placeholders->placeholder('Zend_Layout')->getArrayCopy();
             an action helper class extending
             <classname>Zend_Controller_Action_Helper_Abstract</classname> and pass the
             class name as the <code>helperClass</code> option to the
-            <code>startMvc()</code> method.  Details of the implementation are
+            <code>startMvc()</code> method. Details of the implementation are
             up to you.
         </para>
     </sect2>

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

@@ -67,7 +67,7 @@
                 <emphasis>pluginClass</emphasis>: the front controller plugin
                 class to use when using <classname>Zend_Layout</classname> with the MVC
                 components. By default, this is
-                <classname>Zend_Layout_Controller_Plugin_Layout</classname>.  Accessors
+                <classname>Zend_Layout_Controller_Plugin_Layout</classname>. Accessors
                 are <code>setPluginClass()</code> and
                 <code>getPluginClass()</code>.
         </para></listitem>

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

@@ -40,7 +40,7 @@ path/to/some/directory/
             Within this directory, all code is prefixed with the namespace
             "My_". Within the "acls" subdirectory, the component prefix "Acl_"
             is added, giving a final class name of "My_Acl_Site". Similarly, the
-            "forms" subdirectory maps to "Form_", giving "My_Form_Login".  The
+            "forms" subdirectory maps to "Form_", giving "My_Form_Login". The
             "models" subdirectory has no component namespace, giving "My_User".
         </para>
 

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

@@ -181,7 +181,7 @@ $loader = new Zend_Loader_PluginLoader(array(), 'foobar');
         <para>
             Another common use case for the <code>PluginLoader</code> is to
             determine fully qualified plugin class names of loaded classes;
-            <code>getClassName()</code> provides this functionality.  Typically,
+            <code>getClassName()</code> provides this functionality. Typically,
             this would be used in conjunction with <code>isLoaded()</code>:
         </para>
 
@@ -223,7 +223,7 @@ if ($loader->isLoaded('Adapter')) {
             </para>
 
             <programlisting role="php"><![CDATA[
-$classFileIncCache = APPLICATION_PATH .  '/../data/pluginLoaderCache.php';
+$classFileIncCache = APPLICATION_PATH . '/../data/pluginLoaderCache.php';
 if (file_exists($classFileIncCache)) {
     include_once $classFileIncCache;
 }
@@ -243,7 +243,7 @@ Zend_Loader_PluginLoader::setIncludeFileCache($classFileIncCache);
             </para>
 
             <programlisting role="php"><![CDATA[
-$classFileIncCache = APPLICATION_PATH .  '/../data/pluginLoaderCache.php';
+$classFileIncCache = APPLICATION_PATH . '/../data/pluginLoaderCache.php';
 if (file_exists($classFileIncCache)) {
     include_once $classFileIncCache;
 }

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

@@ -12,8 +12,8 @@
         <title>Zend_Loader vs. require_once()</title>
         <para>
             The <classname>Zend_Loader</classname> methods are best used if the filename you need to
-            load is variable.  For example, if it is based on a parameter from
-            user input or method argument.  If you are loading a file or a
+            load is variable. For example, if it is based on a parameter from
+            user input or method argument. If you are loading a file or a
             class whose name is constant, there is no benefit to using
             <classname>Zend_Loader</classname> over using traditional PHP functions such as
             <ulink url="http://php.net/require_once"><code>require_once()</code></ulink>.
@@ -26,7 +26,7 @@
 
         <para>
             The static method <classname>Zend_Loader::loadFile()</classname> loads a PHP
-            file.  The file loaded may contain any PHP code.
+            file. The file loaded may contain any PHP code.
             The method is a wrapper for the PHP function
             <ulink url="http://php.net/include"><code>include()</code></ulink>.
             This method returns boolean false on failure, for example
@@ -51,13 +51,13 @@ Zend_Loader::loadFile($filename, $dirs=null, $once=false);
 
         <para>
             The <code>$dirs</code> argument specifies which directories to search for
-            the file in.  If the value is <code>NULL</code>, only the <code>include_path</code>
+            the file in. If the value is <code>NULL</code>, only the <code>include_path</code>
             is searched; if the value is a string or an array, the directory or directories
             specified will be searched, followed by the <code>include_path</code>.
         </para>
 
         <para>
-            The <code>$once</code> argument is a boolean.  If <code>TRUE</code>,
+            The <code>$once</code> argument is a boolean. If <code>TRUE</code>,
             <classname>Zend_Loader::loadFile()</classname> uses the PHP function
             <ulink url="http://php.net/include"><code>include_once()</code></ulink>
             for loading the file, otherwise the PHP function
@@ -91,13 +91,13 @@ Zend_Loader::loadClass('Container_Tree',
         <para>
             The string specifying the class is converted to a relative path
             by substituting underscores with directory separators for your OS, and appending
-            '.php'.  In the example above, 'Container_Tree' becomes 'Container/Tree.php' on Windows.
+            '.php'. In the example above, 'Container_Tree' becomes 'Container/Tree.php' on Windows.
         </para>
 
         <para>
             If <code>$dirs</code> is a string or an array,
             <classname>Zend_Loader::loadClass()</classname> searches the directories in
-            the order supplied.  The first matching file is loaded.  If the file
+            the order supplied. The first matching file is loaded. If the file
             does not exist in the specified <code>$dirs</code>, then the
             <code>include_path</code> for the PHP environment is searched.
         </para>
@@ -136,7 +136,7 @@ if (Zend_Loader::isReadable($filename)) {
 
         <para>
             The <code>$filename</code> argument specifies the filename to
-            check.  This may contain path information.
+            check. This may contain path information.
             This method is a wrapper for the PHP function
             <ulink url="http://php.net/is_readable"><code>is_readable()</code></ulink>.
             The PHP function does not search the <code>include_path</code>,
@@ -151,10 +151,10 @@ if (Zend_Loader::isReadable($filename)) {
 
         <para>
             The <classname>Zend_Loader</classname> class contains a method you can register with the
-            PHP SPL autoloader.  <classname>Zend_Loader::autoload()</classname> is the
-            callback method.  As a convenience, <classname>Zend_Loader</classname> provides the
+            PHP SPL autoloader. <classname>Zend_Loader::autoload()</classname> is the
+            callback method. As a convenience, <classname>Zend_Loader</classname> provides the
             <code>registerAutoload()</code> function to register its
-            <code>autoload()</code> method.  If the <code>spl_autoload</code>
+            <code>autoload()</code> method. If the <code>spl_autoload</code>
             extension is not present in your PHP environment, then the
             <code>registerAutoload()</code> method throws a <classname>Zend_Exception</classname>.
         </para>
@@ -169,7 +169,7 @@ Zend_Loader::registerAutoload();
         <para>
             After registering the Zend Framework autoload callback, you can
             reference classes from Zend Framework without having to load
-            them explicitly.  The <code>autoload()</code> method uses
+            them explicitly. The <code>autoload()</code> method uses
             <classname>Zend_Loader::loadClass()</classname> automatically when you
             reference a class.
         </para>
@@ -187,7 +187,7 @@ Zend_Loader::registerAutoload();
                 Because of the semantics of static function references in PHP,
                 you must implement code for both <code>loadClass()</code>
                 and <code>autoload()</code>, and the <code>autoload()</code>
-                must call <code>self::loadClass()</code>.  If your
+                must call <code>self::loadClass()</code>. If your
                 <code>autoload()</code> method delegates to its parent to
                 call <code>self::loadClass()</code>, then it calls the
                 method of that name in the parent class, not the subclass.
@@ -216,9 +216,9 @@ Zend_Loader::registerAutoload('My_Loader');
         </example>
 
         <para>
-            You can remove an autoload callback.  The
+            You can remove an autoload callback. The
             <code>registerAutoload()</code> has an optional second argument,
-            which is <code>true</code> by default.  If this argument is
+            which is <code>true</code> by default. If this argument is
             <code>false</code>, the autoload callback is unregistered from the
             SPL autoload stack.
         </para>

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

@@ -32,7 +32,7 @@
 
     <para>An array with all <link linkend="zend.mime.part"><classname>Zend_Mime_Part</classname></link>
     objects in the <classname>Zend_Mime_Message</classname> is returned
-        from the method <code>-&gt;getParts()</code>.  The Zend_Mime_Part objects
+        from the method <code>-&gt;getParts()</code>. The Zend_Mime_Part objects
         can then be changed since they are stored in the array as references. If
         parts are added to the array or the sequence is changed, the array needs
         to be given back to the <link linkend="zend.mime.part"><classname>Zend_Mime_Part</classname></link>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Navigation-Containers.xml

@@ -456,7 +456,7 @@ $container->setPages($pages);
 
         <para>
             Removing pages can be done with <code>removePage()</code> or
-            <code>removePages()</code>.  The first method accepts a an instance
+            <code>removePages()</code>. The first method accepts a an instance
             of a page, or an integer. The integer corresponds to the
             <code>order</code> a page has. The latter method will remove all
             pages in the container.

+ 7 - 7
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml

@@ -86,14 +86,14 @@ $return = $ec2_ebs->createSnapshot('volumeId');
             <title>Describing an EBS Volume</title>
             <para>
                 <code>describeVolume</code> allows you to get information on an EBS Volume or a set of EBS
-                Volumes.  If nothing is passed in then it will return all EBS Volumes.  If only
+                Volumes. If nothing is passed in then it will return all EBS Volumes. If only
                 one EBS Volume needs to be described a string can be passed in while an array of
                 EBS Volume Id's can be passed in to describe them.
             </para>
             <para>
                 <code>describeVolume</code> will return an array with information about each Volume which
-                includes the volumeId, size, status and createTime.  If the volume is attached to an instance,
-                an addition value of attachmentSet will be returned.  Attachment set contains information
+                includes the volumeId, size, status and createTime. If the volume is attached to an instance,
+                an addition value of attachmentSet will be returned. Attachment set contains information
                 about the instance that the EBS Volume is attached to, which includes volumeId, instanceId,
                 device, status and attachTime.
             </para>
@@ -125,8 +125,8 @@ $return = $ec2_ebs->describeAttachedVolumes('instanceId');
             <title>Describe an EBS Volume Snapshot</title>
             <para>
                 <code>describeSnapshot</code> allows you to get information on an EBS Volume Snapshot
-                or a set of EBS Volume Snapshots.  If nothing is passed in then it will return information
-                about all EBS Volume Snapshots.  If only one EBS Volume Snapshot needs to be described it's
+                or a set of EBS Volume Snapshots. If nothing is passed in then it will return information
+                about all EBS Volume Snapshots. If only one EBS Volume Snapshot needs to be described it's
                 snapshotId can be passed in while an array of EBS Volume Snapshot Id's can be passed in to
                 describe them.
             </para>
@@ -148,7 +148,7 @@ $return = $ec2_ebs->describeSnapshot('volumeId');
         <example id="zend.service.amazon.ec2.ebs.attachdetach.attach">
             <title>Attaching an EBS Volume</title>
             <para>
-                <code>attachVolume</code> will attach an EBS Volume to a running Instance.  To
+                <code>attachVolume</code> will attach an EBS Volume to a running Instance. To
                 attach a volume you need to specify the volumeId, the instanceId and the
                 device <emphasis>(ex: /dev/sdh)</emphasis>.
             </para>
@@ -169,7 +169,7 @@ $return = $ec2_ebs->attachVolume('volumeId', 'instanceid', '/dev/sdh');
             <para>
                 <code>detachVolume</code> will detach an EBS Volume from a running Instance.
                 <code>detachVolume</code> required that you specify the volumeId with the optional
-                instanceId and device name that was passed when attaching the volume.  If you need to
+                instanceId and device name that was passed when attaching the volume. If you need to
                 force the detachment you can set the forth parameter to be true and it will force
                 the volume to detach.
             </para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Image.xml

@@ -113,7 +113,7 @@ $ip = $ec2_img->deregister($imageId);
             </para>
             <para>
                 <code>describe</code> returns an array for all the images that match the critera that was
-                passed in.  The array contains the imageId, imageLocation, imageState, imageOwnerId, isPublic,
+                passed in. The array contains the imageId, imageLocation, imageState, imageOwnerId, isPublic,
                 architecture, imageTYpe, kernelId, ramdiskId and platform.
             </para>
 
@@ -202,7 +202,7 @@ $return = $ec2_img->resetAttribute('imageId', 'launchPermission');
             <title>Describe AMI Attribute</title>
             <para>
                 <code>describeAttribute</code> returns information about an attribute of an AMI.
-                Only one attribute can be specified per call.  Currently only launchPermission and
+                Only one attribute can be specified per call. Currently only launchPermission and
                 productCodes are supported.
             </para>
             <para>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Instance.xml

@@ -28,7 +28,7 @@
         <note>
             <title>Instance Types</title>
             <para>
-                The instance types are defined as constants in the code.  Column eight
+                The instance types are defined as constants in the code. Column eight
                 in the table is the defined constanc name
             </para>
         </note>
@@ -208,14 +208,14 @@
                         <row>
                             <entry><code>minCount</code></entry>
                             <entry><para>
-                                Minimum number of instances to launch.  Default: 1
+                                Minimum number of instances to launch. Default: 1
                             </para></entry>
                             <entry><para>No</para></entry>
                         </row>
                         <row>
                             <entry><code>maxCount</code></entry>
                             <entry><para>
-                                Maximum number of instances to launch.  Default: 1
+                                Maximum number of instances to launch. Default: 1
                             </para></entry>
                             <entry><para>No</para></entry>
                         </row>
@@ -247,7 +247,7 @@
                         <row>
                             <entry><code>instanceType</code></entry>
                             <entry><para>
-                                Specifies the instance type.  Default: m1.small
+                                Specifies the instance type. Default: m1.small
                             </para></entry>
                             <entry><para>No</para></entry>
                         </row>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Keypair.xml

@@ -26,8 +26,8 @@ $return = $ec2_kp->create('my-new-key');
     <example id="zend.service.amazon.ec2.keypairs.delete">
         <title>Deleting an Amazon Keypair</title>
         <para>
-            <code>delete</code>, will delete the key pair.  This will only
-            prevent it from being use on new instances.  Instances currently
+            <code>delete</code>, will delete the key pair. This will only
+            prevent it from being use on new instances. Instances currently
             running with the keypair will still allow you to access them.
         </para>
         <para>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-RegionsAndAvalibilityZones.xml

@@ -36,7 +36,7 @@
             </para>
             <para>
                 <code>describe</code> will return an array containg information about which regions
-                are available.  Each array will contain regionName and regionUrl.
+                are available. Each array will contain regionName and regionUrl.
             </para>
 
             <programlisting role="php"><![CDATA[
@@ -72,7 +72,7 @@ foreach($regions as $region) {
             </para>
             <para>
                 <code>describe</code> will return an array containg information about which zones
-                are available.  Each array will contain zoneName and zoneState.
+                are available. Each array will contain zoneName and zoneState.
             </para>
 
             <programlisting role="php"><![CDATA[

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

@@ -21,7 +21,7 @@
 
         <para>
             Before you can get started with <classname>Zend_Service_Amazon_S3</classname>, you must first
-            register for an account.  Please see the
+            register for an account. Please see the
             <ulink url="http://aws.amazon.com/s3/faqs/">S3 FAQ</ulink>
             page on the Amazon website for more information.
         </para>

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

@@ -120,7 +120,7 @@ Zend_Session::setOptions($config->toArray());
                     <para>
                         string <code>save_path</code> - The correct value is system dependent, and should be provided by
                         the developer using an <emphasis role="strong">absolute path</emphasis> to a directory readable
-                        and writable by the PHP process.  If a writable path is not supplied, then
+                        and writable by the PHP process. If a writable path is not supplied, then
                         <classname>Zend_Session</classname> will throw an exception when started (i.e., when <code>start()</code>
                         is called).
                     </para>

+ 14 - 14
documentation/manual/en/module_specs/Zend_Tool_Framework-Architecture.xml

@@ -72,7 +72,7 @@ interface Zend_Tool_Framework_Registry_EnabledInterface
 
         <para>
             <classname>Zend_Tool_Framework_Provider</classname> represents the functional
-            or "capability" aspect of the framework.  Fundamentally,
+            or "capability" aspect of the framework. Fundamentally,
             <classname>Zend_Tool_Framework_Provider</classname> will provide the
             interfaces necessary to produce "providers", or bits of tooling
             functionality that can be called and used inside the
@@ -143,7 +143,7 @@ abstract class Zend_Tool_Framework_Loader_Abstract
 
         <para>
             The <code>_getFiles()</code> method should return an array of files (absolute
-            paths).  The built-in loader supplied with ZF is called the
+            paths). The built-in loader supplied with ZF is called the
             IncludePath loader. By default, the Tooling framework will use an
             include_path based loader to find files that might include Providers
             or Manifest Metadata objects.
@@ -214,9 +214,9 @@ interface Zend_Tool_Framework_Manifest_Interface
 
         <para>
             There are a few different metadata classes that can be used to
-            describe metadata.  The
+            describe metadata. The
             <code>Zend_Tool_Framework_Manifest_Metadata</code> is the base
-            metadata object.  As you can see by the following code
+            metadata object. As you can see by the following code
             snippet, the base metadata class is fairly lightweight and
             abstract in nature:
         </para>
@@ -241,10 +241,10 @@ class Zend_Tool_Framework_Metadata_Basic
         <para>
             There are other built in metadata classes as well for describing
             more specialized metadata: <code>ActionMetadata</code> and
-            <code>ProviderMetadata</code>.  These classes will help you describe
+            <code>ProviderMetadata</code>. These classes will help you describe
             in more detail metadata that is specific to either actions or
             providers, and the reference is expected to be a reference to an
-            action or a provider respectively.  These classes are described in
+            action or a provider respectively. These classes are described in
             the follow code snippet.
         </para>
 
@@ -278,10 +278,10 @@ class Zend_Tool_Framework_Manifest_ProviderMetadata
 
         <para>
             'Type' in these classes is used to describe the type of metadata the
-            object is responsible for.  In the cases of the
+            object is responsible for. In the cases of the
             <code>ActionMetadat</code>a, the type would be 'Action', and
             conversely in the case of the <code>ProviderMetadata</code> the type
-            is 'Provider'.  These metadata types will also include additional
+            is 'Provider'. These metadata types will also include additional
             structured information about both the "thing" they are describing as
             well as the object (the <code>->getReference()</code>) they are
             referencing with this new metadata.
@@ -291,7 +291,7 @@ class Zend_Tool_Framework_Manifest_ProviderMetadata
             In order to create your own metadata type, all one must do is extend
             the base <code>Zend_Tool_Framework_Manifest_Metadata</code> class
             and return these new metadata objects via a local Manifest
-            class/object.  These user based classes will live in the Manifest
+            class/object. These user based classes will live in the Manifest
             Repository
         </para>
 
@@ -327,7 +327,7 @@ class Zend_Tool_Framework_Manifest_Repository
 
     /**
      * The following will return exactly one of the matching search criteria,
-     * regardless of how many have been returned.  First one in the manifest is
+     * regardless of how many have been returned. First one in the manifest is
      * what will be returned.
      */
     public function findMetadata(Array $searchProperties = array(),
@@ -342,8 +342,8 @@ class Zend_Tool_Framework_Manifest_Repository
 
         <para>
             Looking at the search methods above, the signatures allow for
-            extremely flexible searching.  In order to find a metadata object,
-            simply pass in an array of matching constraints via an array.  If
+            extremely flexible searching. In order to find a metadata object,
+            simply pass in an array of matching constraints via an array. If
             the data is accessible through the Property accessor (the
             <code>getSomething()</code> methods implemented on the metadata
             object), then it will be passed back to the user as a "found"
@@ -358,7 +358,7 @@ class Zend_Tool_Framework_Manifest_Repository
             Clients are the interface which bridges a user or external tool into
             the <code>Zend_Tool_Framework</code> system. Clients can come in all
             shapes and sizes: RPC endpoints, Command Line Interface, or
-            even a web interface.  Zend_Tool has implemented the command
+            even a web interface. Zend_Tool has implemented the command
             line interface as the default interface for interacting with
             the <code>Zend_Tool_Framework</code> system.
         </para>
@@ -399,7 +399,7 @@ abstract class Zend_Tool_Framework_Client_Abstract
 
         <para>
             As you can see, there 1 method required to fulfill the needs of a
-            client (two others suggested), the initialization, prehandling and post handling.  For a
+            client (two others suggested), the initialization, prehandling and post handling. For a
             more in depth study of how the command line client works, please see
             the <ulink url="http://framework.zend.com/svn/framework/standard/branches/release-1.8/library/Zend/Tool/Framework/Client/Console.php">source code</ulink>.
         </para>

+ 20 - 20
documentation/manual/en/module_specs/Zend_Tool_Framework-CliTool.xml

@@ -6,9 +6,9 @@
     <para>
         The CLI, or command line tool (internally known as the console tool), is
         currently the primary interface for dispatching <code>Zend_Tool</code>
-        requests.  With the CLI tool, developers can issue tooling requests
+        requests. With the CLI tool, developers can issue tooling requests
         inside a the "command line windows", also commonly known as a "terminal"
-        window.  This environment is predominant in the *nix environment, but
+        window. This environment is predominant in the *nix environment, but
         also has a common implementation in windows with the
         <code>cmd.exe</code>, console2 and also with the Cygwin project.
     </para>
@@ -19,21 +19,21 @@
         <para>
             To issue tooling requests via the command line client, you first
             need to setup the client so that your system can handle the "zf"
-            command.  The command line client, for all intents and purposes, is
+            command. The command line client, for all intents and purposes, is
             the <code>.sh</code> or <code>.bat</code> file that is provided with
-            your Zend Framework distribution.  In trunk, it can be found here:
+            your Zend Framework distribution. In trunk, it can be found here:
             <ulink url="http://framework.zend.com/svn/framework/standard/trunk/bin/">http://framework.zend.com/svn/framework/standard/trunk/bin/</ulink>
         </para>
 
         <para>
             As you can see, there are 3 files in the <code>bin/</code>
             directory: a <code>zf.php</code>, <code>zf.sh</code>, and
-            <code>zf.bat</code>.  The <code>zf.sh</code> and the
+            <code>zf.bat</code>. The <code>zf.sh</code> and the
             <code>zf.bat</code> are the operating system specific client
             wrappers: <code>zf.sh</code> for the *nix environment, and zf.bat
-            for the Win32 environment.  These client wrappers are responsible
+            for the Win32 environment. These client wrappers are responsible
             for finding the proper <code>php.exe</code>, finding the
-            <code>zf.php</code>, and passing on the client request.  The
+            <code>zf.php</code>, and passing on the client request. The
             <code>zf.php</code> is the responsible for handling understanding
             your environment, constructing the proper include_path, and passing
             what is provided on the command line to the proper library component
@@ -49,7 +49,7 @@
             <listitem>
                 <para>
                     <code>zf.sh/zf.bat</code> is reachable from your system
-                    path.  This is the ability to call <code>zf</code> from
+                    path. This is the ability to call <code>zf</code> from
                     anywhere on your command line, regardless of what your
                     current working directory is.
                 </para>
@@ -75,7 +75,7 @@
         <para>
             The most common setup in the *nix environment, is to copy the
             <code>zf.sh</code> and <code>zf.php</code> into the same directory
-            as your PHP binary.  This can generally be found in one of the
+            as your PHP binary. This can generally be found in one of the
             following places:
         </para>
 
@@ -88,17 +88,17 @@
 
         <para>
             To find out the location of your PHP binary, you can execute 'which
-            php' on the command line.  This will return the location of the php
+            php' on the command line. This will return the location of the php
             binary you will be using to run php scripts in this environment.
         </para>
 
         <para>
             The next order of business is to ensure that the Zend Framework
             library is setup correctly inside of the system PHP
-            <code>include_path</code>.  To find out where your
+            <code>include_path</code>. To find out where your
             <code>include_path</code> is located, you can execute 'php -i' and
             look for the <code>include_path</code> variable, or more succinctly,
-            execute 'php -i | grep include_path'.  Once you have found where
+            execute 'php -i | grep include_path'. Once you have found where
             your <code>include_path</code> is located (this will generally be
             something like /usr/lib/php, /usr/share/php, /usr/local/lib/php, or
             similar), ensure that the contents of the library/ directory are put
@@ -129,7 +129,7 @@
         <para>
             <emphasis>ALTERNATIVE SETUP</emphasis> involves keeping the Zend
             Framework download together as is, and creating a link from a PATH
-            location to the <code>zf.sh</code>.  What this means is you can
+            location to the <code>zf.sh</code>. What this means is you can
             place the contents of the ZendFramework download into a location
             such as <code>/usr/local/share/ZendFramework</code>, or more locally
             like <code>/home/username/lib/ZendFramework</code>, and creating a
@@ -162,7 +162,7 @@ ln -s /home/username/lib/ZendFramework/bin/zf.sh /home/username/bin/zf
         <para>
             The most common setup in the Windows Win32 environment, is to copy
             the <code>zf.sh</code> and <code>zf.php</code> into the same
-            directory as your PHP binary.  This can generally be found in one of
+            directory as your PHP binary. This can generally be found in one of
             the following places:
         </para>
 
@@ -182,11 +182,11 @@ C:\WAMP\PHP\bin
         <para>
             The next order of business is to ensure that the Zend Framework
             library is setup correctly inside of the system PHP
-            <code>include_path</code>.  To find out where your
+            <code>include_path</code>. To find out where your
             <code>include_path</code> is located, you can type 'php -i' and look
             for the <code>include_path</code> variable, or more succinctly
             execute 'php -i | grep include_path' if you have Cygwin setup with
-            grep available.  Once you have found where your
+            grep available. Once you have found where your
             <code>include_path</code> is located (this will generally be
             something like <code>C:\PHP\pear</code>, <code>C:\PHP\share</code>,
             <code>C:\Program Files\ZendServer\share</code> or similar), ensure
@@ -218,10 +218,10 @@ C:\WAMP\PHP\bin
         <para>
             <emphasis>ALTERNATIVE SETUP</emphasis> involves keeping the Zend
             Framework download together as is, and altering both your system
-            PATH as well as the <code>php.ini</code> file.  In your user's
+            PATH as well as the <code>php.ini</code> file. In your user's
             environment, make sure to add
             <code>C:\Path\To\ZendFramework\bin</code>, so that your
-            <code>zf.bat</code> file is executable.  Also, alter the
+            <code>zf.bat</code> file is executable. Also, alter the
             <code>php.ini</code> file to ensure that
             <code>C:\Path\To\ZendFramework\library</code> is in your
             <code>include_path</code>.
@@ -234,7 +234,7 @@ C:\WAMP\PHP\bin
 
         <para>
             If for some reason you do not want the Zend Framework library inside
-            your <code>include_path</code>, there is another option.  There are
+            your <code>include_path</code>, there is another option. There are
             two special environment variables that <code>zf.php</code> will
             utilize to determine the location of your Zend Framework
             installation.
@@ -261,7 +261,7 @@ C:\WAMP\PHP\bin
 
         <para>
             At this point, your should be setup to start initiating some more
-            "interesting" commands.  To get going, you can issue the <code>zf
+            "interesting" commands. To get going, you can issue the <code>zf
                 --help</code> command to see what is available to you.
         </para>
 

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

@@ -60,7 +60,7 @@
             <para>
                 <emphasis>A standard set of system providers"</emphasis> that
                 allow the system to report what the full capabilities of the
-                system are as well as provide useful feedback.  This also
+                system are as well as provide useful feedback. This also
                 includes a comprehensive "Help System".
             </para>
         </listitem>

+ 3 - 3
documentation/manual/en/module_specs/Zend_Tool_Framework-SystemProviders.xml

@@ -7,7 +7,7 @@
         In addition to the more useful project based providers that come shipped
         with <code>Zend_Tool_Project</code>, there are also some more basic, but
         interesting providers that come built into
-        <code>Zend_Tool_Framework</code>.  Some of these exist for the purpose
+        <code>Zend_Tool_Framework</code>. Some of these exist for the purpose
         of providing a means via the command line to extract information, such
         as the version, while others are intended to aid the developer when
         creating additional providers.
@@ -34,9 +34,9 @@
         <para>
             The Manifest provider is included so that you may determine what
             kind of "manifest" information is available during the
-            <code>Zend_Tool</code> runtime.  Manifest data is information that
+            <code>Zend_Tool</code> runtime. Manifest data is information that
             is attached to specific objects during <code>Zend_Tool</code>'s
-            runtime.  Inside the manifest you will find the console specific
+            runtime. Inside the manifest you will find the console specific
             namings that you are expected to use when calling certain commands.
             Data found in the manifest can be used by any provider or client on
             an as-needed basis.

+ 11 - 11
documentation/manual/en/module_specs/Zend_Tool_Framework-WritingProviders.xml

@@ -6,7 +6,7 @@
     <para>
         In general, a provider, on its own, is nothing more than the shell for a
         developer to bundle up some capabilities they wish to dispatch with the
-        command line (or other) clients.  It is an analogue to what a
+        command line (or other) clients. It is an analogue to what a
         "controller" is inside of your MVC application.
     </para>
 
@@ -20,7 +20,7 @@
             Assuming the component is called <code>My_Component</code>, he would
             create a class named <code>My_Component_HelloProvider</code> in a
             file named <code>HelloProvider.php</code> somewhere on the
-            <code>include_path</code>.  This class would implement
+            <code>include_path</code>. This class would implement
             <classname>Zend_Tool_Framework_Provider_Interface</classname>, and the body of
             this file would only have to look like the following:
         </para>
@@ -55,16 +55,16 @@ Hello from my provider!
             The above "Hello World" example is great for simple commands, but
             what about something more advanced?  As your scripting and tooling
             needs grow, you might find that you need the ability to accept
-            variables.  Much like function signatures have parameters, your
+            variables. Much like function signatures have parameters, your
             tooling requests can also accept parameters.
         </para>
 
         <para>
             Just as each tooling request can be isolated to a method within a
             class, the parameters of a tooling request can also be isolated in a
-            very well known place.  Parameters of the action methods of a
+            very well known place. Parameters of the action methods of a
             provider can include the same parameters you want your client to
-            utilize when calling that provider and action combination.  For
+            utilize when calling that provider and action combination. For
             example, if you wanted to accept a name in the above example, you
             would probably do this in OO code:
         </para>
@@ -82,8 +82,8 @@ class My_Component_HelloProvider
 
         <para>
             The above example can then be called via the command line <code>zf
-                say hello Joe</code>.  "Joe" will be supplied to the provider as
-            a parameter of the method call.  Also note, as you see that the
+                say hello Joe</code>. "Joe" will be supplied to the provider as
+            a parameter of the method call. Also note, as you see that the
             parameter is optional, that means it is also optional on the command
             line, so that <code>zf say hello</code> will still work, and default
             to the name "Ralph".
@@ -91,20 +91,20 @@ class My_Component_HelloProvider
 
         <para>
             Another interesting feature you might wish to implement is
-            <emphasis>pretendability</emphasis>.  Pretendabilty is the ability
+            <emphasis>pretendability</emphasis>. Pretendabilty is the ability
             for your provider to "pretend" as if it is doing the requested
             action and provider combination and give the user as much
             information about what it <emphasis>would</emphasis> do without
-            actually doing it.  This might be an important notion when doing
+            actually doing it. This might be an important notion when doing
             heavy database or filesystem modifications that the user might not
             otherwise want to do.
         </para>
 
         <para>
-            Pretendability is easy to implement.  There are two parts to this
+            Pretendability is easy to implement. There are two parts to this
             feature: 1) marking the provider as having the ability to "pretend",
             and 2) checking the request to ensure the current request was indeed
-            asked to be "pretended".  This feature is demonstrated in the code
+            asked to be "pretended". This feature is demonstrated in the code
             sample below.
         </para>
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Tool_Project-CreateProject.xml

@@ -15,7 +15,7 @@
     </para>
 
     <para>
-        To get started with Zend_Tool_Project, you simply need to create a project.  Creating a project
+        To get started with Zend_Tool_Project, you simply need to create a project. Creating a project
         is simple: go to a place on your filesystem, create a directory, change to that directory, then
         issue the following command:
     </para>
@@ -34,7 +34,7 @@
 
     <para>
         The following table will describe the capabilities of providers that are available to
-        you.  As you can see in this table, there is a "Project" provider.  The Project provider
+        you. As you can see in this table, there is a "Project" provider. The Project provider
         has a couple of actions associated to it, and with those actions a number of options that
         can be used to modify the behavior of the action and provider.
 

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

@@ -5,7 +5,7 @@
 
     <para>
         Zend_Tool_Project builds on and extends the capabilities of Zend_Tool_Framework to that
-        of managing a "project".  In general, a "project" is a planned endeavor or an initiative.
+        of managing a "project". In general, a "project" is a planned endeavor or an initiative.
         In the computer world, projects generally are a collection of resources. These resources
         can be files, directories, databases, schemas, images, styles, and more.
     </para>

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

@@ -16,9 +16,9 @@
 
     <para>
       URIs always begin with a scheme, followed by a colon. The construction
-      of the many different schemes varies significantly.  The
+      of the many different schemes varies significantly. The
       <classname>Zend_Uri</classname> class provides a factory that returns a subclass of
-      itself which specializes in each scheme.  The subclass
+      itself which specializes in each scheme. The subclass
       will be named <classname>Zend_Uri_&lt;scheme&gt;</classname>, where
       <code>&lt;scheme&gt;</code> is the scheme lowercased with the first
       letter capitalized. An exception to this rule is HTTPS, which is also
@@ -166,7 +166,7 @@ Zend_Uri::setConfig(array('allow_unwise' => false));
       <title>Getting the Scheme of the URI</title>
 
       <para>
-        The scheme of the URI is the part of the URI that precedes the colon.  For example,
+        The scheme of the URI is the part of the URI that precedes the colon. For example,
         the scheme of <code>http://www.zend.com</code> is <code>http</code>.
       </para>
 

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

@@ -64,7 +64,7 @@
             <para>
                 The <code>getMessages()</code> methods return validation
                 failure information only for the most recent
-                <code>isValid()</code> call.  Each call to
+                <code>isValid()</code> call. Each call to
                 <code>isValid()</code> clears any messages and errors caused by
                 a previous <code>isValid()</code> call, because it's likely
                 that each call to <code>isValid()</code> is made for a
@@ -99,14 +99,14 @@ if ($validator->isValid($email)) {
         <para>
             Validate classes provide a <code>setMessage()</code> method with
             which you can specify the format of a message returned by
-            <code>getMessages()</code> in case of validation failure.  The
+            <code>getMessages()</code> in case of validation failure. The
             first argument of this method is a string containing the error
-            message.  You can include tokens in this string which will be
-            substituted with data relevant to the validator.  The token
+            message. You can include tokens in this string which will be
+            substituted with data relevant to the validator. The token
             <code>%value%</code> is supported by all validators; this is
             substituted with the value you passed to <code>isValid()</code>.
             Other tokens may be supported on a case-by-case basis in each
-            validation class.  For example, <code>%max%</code> is a token
+            validation class. For example, <code>%max%</code> is a token
             supported by <classname>Zend_Validate_LessThan</classname>.
             The <code>getMessageVariables()</code> method returns an array
             of variable tokens supported by the validator.
@@ -143,7 +143,7 @@ if (!$validator->isValid('word')) {
 
         <para>
             You can set multiple messages using the <code>setMessages()</code>
-            method.  Its argument is an array containing key/message pairs.
+            method. Its argument is an array containing key/message pairs.
 
             <programlisting role="php"><![CDATA[
 $validator = new Zend_Validate_StringLength(8, 12);
@@ -164,7 +164,7 @@ $validator->setMessages( array(
             name as the message tokens supported by a given validation class.
             The <code>value</code> property is always available in a validator;
             it is the value you specified as the argument of
-            <code>isValid()</code>.  Other properties may be supported on a
+            <code>isValid()</code>. Other properties may be supported on a
             case-by-case basis in each validation class.
 
             <programlisting role="php"><![CDATA[
@@ -192,11 +192,11 @@ if (!validator->isValid('word')) {
             If it's inconvenient to load a given validation class and create an
             instance of the validator, you can use the static method
             <classname>Zend_Validate::is()</classname> as an alternative invocation
-            style.  The first argument of this method is a data input value,
-            that you would pass to the <code>isValid()</code> method.  The
+            style. The first argument of this method is a data input value,
+            that you would pass to the <code>isValid()</code> method. The
             second argument is a string, which corresponds to the basename of
             the validation class, relative to the <classname>Zend_Validate</classname>
-            namespace.  The <code>is()</code> method automatically loads the
+            namespace. The <code>is()</code> method automatically loads the
             class, creates an instance, and applies the <code>isValid()</code>
             method to the data input.
 
@@ -222,7 +222,7 @@ if (Zend_Validate::is($value, 'Between', array(1, 12))) {
 
         <para>
             The <code>is()</code> method returns a boolean value, the same as
-            the <code>isValid()</code> method.  When using the static
+            the <code>isValid()</code> method. When using the static
             <code>is()</code> method, validation failure messages are not
             available.
         </para>

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

@@ -59,7 +59,7 @@ echo $this->json($this->data, array('keepLayouts' => true));
         <para>
             <classname>Zend_Json::encode</classname> allows the encoding of native JSON
             expressions using <classname>Zend_Json_Expr</classname> objects. This option
-            is disabled by default.  To enable this option, pass a boolean
+            is disabled by default. To enable this option, pass a boolean
             <code>true</code> to the <code>enableJsonExprFinder</code> key of
             the options array:
         </para>

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

@@ -61,7 +61,7 @@
             <title>General</title>
 
             <para>
-                For files that contain only PHP code, the closing tag ("?>") is never permitted.  It is
+                For files that contain only PHP code, the closing tag ("?>") is never permitted. It is
                 not required by PHP, and omitting it prevents the accidental injection of trailing white space into the response.
             </para>
 
@@ -126,7 +126,7 @@
 
             <para>
                 If a class name is comprised of more than one word, the first letter of each new
-                word must be capitalized.  Successive capitalized letters are not allowed, e.g.
+                word must be capitalized. Successive capitalized letters are not allowed, e.g.
                 a class "Zend_PDF" is not allowed while "Zend_Pdf" is acceptable.
             </para>
 
@@ -285,7 +285,7 @@ widgetFactory()
             </para>
 
             <para>
-                Short tags are never allowed.  For files containing only PHP code, the
+                Short tags are never allowed. For files containing only PHP code, the
                 closing tag must always be omitted (See <xref linkend="coding-standard.php-file-formatting.general" />).
             </para>
         </sect2>
@@ -468,7 +468,7 @@ class SampleClass
                     declaration of any methods.
                 </para>
                 <para>
-                    The <code>var</code> construct is not permitted.  Member variables always declare
+                    The <code>var</code> construct is not permitted. Member variables always declare
                     their visibility by using one of the <code>private</code>, <code>protected</code>,
                     or <code>public</code> modifiers. Giving access to member variables directly by declaring them
                     as public is permitted but discouraged in favor of accessor methods (set/get).
@@ -543,7 +543,7 @@ class Foo
                 </para>
 
                 <para>
-                    The return value must not be enclosed in parentheses.  This can hinder readability, in additional to breaking code
+                    The return value must not be enclosed in parentheses. This can hinder readability, in additional to breaking code
                     if a method is later changed to return by reference.
 
                     <programlisting role="php"><![CDATA[
@@ -591,7 +591,7 @@ threeArguments(1, 2, 3);
                 </para>
                 <para>
                     In passing arrays as arguments to a function, the function call may include the
-                    "array" hint and may be split into multiple lines to improve readability.  In
+                    "array" hint and may be split into multiple lines to improve readability. In
                     such cases, the normal guidelines for writing arrays still apply:
 
                     <programlisting role="php"><![CDATA[