Browse Source

[MANUAL] English:

- structural fixes (no translations needed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20827 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
d981461882
22 changed files with 614 additions and 508 deletions
  1. 9 14
      documentation/manual/en/module_specs/Zend_Markup-Parsers.xml
  2. 9 13
      documentation/manual/en/module_specs/Zend_Markup-Renderers.xml
  3. 35 38
      documentation/manual/en/module_specs/Zend_Measure-Creation.xml
  4. 59 53
      documentation/manual/en/module_specs/Zend_Measure-Edit.xml
  5. 22 19
      documentation/manual/en/module_specs/Zend_Measure-Introduction.xml
  6. 19 27
      documentation/manual/en/module_specs/Zend_Measure-Output.xml
  7. 9 24
      documentation/manual/en/module_specs/Zend_Memory-MemoryManager.xml
  8. 2 0
      documentation/manual/en/module_specs/Zend_Memory-MemoryObjects.xml
  9. 8 12
      documentation/manual/en/module_specs/Zend_Memory-Overview.xml
  10. 174 137
      documentation/manual/en/module_specs/Zend_Mime.xml
  11. 87 81
      documentation/manual/en/module_specs/Zend_Mime_Part.xml
  12. 2 0
      documentation/manual/en/module_specs/Zend_Navigation-Introduction.xml
  13. 47 7
      documentation/manual/en/module_specs/Zend_Navigation-Pages-Common.xml
  14. 1 1
      documentation/manual/en/module_specs/Zend_Navigation-Pages-Custom.xml
  15. 5 5
      documentation/manual/en/module_specs/Zend_Navigation-Pages-Factory.xml
  16. 18 27
      documentation/manual/en/module_specs/Zend_Navigation-Pages-MVC.xml
  17. 3 1
      documentation/manual/en/module_specs/Zend_Navigation-Pages-URI.xml
  18. 2 2
      documentation/manual/en/module_specs/Zend_Navigation-Pages.xml
  19. 5 4
      documentation/manual/en/module_specs/Zend_Oauth-GettingStarted.xml
  20. 73 42
      documentation/manual/en/module_specs/Zend_OpenId-Consumer.xml
  21. 10 1
      documentation/manual/en/module_specs/Zend_ProgressBar.xml
  22. 15 0
      documentation/manual/en/module_specs/Zend_ProgressBar_Adapter_Console.xml

+ 9 - 14
documentation/manual/en/module_specs/Zend_Markup-Parsers.xml

@@ -107,7 +107,6 @@
                 <thead>
                 <thead>
                     <row>
                     <row>
                         <entry>Sample input</entry>
                         <entry>Sample input</entry>
-
                         <entry>Sample output</entry>
                         <entry>Sample output</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
@@ -115,80 +114,76 @@
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>*foo*</entry>
                         <entry>*foo*</entry>
-
                         <entry><![CDATA[<strong>foo</strong>]]></entry>
                         <entry><![CDATA[<strong>foo</strong>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>_foo_</entry>
                         <entry>_foo_</entry>
-
                         <entry><![CDATA[<em>foo</em>]]></entry>
                         <entry><![CDATA[<em>foo</em>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>??foo??</entry>
                         <entry>??foo??</entry>
-
                         <entry><![CDATA[<cite>foo</cite>]]></entry>
                         <entry><![CDATA[<cite>foo</cite>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>-foo-</entry>
                         <entry>-foo-</entry>
-
                         <entry><![CDATA[<del>foo</del>]]></entry>
                         <entry><![CDATA[<del>foo</del>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>+foo+</entry>
                         <entry>+foo+</entry>
-
                         <entry><![CDATA[<ins>foo</ins>]]></entry>
                         <entry><![CDATA[<ins>foo</ins>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>^foo^</entry>
                         <entry>^foo^</entry>
-
                         <entry><![CDATA[<sup>foo</sup>]]></entry>
                         <entry><![CDATA[<sup>foo</sup>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>~foo~</entry>
                         <entry>~foo~</entry>
-
                         <entry><![CDATA[<sub>foo</sub>]]></entry>
                         <entry><![CDATA[<sub>foo</sub>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>%foo%</entry>
                         <entry>%foo%</entry>
-
                         <entry><![CDATA[<span>foo</span>]]></entry>
                         <entry><![CDATA[<span>foo</span>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>PHP(PHP Hypertext Preprocessor)</entry>
                         <entry>PHP(PHP Hypertext Preprocessor)</entry>
 
 
-                        <entry><![CDATA[<acronym title="PHP Hypertext Preprocessor">PHP</acronym>]]></entry>
+                        <entry>
+                            <![CDATA[<acronym title="PHP Hypertext Preprocessor">PHP</acronym>]]>
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>"Zend Framework":http://framework.zend.com/</entry>
                         <entry>"Zend Framework":http://framework.zend.com/</entry>
 
 
-                        <entry><![CDATA[<a href="http://framework.zend.com/">Zend Framework</a>]]></entry>
+                        <entry>
+                            <![CDATA[<a href="http://framework.zend.com/">Zend Framework</a>]]>
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>h1. foobar</entry>
                         <entry>h1. foobar</entry>
-
                         <entry><![CDATA[<h1>foobar</h1>]]></entry>
                         <entry><![CDATA[<h1>foobar</h1>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>h6. foobar</entry>
                         <entry>h6. foobar</entry>
-
                         <entry><![CDATA[<h6>foobar</h6>]]></entry>
                         <entry><![CDATA[<h6>foobar</h6>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>!http://framework.zend.com/images/logo.gif!</entry>
                         <entry>!http://framework.zend.com/images/logo.gif!</entry>
 
 
-                        <entry><![CDATA[<img src="http://framework.zend.com/images/logo.gif" />]]></entry>
+                        <entry>
+                            <![CDATA[<img src="http://framework.zend.com/images/logo.gif" />]]>
+                        </entry>
                     </row>
                     </row>
                 </tbody>
                 </tbody>
             </tgroup>
             </tgroup>

+ 9 - 13
documentation/manual/en/module_specs/Zend_Markup-Renderers.xml

@@ -123,7 +123,6 @@ echo $bbcode->render('my [upper]tag[/upper]');
                 <thead>
                 <thead>
                     <row>
                     <row>
                         <entry>Sample input (bbcode)</entry>
                         <entry>Sample input (bbcode)</entry>
-
                         <entry>Sample output</entry>
                         <entry>Sample output</entry>
                     </row>
                     </row>
                 </thead>
                 </thead>
@@ -131,74 +130,71 @@ echo $bbcode->render('my [upper]tag[/upper]');
                 <tbody>
                 <tbody>
                     <row>
                     <row>
                         <entry>[b]foo[/b]</entry>
                         <entry>[b]foo[/b]</entry>
-
                         <entry><![CDATA[<strong>foo</strong>]]></entry>
                         <entry><![CDATA[<strong>foo</strong>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[i]foo[/i]</entry>
                         <entry>[i]foo[/i]</entry>
-
                         <entry><![CDATA[<em>foo</em>]]></entry>
                         <entry><![CDATA[<em>foo</em>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[cite]foo[/cite]</entry>
                         <entry>[cite]foo[/cite]</entry>
-
                         <entry><![CDATA[<cite>foo</cite>]]></entry>
                         <entry><![CDATA[<cite>foo</cite>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[del]foo[/del]</entry>
                         <entry>[del]foo[/del]</entry>
-
                         <entry><![CDATA[<del>foo</del>]]></entry>
                         <entry><![CDATA[<del>foo</del>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[ins]foo[/ins]</entry>
                         <entry>[ins]foo[/ins]</entry>
-
                         <entry><![CDATA[<ins>foo</ins>]]></entry>
                         <entry><![CDATA[<ins>foo</ins>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[sup]foo[/sup]</entry>
                         <entry>[sup]foo[/sup]</entry>
-
                         <entry><![CDATA[<sup>foo</sup>]]></entry>
                         <entry><![CDATA[<sup>foo</sup>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[sub]foo[/sub]</entry>
                         <entry>[sub]foo[/sub]</entry>
-
                         <entry><![CDATA[<sub>foo</sub>]]></entry>
                         <entry><![CDATA[<sub>foo</sub>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[span]foo[/span]</entry>
                         <entry>[span]foo[/span]</entry>
-
                         <entry><![CDATA[<span>foo</span>]]></entry>
                         <entry><![CDATA[<span>foo</span>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[acronym title="PHP Hypertext Preprocessor]PHP[/acronym]</entry>
                         <entry>[acronym title="PHP Hypertext Preprocessor]PHP[/acronym]</entry>
 
 
-                        <entry><![CDATA[<acronym title="PHP Hypertext Preprocessor">PHP</acronym>]]></entry>
+                        <entry>
+                            <![CDATA[<acronym title="PHP Hypertext Preprocessor">PHP</acronym>]]>
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[url=http://framework.zend.com/]Zend Framework[/url]</entry>
                         <entry>[url=http://framework.zend.com/]Zend Framework[/url]</entry>
 
 
-                        <entry><![CDATA[<a href="http://framework.zend.com/">Zend Framework</a>]]></entry>
+                        <entry>
+                            <![CDATA[<a href="http://framework.zend.com/">Zend Framework</a>]]>
+                        </entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[h1]foobar[/h1]</entry>
                         <entry>[h1]foobar[/h1]</entry>
-
                         <entry><![CDATA[<h1>foobar</h1>]]></entry>
                         <entry><![CDATA[<h1>foobar</h1>]]></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
                         <entry>[img]http://framework.zend.com/images/logo.gif[/img]</entry>
                         <entry>[img]http://framework.zend.com/images/logo.gif[/img]</entry>
 
 
-                        <entry><![CDATA[<img src="http://framework.zend.com/images/logo.gif" />]]></entry>
+                        <entry>
+                            <![CDATA[<img src="http://framework.zend.com/images/logo.gif" />]]>
+                        </entry>
                     </row>
                     </row>
                 </tbody>
                 </tbody>
             </tgroup>
             </tgroup>

+ 35 - 38
documentation/manual/en/module_specs/Zend_Measure-Creation.xml

@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.measure.creation">
 <sect1 id="zend.measure.creation">
-
     <title>Creation of Measurements</title>
     <title>Creation of Measurements</title>
 
 
     <para>
     <para>
-        When creating a measurement object, <classname>Zend_Measure_*</classname> methods expect the input/original measurement
-        data value as the first parameter. This can be a
-        <link linkend="zend.measure.creation.number"><code>numeric argument</code>
-        </link>
-        , a
-        <link linkend="zend.measure.creation.string"><type>String</type>
-        </link>
-        without units, or a
-        <link linkend="zend.measure.creation.localized"><code>localized string</code> with unit(s) specified.
-        </link>
-        The second parameter defines the type of the measurement. Both parameters are mandatory. The language may
-        optionally be specified as the third parameter.
+        When creating a measurement object, <classname>Zend_Measure_*</classname> methods expect the
+        input/original measurement data value as the first parameter. This can be a
+        <link linkend="zend.measure.creation.number"><code>numeric argument</code></link>, a
+        <link linkend="zend.measure.creation.string"><type>String</type></link> without units, or a
+        <link linkend="zend.measure.creation.localized"><code>localized string</code> with unit(s)
+            specified.</link> The second parameter defines the type of the measurement. Both
+        parameters are mandatory. The language may optionally be specified as the third parameter.
     </para>
     </para>
 
 
     <sect2 id="zend.measure.creation.number">
     <sect2 id="zend.measure.creation.number">
-
         <title>Creating measurements from integers and floats</title>
         <title>Creating measurements from integers and floats</title>
 
 
         <para>
         <para>
             In addition to integer data values, floating point types may be used, but
             In addition to integer data values, floating point types may be used, but
-            <ulink url="http://www.php.net/float">"simple decimal fractions like 0.1 or 0.7 cannot be converted into their internal binary counterparts without a little loss of precision,"</ulink>
-            sometimes giving surprising results. Also, do not compare two "float" type numbers for equality.
+            <ulink url="http://www.php.net/float">"simple decimal fractions like 0.1 or 0.7 cannot
+                be converted into their internal binary counterparts without a little loss of
+                precision,"</ulink> sometimes giving surprising results. Also, do not compare two
+            "float" type numbers for equality.
         </para>
         </para>
 
 
         <example id="zend.measure.creation.number.example-1">
         <example id="zend.measure.creation.number.example-1">
             <title>Creation using integer and floating values</title>
             <title>Creation using integer and floating values</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $measurement = 1234.7;
 $measurement = 1234.7;
 $unit = new Zend_Measure_Length((integer)$measurement,
 $unit = new Zend_Measure_Length((integer)$measurement,
@@ -43,28 +39,28 @@ echo $unit;
 // outputs '1234.7 m' (meters)
 // outputs '1234.7 m' (meters)
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.creation.string">
     <sect2 id="zend.measure.creation.string">
-
         <title>Creating measurements from strings</title>
         <title>Creating measurements from strings</title>
 
 
         <para>
         <para>
             Many measurements received as input to Zend Framework applications can only be passed
             Many measurements received as input to Zend Framework applications can only be passed
             to <classname>Zend_Measure_*</classname> classes as strings, such as numbers written
             to <classname>Zend_Measure_*</classname> classes as strings, such as numbers written
             using <ulink url="http://en.wikipedia.org/wiki/Roman_numerals">roman numerals</ulink>
             using <ulink url="http://en.wikipedia.org/wiki/Roman_numerals">roman numerals</ulink>
-            or extremely large binary values that exceed the precision of <acronym>PHP</acronym>'s native integer
-            and float types. Since integers can be denoted using strings, if there is any risk of
-            losing precision due to limitations of <acronym>PHP</acronym>'s native integer and float types, using
-            strings instead. <classname>Zend_Measure_Number</classname> uses the BCMath extension
-            to support arbitrary precision, as shown in the example below, to avoid limitations in
-            many <acronym>PHP</acronym> functions, such as
-            <ulink url="http://php.net/bin2dec"><methodname>bin2dec()</methodname></ulink>.
+            or extremely large binary values that exceed the precision of <acronym>PHP</acronym>'s
+            native integer and float types. Since integers can be denoted using strings, if there is
+            any risk of losing precision due to limitations of <acronym>PHP</acronym>'s native
+            integer and float types, using strings instead.
+            <classname>Zend_Measure_Number</classname> uses the BCMath extension to support
+            arbitrary precision, as shown in the example below, to avoid limitations in many
+            <acronym>PHP</acronym> functions, such as <ulink
+                url="http://php.net/bin2dec"><methodname>bin2dec()</methodname></ulink>.
         </para>
         </para>
 
 
         <example id="zend.measure.creation.string.example-1">
         <example id="zend.measure.creation.string.example-1">
             <title>Creation using strings</title>
             <title>Creation using strings</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $mystring = "10010100111010111010100001011011101010001";
 $mystring = "10010100111010111010100001011011101010001";
 $unit = new Zend_Measure_Number($mystring, Zend_Measure_Number::BINARY);
 $unit = new Zend_Measure_Number($mystring, Zend_Measure_Number::BINARY);
@@ -75,20 +71,22 @@ echo $unit;
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.creation.localized">
     <sect2 id="zend.measure.creation.localized">
-
         <title>Measurements from localized strings</title>
         <title>Measurements from localized strings</title>
 
 
         <para>
         <para>
-            When a string is entered in a localized notation, the correct interpretation can not be determined without
-            knowing the intended locale. The division of decimal digits with "." and grouping of thousands with "," is
-            common in the English language, but not so in other languages. For example, the English number "1,234.50"
-            would be interpreted as meaning "1.2345" in German. To deal with such problems, the locale-aware
-            <classname>Zend_Measure_*</classname> family of classes offer the possibility to specify a language or region to
-            disambiguate the input data and properly interpret the intended semantic value.
+            When a string is entered in a localized notation, the correct interpretation can not be
+            determined without knowing the intended locale. The division of decimal digits with "."
+            and grouping of thousands with "," is common in the English language, but not so in
+            other languages. For example, the English number "1,234.50" would be interpreted as
+            meaning "1.2345" in German. To deal with such problems, the locale-aware
+            <classname>Zend_Measure_*</classname> family of classes offer the possibility to specify
+            a language or region to disambiguate the input data and properly interpret the intended
+            semantic value.
         </para>
         </para>
 
 
         <example id="zend.measure.creation.localized.example-1">
         <example id="zend.measure.creation.localized.example-1">
             <title>Localized string</title>
             <title>Localized string</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de');
 $locale = new Zend_Locale('de');
 $mystring = "1,234.50";
 $mystring = "1,234.50";
@@ -106,10 +104,11 @@ echo $unit; // outputs "1234.50 m"
         </example>
         </example>
 
 
         <para>
         <para>
-            Since Zend Framework 1.7.0 <classname>Zend_Measure</classname> does also support the usage of an application
-            wide locale. You can simply set a <classname>Zend_Locale</classname> instance to the registry like shown
-            below. With this notation you can forget about setting the locale manually with each instance when
-            you want to use the same locale multiple times.
+            Since Zend Framework 1.7.0 <classname>Zend_Measure</classname> does also support the
+            usage of an application wide locale. You can simply set a
+            <classname>Zend_Locale</classname> instance to the registry like shown below. With this
+            notation you can forget about setting the locale manually with each instance when you
+            want to use the same locale multiple times.
         </para>
         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
@@ -120,9 +119,7 @@ Zend_Registry::set('Zend_Locale', $locale);
 // somewhere in your application
 // somewhere in your application
 $length = new Zend_Measure_Length(Zend_Measure_Length::METER();
 $length = new Zend_Measure_Length(Zend_Measure_Length::METER();
 ]]></programlisting>
 ]]></programlisting>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 59 - 53
documentation/manual/en/module_specs/Zend_Measure-Edit.xml

@@ -1,73 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.measure.edit">
 <sect1 id="zend.measure.edit">
-
     <title>Manipulating Measurements</title>
     <title>Manipulating Measurements</title>
 
 
     <para>
     <para>
-        Parsing and normalization of input, combined with output to localized notations makes data accessible to users
-        in different locales. Many additional methods exist in <classname>Zend_Measure_*</classname> components to manipulate and
-        work with this data, after it has been normalized.
+        Parsing and normalization of input, combined with output to localized notations makes data
+        accessible to users in different locales. Many additional methods exist in
+        <classname>Zend_Measure_*</classname> components to manipulate and work with this data,
+        after it has been normalized.
     </para>
     </para>
 
 
     <itemizedlist>
     <itemizedlist>
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.convert"><code>Convert</code>
-                </link>
+                <link linkend="zend.measure.edit.convert"><code>Convert</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.add"><code>Add and subtract</code>
-                </link>
+                <link linkend="zend.measure.edit.add"><code>Add and subtract</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.equal"><code>Compare to boolean</code>
-                </link>
+                <link linkend="zend.measure.edit.equal"><code>Compare to boolean</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.compare"><code>Compare to greater/smaller</code>
-                </link>
+                <link
+                    linkend="zend.measure.edit.compare"><code>Compare to greater/smaller</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.changevalue"><code>Manually change values</code>
-                </link>
+                <link
+                    linkend="zend.measure.edit.changevalue"><code>Manually change values</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
-                <link linkend="zend.measure.edit.changetype"><code>Manually change types</code>
-                </link>
+                <link
+                    linkend="zend.measure.edit.changetype"><code>Manually change types</code></link>
             </para>
             </para>
         </listitem>
         </listitem>
     </itemizedlist>
     </itemizedlist>
 
 
     <sect2 id="zend.measure.edit.convert">
     <sect2 id="zend.measure.edit.convert">
-
         <title>Convert</title>
         <title>Convert</title>
 
 
         <para>
         <para>
-            Probably the most important feature is the conversion into different units of measurement. The conversion of
-            a unit can be done any number of times using the method <methodname>convertTo()</methodname>. Units of measurement can
-            only be converted to other units of the same type (class). Therefore, it is not possible to convert (e.g.) a
-            length into a weight, which would might encourage poor programming practices and allow errors to propagate
-            without exceptions.
+            Probably the most important feature is the conversion into different units of
+            measurement. The conversion of a unit can be done any number of times using the method
+            <methodname>convertTo()</methodname>. Units of measurement can only be converted to
+            other units of the same type (class). Therefore, it is not possible to convert (e.g.) a
+            length into a weight, which would might encourage poor programming practices and allow
+            errors to propagate without exceptions.
         </para>
         </para>
 
 
         <para>
         <para>
-            The <code>convertTo</code> method accepts an optional parameter. With this parameter you can define
-            an precision for the returned output. The standard precision is '<code>2</code>'.
+            The <code>convertTo</code> method accepts an optional parameter. With this parameter you
+            can define an precision for the returned output. The standard precision is
+            '<code>2</code>'.
         </para>
         </para>
 
 
         <example id="zend.measure.edit.convert.example-1">
         <example id="zend.measure.edit.convert.example-1">
             <title>Convert</title>
             <title>Convert</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de');
 $locale = new Zend_Locale('de');
 $mystring = "1.234.567,89";
 $mystring = "1.234.567,89";
@@ -82,24 +86,24 @@ print "Ton:".$unit->convertTo(Zend_Measure_Weight::TON);
 print "Ton:".$unit->convertTo(Zend_Measure_Weight::TON, 3);
 print "Ton:".$unit->convertTo(Zend_Measure_Weight::TON, 3);
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.edit.add">
     <sect2 id="zend.measure.edit.add">
-
         <title>Add and subtract</title>
         <title>Add and subtract</title>
 
 
         <para>
         <para>
-            Measurements can be added together using <methodname>add()</methodname> and subtracted using <methodname>sub()</methodname>. Each
-            addition will create a new object for the result. The actual object will never be changed by the class. The
-            new object will be of the same type as the originating object. Dynamic objects support a fluid style of
-            programming, where complex sequences of operations can be nested without risk of side-effects altering the
-            input objects.
+            Measurements can be added together using <methodname>add()</methodname> and subtracted
+            using <methodname>sub()</methodname>. Each addition will create a new object for the
+            result. The actual object will never be changed by the class. The new object will be of
+            the same type as the originating object. Dynamic objects support a fluid style of
+            programming, where complex sequences of operations can be nested without risk of
+            side-effects altering the input objects.
         </para>
         </para>
 
 
         <para>
         <para>
             <example id="zend.measure.edit.add.example-1">
             <example id="zend.measure.edit.add.example-1">
                 <title>Adding units</title>
                 <title>Adding units</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 // Define objects
 // Define objects
 $unit = new Zend_Measure_Length(200, Zend_Measure_Length::CENTIMETER);
 $unit = new Zend_Measure_Length(200, Zend_Measure_Length::CENTIMETER);
@@ -115,11 +119,11 @@ echo $sum; // outputs "300 cm"
 
 
         <note>
         <note>
             <title>Automatic conversion</title>
             <title>Automatic conversion</title>
+
             <para>
             <para>
-                Adding one object to another will automatically convert it to the correct unit. It is not necessary to
-                call
-                <link linkend="zend.measure.edit.convert"><methodname>convertTo()</methodname>
-                </link>
+                Adding one object to another will automatically convert it to the correct unit. It
+                is not necessary to call <link
+                    linkend="zend.measure.edit.convert"><methodname>convertTo()</methodname></link>
                 before adding different units.
                 before adding different units.
             </para>
             </para>
         </note>
         </note>
@@ -127,9 +131,11 @@ echo $sum; // outputs "300 cm"
         <para>
         <para>
             <example id="zend.measure.edit.add.example-2">
             <example id="zend.measure.edit.add.example-2">
                 <title>Subtract</title>
                 <title>Subtract</title>
+
                 <para>
                 <para>
                     Subtraction of measurements works just like addition.
                     Subtraction of measurements works just like addition.
                 </para>
                 </para>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 // Define objects
 // Define objects
 $unit = new Zend_Measure_Length(200, Zend_Measure_Length::CENTIMETER);
 $unit = new Zend_Measure_Length(200, Zend_Measure_Length::CENTIMETER);
@@ -142,21 +148,21 @@ echo $sum;
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.edit.equal">
     <sect2 id="zend.measure.edit.equal">
-
         <title>Compare</title>
         <title>Compare</title>
 
 
         <para>
         <para>
-            Measurements can also be compared, but without automatic unit conversion. Thus, <methodname>equals()</methodname>
-            returns <constant>TRUE</constant>, only if both the value and the unit of measure are identical.
+            Measurements can also be compared, but without automatic unit conversion. Thus,
+            <methodname>equals()</methodname> returns <constant>TRUE</constant>, only if both the
+            value and the unit of measure are identical.
         </para>
         </para>
 
 
         <para>
         <para>
             <example id="zend.measure.edit.equal.example-1">
             <example id="zend.measure.edit.equal.example-1">
                 <title>Different measurements</title>
                 <title>Different measurements</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 // Define measurements
 // Define measurements
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
@@ -169,8 +175,10 @@ if ($unit->equals($unit2)) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
+
             <example id="zend.measure.edit.equal.example-2">
             <example id="zend.measure.edit.equal.example-2">
                 <title>Identical measurements</title>
                 <title>Identical measurements</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 // Define measurements
 // Define measurements
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
@@ -186,22 +194,22 @@ if ($unit->equals($unit2)) {
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.edit.compare">
     <sect2 id="zend.measure.edit.compare">
-
         <title>Compare</title>
         <title>Compare</title>
 
 
         <para>
         <para>
-            To determine if a measurement is less than or greater than another, use <methodname>compare()</methodname>, which
-            returns 0, -1 or 1 depending on the difference between the two objects. Identical measurements will return
-            0. Lesser ones will return a negative, greater ones a positive value.
+            To determine if a measurement is less than or greater than another, use
+            <methodname>compare()</methodname>, which returns 0, -1 or 1 depending on the difference
+            between the two objects. Identical measurements will return 0. Lesser ones will return a
+            negative, greater ones a positive value.
         </para>
         </para>
 
 
         <para>
         <para>
             <example id="zend.measure.edit.compare.example-1">
             <example id="zend.measure.edit.compare.example-1">
                 <title>Difference</title>
                 <title>Difference</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::CENTIMETER);
 $unit2 = new Zend_Measure_Length(1, Zend_Measure_Length::METER);
 $unit2 = new Zend_Measure_Length(1, Zend_Measure_Length::METER);
@@ -213,21 +221,21 @@ print "Greater:".$unit3->compare($unit2);
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.edit.changevalue">
     <sect2 id="zend.measure.edit.changevalue">
-
         <title>Manually change values</title>
         <title>Manually change values</title>
 
 
         <para>
         <para>
-            To change the value of a measurement explicitly, use <methodname>setValue()</methodname>. to overwrite the current
-            value. The parameters are the same as the constructor.
+            To change the value of a measurement explicitly, use
+            <methodname>setValue()</methodname>. to overwrite the current value. The parameters are
+            the same as the constructor.
         </para>
         </para>
 
 
         <para>
         <para>
             <example id="zend.measure.edit.changevalue.example-1">
             <example id="zend.measure.edit.changevalue.example-1">
                 <title>Changing a value</title>
                 <title>Changing a value</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de_AT');
 $locale = new Zend_Locale('de_AT');
 $unit = new Zend_Measure_Length(1,Zend_Measure_Length::METER);
 $unit = new Zend_Measure_Length(1,Zend_Measure_Length::METER);
@@ -243,19 +251,19 @@ echo $unit;
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.edit.changetype">
     <sect2 id="zend.measure.edit.changetype">
-
         <title>Manually change types</title>
         <title>Manually change types</title>
 
 
         <para>
         <para>
-            To change the type of a measurement without altering its value use <methodname>setType()</methodname>.
+            To change the type of a measurement without altering its value use
+            <methodname>setType()</methodname>.
         </para>
         </para>
 
 
         <example id="zend.measure.edit.changetype.example-1">
         <example id="zend.measure.edit.changetype.example-1">
             <title>Changing the type</title>
             <title>Changing the type</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $unit = new Zend_Measure_Length(1,Zend_Measure_Length::METER);
 $unit = new Zend_Measure_Length(1,Zend_Measure_Length::METER);
 echo $unit; // outputs "1 m"
 echo $unit; // outputs "1 m"
@@ -264,9 +272,7 @@ $unit->setType(Zend_Measure_Length::KILOMETER);
 echo $unit; // outputs "1000 km"
 echo $unit; // outputs "1000 km"
 ]]></programlisting>
 ]]></programlisting>
         </example>
         </example>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 22 - 19
documentation/manual/en/module_specs/Zend_Measure-Introduction.xml

@@ -5,20 +5,23 @@
     <title>Introduction</title>
     <title>Introduction</title>
 
 
     <para>
     <para>
-        <classname>Zend_Measure_*</classname> classes provide a generic and easy way for working with measurements. Using
-        <classname>Zend_Measure_*</classname> classes, you can convert measurements into different units of the same type. They
-        can be added, subtracted and compared against each other. From a given input made in the user's native language,
-        the unit of measurement can be automatically extracted. Numerous units of measurement are supported.
+        <classname>Zend_Measure_*</classname> classes provide a generic and easy way for working
+        with measurements. Using <classname>Zend_Measure_*</classname> classes, you can convert
+        measurements into different units of the same type. They can be added, subtracted and
+        compared against each other. From a given input made in the user's native language, the unit
+        of measurement can be automatically extracted. Numerous units of measurement are supported.
     </para>
     </para>
 
 
     <example id="zend.measure.introduction.example-1">
     <example id="zend.measure.introduction.example-1">
         <title>Converting measurements</title>
         <title>Converting measurements</title>
+
         <para>
         <para>
-            The following introductory example shows automatic conversion of units of measurement. To convert a
-            measurement, its value and its type have to be known. The value can be an integer, a float, or even a string
-            containing a number. Conversions are only possible for units of the same type (mass, area, temperature,
-            velocity, etc.), not between types.
+            The following introductory example shows automatic conversion of units of measurement.
+            To convert a measurement, its value and its type have to be known. The value can be an
+            integer, a float, or even a string containing a number. Conversions are only possible
+            for units of the same type (mass, area, temperature, velocity, etc.), not between types.
         </para>
         </para>
+
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('en');
 $locale = new Zend_Locale('en');
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::METER, $locale);
 $unit = new Zend_Measure_Length(100, Zend_Measure_Length::METER, $locale);
@@ -29,22 +32,23 @@ echo $unit->convertTo(Zend_Measure_Length::YARD);
     </example>
     </example>
 
 
     <para>
     <para>
-        <classname>Zend_Measure_*</classname> includes support for many different units of measurement. The units of measurement
-        all have a unified notation: <classname>Zend_Measure_&lt;TYPE&gt;::NAME_OF_UNIT</classname>, where &lt;TYPE&gt;
-        corresponds to a well-known physical or numerical property. . Every unit of measurement consists of a conversion
-        factor and a display unit. A detailed list can be found in the chapter
-        <link linkend="zend.measure.types"><code>Types of measurements</code>
-        </link>
-        .
+        <classname>Zend_Measure_*</classname> includes support for many different units of
+        measurement. The units of measurement all have a unified notation:
+        <classname>Zend_Measure_&lt;TYPE&gt;::NAME_OF_UNIT</classname>, where &lt;TYPE&gt;
+        corresponds to a well-known physical or numerical property. . Every unit of measurement
+        consists of a conversion factor and a display unit. A detailed list can be found in the
+        chapter <link linkend="zend.measure.types"><code>Types of measurements</code></link>.
     </para>
     </para>
 
 
     <example id="zend.measure.introduction.example-2">
     <example id="zend.measure.introduction.example-2">
         <title>The meter measurement</title>
         <title>The meter measurement</title>
+
         <para>
         <para>
-            The <code>meter</code> is used for measuring lengths, so its type constant can be found in the
-            <code>Length</code> class. To refer to this unit of measurement, the notation <constant>Length::METER</constant>
-            must be used. The display unit is <code>m</code>.
+            The <code>meter</code> is used for measuring lengths, so its type constant can be found
+            in the <code>Length</code> class. To refer to this unit of measurement, the notation
+            <constant>Length::METER</constant> must be used. The display unit is <code>m</code>.
         </para>
         </para>
+
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 echo Zend_Measure_Length::STANDARD;  // outputs 'Length::METER'
 echo Zend_Measure_Length::STANDARD;  // outputs 'Length::METER'
 echo Zend_Measure_Length::KILOMETER; // outputs 'Length::KILOMETER'
 echo Zend_Measure_Length::KILOMETER; // outputs 'Length::KILOMETER'
@@ -54,7 +58,6 @@ echo $unit;
 // outputs '100 m'
 // outputs '100 m'
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 19 - 27
documentation/manual/en/module_specs/Zend_Measure-Output.xml

@@ -9,33 +9,30 @@
     </para>
     </para>
 
 
     <para>
     <para>
-        <link linkend="zend.measure.output.auto"><code>Automatic output</code>
-        </link>
+        <link linkend="zend.measure.output.auto"><code>Automatic output</code></link>
     </para>
     </para>
 
 
     <para>
     <para>
-        <link linkend="zend.measure.output.value"><code>Outputting values</code>
-        </link>
+        <link linkend="zend.measure.output.value"><code>Outputting values</code></link>
     </para>
     </para>
 
 
     <para>
     <para>
-        <link linkend="zend.measure.output.unit"><code>Output with unit of measurement</code>
-        </link>
+        <link linkend="zend.measure.output.unit"><code>Output with unit of measurement</code></link>
     </para>
     </para>
 
 
     <para>
     <para>
-        <link linkend="zend.measure.output.unit"><code>Output as localized string</code>
-        </link>
+        <link linkend="zend.measure.output.unit"><code>Output as localized string</code></link>
     </para>
     </para>
 
 
     <sect2 id="zend.measure.output.auto">
     <sect2 id="zend.measure.output.auto">
-
         <title>Automatic output</title>
         <title>Automatic output</title>
 
 
         <para>
         <para>
             <classname>Zend_Measure</classname> supports outputting of strings automatically.
             <classname>Zend_Measure</classname> supports outputting of strings automatically.
+
             <example id="zend.measure.output.auto.example-1">
             <example id="zend.measure.output.auto.example-1">
                 <title>Automatic output</title>
                 <title>Automatic output</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de');
 $locale = new Zend_Locale('de');
 $mystring = "1.234.567,89";
 $mystring = "1.234.567,89";
@@ -50,27 +47,24 @@ echo $unit;
 
 
         <note>
         <note>
             <title>Measurement output</title>
             <title>Measurement output</title>
+
             <para>
             <para>
                 Output can be achieved simply by using
                 Output can be achieved simply by using
-                <ulink url="http://php.net/echo"><code>echo</code>
-                </ulink>
-                or
-                <ulink url="http://php.net/print"><code>print</code>
-                </ulink>
-                .
+                <ulink url="http://php.net/echo"><code>echo</code></ulink> or
+                <ulink url="http://php.net/print"><code>print</code></ulink>.
             </para>
             </para>
         </note>
         </note>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.output.value">
     <sect2 id="zend.measure.output.value">
-
         <title>Outputting values</title>
         <title>Outputting values</title>
 
 
         <para>
         <para>
             The value of a measurement can be output using <methodname>getValue()</methodname>.
             The value of a measurement can be output using <methodname>getValue()</methodname>.
+
             <example id="zend.measure.output.value.example-1">
             <example id="zend.measure.output.value.example-1">
                 <title>Output a value</title>
                 <title>Output a value</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de');
 $locale = new Zend_Locale('de');
 $mystring = "1.234.567,89";
 $mystring = "1.234.567,89";
@@ -84,19 +78,21 @@ echo $unit->getValue();
         </para>
         </para>
 
 
         <para>
         <para>
-            The <methodname>getValue()</methodname> method accepts an optional parameter '<code>round</code>' which allows to
-            define a precision for the generated output. The standard precision is '<code>2</code>'.
+            The <methodname>getValue()</methodname> method accepts an optional parameter
+            '<code>round</code>' which allows to define a precision for the generated output. The
+            standard precision is '<code>2</code>'.
         </para>
         </para>
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.output.unit">
     <sect2 id="zend.measure.output.unit">
-
         <title>Output with unit of measurement</title>
         <title>Output with unit of measurement</title>
 
 
         <para>
         <para>
             The function <methodname>getType()</methodname> returns the current unit of measurement.
             The function <methodname>getType()</methodname> returns the current unit of measurement.
+
             <example id="zend.measure.output.unit.example-1">
             <example id="zend.measure.output.unit.example-1">
                 <title>Outputting units</title>
                 <title>Outputting units</title>
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $locale = new Zend_Locale('de');
 $locale = new Zend_Locale('de');
 $mystring = "1.234.567,89";
 $mystring = "1.234.567,89";
@@ -108,21 +104,17 @@ echo $unit->getType();
 ]]></programlisting>
 ]]></programlisting>
             </example>
             </example>
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.measure.output.localized">
     <sect2 id="zend.measure.output.localized">
-
         <title>Output as localized string</title>
         <title>Output as localized string</title>
 
 
         <para>
         <para>
-            Outputting a string in a format common in the users' country is usually desirable. For example, the
-            measurement "1234567.8" would become "1.234.567,8" for Germany. This functionality will be supported in a
-            future release.
+            Outputting a string in a format common in the users' country is usually desirable. For
+            example, the measurement "1234567.8" would become "1.234.567,8" for Germany. This
+            functionality will be supported in a future release.
         </para>
         </para>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:

+ 9 - 24
documentation/manual/en/module_specs/Zend_Memory-MemoryManager.xml

@@ -4,7 +4,6 @@
     <title>Memory Manager</title>
     <title>Memory Manager</title>
 
 
     <sect2 id="zend.memory.memory-manager.creation">
     <sect2 id="zend.memory.memory-manager.creation">
-
         <title>Creating a Memory Manager</title>
         <title>Creating a Memory Manager</title>
 
 
         <para>
         <para>
@@ -33,8 +32,9 @@ $memoryManager = Zend_Memory::factory('File', $backendOptions);
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            <classname>Zend_Memory</classname> uses <link linkend="zend.cache.backends"><classname>Zend_Cache backends</classname></link>
-            as storage providers.
+            <classname>Zend_Memory</classname> uses <link
+                linkend="zend.cache.backends"><classname>Zend_Cache backends</classname></link> as
+            storage providers.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -56,11 +56,9 @@ $memoryManager = Zend_Memory::factory('None');
         <para>
         <para>
             The '<code>None</code>' backend doesn't need any option specified.
             The '<code>None</code>' backend doesn't need any option specified.
         </para>
         </para>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.memory.memory-manager.objects-management">
     <sect2 id="zend.memory.memory-manager.objects-management">
-
         <title>Managing Memory Objects</title>
         <title>Managing Memory Objects</title>
 
 
         <para>
         <para>
@@ -69,7 +67,6 @@ $memoryManager = Zend_Memory::factory('None');
         </para>
         </para>
 
 
         <sect3 id="zend.memory.memory-manager.objects-management.movable">
         <sect3 id="zend.memory.memory-manager.objects-management.movable">
-
             <title>Creating Movable Objects</title>
             <title>Creating Movable Objects</title>
 
 
             <para>
             <para>
@@ -78,7 +75,6 @@ $memoryManager = Zend_Memory::factory('None');
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $memObject = $memoryManager->create($data);
 $memObject = $memoryManager->create($data);
 ]]></programlisting>
 ]]></programlisting>
-
             </para>
             </para>
 
 
             <para>
             <para>
@@ -86,11 +82,9 @@ $memObject = $memoryManager->create($data);
                 initialize the object value. If the <varname>$data</varname>
                 initialize the object value. If the <varname>$data</varname>
                 argument is omitted, the value is an empty string.
                 argument is omitted, the value is an empty string.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.memory-manager.objects-management.locked">
         <sect3 id="zend.memory.memory-manager.objects-management.locked">
-
             <title>Creating Locked Objects</title>
             <title>Creating Locked Objects</title>
 
 
             <para>
             <para>
@@ -106,11 +100,9 @@ $memObject = $memoryManager->createLocked($data);
                 initialize the object value. If the <varname>$data</varname>
                 initialize the object value. If the <varname>$data</varname>
                 argument is omitted, the value is an empty string.
                 argument is omitted, the value is an empty string.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.memory-manager.objects-management.destruction">
         <sect3 id="zend.memory.memory-manager.objects-management.destruction">
-
             <title>Destroying Objects</title>
             <title>Destroying Objects</title>
 
 
             <para>
             <para>
@@ -147,17 +139,13 @@ function foo()
             <para>
             <para>
                 This applies to both movable and locked objects.
                 This applies to both movable and locked objects.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.memory.memory-manager.settings">
     <sect2 id="zend.memory.memory-manager.settings">
-
         <title>Memory Manager Settings</title>
         <title>Memory Manager Settings</title>
 
 
         <sect3 id="zend.memory.memory-manager.settings.memory-limit">
         <sect3 id="zend.memory.memory-manager.settings.memory-limit">
-
             <title>Memory Limit</title>
             <title>Memory Limit</title>
 
 
             <para>
             <para>
@@ -173,8 +161,9 @@ function foo()
 
 
             <para>
             <para>
                 You can retrieve or set the memory limit setting using the
                 You can retrieve or set the memory limit setting using the
-                <methodname>getMemoryLimit()</methodname> and <methodname>setMemoryLimit($newLimit)</methodname>
-                methods:
+                <methodname>getMemoryLimit()</methodname> and
+                <methodname>setMemoryLimit($newLimit)</methodname> methods:
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $oldLimit = $memoryManager->getMemoryLimit();  // Get memory limit in bytes
 $oldLimit = $memoryManager->getMemoryLimit();  // Get memory limit in bytes
 $memoryManager->setMemoryLimit($newLimit);     // Set memory limit in bytes
 $memoryManager->setMemoryLimit($newLimit);     // Set memory limit in bytes
@@ -190,11 +179,9 @@ $memoryManager->setMemoryLimit($newLimit);     // Set memory limit in bytes
                 '<code>memory_limit</code>' in php.ini or 'no limit' (-1)
                 '<code>memory_limit</code>' in php.ini or 'no limit' (-1)
                 if '<code>memory_limit</code>' is not set in php.ini.
                 if '<code>memory_limit</code>' is not set in php.ini.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.memory-manager.settings.min-size">
         <sect3 id="zend.memory.memory-manager.settings.min-size">
-
             <title>MinSize</title>
             <title>MinSize</title>
 
 
             <para>
             <para>
@@ -206,8 +193,9 @@ $memoryManager->setMemoryLimit($newLimit);     // Set memory limit in bytes
 
 
             <para>
             <para>
                 You can retrieve or set the minimum size using the
                 You can retrieve or set the minimum size using the
-                <methodname>getMinSize()</methodname> and <methodname>setMinSize($newSize)</methodname>
-                methods:
+                <methodname>getMinSize()</methodname> and
+                <methodname>setMinSize($newSize)</methodname> methods:
+
                 <programlisting language="php"><![CDATA[
                 <programlisting language="php"><![CDATA[
 $oldMinSize = $memoryManager->getMinSize();  // Get MinSize in bytes
 $oldMinSize = $memoryManager->getMinSize();  // Get MinSize in bytes
 $memoryManager->setMinSize($newSize);        // Set MinSize limit in bytes
 $memoryManager->setMinSize($newSize);        // Set MinSize limit in bytes
@@ -217,9 +205,6 @@ $memoryManager->setMinSize($newSize);        // Set MinSize limit in bytes
             <para>
             <para>
                 The default minimum size value is 16KB (16384 bytes).
                 The default minimum size value is 16KB (16384 bytes).
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>

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

@@ -9,6 +9,7 @@
         <para>
         <para>
             Create movable memory objects using the <methodname>create([$data])</methodname>
             Create movable memory objects using the <methodname>create([$data])</methodname>
             method of the memory manager:
             method of the memory manager:
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $memObject = $memoryManager->create($data);
 $memObject = $memoryManager->create($data);
 ]]></programlisting>
 ]]></programlisting>
@@ -26,6 +27,7 @@ $memObject = $memoryManager->create($data);
         <para>
         <para>
             Create locked memory objects using the <methodname>createLocked([$data])</methodname>
             Create locked memory objects using the <methodname>createLocked([$data])</methodname>
             method of the memory manager:
             method of the memory manager:
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $memObject = $memoryManager->createLocked($data);
 $memObject = $memoryManager->createLocked($data);
 ]]></programlisting>
 ]]></programlisting>

+ 8 - 12
documentation/manual/en/module_specs/Zend_Memory-Overview.xml

@@ -5,6 +5,7 @@
 
 
     <sect2 id="zend.memory.introduction">
     <sect2 id="zend.memory.introduction">
         <title>Introduction</title>
         <title>Introduction</title>
+
         <para>
         <para>
             The <classname>Zend_Memory</classname> component is intended to manage data in an
             The <classname>Zend_Memory</classname> component is intended to manage data in an
             environment with limited memory.
             environment with limited memory.
@@ -31,11 +32,13 @@
 
 
         <example id="zend.memory.introduction.example-1">
         <example id="zend.memory.introduction.example-1">
             <title>Using Zend_Memory component</title>
             <title>Using Zend_Memory component</title>
+
             <para>
             <para>
                 <methodname>Zend_Memory::factory()</methodname> instantiates the memory
                 <methodname>Zend_Memory::factory()</methodname> instantiates the memory
                 manager object with specified backend options.
                 manager object with specified backend options.
             </para>
             </para>
-                <programlisting language="php"><![CDATA[
+
+            <programlisting language="php"><![CDATA[
 $backendOptions = array(
 $backendOptions = array(
     'cache_dir' => './tmp/' // Directory where to put the swapped memory blocks
     'cache_dir' => './tmp/' // Directory where to put the swapped memory blocks
 );
 );
@@ -62,21 +65,24 @@ $loadedFiles[$index3]->value[$charIndex] = '_';
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.memory.theory-of-operation">
     <sect2 id="zend.memory.theory-of-operation">
-
         <title>Theory of Operation</title>
         <title>Theory of Operation</title>
 
 
         <para>
         <para>
             <classname>Zend_Memory</classname> component operates with the following concepts:
             <classname>Zend_Memory</classname> component operates with the following concepts:
+
             <itemizedlist>
             <itemizedlist>
                 <listitem>
                 <listitem>
                     <para>Memory manager</para>
                     <para>Memory manager</para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>Memory container</para>
                     <para>Memory container</para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>Locked memory object</para>
                     <para>Locked memory object</para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>Movable memory object</para>
                     <para>Movable memory object</para>
                 </listitem>
                 </listitem>
@@ -84,7 +90,6 @@ $loadedFiles[$index3]->value[$charIndex] = '_';
         </para>
         </para>
 
 
         <sect3 id="zend.memory.theory-of-operation.manager">
         <sect3 id="zend.memory.theory-of-operation.manager">
-
             <title>Memory manager</title>
             <title>Memory manager</title>
 
 
             <para>
             <para>
@@ -92,11 +97,9 @@ $loadedFiles[$index3]->value[$charIndex] = '_';
                 by request of user application and returns them wrapped into
                 by request of user application and returns them wrapped into
                 a memory container object.
                 a memory container object.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.theory-of-operation.container">
         <sect3 id="zend.memory.theory-of-operation.container">
-
             <title>Memory container</title>
             <title>Memory container</title>
 
 
             <para>
             <para>
@@ -131,11 +134,9 @@ $memObject->value = substr($memObject->value, $start, $length);
                     method instead of accessing the value property directly.
                     method instead of accessing the value property directly.
                 </para>
                 </para>
             </note>
             </note>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.theory-of-operation.locked">
         <sect3 id="zend.memory.theory-of-operation.locked">
-
             <title>Locked memory</title>
             <title>Locked memory</title>
 
 
             <para>
             <para>
@@ -143,11 +144,9 @@ $memObject->value = substr($memObject->value, $start, $length);
                 Data stored in locked memory are never swapped to the cache
                 Data stored in locked memory are never swapped to the cache
                 backend.
                 backend.
             </para>
             </para>
-
         </sect3>
         </sect3>
 
 
         <sect3 id="zend.memory.theory-of-operation.movable">
         <sect3 id="zend.memory.theory-of-operation.movable">
-
             <title>Movable memory</title>
             <title>Movable memory</title>
 
 
             <para>
             <para>
@@ -161,9 +160,6 @@ $memObject->value = substr($memObject->value, $start, $length);
                 See <xref linkend="zend.memory.memory-manager.settings.min-size" />
                 See <xref linkend="zend.memory.memory-manager.settings.min-size" />
                 for more details.
                 for more details.
             </para>
             </para>
-
         </sect3>
         </sect3>
-
     </sect2>
     </sect2>
-
 </sect1>
 </sect1>

+ 174 - 137
documentation/manual/en/module_specs/Zend_Mime.xml

@@ -5,152 +5,189 @@
 
 
     <sect2 id="zend.mime.mime.introduction">
     <sect2 id="zend.mime.mime.introduction">
         <title>Introduction</title>
         <title>Introduction</title>
+
         <para>
         <para>
-            <classname>Zend_Mime</classname> is a support class for handling multipart <acronym>MIME</acronym> messages. It is used by <link
-            linkend="zend.mail"><classname>Zend_Mail</classname></link> and <link
-            linkend="zend.mime.message"><classname>Zend_Mime_Message</classname></link> and may be used by applications requiring
-            <acronym>MIME</acronym> support.
+            <classname>Zend_Mime</classname> is a support class for handling multipart
+            <acronym>MIME</acronym> messages. It is used by <link
+                linkend="zend.mail"><classname>Zend_Mail</classname></link> and <link
+                linkend="zend.mime.message"><classname>Zend_Mime_Message</classname></link> and may
+            be used by applications requiring <acronym>MIME</acronym> support.
         </para>
         </para>
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.mime.mime.static">
     <sect2 id="zend.mime.mime.static">
-    <title>Static Methods and Constants</title>
-    <para>
-        <classname>Zend_Mime</classname> provides a simple set of static helper methods to work with <acronym>MIME</acronym>:
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::isPrintable()</methodname>: Returns
-                    <constant>TRUE</constant> if the given string contains no unprintable
-                    characters, <constant>FALSE</constant> otherwise.
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::encode()</methodname>: Encodes a string with specified encoding.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::encodeBase64()</methodname>: Encodes a string into base64 encoding.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::encodeQuotedPrintable()</methodname>: Encodes a string with the quoted-printable mechanism.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::encodeBase64Header()</methodname>: Encodes a string into base64 encoding for Mail Headers.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>Zend_Mime::encodeQuotedPrintableHeader()</methodname>: Encodes a string with the quoted-printable mechanism for Mail Headers.
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
-    <para>
-        <classname>Zend_Mime</classname> defines a set of constants commonly used with <acronym>MIME</acronym> Messages:
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::TYPE_OCTETSTREAM</constant>: 'application/octet-stream'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::TYPE_TEXT</constant>: 'text/plain'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::TYPE_HTML</constant>: 'text/html'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::ENCODING_7BIT</constant>: '7bit'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::ENCODING_8BIT</constant>: '8bit'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::ENCODING_QUOTEDPRINTABLE</constant>: 'quoted-printable'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::ENCODING_BASE64</constant>: 'base64'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::DISPOSITION_ATTACHMENT</constant>: 'attachment'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::DISPOSITION_INLINE</constant>: 'inline'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::MULTIPART_ALTERNATIVE</constant>: 'multipart/alternative'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::MULTIPART_MIXED</constant>: 'multipart/mixed'
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <constant>Zend_Mime::MULTIPART_RELATED</constant>: 'multipart/related'
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+        <title>Static Methods and Constants</title>
+
+        <para>
+            <classname>Zend_Mime</classname> provides a simple set of static helper methods to work
+            with <acronym>MIME</acronym>:
+
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::isPrintable()</methodname>: Returns
+                        <constant>TRUE</constant> if the given string contains no unprintable
+                        characters, <constant>FALSE</constant> otherwise.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::encode()</methodname>: Encodes a string with
+                        specified encoding.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::encodeBase64()</methodname>: Encodes a string into
+                        base64 encoding.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::encodeQuotedPrintable()</methodname>: Encodes a
+                        string with the quoted-printable mechanism.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::encodeBase64Header()</methodname>: Encodes a string
+                        into base64 encoding for Mail Headers.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>Zend_Mime::encodeQuotedPrintableHeader()</methodname>: Encodes
+                        a string with the quoted-printable mechanism for Mail Headers.
+                    </para>
+                </listitem>
+            </itemizedlist>
+        </para>
+
+        <para>
+            <classname>Zend_Mime</classname> defines a set of constants commonly used with
+            <acronym>MIME</acronym> Messages:
+
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::TYPE_OCTETSTREAM</constant>: 'application/octet-stream'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::TYPE_TEXT</constant>: 'text/plain'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::TYPE_HTML</constant>: 'text/html'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::ENCODING_7BIT</constant>: '7bit'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::ENCODING_8BIT</constant>: '8bit'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::ENCODING_QUOTEDPRINTABLE</constant>: 'quoted-printable'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::ENCODING_BASE64</constant>: 'base64'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::DISPOSITION_ATTACHMENT</constant>: 'attachment'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::DISPOSITION_INLINE</constant>: 'inline'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::MULTIPART_ALTERNATIVE</constant>:
+                        'multipart/alternative'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::MULTIPART_MIXED</constant>: 'multipart/mixed'
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <constant>Zend_Mime::MULTIPART_RELATED</constant>: 'multipart/related'
+                    </para>
+                </listitem>
+            </itemizedlist>
+        </para>
     </sect2>
     </sect2>
 
 
     <sect2 id="zend.mime.mime.instantiation">
     <sect2 id="zend.mime.mime.instantiation">
-    <title>Instantiating Zend_Mime</title>
-    <para>
-        When Instantiating a <classname>Zend_Mime</classname> Object, a <acronym>MIME</acronym> boundary is stored that
-        is used for all subsequent non-static method calls on that object.
-        If the constructor is called with a string parameter, this value
-        is used as a <acronym>MIME</acronym> boundary. If not, a random <acronym>MIME</acronym> boundary is generated
-        during construction time.
-    </para>
-    <para>
-        A <classname>Zend_Mime</classname> object has the following Methods:
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <methodname>boundary()</methodname>: Returns the <acronym>MIME</acronym> boundary string.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>boundaryLine()</methodname>: Returns the complete <acronym>MIME</acronym> boundary line.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <methodname>mimeEnd()</methodname>: Returns the complete <acronym>MIME</acronym> end boundary line.
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+        <title>Instantiating Zend_Mime</title>
+
+        <para>
+            When Instantiating a <classname>Zend_Mime</classname> Object, a <acronym>MIME</acronym>
+            boundary is stored that is used for all subsequent non-static method calls on that
+            object. If the constructor is called with a string parameter, this value
+            is used as a <acronym>MIME</acronym> boundary. If not, a random <acronym>MIME</acronym>
+            boundary is generated during construction time.
+        </para>
+
+        <para>
+            A <classname>Zend_Mime</classname> object has the following Methods:
+
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        <methodname>boundary()</methodname>: Returns the <acronym>MIME</acronym>
+                        boundary string.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>boundaryLine()</methodname>: Returns the complete
+                        <acronym>MIME</acronym> boundary line.
+                    </para>
+                </listitem>
+
+                <listitem>
+                    <para>
+                        <methodname>mimeEnd()</methodname>: Returns the complete
+                        <acronym>MIME</acronym> end boundary line.
+                    </para>
+                </listitem>
+            </itemizedlist>
+        </para>
     </sect2>
     </sect2>
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:
--->
+-->

+ 87 - 81
documentation/manual/en/module_specs/Zend_Mime_Part.xml

@@ -4,27 +4,31 @@
     <title>Zend_Mime_Part</title>
     <title>Zend_Mime_Part</title>
 
 
     <sect2 id="zend.mime.part.introduction">
     <sect2 id="zend.mime.part.introduction">
-      <title>Introduction</title>
+        <title>Introduction</title>
 
 
-      <para>This class represents a single part of a <acronym>MIME</acronym> message. It contains the
-      actual content of the message part plus information about its encoding,
-      content type and original filename. It provides a method for generating a
-      string from the stored data. <classname>Zend_Mime_Part</classname> objects can be
-      added to <link
-      linkend="zend.mime.message"><classname>Zend_Mime_Message</classname></link> to
-      assemble a complete multipart message.</para>
+        <para>
+            This class represents a single part of a <acronym>MIME</acronym> message. It contains
+            the actual content of the message part plus information about its encoding,
+            content type and original filename. It provides a method for generating a
+            string from the stored data. <classname>Zend_Mime_Part</classname> objects can be
+            added to <link
+                linkend="zend.mime.message"><classname>Zend_Mime_Message</classname></link> to
+            assemble a complete multipart message.
+        </para>
     </sect2>
     </sect2>
 
 
-  <sect2 id="zend.mime.part.instantiation">
-    <title>Instantiation</title>
+    <sect2 id="zend.mime.part.instantiation">
+        <title>Instantiation</title>
 
 
-    <para><classname>Zend_Mime_Part</classname> is instantiated with a string that
-    represents the content of the new part. The type is assumed to be
-    OCTET-STREAM, encoding is 8Bit. After instantiating a
-    <classname>Zend_Mime_Part</classname>, meta information can be set by accessing its
-    attributes directly:</para>
+        <para>
+            <classname>Zend_Mime_Part</classname> is instantiated with a string that
+            represents the content of the new part. The type is assumed to be
+            OCTET-STREAM, encoding is 8Bit. After instantiating a
+            <classname>Zend_Mime_Part</classname>, meta information can be set by accessing its
+            attributes directly:
+        </para>
 
 
-    <programlisting language="php"><![CDATA[
+        <programlisting language="php"><![CDATA[
 public $type = Zend_Mime::TYPE_OCTETSTREAM;
 public $type = Zend_Mime::TYPE_OCTETSTREAM;
 public $encoding = Zend_Mime::ENCODING_8BIT;
 public $encoding = Zend_Mime::ENCODING_8BIT;
 public $id;
 public $id;
@@ -38,73 +42,75 @@ public $language;
 ]]></programlisting>
 ]]></programlisting>
     </sect2>
     </sect2>
 
 
-  <sect2 id="zend.mime.part.methods">
-    <title>Methods for rendering the message part to a string</title>
+    <sect2 id="zend.mime.part.methods">
+        <title>Methods for rendering the message part to a string</title>
 
 
-    <para><methodname>getContent()</methodname> returns the encoded content of the
-    MimePart as a string using the encoding specified in the attribute
-    $encoding. Valid values are Zend_Mime::ENCODING_* Characterset conversions are
-    not performed.</para>
+        <para>
+            <methodname>getContent()</methodname> returns the encoded content of the
+            MimePart as a string using the encoding specified in the attribute
+            $encoding. Valid values are Zend_Mime::ENCODING_* Characterset conversions are
+            not performed.
+        </para>
 
 
-    <para>
-        <methodname>getHeaders()</methodname> returns the Mime-Headers for the
-        MimePart as generated from the information in the publicly accessible
-        attributes. The attributes of the object need to be set correctly before
-        this method is called.
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <varname>$charset</varname>
-                    has to be set to the actual charset of the content if it is a text type (Text or HTML).
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$id</varname>
-                    may be set to identify a content-id for inline images in a HTML mail.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$filename</varname>
-                    contains the name the file will get when downloading it.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$disposition</varname>
-                    defines if the file should be treated as an attachment or if it is used inside
-                    the (HTML-) mail (inline).
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$description</varname>
-                    is only used for informational purposes.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$boundary</varname>
-                    defines string as boundary.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$location</varname>
-                    can be used as resource <acronym>URI</acronym> that has relation to the content.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <varname>$language</varname>
-                    defines languages in the content.
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
-  </sect2>
+        <para>
+            <methodname>getHeaders()</methodname> returns the Mime-Headers for the
+            MimePart as generated from the information in the publicly accessible
+            attributes. The attributes of the object need to be set correctly before
+            this method is called.
+
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        <varname>$charset</varname> has to be set to the actual charset of the
+                        content if it is a text type (Text or HTML).
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$id</varname>
+                        may be set to identify a content-id for inline images in a HTML mail.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$filename</varname>
+                        contains the name the file will get when downloading it.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$disposition</varname> defines if the file should be treated as an
+                        attachment or if it is used inside the (HTML-) mail (inline).
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$description</varname>
+                        is only used for informational purposes.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$boundary</varname>
+                        defines string as boundary.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$location</varname> can be used as resource <acronym>URI</acronym>
+                        that has relation to the content.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <varname>$language</varname>
+                        defines languages in the content.
+                    </para>
+                </listitem>
+            </itemizedlist>
+        </para>
+    </sect2>
 </sect1>
 </sect1>
 <!--
 <!--
 vim:se ts=4 sw=4 et:
 vim:se ts=4 sw=4 et:
--->
+-->

+ 2 - 0
documentation/manual/en/module_specs/Zend_Navigation-Introduction.xml

@@ -19,6 +19,7 @@
 
 
         <sect3 id="zend.navigation.introduction.pages">
         <sect3 id="zend.navigation.introduction.pages">
             <title>Pages</title>
             <title>Pages</title>
+
             <para>
             <para>
                 A page (<classname>Zend_Navigation_Page</classname>) in
                 A page (<classname>Zend_Navigation_Page</classname>) in
                 <classname>Zend_Navigation</classname> –
                 <classname>Zend_Navigation</classname> –
@@ -38,6 +39,7 @@
 
 
         <sect3 id="zend.navigation.introduction.containers">
         <sect3 id="zend.navigation.introduction.containers">
             <title>Containers</title>
             <title>Containers</title>
+
             <para>
             <para>
                 A navigation container
                 A navigation container
                 (<classname>Zend_Navigation_Container</classname>) is a
                 (<classname>Zend_Navigation_Container</classname>) is a

+ 47 - 7
documentation/manual/en/module_specs/Zend_Navigation-Pages-Common.xml

@@ -25,6 +25,7 @@
 
 
     <table id="zend.navigation.pages.common.options">
     <table id="zend.navigation.pages.common.options">
         <title>Common page options</title>
         <title>Common page options</title>
+
         <tgroup cols="4">
         <tgroup cols="4">
             <thead>
             <thead>
                 <row>
                 <row>
@@ -34,55 +35,64 @@
                     <entry>Description</entry>
                     <entry>Description</entry>
                 </row>
                 </row>
             </thead>
             </thead>
+
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>label</code></entry>
                     <entry><code>label</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
-                    <entry>
-                        A page label, such as 'Home' or 'Blog'.
-                    </entry>
+                    <entry>A page label, such as 'Home' or 'Blog'.</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>id</code></entry>
                     <entry><code>id</code></entry>
                     <entry><type>String</type> | <code>int</code></entry>
                     <entry><type>String</type> | <code>int</code></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         An id tag/attribute that may be used when rendering
                         An id tag/attribute that may be used when rendering
                         the page, typically in an anchor element.
                         the page, typically in an anchor element.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>class</code></entry>
                     <entry><code>class</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         A <acronym>CSS</acronym> class that may be used when rendering the page,
                         A <acronym>CSS</acronym> class that may be used when rendering the page,
                         typically in an anchor element.
                         typically in an anchor element.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>title</code></entry>
                     <entry><code>title</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         A short page description, typically for using
                         A short page description, typically for using
                         as the <code>title</code> attribute in an anchor.
                         as the <code>title</code> attribute in an anchor.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>target</code></entry>
                     <entry><code>target</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         Specifies a target that may be used for the page,
                         Specifies a target that may be used for the page,
                         typically in an anchor element.
                         typically in an anchor element.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>rel</code></entry>
                     <entry><code>rel</code></entry>
                     <entry><type>Array</type></entry>
                     <entry><type>Array</type></entry>
                     <entry><methodname>array()</methodname></entry>
                     <entry><methodname>array()</methodname></entry>
+
                     <entry>
                     <entry>
                         Specifies forward relations for the page.
                         Specifies forward relations for the page.
                         Each element in the array is a key-value pair, where the
                         Each element in the array is a key-value pair, where the
@@ -96,19 +106,27 @@
                         section on the Links helper.</link>.
                         section on the Links helper.</link>.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>rev</code></entry>
                     <entry><code>rev</code></entry>
                     <entry><type>Array</type></entry>
                     <entry><type>Array</type></entry>
                     <entry><methodname>array()</methodname></entry>
                     <entry><methodname>array()</methodname></entry>
+
                     <entry>
                     <entry>
                         Specifies reverse relations for the page. Works exactly
                         Specifies reverse relations for the page. Works exactly
                         like <code>rel</code>.
                         like <code>rel</code>.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>order</code></entry>
                     <entry><code>order</code></entry>
-                    <entry><type>String</type> | <code>int</code> | <constant>NULL</constant></entry>
+
+                    <entry>
+                        <type>String</type> | <code>int</code> | <constant>NULL</constant>
+                    </entry>
+
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         Works like order for elements in
                         Works like order for elements in
                         <link linkend="zend.form.quickstart.render">
                         <link linkend="zend.form.quickstart.render">
@@ -122,30 +140,41 @@
                         the page was added to the container will be used.
                         the page was added to the container will be used.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>resource</code></entry>
                     <entry><code>resource</code></entry>
-                    <entry><type>String</type> | <classname>Zend_Acl_Resource_Interface</classname> | <constant>NULL</constant></entry>
+
+                    <entry>
+                        <type>String</type> | <classname>Zend_Acl_Resource_Interface</classname>
+                        | <constant>NULL</constant>
+                    </entry>
+
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         <acronym>ACL</acronym> resource to associate with the page. Read more in
                         <acronym>ACL</acronym> resource to associate with the page. Read more in
                         <link linkend="zend.view.helpers.initial.navigation.acl">the
                         <link linkend="zend.view.helpers.initial.navigation.acl">the
                         section on <acronym>ACL</acronym> integration in view helpers.</link>.
                         section on <acronym>ACL</acronym> integration in view helpers.</link>.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>privilege</code></entry>
                     <entry><code>privilege</code></entry>
                     <entry><type>String</type> | <constant>NULL</constant></entry>
                     <entry><type>String</type> | <constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         <acronym>ACL</acronym> privilege to associate with the page. Read more in
                         <acronym>ACL</acronym> privilege to associate with the page. Read more in
                         <link linkend="zend.view.helpers.initial.navigation.acl">the
                         <link linkend="zend.view.helpers.initial.navigation.acl">the
                         section on <acronym>ACL</acronym> integration in view helpers.</link>.
                         section on <acronym>ACL</acronym> integration in view helpers.</link>.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>active</code></entry>
                     <entry><code>active</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><constant>FALSE</constant></entry>
                     <entry><constant>FALSE</constant></entry>
+
                     <entry>
                     <entry>
                         Whether the page should be considered active for the
                         Whether the page should be considered active for the
                         current request. If active is <constant>FALSE</constant> or not
                         current request. If active is <constant>FALSE</constant> or not
@@ -153,20 +182,29 @@
                         request object upon calling <code>$page->isActive()</code>.
                         request object upon calling <code>$page->isActive()</code>.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>visible</code></entry>
                     <entry><code>visible</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><constant>TRUE</constant></entry>
                     <entry><constant>TRUE</constant></entry>
+
                     <entry>
                     <entry>
                         Whether page should be visible for the user, or just
                         Whether page should be visible for the user, or just
                         be a part of the structure. Invisible pages are skipped
                         be a part of the structure. Invisible pages are skipped
                         by view helpers.
                         by view helpers.
                     </entry>
                     </entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>pages</code></entry>
                     <entry><code>pages</code></entry>
-                    <entry><type>Array</type> | <classname>Zend_Config</classname> | <constant>NULL</constant></entry>
+
+                    <entry>
+                        <type>Array</type> | <classname>Zend_Config</classname> |
+                        <constant>NULL</constant>
+                    </entry>
+
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
+
                     <entry>
                     <entry>
                         Child pages of the page. This could be an <type>Array</type>
                         Child pages of the page. This could be an <type>Array</type>
                         or <classname>Zend_Config</classname> object containing either page
                         or <classname>Zend_Config</classname> object containing either page
@@ -181,6 +219,7 @@
 
 
     <note>
     <note>
         <title>Custom properties</title>
         <title>Custom properties</title>
+
         <para>
         <para>
             All pages support setting and getting of custom properties by
             All pages support setting and getting of custom properties by
             use of the magic methods <methodname>__set($name, $value)</methodname>,
             use of the magic methods <methodname>__set($name, $value)</methodname>,
@@ -191,6 +230,7 @@
             can be serialized/deserialized successfully even if the pages
             can be serialized/deserialized successfully even if the pages
             contains properties that are not native in the page class.
             contains properties that are not native in the page class.
         </para>
         </para>
+
         <para>
         <para>
             Both native and custom properties can be set using
             Both native and custom properties can be set using
             <code>$page->set($name, $value)</code> and retrieved using
             <code>$page->set($name, $value)</code> and retrieved using
@@ -217,4 +257,4 @@ if ($page->meaning != 42) {
 }
 }
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
-</sect2>
+</sect2>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Navigation-Pages-Custom.xml

@@ -96,4 +96,4 @@ $page = Zend_Navigation_Page::factory(array(
 ));
 ));
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
-</sect2>
+</sect2>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Navigation-Pages-Factory.xml

@@ -83,10 +83,10 @@ $page = Zend_Navigation_Page::factory(array(
     <example id="zend.navigation.pages.factory.example.custom">
     <example id="zend.navigation.pages.factory.example.custom">
         <title>Creating a custom page type using the page factory</title>
         <title>Creating a custom page type using the page factory</title>
 
 
-     <para>
-         To create a custom page type using the factory, use the option
-         <code>type</code> to specify a class name to instantiate.
-     </para>
+         <para>
+             To create a custom page type using the factory, use the option
+             <code>type</code> to specify a class name to instantiate.
+         </para>
 
 
         <programlisting language="php"><![CDATA[
         <programlisting language="php"><![CDATA[
 class My_Navigation_Page extends Zend_Navigation_Page
 class My_Navigation_Page extends Zend_Navigation_Page
@@ -106,4 +106,4 @@ $page = Zend_Navigation_Page::factory(array(
 ));
 ));
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
-</sect2>
+</sect2>

+ 18 - 27
documentation/manual/en/module_specs/Zend_Navigation-Pages-MVC.xml

@@ -4,9 +4,9 @@
     <title>Zend_Navigation_Page_Mvc</title>
     <title>Zend_Navigation_Page_Mvc</title>
 
 
     <para>
     <para>
-        <acronym>MVC</acronym> pages are defined using <acronym>MVC</acronym> parameters known from the
-        <classname>Zend_Controller</classname> component. An <acronym>MVC</acronym> page will use
-        <classname>Zend_Controller_Action_Helper_Url</classname> internally
+        <acronym>MVC</acronym> pages are defined using <acronym>MVC</acronym> parameters known from
+        the <classname>Zend_Controller</classname> component. An <acronym>MVC</acronym> page will
+        use <classname>Zend_Controller_Action_Helper_Url</classname> internally
         in the <methodname>getHref()</methodname> method to generate hrefs, and
         in the <methodname>getHref()</methodname> method to generate hrefs, and
         the <methodname>isActive()</methodname> method will intersect the
         the <methodname>isActive()</methodname> method will intersect the
         <classname>Zend_Controller_Request_Abstract</classname> params
         <classname>Zend_Controller_Request_Abstract</classname> params
@@ -15,6 +15,7 @@
 
 
     <table id="zend.navigation.pages.mvc.options">
     <table id="zend.navigation.pages.mvc.options">
         <title>MVC page options</title>
         <title>MVC page options</title>
+
         <tgroup cols="4">
         <tgroup cols="4">
             <thead>
             <thead>
                 <row>
                 <row>
@@ -24,58 +25,48 @@
                     <entry>Description</entry>
                     <entry>Description</entry>
                 </row>
                 </row>
             </thead>
             </thead>
+
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>action</code></entry>
                     <entry><code>action</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
-                    <entry>
-                        Action name to use when generating
-                        href to the page.
-                    </entry>
+                    <entry>Action name to use when generating href to the page.</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>controller</code></entry>
                     <entry><code>controller</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
-                    <entry>
-                        Controller name to use when generating
-                        href to the page.
-                    </entry>
+                    <entry>Controller name to use when generating href to the page.</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>module</code></entry>
                     <entry><code>module</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
-                    <entry>
-                        Module name to use when generating
-                        href to the page.
-                    </entry>
+                    <entry>Module name to use when generating href to the page.</entry>
                 </row>
                 </row>
+
                 <row>
                 <row>
                     <entry><code>params</code></entry>
                     <entry><code>params</code></entry>
                     <entry><type>Array</type></entry>
                     <entry><type>Array</type></entry>
                     <entry><methodname>array()</methodname></entry>
                     <entry><methodname>array()</methodname></entry>
-                    <entry>
-                        User params to use when generating href to the page.
-                    </entry>
+                    <entry>User params to use when generating href to the page.</entry>
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>route</code></entry>
                     <entry><code>route</code></entry>
                     <entry><type>String</type></entry>
                     <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
-                    <entry>
-                        Route name to use when generating
-                        href to the page.
-                    </entry>
+                    <entry>Route name to use when generating href to the page.</entry>
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>reset_params</code></entry>
                     <entry><code>reset_params</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><code>bool</code></entry>
                     <entry><constant>TRUE</constant></entry>
                     <entry><constant>TRUE</constant></entry>
+
                     <entry>
                     <entry>
-                        Whether user params should be reset
-                        when generating href to the page.
+                        Whether user params should be reset when generating href to the page.
                     </entry>
                     </entry>
                 </row>
                 </row>
             </tbody>
             </tbody>
@@ -195,8 +186,8 @@ $page->isActive(); // returns false
 
 
         <para>
         <para>
             Routes can be used with <acronym>MVC</acronym> pages. If a page has a route, this
             Routes can be used with <acronym>MVC</acronym> pages. If a page has a route, this
-            route will be used in <methodname>getHref()</methodname> to generate the <acronym>URL</acronym>
-            for the page.
+            route will be used in <methodname>getHref()</methodname> to generate the
+            <acronym>URL</acronym> for the page.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -244,4 +235,4 @@ $page = new Zend_Navigation_Page_Mvc(array(
 $page->getHref();
 $page->getHref();
 ]]></programlisting>
 ]]></programlisting>
     </example>
     </example>
-</sect2>
+</sect2>

+ 3 - 1
documentation/manual/en/module_specs/Zend_Navigation-Pages-URI.xml

@@ -25,6 +25,7 @@
 
 
     <table id="zend.navigation.pages.uri.options">
     <table id="zend.navigation.pages.uri.options">
         <title>URI page options</title>
         <title>URI page options</title>
+
         <tgroup cols="4">
         <tgroup cols="4">
             <thead>
             <thead>
                 <row>
                 <row>
@@ -34,6 +35,7 @@
                     <entry>Description</entry>
                     <entry>Description</entry>
                 </row>
                 </row>
             </thead>
             </thead>
+
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>uri</code></entry>
                     <entry><code>uri</code></entry>
@@ -48,4 +50,4 @@
             </tbody>
             </tbody>
         </tgroup>
         </tgroup>
     </table>
     </table>
-</sect2>
+</sect2>

+ 2 - 2
documentation/manual/en/module_specs/Zend_Navigation-Pages.xml

@@ -13,6 +13,7 @@
                      – using the class <classname>Zend_Navigation_Page_Mvc</classname>
                      – using the class <classname>Zend_Navigation_Page_Mvc</classname>
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <link linkend="zend.navigation.pages.uri">URI pages</link>
                     <link linkend="zend.navigation.pages.uri">URI pages</link>
@@ -35,5 +36,4 @@
     <xi:include href="Zend_Navigation-Pages-URI.xml" />
     <xi:include href="Zend_Navigation-Pages-URI.xml" />
     <xi:include href="Zend_Navigation-Pages-Custom.xml" />
     <xi:include href="Zend_Navigation-Pages-Custom.xml" />
     <xi:include href="Zend_Navigation-Pages-Factory.xml" />
     <xi:include href="Zend_Navigation-Pages-Factory.xml" />
-
-</sect1>
+</sect1>

+ 5 - 4
documentation/manual/en/module_specs/Zend_Oauth-GettingStarted.xml

@@ -208,8 +208,9 @@ if (isset($data->text)) {
 echo $result;
 echo $result;
 ]]></programlisting>
 ]]></programlisting>
 
 
-    <para>As a note on the customised client, this can be passed to most
-    Zend Framework service or other classes using <classname>Zend_Http_Client
-    </classname> displacing the default client they would otherwise use.</para>
-
+    <para>
+        As a note on the customised client, this can be passed to most
+        Zend Framework service or other classes using <classname>Zend_Http_Client
+        </classname> displacing the default client they would otherwise use.
+    </para>
 </sect2>
 </sect2>

+ 73 - 42
documentation/manual/en/module_specs/Zend_OpenId-Consumer.xml

@@ -2,6 +2,7 @@
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect1 id="zend.openid.consumer">
 <sect1 id="zend.openid.consumer">
     <title>Zend_OpenId_Consumer Basics</title>
     <title>Zend_OpenId_Consumer Basics</title>
+
     <para>
     <para>
         <classname>Zend_OpenId_Consumer</classname> can be used to implement OpenID
         <classname>Zend_OpenId_Consumer</classname> can be used to implement OpenID
         authentication for web sites.
         authentication for web sites.
@@ -9,6 +10,7 @@
 
 
     <sect2 id="zend.openid.consumer.authentication">
     <sect2 id="zend.openid.consumer.authentication">
         <title>OpenID Authentication</title>
         <title>OpenID Authentication</title>
+
         <para>
         <para>
             From a web site developer's point of view, the OpenID authentication
             From a web site developer's point of view, the OpenID authentication
             process consists of three steps:
             process consists of three steps:
@@ -50,6 +52,7 @@
 
 
         <example id="zend.openid.consumer.example-1">
         <example id="zend.openid.consumer.example-1">
             <title>The Simple OpenID Login form</title>
             <title>The Simple OpenID Login form</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 <html><body>
 <html><body>
 <form method="post" action="example-1_2.php"><fieldset>
 <form method="post" action="example-1_2.php"><fieldset>
@@ -61,16 +64,18 @@
         </example>
         </example>
 
 
         <para>
         <para>
-            This form passes the OpenID identity on submission to the following <acronym>PHP</acronym>
-            script that performs the second step of authentication. The
-            <acronym>PHP</acronym> script need only call the <methodname>Zend_OpenId_Consumer::login()</methodname> method in this step.
-            The first argument of this
-            method is an accepted OpenID identity, and the second is the <acronym>URL</acronym> of a script
-            that handles the third and last step of authentication.
+            This form passes the OpenID identity on submission to the following
+            <acronym>PHP</acronym> script that performs the second step of authentication. The
+            <acronym>PHP</acronym> script need only call the
+            <methodname>Zend_OpenId_Consumer::login()</methodname> method in this step. The first
+            argument of this method is an accepted OpenID identity, and the second is the
+            <acronym>URL</acronym> of a script that handles the third and last step of
+            authentication.
         </para>
         </para>
 
 
         <example id="zend.openid.consumer.example-1_2">
         <example id="zend.openid.consumer.example-1_2">
             <title>The Authentication Request Handler</title>
             <title>The Authentication Request Handler</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $consumer = new Zend_OpenId_Consumer();
 $consumer = new Zend_OpenId_Consumer();
 if (!$consumer->login($_POST['openid_identifier'], 'example-1_3.php')) {
 if (!$consumer->login($_POST['openid_identifier'], 'example-1_3.php')) {
@@ -116,6 +121,7 @@ if (!$consumer->login($_POST['openid_identifier'], 'example-1_3.php')) {
 
 
         <example id="zend.openid.consumer.example-1_3">
         <example id="zend.openid.consumer.example-1_3">
             <title>The Authentication Response Verifier</title>
             <title>The Authentication Response Verifier</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $consumer = new Zend_OpenId_Consumer();
 $consumer = new Zend_OpenId_Consumer();
 if ($consumer->verify($_GET, $id)) {
 if ($consumer->verify($_GET, $id)) {
@@ -129,8 +135,8 @@ if ($consumer->verify($_GET, $id)) {
         <para>
         <para>
             This check is performed using the <classname>Zend_OpenId_Consumer::verify</classname>
             This check is performed using the <classname>Zend_OpenId_Consumer::verify</classname>
             method, which takes an array of
             method, which takes an array of
-            the <acronym>HTTP</acronym> request's arguments and checks that this response is properly
-            signed by the OpenID provider. It may assign
+            the <acronym>HTTP</acronym> request's arguments and checks that this response is
+            properly signed by the OpenID provider. It may assign
             the claimed OpenID identity that was entered by end user in the
             the claimed OpenID identity that was entered by end user in the
             first step using a second, optional argument.
             first step using a second, optional argument.
         </para>
         </para>
@@ -138,6 +144,7 @@ if ($consumer->verify($_GET, $id)) {
 
 
     <sect2 id="zend.openid.consumer.combine">
     <sect2 id="zend.openid.consumer.combine">
         <title>Combining all Steps in One Page</title>
         <title>Combining all Steps in One Page</title>
+
         <para>
         <para>
             The following example combines all three steps in one script. It doesn't
             The following example combines all three steps in one script. It doesn't
             provide any new functionality. The advantage of using just one script is that
             provide any new functionality. The advantage of using just one script is that
@@ -149,6 +156,7 @@ if ($consumer->verify($_GET, $id)) {
 
 
         <example id="zend.openid.consumer.example-2">
         <example id="zend.openid.consumer.example-2">
             <title>The Complete OpenID Login Script</title>
             <title>The Complete OpenID Login Script</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 <?php
 <?php
 $status = "";
 $status = "";
@@ -197,18 +205,20 @@ if (isset($_POST['openid_action']) &&
 
 
     <sect2 id="zend.openid.consumer.realm">
     <sect2 id="zend.openid.consumer.realm">
         <title>Consumer Realm</title>
         <title>Consumer Realm</title>
+
         <para>
         <para>
             When an OpenID-enabled site passes authentication requests to a
             When an OpenID-enabled site passes authentication requests to a
-            provider, it identifies itself with a realm <acronym>URL</acronym>. This <acronym>URL</acronym> may be
-            considered a root of a trusted site. If the user trusts the realm <acronym>URL</acronym>, he or she
-            should also trust matched and subsequent <acronym>URL</acronym>s.
+            provider, it identifies itself with a realm <acronym>URL</acronym>. This
+            <acronym>URL</acronym> may be considered a root of a trusted site. If the user trusts
+            the realm <acronym>URL</acronym>, he or she should also trust matched and subsequent
+            <acronym>URL</acronym>s.
         </para>
         </para>
 
 
         <para>
         <para>
-            By default, the realm <acronym>URL</acronym> is automatically set to the <acronym>URL</acronym> of the
-            directory in which the login script resides. This default value is useful for most, but
-            not all, cases. Sometimes an entire domain, and not a directory should be trusted. Or even a
-            combination of several servers in one domain.
+            By default, the realm <acronym>URL</acronym> is automatically set to the
+            <acronym>URL</acronym> of the directory in which the login script resides. This default
+            value is useful for most, but not all, cases. Sometimes an entire domain, and not a
+            directory should be trusted. Or even a combination of several servers in one domain.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -220,6 +230,7 @@ if (isset($_POST['openid_action']) &&
 
 
         <example id="zend.openid.consumer.example-3_2">
         <example id="zend.openid.consumer.example-3_2">
             <title>Authentication Request for Specified Realm</title>
             <title>Authentication Request for Specified Realm</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $consumer = new Zend_OpenId_Consumer();
 $consumer = new Zend_OpenId_Consumer();
 if (!$consumer->login($_POST['openid_identifier'],
 if (!$consumer->login($_POST['openid_identifier'],
@@ -238,6 +249,7 @@ if (!$consumer->login($_POST['openid_identifier'],
 
 
     <sect2 id="zend.openid.consumer.check">
     <sect2 id="zend.openid.consumer.check">
         <title>Immediate Check</title>
         <title>Immediate Check</title>
+
         <para>
         <para>
             In some cases, an application need only check if a user is already
             In some cases, an application need only check if a user is already
             logged in to a trusted OpenID server without any interaction with the
             logged in to a trusted OpenID server without any interaction with the
@@ -252,6 +264,7 @@ if (!$consumer->login($_POST['openid_identifier'],
 
 
         <example id="zend.openid.consumer.example-4">
         <example id="zend.openid.consumer.example-4">
             <title>Immediate Check without Interaction</title>
             <title>Immediate Check without Interaction</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $consumer = new Zend_OpenId_Consumer();
 $consumer = new Zend_OpenId_Consumer();
 if (!$consumer->check($_POST['openid_identifier'], 'example-4_3.php')) {
 if (!$consumer->check($_POST['openid_identifier'], 'example-4_3.php')) {
@@ -268,33 +281,37 @@ if (!$consumer->check($_POST['openid_identifier'], 'example-4_3.php')) {
 
 
     <sect2 id="zend.openid.consumer.storage">
     <sect2 id="zend.openid.consumer.storage">
         <title>Zend_OpenId_Consumer_Storage</title>
         <title>Zend_OpenId_Consumer_Storage</title>
+
         <para>
         <para>
             There are three steps in the OpenID authentication procedure, and each
             There are three steps in the OpenID authentication procedure, and each
-            step is performed by a separate <acronym>HTTP</acronym> request. To store information between
-            requests, <classname>Zend_OpenId_Consumer</classname> uses internal storage.
+            step is performed by a separate <acronym>HTTP</acronym> request. To store information
+            between requests, <classname>Zend_OpenId_Consumer</classname> uses internal storage.
         </para>
         </para>
 
 
         <para>
         <para>
             Developers do not necessarily have to be aware of this storage because by default
             Developers do not necessarily have to be aware of this storage because by default
-            <classname>Zend_OpenId_Consumer</classname> uses file-based storage under the temporary directory-
-            similar to <acronym>PHP</acronym> sessions. However, this storage may be not suitable in all
-            cases. Some developers may want to store information in a database, while others may
-            need to use common storage suitable for server farms. Fortunately,
-            developers may easily replace the default storage with their own. To specify a custom storage mechanism,
-            one need only extend the <classname>Zend_OpenId_Consumer_Storage</classname> class and pass this subclass
-            to the <classname>Zend_OpenId_Consumer</classname> constructor in the first argument.
+            <classname>Zend_OpenId_Consumer</classname> uses file-based storage under the temporary
+            directory- similar to <acronym>PHP</acronym> sessions. However, this storage may be not
+            suitable in all cases. Some developers may want to store information in a database,
+            while others may need to use common storage suitable for server farms. Fortunately,
+            developers may easily replace the default storage with their own. To specify a custom
+            storage mechanism, one need only extend the
+            <classname>Zend_OpenId_Consumer_Storage</classname> class and pass this subclass to the
+            <classname>Zend_OpenId_Consumer</classname> constructor in the first argument.
         </para>
         </para>
 
 
         <para>
         <para>
             The following example demonstrates a simple storage mechanism that uses
             The following example demonstrates a simple storage mechanism that uses
             <classname>Zend_Db</classname> as its backend and exposes three groups of functions.
             <classname>Zend_Db</classname> as its backend and exposes three groups of functions.
-            The first group contains functions for working with associations, while the second group caches
-            discovery information, and the third group can be used to check whether a response is unique. This
-            class can easily be used with existing or new databases; if the required tables don't exist, it will create them.
+            The first group contains functions for working with associations, while the second group
+            caches discovery information, and the third group can be used to check whether a
+            response is unique. This class can easily be used with existing or new databases; if the
+            required tables don't exist, it will create them.
         </para>
         </para>
 
 
         <example id="zend.openid.consumer.example-5">
         <example id="zend.openid.consumer.example-5">
             <title>Database Storage</title>
             <title>Database Storage</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 class DbStorage extends Zend_OpenId_Consumer_Storage
 class DbStorage extends Zend_OpenId_Consumer_Storage
 {
 {
@@ -507,12 +524,13 @@ $consumer = new Zend_OpenId_Consumer($storage);
 
 
     <sect2 id="zend.openid.consumer.sreg">
     <sect2 id="zend.openid.consumer.sreg">
         <title>Simple Registration Extension</title>
         <title>Simple Registration Extension</title>
+
         <para>
         <para>
             In addition to authentication, the OpenID standard can be used for
             In addition to authentication, the OpenID standard can be used for
-            lightweight profile exchange to make information about a user portable across multiple sites. This feature is not covered by the OpenID
-            authentication specification, but by the OpenID Simple Registration
-            Extension protocol. This protocol allows OpenID-enabled sites to ask for
-            information about end users from OpenID providers. Such information may
+            lightweight profile exchange to make information about a user portable across multiple
+            sites. This feature is not covered by the OpenID authentication specification, but by
+            the OpenID Simple Registration Extension protocol. This protocol allows OpenID-enabled
+            sites to ask for information about end users from OpenID providers. Such information may
             include:
             include:
         </para>
         </para>
 
 
@@ -523,6 +541,7 @@ $consumer = new Zend_OpenId_Consumer($storage);
                     - any UTF-8 string that the end user uses as a nickname
                     - any UTF-8 string that the end user uses as a nickname
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>email</emphasis>
                     <emphasis>email</emphasis>
@@ -530,12 +549,14 @@ $consumer = new Zend_OpenId_Consumer($storage);
                     of RFC2822
                     of RFC2822
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>fullname</emphasis>
                     <emphasis>fullname</emphasis>
                     - a UTF-8 string representation of the user's full name
                     - a UTF-8 string representation of the user's full name
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>dob</emphasis>
                     <emphasis>dob</emphasis>
@@ -543,35 +564,40 @@ $consumer = new Zend_OpenId_Consumer($storage);
                     representation uses fewer than the specified number of digits in this format
                     representation uses fewer than the specified number of digits in this format
                     should be zero-padded. In other words, the length of this value must always be
                     should be zero-padded. In other words, the length of this value must always be
                     10. If the end user does not want to reveal any particular
                     10. If the end user does not want to reveal any particular
-                    part of this value (i.e., year, month or day), it must be set to zero. For example,
-                    if the user wants to specify that his date of birth falls in 1980,
+                    part of this value (i.e., year, month or day), it must be set to zero. For
+                    example, if the user wants to specify that his date of birth falls in 1980,
                     but not specify the month or day, the value returned should be '1980-00-00'.
                     but not specify the month or day, the value returned should be '1980-00-00'.
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>gender</emphasis>
                     <emphasis>gender</emphasis>
                     - the user's gender: "M" for male, "F" for female
                     - the user's gender: "M" for male, "F" for female
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>postcode</emphasis>
                     <emphasis>postcode</emphasis>
                     - a UTF-8 string that conforms to the postal system of the user's country
                     - a UTF-8 string that conforms to the postal system of the user's country
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>country</emphasis>
                     <emphasis>country</emphasis>
                     - the user's country of residence as specified by ISO3166
                     - the user's country of residence as specified by ISO3166
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>language</emphasis>
                     <emphasis>language</emphasis>
                     - the user's preferred language as specified by ISO639
                     - the user's preferred language as specified by ISO639
                 </para>
                 </para>
             </listitem>
             </listitem>
+
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <emphasis>timezone</emphasis>
                     <emphasis>timezone</emphasis>
@@ -592,6 +618,7 @@ $consumer = new Zend_OpenId_Consumer($storage);
 
 
         <example id="zend.openid.consumer.example-6_2">
         <example id="zend.openid.consumer.example-6_2">
             <title>Sending Requests with a Simple Registration Extension</title>
             <title>Sending Requests with a Simple Registration Extension</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $sreg = new Zend_OpenId_Extension_Sreg(array(
 $sreg = new Zend_OpenId_Extension_Sreg(array(
     'nickname'=>true,
     'nickname'=>true,
@@ -621,12 +648,13 @@ if (!$consumer->login($_POST['openid_identifier'],
             On the third step of authentication, the
             On the third step of authentication, the
             <classname>Zend_OpenId_Extension_Sreg</classname> object should be passed to
             <classname>Zend_OpenId_Extension_Sreg</classname> object should be passed to
             <classname>Zend_OpenId_Consumer::verify</classname>. Then on successful authentication
             <classname>Zend_OpenId_Consumer::verify</classname>. Then on successful authentication
-            the <classname>Zend_OpenId_Extension_Sreg::getProperties</classname> method will return an
-            associative array of requested fields.
+            the <classname>Zend_OpenId_Extension_Sreg::getProperties</classname> method will return
+            an associative array of requested fields.
         </para>
         </para>
 
 
         <example id="zend.openid.consumer.example-6_3">
         <example id="zend.openid.consumer.example-6_3">
             <title>Verifying Responses with a Simple Registration Extension</title>
             <title>Verifying Responses with a Simple Registration Extension</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 $sreg = new Zend_OpenId_Extension_Sreg(array(
 $sreg = new Zend_OpenId_Extension_Sreg(array(
     'nickname'=>true,
     'nickname'=>true,
@@ -655,8 +683,8 @@ if ($consumer->verify($_GET, $id, $sreg)) {
             If the <classname>Zend_OpenId_Extension_Sreg</classname> object was created without any
             If the <classname>Zend_OpenId_Extension_Sreg</classname> object was created without any
             arguments, the user code should check for the existence of the required
             arguments, the user code should check for the existence of the required
             data itself. However, if the object is created with the same list of
             data itself. However, if the object is created with the same list of
-            required fields as on the second step, it will automatically check for the
-            existence of required data. In this case, <classname>Zend_OpenId_Consumer::verify</classname>
+            required fields as on the second step, it will automatically check for the existence
+            of required data. In this case, <classname>Zend_OpenId_Consumer::verify</classname>
             will return <constant>FALSE</constant> if any of the required fields are
             will return <constant>FALSE</constant> if any of the required fields are
             missing.
             missing.
         </para>
         </para>
@@ -679,6 +707,7 @@ if ($consumer->verify($_GET, $id, $sreg)) {
 
 
     <sect2 id="zend.openid.consumer.auth">
     <sect2 id="zend.openid.consumer.auth">
         <title>Integration with Zend_Auth</title>
         <title>Integration with Zend_Auth</title>
+
         <para>
         <para>
             Zend Framework provides a special class to support user
             Zend Framework provides a special class to support user
             authentication: <classname>Zend_Auth</classname>. This class can be used together
             authentication: <classname>Zend_Auth</classname>. This class can be used together
@@ -691,12 +720,13 @@ if ($consumer->verify($_GET, $id, $sreg)) {
 
 
         <para>
         <para>
             The big difference between this adapter and existing ones, is that
             The big difference between this adapter and existing ones, is that
-            it works on two <acronym>HTTP</acronym> requests and includes a dispatch code to perform the
-            second or third step of OpenID authentication.
+            it works on two <acronym>HTTP</acronym> requests and includes a dispatch code to perform
+            the second or third step of OpenID authentication.
         </para>
         </para>
 
 
         <example id="zend.openid.consumer.example-7">
         <example id="zend.openid.consumer.example-7">
             <title>Zend_Auth Adapter for OpenID</title>
             <title>Zend_Auth Adapter for OpenID</title>
+
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
 <?php
 <?php
 class OpenIdAdapter implements Zend_Auth_Adapter_Interface {
 class OpenIdAdapter implements Zend_Auth_Adapter_Interface {
@@ -773,6 +803,7 @@ if ((isset($_POST['openid_action']) &&
 
 
     <sect2 id="zend.openid.consumer.mvc">
     <sect2 id="zend.openid.consumer.mvc">
         <title>Integration with Zend_Controller</title>
         <title>Integration with Zend_Controller</title>
+
         <para>
         <para>
             Finally a couple of words about integration into
             Finally a couple of words about integration into
             Model-View-Controller applications: such Zend Framework applications are
             Model-View-Controller applications: such Zend Framework applications are
@@ -786,9 +817,9 @@ if ((isset($_POST['openid_action']) &&
             capabilities but it performs <acronym>HTTP</acronym> redirections on success of
             capabilities but it performs <acronym>HTTP</acronym> redirections on success of
             <classname>Zend_OpenId_Consumer::login</classname> and
             <classname>Zend_OpenId_Consumer::login</classname> and
             <classname>Zend_OpenId_Consumer::check</classname>. These redirections may work
             <classname>Zend_OpenId_Consumer::check</classname>. These redirections may work
-            incorrectly or not at all if some data was already sent to the
-            web browser. To properly perform <acronym>HTTP</acronym> redirection in <acronym>MVC</acronym> code the real
-            <classname>Zend_Controller_Response_Http</classname> should be sent to
+            incorrectly or not at all if some data was already sent to the web browser. To
+            properly perform <acronym>HTTP</acronym> redirection in <acronym>MVC</acronym> code the
+            real <classname>Zend_Controller_Response_Http</classname> should be sent to
             <classname>Zend_OpenId_Consumer::login</classname> or
             <classname>Zend_OpenId_Consumer::login</classname> or
             <classname>Zend_OpenId_Consumer::check</classname> as the last argument.
             <classname>Zend_OpenId_Consumer::check</classname> as the last argument.
         </para>
         </para>

+ 10 - 1
documentation/manual/en/module_specs/Zend_ProgressBar.xml

@@ -5,6 +5,7 @@
 
 
     <sect2 id="zend.progressbar.whatisit">
     <sect2 id="zend.progressbar.whatisit">
         <title>Introduction</title>
         <title>Introduction</title>
+
         <para>
         <para>
             <classname>Zend_ProgressBar</classname> is a component to create and update
             <classname>Zend_ProgressBar</classname> is a component to create and update
             progressbars in different environments. It consists of a single
             progressbars in different environments. It consists of a single
@@ -17,6 +18,7 @@
 
 
     <sect2 id="zend.progressbar.basic">
     <sect2 id="zend.progressbar.basic">
         <title>Basic Usage of Zend_Progressbar</title>
         <title>Basic Usage of Zend_Progressbar</title>
+
         <para>
         <para>
             <classname>Zend_ProgressBar</classname> is quite easy in its usage. You
             <classname>Zend_ProgressBar</classname> is quite easy in its usage. You
             simply create a new instance of <classname>Zend_Progressbar</classname>, defining a
             simply create a new instance of <classname>Zend_Progressbar</classname>, defining a
@@ -43,6 +45,7 @@ $progressBar->finish();
             the progressbar is updated with the current byte count. At the end
             the progressbar is updated with the current byte count. At the end
             of the loop, the progressbar status is set to finished.
             of the loop, the progressbar status is set to finished.
         </para>
         </para>
+
         <para>
         <para>
             You can also call the <methodname>update()</methodname> method of
             You can also call the <methodname>update()</methodname> method of
             <classname>Zend_ProgressBar</classname> without arguments, which just
             <classname>Zend_ProgressBar</classname> without arguments, which just
@@ -53,6 +56,7 @@ $progressBar->finish();
 
 
     <sect2 id="zend.progressbar.persistent">
     <sect2 id="zend.progressbar.persistent">
         <title>Persistent progress</title>
         <title>Persistent progress</title>
+
         <para>
         <para>
             If you want the progressbar to be persistent over multiple requests,
             If you want the progressbar to be persistent over multiple requests,
             you can give the name of a session namespace as fourth argument
             you can give the name of a session namespace as fourth argument
@@ -66,15 +70,20 @@ $progressBar->finish();
 
 
     <sect2 id="zend.progressbar.adapters">
     <sect2 id="zend.progressbar.adapters">
         <title>Standard adapters</title>
         <title>Standard adapters</title>
+
         <para>
         <para>
             <classname>Zend_ProgressBar</classname> comes with the following three adapters:
             <classname>Zend_ProgressBar</classname> comes with the following three adapters:
 
 
             <itemizedlist mark="opencircle">
             <itemizedlist mark="opencircle">
-                <listitem><para><xref linkend="zend.progressbar.adapter.console" /></para></listitem>
+                <listitem>
+                    <para><xref linkend="zend.progressbar.adapter.console" /></para>
+                </listitem>
+
                 <listitem><para><xref linkend="zend.progressbar.adapter.jspush" /></para></listitem>
                 <listitem><para><xref linkend="zend.progressbar.adapter.jspush" /></para></listitem>
                 <listitem><para><xref linkend="zend.progressbar.adapter.jspull" /></para></listitem>
                 <listitem><para><xref linkend="zend.progressbar.adapter.jspull" /></para></listitem>
             </itemizedlist>
             </itemizedlist>
         </para>
         </para>
+
         <xi:include href="Zend_ProgressBar_Adapter_Console.xml" />
         <xi:include href="Zend_ProgressBar_Adapter_Console.xml" />
         <xi:include href="Zend_ProgressBar_Adapter_JsPush.xml" />
         <xi:include href="Zend_ProgressBar_Adapter_JsPush.xml" />
         <xi:include href="Zend_ProgressBar_Adapter_JsPull.xml" />
         <xi:include href="Zend_ProgressBar_Adapter_JsPull.xml" />

+ 15 - 0
documentation/manual/en/module_specs/Zend_ProgressBar_Adapter_Console.xml

@@ -2,6 +2,7 @@
 <!-- Reviewed: no -->
 <!-- Reviewed: no -->
 <sect3 id="zend.progressbar.adapter.console">
 <sect3 id="zend.progressbar.adapter.console">
     <title>Zend_ProgressBar_Adapter_Console</title>
     <title>Zend_ProgressBar_Adapter_Console</title>
+
     <para>
     <para>
         <classname>Zend_ProgressBar_Adapter_Console</classname> is a text-based adapter
         <classname>Zend_ProgressBar_Adapter_Console</classname> is a text-based adapter
         for terminals. It can automatically detect terminal widths but supports
         for terminals. It can automatically detect terminal widths but supports
@@ -9,19 +10,23 @@
         the progressbar and as well customize the order of them. You can also
         the progressbar and as well customize the order of them. You can also
         define the style of the progressbar itself.
         define the style of the progressbar itself.
     </para>
     </para>
+
     <note>
     <note>
         <title>Automatic console width recognition</title>
         <title>Automatic console width recognition</title>
+
         <para>
         <para>
             <code>shell_exec</code> is required for this feature to work on
             <code>shell_exec</code> is required for this feature to work on
             *nix based systems. On windows, there is always a fixed terminal
             *nix based systems. On windows, there is always a fixed terminal
             width of 80 character, so no recognition is required there.
             width of 80 character, so no recognition is required there.
         </para>
         </para>
     </note>
     </note>
+
     <para>
     <para>
         You can set the adapter options either via the <code>set*</code> methods
         You can set the adapter options either via the <code>set*</code> methods
         or give an array or a <classname>Zend_Config</classname> instance with options as first
         or give an array or a <classname>Zend_Config</classname> instance with options as first
         parameter to the constructor. The available options are:
         parameter to the constructor. The available options are:
     </para>
     </para>
+
     <itemizedlist>
     <itemizedlist>
         <listitem>
         <listitem>
             <para>
             <para>
@@ -30,12 +35,14 @@
                 <code>php://stderr</code> or a path to a file.
                 <code>php://stderr</code> or a path to a file.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>width</code>: Either an integer or the <constant>AUTO</constant>
                 <code>width</code>: Either an integer or the <constant>AUTO</constant>
                 constant of <classname>Zend_Console_ProgressBar</classname>.
                 constant of <classname>Zend_Console_ProgressBar</classname>.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>elements</code>: Either <constant>NULL</constant> for default
                 <code>elements</code>: Either <constant>NULL</constant> for default
@@ -49,12 +56,14 @@
                         <constant>ELEMENT_PERCENT</constant>: The current value in percent.
                         <constant>ELEMENT_PERCENT</constant>: The current value in percent.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>ELEMENT_BAR</constant>: The visual bar which display
                         <constant>ELEMENT_BAR</constant>: The visual bar which display
                         the percentage.
                         the percentage.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>ELEMENT_ETA</constant>: The automatic calculated ETA.
                         <constant>ELEMENT_ETA</constant>: The automatic calculated ETA.
@@ -63,6 +72,7 @@
                         accurate results.
                         accurate results.
                     </para>
                     </para>
                 </listitem>
                 </listitem>
+
                 <listitem>
                 <listitem>
                     <para>
                     <para>
                         <constant>ELEMENT_TEXT</constant>: An optional status message
                         <constant>ELEMENT_TEXT</constant>: An optional status message
@@ -71,30 +81,35 @@
                 </listitem>
                 </listitem>
             </itemizedlist>
             </itemizedlist>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>textWidth</code>: Width in characters of the
                 <code>textWidth</code>: Width in characters of the
                 <constant>ELEMENT_TEXT</constant> element. Default is 20.
                 <constant>ELEMENT_TEXT</constant> element. Default is 20.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>charset</code>: Charset of the
                 <code>charset</code>: Charset of the
                 <constant>ELEMENT_TEXT</constant> element. Default is utf-8.
                 <constant>ELEMENT_TEXT</constant> element. Default is utf-8.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>barLeftChar</code>: A string which is used left-hand
                 <code>barLeftChar</code>: A string which is used left-hand
                 of the indicator in the progressbar.
                 of the indicator in the progressbar.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>barRightChar</code>: A string which is used right-hand
                 <code>barRightChar</code>: A string which is used right-hand
                 of the indicator in the progressbar.
                 of the indicator in the progressbar.
             </para>
             </para>
         </listitem>
         </listitem>
+
         <listitem>
         <listitem>
             <para>
             <para>
                 <code>barIndicatorChar</code>: A string which is used for
                 <code>barIndicatorChar</code>: A string which is used for