[DOCUMENTATION] English:

- manual fixes (only line length)

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

documentation/manual/en/module_specs/Zend_Feed-ConsumingAtom.xml

@@ -4,18 +4,20 @@
 <title>Consuming an Atom Feed</title>
 
     <para>
-        <classname>Zend_Feed_Atom</classname> is used in much the same way as <classname>Zend_Feed_Rss</classname>. It provides
-        the same access to feed-level properties and iteration over entries in the feed. The main
-        difference is in the structure of the Atom protocol itself. Atom is a successor to RSS; it is more
-        generalized protocol and it is designed to deal more easily with feeds that provide their full
-        content inside the feed, splitting RSS' <code>description</code> tag into two elements,
-        <code>summary</code> and <code>content</code>, for that purpose.
+        <classname>Zend_Feed_Atom</classname> is used in much the same way as
+        <classname>Zend_Feed_Rss</classname>. It provides the same access to feed-level properties
+        and iteration over entries in the feed. The main difference is in the structure of the Atom
+        protocol itself. Atom is a successor to RSS; it is more generalized protocol and it is
+        designed to deal more easily with feeds that provide their full content inside the feed,
+        splitting RSS' <code>description</code> tag into two elements, <code>summary</code> and
+        <code>content</code>, for that purpose.
     </para>
 
     <example id="zend.feed.consuming-atom.example.usage">
         <title>Basic Use of an Atom Feed</title>
         <para>
-            Read an Atom feed and print the <code>title</code> and <code>summary</code> of each entry:
+            Read an Atom feed and print the <code>title</code> and <code>summary</code> of each
+            entry:
         </para>
         <programlisting language="php"><![CDATA[
 $feed = new Zend_Feed_Atom('http://atom.example.com/feed/');
@@ -40,16 +42,20 @@ foreach ($feed as $entry) {
                 <para><code>id</code> - Every feed and entry in Atom has a unique identifier</para>
             </listitem>
             <listitem>
-                <para><code>link</code> - Feeds can have multiple links, which are distinguished by a
-                <code>type</code> attribute</para>
                 <para>
-                    The equivalent to RSS's channel link would be <code>type="text/html"</code>. If the link
-                    is to an alternate version of the same content that's in the feed, it would have a
-                    <code>rel="alternate"</code> attribute.
+                    <code>link</code> - Feeds can have multiple links, which are distinguished by a
+                    <code>type</code> attribute
+                </para>
+                <para>
+                    The equivalent to RSS's channel link would be <code>type="text/html"</code>. If
+                    the link is to an alternate version of the same content that's in the feed, it
+                    would have a <code>rel="alternate"</code> attribute.
                 </para>
             </listitem>
             <listitem>
-                <para><code>subtitle</code> - The feed's description, equivalent to RSS' channel description
+                <para>
+                    <code>subtitle</code> - The feed's description, equivalent to RSS' channel
+                    description
                 </para>
                 <para><code>author->name()</code> - The feed author's name</para>
                 <para><code>author->email()</code> - The feed author's email address</para>
@@ -70,24 +76,34 @@ foreach ($feed as $entry) {
                 <para><code>title</code> - The entry's title, same as RSS item titles</para>
             </listitem>
             <listitem>
-                <para><code>link</code> - A link to another format or an alternate view of this entry</para>
+                <para>
+                    <code>link</code> - A link to another format or an alternate view of this entry
+                </para>
             </listitem>
             <listitem>
                 <para><code>summary</code> - A summary of this entry's content</para>
             </listitem>
             <listitem>
-                <para><code>content</code> - The full content of the entry; can be skipped if the feed just
-                contains summaries</para>
+                <para>
+                    <code>content</code> - The full content of the entry; can be skipped if the feed
+                    just contains summaries
+                </para>
             </listitem>
             <listitem>
-                <para><code>author</code> - with <code>name</code> and <code>email</code> sub-tags like
-                feeds have</para>
+                <para>
+                    <code>author</code> - with <code>name</code> and <code>email</code> sub-tags
+                    like feeds have
+                </para>
             </listitem>
             <listitem>
-                <para><code>published</code> - the date the entry was published, in RFC 3339 format</para>
+                <para>
+                    <code>published</code> - the date the entry was published, in RFC 3339 format
+                </para>
             </listitem>
             <listitem>
-                <para><code>updated</code> - the date the entry was last updated, in RFC 3339 format</para>
+                <para>
+                    <code>updated</code> - the date the entry was last updated, in RFC 3339 format
+                </para>
             </listitem>
         </itemizedlist>
     </para>

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

@@ -4,14 +4,14 @@
     <title>Consuming a Single Atom Entry</title>
 
     <para>
-        Single Atom <code>&lt;entry&gt;</code> elements are also valid by themselves. Usually the URL for an
-        entry is the feed's URL followed by <code>/&lt;entryId&gt;</code>, such as
+        Single Atom <code>&lt;entry&gt;</code> elements are also valid by themselves. Usually the
+        URL for an entry is the feed's URL followed by <code>/&lt;entryId&gt;</code>, such as
         <code>http://atom.example.com/feed/1</code>, using the example URL we used above.
     </para>
 
     <para>
-        If you read a single entry, you will still have a <classname>Zend_Feed_Atom</classname> object, but it will
-        automatically create an "anonymous" feed to contain the entry.
+        If you read a single entry, you will still have a <classname>Zend_Feed_Atom</classname>
+        object, but it will automatically create an "anonymous" feed to contain the entry.
     </para>
 
     <example id="zend.feed.consuming-atom-single-entry.example.atom">
@@ -25,8 +25,8 @@ $entry = $feed->current();
     </example>
 
     <para>
-        Alternatively, you could instantiate the entry object directly if you know you are accessing an
-        <code>&lt;entry&gt;</code>-only document:
+        Alternatively, you could instantiate the entry object directly if you know you are accessing
+        an <code>&lt;entry&gt;</code>-only document:
     </para>
 
     <example id="zend.feed.consuming-atom-single-entry.example.entryatom">

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

@@ -3,28 +3,30 @@
 <sect1 id="zend.feed.consuming-rss">
     <title>Consuming an RSS Feed</title>
     <para>
-        Reading an RSS feed is as simple as instantiating a <classname>Zend_Feed_Rss</classname> object with the URL
-        of the feed:
+        Reading an RSS feed is as simple as instantiating a <classname>Zend_Feed_Rss</classname>
+        object with the URL of the feed:
     </para>
     <programlisting language="php"><![CDATA[
 $channel = new Zend_Feed_Rss('http://rss.example.com/channelName');
 ]]></programlisting>
     <para>
-        If any errors occur fetching the feed, a <classname>Zend_Feed_Exception</classname> will be thrown.
+        If any errors occur fetching the feed, a <classname>Zend_Feed_Exception</classname> will be
+        thrown.
     </para>
 
     <para>
-        Once you have a feed object, you can access any of the standard RSS "channel" properties directly
-        on the object:
+        Once you have a feed object, you can access any of the standard RSS "channel" properties
+        directly on the object:
     </para>
     <programlisting language="php"><![CDATA[
 echo $channel->title();
 ]]></programlisting>
     <para>
-        Note the function syntax. <classname>Zend_Feed</classname> uses a convention of treating properties as XML
-        object if they are requested with variable "getter" syntax (<code>$obj->property</code>) and as
-        strings if they are access with method syntax (<code>$obj->property()</code>). This enables access
-        to the full text of any individual node while still allowing full access to all children.
+        Note the function syntax. <classname>Zend_Feed</classname> uses a convention of treating
+        properties as XML object if they are requested with variable "getter" syntax
+        (<code>$obj->property</code>) and as strings if they are access with method syntax
+        (<code>$obj->property()</code>). This enables access to the full text of any individual node
+        while still allowing full access to all children.
     </para>
 
     <para>
@@ -34,14 +36,14 @@ echo $channel->title();
 echo $channel->category['domain'];
 ]]></programlisting>
     <para>
-        Since XML attributes cannot have children, method syntax is not necessary for accessing attribute
-        values.
+        Since XML attributes cannot have children, method syntax is not necessary for accessing
+        attribute values.
     </para>
 
     <para>
         Most commonly you'll want to loop through the feed and do something with its entries.
-        <classname>Zend_Feed_Abstract</classname> implements PHP's <code>Iterator</code> interface, so printing all
-        titles of articles in a channel is just a matter of:
+        <classname>Zend_Feed_Abstract</classname> implements PHP's <code>Iterator</code> interface,
+        so printing all titles of articles in a channel is just a matter of:
     </para>
     <programlisting language="php"><![CDATA[
 foreach ($channel as $item) {
@@ -49,8 +51,8 @@ foreach ($channel as $item) {
 }
 ]]></programlisting>
     <para>
-        If you are not familiar with RSS, here are the standard elements you can expect to be available in
-        an RSS channel and in individual RSS items (entries).
+        If you are not familiar with RSS, here are the standard elements you can expect to be
+        available in an RSS channel and in individual RSS items (entries).
     </para>
 
     <para>
@@ -63,7 +65,9 @@ foreach ($channel as $item) {
                 <para><code>title</code> - The name of the channel</para>
             </listitem>
             <listitem>
-                <para><code>link</code> - The URL of the web site corresponding to the channel</para>
+                <para>
+                    <code>link</code> - The URL of the web site corresponding to the channel
+                </para>
             </listitem>
             <listitem>
                 <para><code>description</code> - A sentence or several describing the channel</para>
@@ -78,22 +82,26 @@ foreach ($channel as $item) {
     <para>
         <itemizedlist>
             <listitem>
-                <para><code>pubDate</code> - The publication date of this set of content, in RFC 822 date
-                format</para>
+                <para>
+                    <code>pubDate</code> - The publication date of this set of content, in RFC 822
+                    date format
+                </para>
             </listitem>
             <listitem>
                 <para><code>language</code> - The language the channel is written in</para>
             </listitem>
             <listitem>
-                <para><code>category</code> - One or more (specified by multiple tags) categories the
-                channel belongs to</para>
+                <para>
+                    <code>category</code> - One or more (specified by multiple tags) categories the
+                    channel belongs to
+                </para>
             </listitem>
         </itemizedlist>
     </para>
 
     <para>
-        RSS <code>&lt;item&gt;</code> elements do not have any strictly required elements. However, either
-        <code>title</code> or <code>description</code> must be present.
+        RSS <code>&lt;item&gt;</code> elements do not have any strictly required elements. However,
+        either <code>title</code> or <code>description</code> must be present.
     </para>
 
     <para>
@@ -115,13 +123,17 @@ foreach ($channel as $item) {
                 <para><code>author</code> - The author's email address</para>
             </listitem>
             <listitem>
-                <para><code>category</code> - One more more categories that the item belongs to</para>
+                <para>
+                    <code>category</code> - One more more categories that the item belongs to
+                </para>
             </listitem>
             <listitem>
                 <para><code>comments</code> - URL of comments relating to this item</para>
             </listitem>
             <listitem>
-                <para><code>pubDate</code> - The date the item was published, in RFC 822 date format</para>
+                <para>
+                    <code>pubDate</code> - The date the item was published, in RFC 822 date format
+                </para>
             </listitem>
         </itemizedlist>
     </para>
@@ -136,13 +148,13 @@ if ($item->propname()) {
 ]]></programlisting>
 
     <para>
-        If you use <code>$item->propname</code> instead, you will always get an empty object which will
-        evaluate to <constant>TRUE</constant>, so your check will fail.
+        If you use <code>$item->propname</code> instead, you will always get an empty object which
+        will evaluate to <constant>TRUE</constant>, so your check will fail.
     </para>
 
     <para>
-        For further information, the official RSS 2.0 specification is available at:
-        <ulink url="http://blogs.law.harvard.edu/tech/rss">http://blogs.law.harvard.edu/tech/rss</ulink>
+        For further information, the official RSS 2.0 specification is available at: <ulink
+            url="http://blogs.law.harvard.edu/tech/rss">http://blogs.law.harvard.edu/tech/rss</ulink>
     </para>
 </sect1>
 <!--

documentation/manual/en/module_specs/Zend_Feed-CustomFeed.xml

@@ -4,14 +4,15 @@
     <title>Custom Feed and Entry Classes</title>
 
     <para>
-        Finally, you can extend the <classname>Zend_Feed</classname> classes if you'd like to provide your own format or
-        niceties like automatic handling of elements that should go into a custom namespace.
+        Finally, you can extend the <classname>Zend_Feed</classname> classes if you'd like to
+        provide your own format or niceties like automatic handling of elements that should go into
+        a custom namespace.
     </para>
 
     <para>
-        Here is an example of a custom Atom entry class that handles its own <code>myns:</code> namespace
-        entries. Note that it also makes the <code>registerNamespace()</code> call for you, so the end user
-        doesn't need to worry about namespaces at all.
+        Here is an example of a custom Atom entry class that handles its own <code>myns:</code>
+        namespace entries. Note that it also makes the <code>registerNamespace()</code> call for
+        you, so the end user doesn't need to worry about namespaces at all.
     </para>
 
     <example id="zend.feed.custom-feed.example.extending">
@@ -72,8 +73,8 @@ class MyEntry extends Zend_Feed_Entry_Atom
 }
 ]]></programlisting>
         <para>
-            Then to use this class, you'd just instantiate it directly and set the <code>myUpdated</code>
-            property:
+            Then to use this class, you'd just instantiate it directly and set the
+            <code>myUpdated</code> property:
         </para>
         <programlisting language="php"><![CDATA[
 $entry = new MyEntry();

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

@@ -3,19 +3,21 @@
 <sect1 id="zend.feed.findFeeds">
     <title>Retrieving Feeds from Web Pages</title>
     <para>
-        Web pages often contain <code>&lt;link&gt;</code> tags that refer to feeds with content relevant to
-        the particular page. <classname>Zend_Feed</classname> enables you to retrieve all feeds referenced by a web
-        page with one simple method call:
+        Web pages often contain <code>&lt;link&gt;</code> tags that refer to feeds with content
+        relevant to the particular page. <classname>Zend_Feed</classname> enables you to retrieve
+        all feeds referenced by a web page with one simple method call:
     </para>
     <programlisting language="php"><![CDATA[
 $feedArray = Zend_Feed::findFeeds('http://www.example.com/news.html');
 ]]></programlisting>
     <para>
-        Here the <code>findFeeds()</code> method returns an array of <classname>Zend_Feed_Abstract</classname>
-        objects that are referenced by <code>&lt;link&gt;</code> tags on the news.html web page. Depending on
-        the type of each feed, each respective entry in the <code>$feedArray</code> array may be a
-        <classname>Zend_Feed_Rss</classname> or <classname>Zend_Feed_Atom</classname> instance. <classname>Zend_Feed</classname> will throw a
-        <classname>Zend_Feed_Exception</classname> upon failure, such as an HTTP 404 response code or a malformed feed.
+        Here the <code>findFeeds()</code> method returns an array of
+        <classname>Zend_Feed_Abstract</classname> objects that are referenced by
+        <code>&lt;link&gt;</code> tags on the news.html web page. Depending on the type of each
+        feed, each respective entry in the <code>$feedArray</code> array may be a
+        <classname>Zend_Feed_Rss</classname> or <classname>Zend_Feed_Atom</classname> instance.
+        <classname>Zend_Feed</classname> will throw a <classname>Zend_Feed_Exception</classname>
+        upon failure, such as an HTTP 404 response code or a malformed feed.
     </para>
 </sect1>
 <!--

documentation/manual/en/module_specs/Zend_Feed-Importing.xml

@@ -5,8 +5,8 @@
     <title>Importing Feeds</title>
 
     <para>
-        <classname>Zend_Feed</classname> enables developers to retrieve feeds very easily. If you know the URI of a feed, simply
-        use the <classname>Zend_Feed::import()</classname> method:
+        <classname>Zend_Feed</classname> enables developers to retrieve feeds very easily. If you
+        know the URI of a feed, simply use the <classname>Zend_Feed::import()</classname> method:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -14,8 +14,8 @@ $feed = Zend_Feed::import('http://feeds.example.com/feedName');
 ]]></programlisting>
 
     <para>
-        You can also use <classname>Zend_Feed</classname> to fetch the contents of a feed from a file or the contents of a PHP
-        string variable:
+        You can also use <classname>Zend_Feed</classname> to fetch the contents of a feed from a
+        file or the contents of a PHP string variable:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -27,11 +27,13 @@ $feedFromPHP = Zend_Feed::importString($feedString);
 ]]></programlisting>
 
     <para>
-        In each of the examples above, an object of a class that extends <classname>Zend_Feed_Abstract</classname> is returned
-        upon success, depending on the type of the feed. If an RSS feed were retrieved via one of the import methods
-        above, then a <classname>Zend_Feed_Rss</classname> object would be returned. On the other hand, if an Atom feed were
-        imported, then a <classname>Zend_Feed_Atom</classname> object is returned. The import methods will also throw a
-        <classname>Zend_Feed_Exception</classname> object upon failure, such as an unreadable or malformed feed.
+        In each of the examples above, an object of a class that extends
+        <classname>Zend_Feed_Abstract</classname> is returned upon success, depending on the type of
+        the feed. If an RSS feed were retrieved via one of the import methods above, then a
+        <classname>Zend_Feed_Rss</classname> object would be returned. On the other hand, if an Atom
+        feed were imported, then a <classname>Zend_Feed_Atom</classname> object is returned. The
+        import methods will also throw a <classname>Zend_Feed_Exception</classname> object upon
+        failure, such as an unreadable or malformed feed.
     </para>
 
     <sect2 id="zend.feed.importing.custom">
@@ -39,10 +41,12 @@ $feedFromPHP = Zend_Feed::importString($feedString);
         <title>Custom feeds</title>
 
         <para>
-            <classname>Zend_Feed</classname> enables developers to create custom feeds very easily. You just have to create an
-            array and to import it with <classname>Zend_Feed</classname>. This array can be imported with <classname>Zend_Feed::importArray()</classname>
-            or with <classname>Zend_Feed::importBuilder()</classname>. In this last case the array will be computed on the fly by
-            a custom data source implementing <classname>Zend_Feed_Builder_Interface</classname>.
+            <classname>Zend_Feed</classname> enables developers to create custom feeds very easily.
+            You just have to create an array and to import it with <classname>Zend_Feed</classname>.
+            This array can be imported with <classname>Zend_Feed::importArray()</classname> or with
+            <classname>Zend_Feed::importBuilder()</classname>. In this last case the array will be
+            computed on the fly by a custom data source implementing
+            <classname>Zend_Feed_Builder_Interface</classname>.
         </para>
 
         <sect3 id="zend.feed.importing.custom.importarray">
@@ -253,25 +257,28 @@ array(
                 <itemizedlist>
                     <listitem>
                         <para>
-                            RSS 2.0 specification: <ulink url="http://blogs.law.harvard.edu/tech/rss">RSS 2.0</ulink>
+                            RSS 2.0 specification: <ulink
+                                url="http://blogs.law.harvard.edu/tech/rss">RSS 2.0</ulink>
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            Atom specification: <ulink url="http://tools.ietf.org/html/rfc4287">RFC 4287</ulink>
+                            Atom specification: <ulink
+                                url="http://tools.ietf.org/html/rfc4287">RFC 4287</ulink>
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            WFW specification: <ulink url="http://wellformedweb.org/news/wfw_namespace_elements">Well
-                            Formed Web</ulink>
+                            WFW specification: <ulink
+                                url="http://wellformedweb.org/news/wfw_namespace_elements">Well
+                                Formed Web</ulink>
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            iTunes specification:
-                            <ulink url="http://www.apple.com/itunes/store/podcaststechspecs.html">iTunes Technical
-                            Specifications</ulink>
+                            iTunes specification: <ulink
+                                url="http://www.apple.com/itunes/store/podcaststechspecs.html">iTunes
+                                Technical Specifications</ulink>
                         </para>
                     </listitem>
                 </itemizedlist>
@@ -285,19 +292,22 @@ array(
 
             <para>
                 You can create a Zeed_Feed instance from any data source implementing
-                <classname>Zend_Feed_Builder_Interface</classname>. You just have to implement the <code>getHeader()</code> and
-                <code>getEntries()</code> methods to be able to use your object with
-                <classname>Zend_Feed::importBuilder()</classname>. As a simple reference implementation, you can use
-                <classname>Zend_Feed_Builder</classname>, which takes an array in its constructor, performs some minor validation,
-                and then can be used in the <code>importBuilder()</code> method. The <code>getHeader()</code> method
-                must return an instance of <classname>Zend_Feed_Builder_Header</classname>, and <code>getEntries()</code> must
-                return an array of <classname>Zend_Feed_Builder_Entry</classname> instances.
+                <classname>Zend_Feed_Builder_Interface</classname>. You just have to implement the
+                <code>getHeader()</code> and <code>getEntries()</code> methods to be able to use
+                your object with <classname>Zend_Feed::importBuilder()</classname>. As a simple
+                reference implementation, you can use <classname>Zend_Feed_Builder</classname>,
+                which takes an array in its constructor, performs some minor validation, and then
+                can be used in the <code>importBuilder()</code> method. The <code>getHeader()</code>
+                method must return an instance of <classname>Zend_Feed_Builder_Header</classname>,
+                and <code>getEntries()</code> must return an array of
+                <classname>Zend_Feed_Builder_Entry</classname> instances.
             </para>
 
             <note>
                 <para>
-                    <classname>Zend_Feed_Builder</classname> serves as a concrete implementation to demonstrate the usage. Users
-                    are encouraged to make their own classes to implement <classname>Zend_Feed_Builder_Interface</classname>.
+                    <classname>Zend_Feed_Builder</classname> serves as a concrete implementation to
+                    demonstrate the usage. Users are encouraged to make their own classes to
+                    implement <classname>Zend_Feed_Builder_Interface</classname>.
                 </para>
             </note>
 
@@ -327,8 +337,8 @@ $rssFeedFromArray =
             <title>Dumping the contents of a feed</title>
 
             <para>
-                To dump the contents of a <classname>Zend_Feed_Abstract</classname> instance, you may use <code>send()</code> or
-                <code>saveXml()</code> methods.
+                To dump the contents of a <classname>Zend_Feed_Abstract</classname> instance, you
+                may use <code>send()</code> or <code>saveXml()</code> methods.
             </para>
 
             <programlisting language="php"><![CDATA[

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

@@ -4,9 +4,9 @@
     <title>Modifying Feed and Entry structures</title>
 
     <para>
-        <classname>Zend_Feed</classname>'s natural syntax extends to constructing and modifying feeds and entries as well
-        as reading them. You can easily turn your new or modified objects back into well-formed XML for saving
-        to a file or sending to a server.
+        <classname>Zend_Feed</classname>'s natural syntax extends to constructing and modifying
+        feeds and entries as well as reading them. You can easily turn your new or modified objects
+        back into well-formed XML for saving to a file or sending to a server.
     </para>
 
     <example id="zend.feed.modifying-feed.example.modifying">
@@ -21,22 +21,24 @@ $entry->author->email = 'my_email@example.com';
 echo $entry->saveXML();
 ]]></programlisting>
         <para>
-            This will output a full (includes <code>&lt;?xml ... &gt;</code> prologue) XML representation of the
-            new entry, including any necessary XML namespaces.
+            This will output a full (includes <code>&lt;?xml ... &gt;</code> prologue) XML
+            representation of the new entry, including any necessary XML namespaces.
         </para>
         <para>
-            Note that the above will work even if the existing entry does not already have an author tag. You can
-            use as many levels of <code>-&gt;</code> access as you like before getting to an assignment; all of the
-            intervening levels will be created for you automatically if necessary.
+            Note that the above will work even if the existing entry does not already have an author
+            tag. You can use as many levels of <code>-&gt;</code> access as you like before getting
+            to an assignment; all of the intervening levels will be created for you automatically if
+            necessary.
         </para>
     </example>
 
     <para>
-        If you want to use a namespace other than <code>atom:</code>, <code>rss:</code>, or <code>osrss:</code>
-        in your entry, you need to register the namespace with <classname>Zend_Feed</classname> using
-        <classname>Zend_Feed::registerNamespace()</classname>. When you are modifying an existing element, it will always
-        maintain its original namespace. When adding a new element, it will go into the default namespace if
-        you do not explicitly specify another namespace.
+        If you want to use a namespace other than <code>atom:</code>, <code>rss:</code>, or
+        <code>osrss:</code> in your entry, you need to register the namespace with
+        <classname>Zend_Feed</classname> using
+        <classname>Zend_Feed::registerNamespace()</classname>. When you are modifying an existing
+        element, it will always maintain its original namespace. When adding a new element, it will
+        go into the default namespace if you do not explicitly specify another namespace.
     </para>
 
     <example id="zend.feed.modifying-feed.example.creating">

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

@@ -5,13 +5,14 @@
     <title>Filters for Zend_File_Transfer</title>
 
     <para>
-        <classname>Zend_File_Transfer</classname> is delivered with several file related filters which can be
-        used to automate several tasks which are often done on files. Note that file filters are
-        applied after validation. Also file filters behave slightly different that other filters.
-        They will always return the file name and not the changed content (which would be a bad idea
-        when working on 1GB files). All filters which are provided with <classname>Zend_File_Transfer</classname> can
-        be found in the <classname>Zend_Filter</classname> component and are named <classname>Zend_Filter_File_*</classname>.
-        The following filters are actually available:
+        <classname>Zend_File_Transfer</classname> is delivered with several file related filters
+        which can be used to automate several tasks which are often done on files. Note that file
+        filters are applied after validation. Also file filters behave slightly different that other
+        filters. They will always return the file name and not the changed content (which would be a
+        bad idea when working on 1GB files). All filters which are provided with
+        <classname>Zend_File_Transfer</classname> can be found in the
+        <classname>Zend_Filter</classname> component and are named
+        <classname>Zend_Filter_File_*</classname>. The following filters are actually available:
     </para>
 
     <itemizedlist>
@@ -32,8 +33,8 @@
         </listitem>
         <listitem>
             <para>
-                <code>Rename</code>: This filter can rename files, change the location and even force
-                overwriting of existing files.
+                <code>Rename</code>: This filter can rename files, change the location and even
+                force overwriting of existing files.
             </para>
         </listitem>
         <listitem>
@@ -47,7 +48,8 @@
         <title>Using filters with Zend_File_Transfer</title>
 
         <para>
-            The usage of filters is quite simple. There are several methods for adding and manipulating filters.
+            The usage of filters is quite simple. There are several methods for adding and
+            manipulating filters.
         </para>
 
         <itemizedlist>
@@ -156,17 +158,18 @@ $upload->addFilter('Rename', 'C:\picture\uploads', 'file2');
         </example>
 
         <para>
-            Generally you should simply use the <code>addFilters()</code> method, which can be called
-            multiple times.
+            Generally you should simply use the <code>addFilters()</code> method, which can be
+            called multiple times.
         </para>
 
         <example id="zend.file.transfer.filters.usage.examplemultiple">
             <title>Add multiple filters</title>
 
             <para>
-                Often it's simpler just to call <code>addFilter()</code> multiple times. One call for each
-                filter. This also increases the readability and makes your code more maintainable. As all
-                methods provide a fluent interface you can couple the calls as shown below:
+                Often it's simpler just to call <code>addFilter()</code> multiple times. One call
+                for each filter. This also increases the readability and makes your code more
+                maintainable. As all methods provide a fluent interface you can couple the calls as
+                shown below:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -197,15 +200,17 @@ $upload->addFilter('Rename', 'C:\picture\newjpg', 'file1')
         </para>
 
         <para>
-            This filter makes use of <classname>Zend_Filter_Decrypt</classname>. It supports the <code>Mcrypt</code>
-            and <code>OpenSSL</code> extensions from PHP. Please read the related section for
-            details about how to set the options for decryption and which options are supported.
+            This filter makes use of <classname>Zend_Filter_Decrypt</classname>. It supports the
+            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from PHP. Please read the
+            related section for details about how to set the options for decryption and which
+            options are supported.
         </para>
 
         <para>
-            This filter supports one additional option which can be used to save the decrypted file with another
-            filename. Set the <code>filename</code> option to change the filename where the decrypted file will
-            be stored. If you suppress this option, the decrypted file will overwrite the original encrypted file.
+            This filter supports one additional option which can be used to save the decrypted file
+            with another filename. Set the <code>filename</code> option to change the filename where
+            the decrypted file will be stored. If you suppress this option, the decrypted file will
+            overwrite the original encrypted file.
         </para>
 
         <example id="zend.file.transfer.filters.decrypt.example1">
@@ -247,15 +252,17 @@ $upload->addFilter('Decrypt',
         </para>
 
         <para>
-            This filter makes use of <classname>Zend_Filter_Encrypt</classname>. It supports the <code>Mcrypt</code>
-            and <code>OpenSSL</code> extensions from PHP. Please read the related section for
-            details about how to set the options for encryption and which options are supported.
+            This filter makes use of <classname>Zend_Filter_Encrypt</classname>. It supports the
+            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from PHP. Please read the
+            related section for details about how to set the options for encryption and which
+            options are supported.
         </para>
 
         <para>
-            This filter supports one additional option which can be used to save the encrypted file with another
-            filename. Set the <code>filename</code> option to change the filename where the encrypted file will
-            be stored. If you suppress this option, the encrypted file will overwrite the original file.
+            This filter supports one additional option which can be used to save the encrypted file
+            with another filename. Set the <code>filename</code> option to change the filename where
+            the encrypted file will be stored. If you suppress this option, the encrypted file will
+            overwrite the original file.
         </para>
 
         <example id="zend.file.transfer.filters.encrypt.example1">
@@ -297,8 +304,8 @@ $upload->addFilter('Encrypt',
         </para>
 
         <para>
-            At initiation you can give a string which will then be used as encoding. Or you can use the
-            <code>setEncoding()</code> method to set it afterwards.
+            At initiation you can give a string which will then be used as encoding. Or you can use
+            the <code>setEncoding()</code> method to set it afterwards.
         </para>
 
         <example id="zend.file.transfer.filters.lowercase.example">
@@ -322,8 +329,9 @@ $upload->addFilter('LowerCase', 'ISO-8859-1');
 
         <note>
             <para>
-                Note that due to the fact that the options for the LowerCase filter are optional, you must give
-                a null as second parameter (the options) when you want to limit it to a single file element.
+                Note that due to the fact that the options for the LowerCase filter are optional,
+                you must give a null as second parameter (the options) when you want to limit it to
+                a single file element.
             </para>
         </note>
 
@@ -333,14 +341,15 @@ $upload->addFilter('LowerCase', 'ISO-8859-1');
         <title>Rename filter</title>
 
         <para>
-            The <code>Rename</code> filter allows to change the destination of the upload, the filename
-            and also to overwrite existing files. It supports the following options:
+            The <code>Rename</code> filter allows to change the destination of the upload, the
+            filename and also to overwrite existing files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>source</code>: The name and destination of the old file which shall be renamed.
+                    <code>source</code>: The name and destination of the old file which shall be
+                    renamed.
                 </para>
             </listitem>
 
@@ -352,17 +361,18 @@ $upload->addFilter('LowerCase', 'ISO-8859-1');
 
             <listitem>
                 <para>
-                    <code>overwrite</code>: Sets if the old file overwrites the new one if it already exists.
-                    The default value is false.
+                    <code>overwrite</code>: Sets if the old file overwrites the new one if it
+                    already exists. The default value is false.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            Additionally you can also use the method <code>setFile()</code> to set files, which erases
-            all previous set, <code>addFile()</code> to add a new file to existing ones, and
-            <code>getFile()</code> to get all actually set files. To simplify things, this filter understands
-            several notations and that methods and constructor understand the same notations.
+            Additionally you can also use the method <code>setFile()</code> to set files, which
+            erases all previous set, <code>addFile()</code> to add a new file to existing ones, and
+            <code>getFile()</code> to get all actually set files. To simplify things, this filter
+            understands several notations and that methods and constructor understand the same
+            notations.
         </para>
 
         <example id="zend.file.transfer.filters.rename.example">
@@ -381,9 +391,9 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
         </example>
 
         <para>
-            You can use different notations. Below is a table where you will find a description and the
-            intention for the supported notations. Note that when you use the Adapter or the Form Element
-            you will not be able to use all described notations.
+            You can use different notations. Below is a table where you will find a description and
+            the intention for the supported notations. Note that when you use the Adapter or the
+            Form Element you will not be able to use all described notations.
         </para>
 
         <table id="zend.file.transfer.filters.rename.notations">
@@ -407,9 +417,9 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
                             addFile('C:\uploads')
                         </entry>
                         <entry>
-                            Specifies a new location for all files when the given string is a directory.
-                            Note that you will get an exception when the file already exists, see the
-                            overwriting parameter.
+                            Specifies a new location for all files when the given string is a
+                            directory. Note that you will get an exception when the file already
+                            exists, see the overwriting parameter.
                         </entry>
                     </row>
                     <row>
@@ -417,9 +427,9 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
                             addFile('C:\uploads\file.ext')
                         </entry>
                         <entry>
-                            Specifies a new location and filename for all files when the given string is
-                            not detected as directory. Note that you will get an exception when the file
-                            already exists, see the overwriting parameter.
+                            Specifies a new location and filename for all files when the given
+                            string is not detected as directory. Note that you will get an exception
+                            when the file already exists, see the overwriting parameter.
                         </entry>
                     </row>
                     <row>
@@ -427,9 +437,10 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
                             addFile(array('C:\uploads\file.ext', 'overwrite' => true))
                         </entry>
                         <entry>
-                            Specifies a new location and filename for all files when the given string is
-                            not detected as directory and overwrites an existing file with the same target name.
-                            Note, that you will get no notification that a file was overwritten.
+                            Specifies a new location and filename for all files when the given
+                            string is not detected as directory and overwrites an existing file with
+                            the same target name. Note, that you will get no notification that a
+                            file was overwritten.
                         </entry>
                     </row>
                     <row>
@@ -437,19 +448,21 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
                             addFile(array('source' => 'C:\temp\uploads', 'target' => 'C:\uploads'))
                         </entry>
                         <entry>
-                            Specifies a new location for all files in the old location when the given strings are
-                            detected as directory. Note that you will get an exception when the file
-                            already exists, see the overwriting parameter.
+                            Specifies a new location for all files in the old location when the
+                            given strings are detected as directory. Note that you will get an
+                            exception when the file already exists, see the overwriting parameter.
                         </entry>
                     </row>
                     <row>
                         <entry>
-                            addFile(array('source' => 'C:\temp\uploads', 'target' => 'C:\uploads', 'overwrite' => true))
+                            addFile(array('source' => 'C:\temp\uploads', 'target' => 'C:\uploads',
+                            'overwrite' => true))
                         </entry>
                         <entry>
-                            Specifies a new location for all files in the old location when the given strings are
-                            detected as directory and overwrites and existing file with the same target name.
-                            Note, that you will get no notification that a file was overwritten.
+                            Specifies a new location for all files in the old location when the
+                            given strings are detected as directory and overwrites and existing file
+                            with the same target name. Note, that you will get no notification that
+                            a file was overwritten.
                         </entry>
                     </row>
                 </tbody>
@@ -468,8 +481,8 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
         </para>
 
         <para>
-            At initiation you can give a string which will then be used as encoding. Or you can use the
-            <code>setEncoding()</code> method to set it afterwards.
+            At initiation you can give a string which will then be used as encoding. Or you can use
+            the <code>setEncoding()</code> method to set it afterwards.
         </para>
 
         <example id="zend.file.transfer.filters.uppercase.example">
@@ -493,8 +506,9 @@ $upload->addFilter('UpperCase', 'ISO-8859-1');
 
         <note>
             <para>
-                Note that due to the fact that the options for the UpperCase filter are optional, you must give
-                a null as second parameter (the options) when you want to limit it to a single file element.
+                Note that due to the fact that the options for the UpperCase filter are optional,
+                you must give a null as second parameter (the options) when you want to limit it to
+                a single file element.
             </para>
         </note>
 

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

@@ -5,19 +5,19 @@
     <title>Zend_File_Transfer</title>
 
     <para>
-        <classname>Zend_File_Transfer</classname> provides extensive support for file uploads and downloads.
-        It comes with built-in validators for files plus functionality to
-        change files with filters. Protocol adapters allow <classname>Zend_File_Transfer</classname> to expose the
-        same API for transport protocols like HTTP, FTP, WEBDAV and more.
+        <classname>Zend_File_Transfer</classname> provides extensive support for file uploads and
+        downloads. It comes with built-in validators for files plus functionality to change files
+        with filters. Protocol adapters allow <classname>Zend_File_Transfer</classname> to expose
+        the same API for transport protocols like HTTP, FTP, WEBDAV and more.
     </para>
 
     <note>
         <title>Limitation</title>
         <para>
-            The current implementation of <classname>Zend_File_Transfer</classname> is limited to HTTP Post Uploads.
-            Other adapters supporting downloads and other protocols will be added in future releases. Unimplemented methods
-            will throw an exception. For now, you should use
-            <classname>Zend_File_Transfer_Adapter_Http</classname> directly. As soon as
+            The current implementation of <classname>Zend_File_Transfer</classname> is limited to
+            HTTP Post Uploads. Other adapters supporting downloads and other protocols will be added
+            in future releases. Unimplemented methods will throw an exception. For now, you should
+            use <classname>Zend_File_Transfer_Adapter_Http</classname> directly. As soon as
             there are multiple adapters available you can use a common interface.
         </para>
     </note>
@@ -25,16 +25,19 @@
     <note>
         <title>Forms</title>
         <para>
-            When you are using <classname>Zend_Form</classname> you should use the APIs provided by <classname>Zend_Form</classname> and not <classname>Zend_File_Transfer</classname> directly.
-            The file transfer support in <classname>Zend_Form</classname> is implemented with <classname>Zend_File_Transfer</classname>, so
-            the information in this chapter may be useful for advanced users of <classname>Zend_Form</classname>.
+            When you are using <classname>Zend_Form</classname> you should use the APIs provided by
+            <classname>Zend_Form</classname> and not <classname>Zend_File_Transfer</classname>
+            directly. The file transfer support in <classname>Zend_Form</classname> is implemented
+            with <classname>Zend_File_Transfer</classname>, so the information in this chapter may
+            be useful for advanced users of <classname>Zend_Form</classname>.
         </para>
     </note>
 
     <para>
-        The usage of <classname>Zend_File_Transfer</classname> is relatively simple. It consists of two parts. The HTTP form
-        does the upload, while the <classname>Zend_File_Transfer</classname> handles the uploaded files.
-        See the following example:
+        The usage of <classname>Zend_File_Transfer</classname> is relatively simple. It consists of
+        two parts. The HTTP form does the upload, while the
+        <classname>Zend_File_Transfer</classname> handles the uploaded files. See the following
+        example:
     </para>
 
     <example id="zend.file.transfer.introduction.example">
@@ -52,13 +55,14 @@
 </form>
 ]]></programlisting>
         <para>
-           For convenience, you can use <link linkend="zend.form.standardElements.file">Zend_Form_Element_File</link> instead of building
-           the HTML manually.
+           For convenience, you can use <link
+               linkend="zend.form.standardElements.file">Zend_Form_Element_File</link> instead of
+           building the HTML manually.
         </para>
         <para>
-            The next step is to create the receiver of the upload. In our example the receiver is located at
-            <code>/file/upload</code>. So next we will create the <code>file</code> controller
-            and the <code>upload</code> action.
+            The next step is to create the receiver of the upload. In our example the receiver is
+            located at <code>/file/upload</code>. So next we will create the <code>file</code>
+            controller and the <code>upload</code> action.
         </para>
         <programlisting language="php"><![CDATA[
 $adapter = new Zend_File_Transfer_Adapter_Http();
@@ -71,8 +75,10 @@ if (!$adapter->receive()) {
 }
 ]]></programlisting>
         <para>
-            This code listing demonstrates the simplest usage of <classname>Zend_File_Transfer</classname>. A local destination is set with the <code>setDestination</code>
-            method, then the <code>receive()</code> method is called. If there are any upload errors, an error will be returned.
+            This code listing demonstrates the simplest usage of
+            <classname>Zend_File_Transfer</classname>. A local destination is set with the
+            <code>setDestination</code> method, then the <code>receive()</code> method is called. If
+            there are any upload errors, an error will be returned.
         </para>
 
     </example>
@@ -80,9 +86,10 @@ if (!$adapter->receive()) {
     <note>
         <title>Attention</title>
         <para>
-            This example is suitable only for demonstrating the basic API of <classname>Zend_File_Transfer</classname>. You should
-            <emphasis>never</emphasis> use this code listing in a production environment, because
-            severe security issues may be introduced. You should always use validators to increase security.
+            This example is suitable only for demonstrating the basic API of
+            <classname>Zend_File_Transfer</classname>. You should <emphasis>never</emphasis> use
+            this code listing in a production environment, because severe security issues may be
+            introduced. You should always use validators to increase security.
         </para>
     </note>
 
@@ -91,9 +98,10 @@ if (!$adapter->receive()) {
         <title>Supported Adapters for Zend_File_Transfer</title>
 
         <para>
-            <classname>Zend_File_Transfer</classname> is designed to support a variety of adapters and transfer directions.
-            With <classname>Zend_File_Transfer</classname> you can upload, download and even forward (upload one adapter and
-            download with another adapter at the same time) files.
+            <classname>Zend_File_Transfer</classname> is designed to support a variety of adapters
+            and transfer directions. With <classname>Zend_File_Transfer</classname> you can upload,
+            download and even forward (upload one adapter and download with another adapter at the
+            same time) files.
         </para>
     </sect2>
 
@@ -102,17 +110,18 @@ if (!$adapter->receive()) {
         <title>Options for Zend_File_Transfer</title>
 
         <para>
-            <classname>Zend_File_Transfer</classname> and its adapters support different options. You can set all
-            options either by passing them to the constructor or by calling <code>setOptions($options)</code>.
-            <code>getOptions()</code> will return the options that are currently set. The following is a
-            list of all supported options.
+            <classname>Zend_File_Transfer</classname> and its adapters support different options.
+            You can set all options either by passing them to the constructor or by calling
+            <code>setOptions($options)</code>. <code>getOptions()</code> will return the options
+            that are currently set. The following is a list of all supported options.
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>ignoreNoFile</emphasis>: If this option is set to true,
-                    all validators will ignore files that have not been uploaded by the form. The default value is false which results in an error if no files were specified.
+                    <emphasis>ignoreNoFile</emphasis>: If this option is set to true, all
+                    validators will ignore files that have not been uploaded by the form. The
+                    default value is false which results in an error if no files were specified.
                 </para>
             </listitem>
         </itemizedlist>
@@ -123,8 +132,9 @@ if (!$adapter->receive()) {
         <title>Checking Files</title>
 
         <para>
-            <classname>Zend_File_Transfer</classname> has several methods that check for various states of the specified file. These
-            are useful if you must process files after they have been uploaded. These methods include:
+            <classname>Zend_File_Transfer</classname> has several methods that check for various
+            states of the specified file. These are useful if you must process files after they have
+            been uploaded. These methods include:
         </para>
 
         <itemizedlist>
@@ -132,24 +142,27 @@ if (!$adapter->receive()) {
                 <para>
                     <emphasis>isValid($files = null)</emphasis>: This method will check if the
                     given files are valid, based on the validators that are attached to the files.
-                    If no files are specified, all files will be checked. You can call <code>isValid()</code>
-                    before calling <code>receive()</code>; in this case, <code>receive()</code> will not call
-                    <code>isValid</code> internally again when receiving the file.
+                    If no files are specified, all files will be checked. You can call
+                    <code>isValid()</code> before calling <code>receive()</code>; in this case,
+                    <code>receive()</code> will not call <code>isValid</code> internally again when
+                    receiving the file.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
                     <emphasis>isUploaded($files = null)</emphasis>: This method will check if the
-                    specified files have been uploaded by the user. This is useful when you have defined
-                    one or more optional files. When no files are specified, all files will be checked.
+                    specified files have been uploaded by the user. This is useful when you have
+                    defined one or more optional files. When no files are specified, all files will
+                    be checked.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
                     <emphasis>isReceived($files = null)</emphasis>: This method will check if the
-                    given files have already been received. When no files are specified, all files will be checked.
+                    given files have already been received. When no files are specified, all files
+                    will be checked.
                 </para>
             </listitem>
         </itemizedlist>
@@ -230,15 +243,16 @@ $upload->receive();
         </itemizedlist>
 
         <para>
-            <code>getFileName()</code> accepts the name of the element as first parameter. If no name is given,
-            all known filenames will be returned in an array. If the file is a multifile, you will also get
-            an array. If there is only a single file a string will be returned.
+            <code>getFileName()</code> accepts the name of the element as first parameter. If no
+            name is given, all known filenames will be returned in an array. If the file is a
+            multifile, you will also get an array. If there is only a single file a string will be
+            returned.
         </para>
 
         <para>
-            By default file names will be returned with the complete path. If you only need the file name
-            without path, you can set the second parameter, <code>$path</code>, which will truncate the
-            file path when set to false.
+            By default file names will be returned with the complete path. If you only need the file
+            name without path, you can set the second parameter, <code>$path</code>, which will
+            truncate the file path when set to false.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.example1">
@@ -259,16 +273,16 @@ $names = $upload->getFileName('foo');
 
         <note>
             <para>
-                Note that the file name can change after you receive the file, because
-                all filters will be applied once the file is received. So you should always call <code>getFileName()</code>
-                after the files have been received.
+                Note that the file name can change after you receive the file, because all filters
+                will be applied once the file is received. So you should always call
+                <code>getFileName()</code> after the files have been received.
             </para>
         </note>
 
         <para>
-            <code>getFileSize()</code> returns per default the real filesize in SI notation which means you will
-            get <code>2kB</code> instead of <code>2048</code>. If you need only the plain size set the
-            <code>useByteString</code> option to false.
+            <code>getFileSize()</code> returns per default the real filesize in SI notation which
+            means you will get <code>2kB</code> instead of <code>2048</code>. If you need only the
+            plain size set the <code>useByteString</code> option to false.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.example.getfilesize">
@@ -289,10 +303,10 @@ $size = $upload->getFileSize();
         </example>
 
         <para>
-            <code>getHash()</code> accepts the name of a hash algorithm as first parameter. For a list of
-            known algorithms refer to
-            <ulink url="http://php.net/hash_algos">PHP's hash_algos method</ulink>. If you don't specify an algorithm,
-            the <code>crc32</code> algorithm will be used by default.
+            <code>getHash()</code> accepts the name of a hash algorithm as first parameter. For a
+            list of known algorithms refer to
+            <ulink url="http://php.net/hash_algos">PHP's hash_algos method</ulink>. If you don't
+            specify an algorithm, the <code>crc32</code> algorithm will be used by default.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.example2">
@@ -319,8 +333,8 @@ $names = $upload->getHash('crc32', 'foo');
         </note>
 
         <para>
-            <code>getMimeType()</code> returns the mimetype of a file. If more than one file was uploaded
-            it returns an array, otherwise a string.
+            <code>getMimeType()</code> returns the mimetype of a file. If more than one file was
+            uploaded it returns an array, otherwise a string.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.getmimetype">
@@ -340,9 +354,9 @@ $names = $upload->getMimeType('foo');
 
         <note>
             <para>
-                Note that this method uses the fileinfo extension if it is available. If this extension can
-                not be found, it uses the mimemagic extension. When no extension was found it uses the
-                mimetype given by the fileserver when the file was uploaded.
+                Note that this method uses the fileinfo extension if it is available. If this
+                extension can not be found, it uses the mimemagic extension. When no extension was
+                found it uses the mimetype given by the fileserver when the file was uploaded.
             </para>
         </note>
     </sect2>
@@ -352,27 +366,28 @@ $names = $upload->getMimeType('foo');
         <title>Progress for file uploads</title>
 
         <para>
-            <classname>Zend_File_Transfer</classname> can give you the actual state of a fileupload in progress. To use
-            this feature you need either the <code>APC</code> extension which is provided with most default
-            PHP installations, or the <code>uploadprogress</code> extension. Both extensions are detected
-            and used automatically. To be able to get the progress you need to meet some prerequisites.
+            <classname>Zend_File_Transfer</classname> can give you the actual state of a fileupload
+            in progress. To use this feature you need either the <code>APC</code> extension which is
+            provided with most default PHP installations, or the <code>uploadprogress</code>
+            extension. Both extensions are detected and used automatically. To be able to get the
+            progress you need to meet some prerequisites.
         </para>
 
         <para>
-            First, you need to have either <code>APC</code> or <code>uploadprogress</code> to be enabled.
-            Note that you can disable this feature of <code>APC</code> within your php.ini.
+            First, you need to have either <code>APC</code> or <code>uploadprogress</code> to be
+            enabled. Note that you can disable this feature of <code>APC</code> within your php.ini.
         </para>
 
         <para>
-            Second, you need to have the proper hidden fields added in the form which sends the files. When you
-            use <classname>Zend_Form_Element_File</classname> this hidden fields are automatically added by
-            <classname>Zend_Form</classname>.
+            Second, you need to have the proper hidden fields added in the form which sends the
+            files. When you use <classname>Zend_Form_Element_File</classname> this hidden fields are
+            automatically added by <classname>Zend_Form</classname>.
         </para>
 
         <para>
-            When the above two points are provided then you are able to get the actual progress of the
-            file upload by using the <code>getProgress</code> method. Actually there are 2 official ways to
-            handle this.
+            When the above two points are provided then you are able to get the actual progress of
+            the file upload by using the <code>getProgress</code> method. Actually there are 2
+            official ways to handle this.
         </para>
 
         <sect3 id="zend.file.transfer.introduction.uploadprogress.progressadapter">
@@ -380,15 +395,16 @@ $names = $upload->getMimeType('foo');
             <title>Using a progressbar adapter</title>
 
             <para>
-                You can use the convinient <emphasis>Zend_ProgressBar</emphasis> to get the actual progress
-                and can display it in a simple manner to your user.
+                You can use the convinient <emphasis>Zend_ProgressBar</emphasis> to get the actual
+                progress and can display it in a simple manner to your user.
             </para>
 
             <para>
-                To archive this, you have to add the wished <emphasis>Zend_ProgressBar_Adapter</emphasis> to
-                <code>getProgress()</code> when you are calling it the first time. For details about the right
-                adapter to use, look into the chapter
-                <link linkend="zend.progressbar.adapters">Zend_ProgressBar Standard Adapters</link>.
+                To archive this, you have to add the wished
+                <emphasis>Zend_ProgressBar_Adapter</emphasis> to <code>getProgress()</code> when you
+                are calling it the first time. For details about the right adapter to use, look into
+                the chapter <link linkend="zend.progressbar.adapters">Zend_ProgressBar Standard
+                    Adapters</link>.
             </para>
 
             <example id="zend.file.transfer.introduction.uploadprogress.progressadapter.example1">
@@ -408,7 +424,8 @@ while (!$upload['done']) {
             </example>
 
             <para>
-                The complete handling is done by <code>getProgress()</code> for you in the background.
+                The complete handling is done by <code>getProgress()</code> for you in the
+                background.
             </para>
 
         </sect3>
@@ -423,24 +440,24 @@ while (!$upload['done']) {
             </para>
 
             <para>
-                Call <code>getProgress()</code> without settings. It will return you an array with several keys.
-                They differ according to the used PHP extension. But the following keys are given independently
-                of the extension:
+                Call <code>getProgress()</code> without settings. It will return you an array with
+                several keys. They differ according to the used PHP extension. But the following
+                keys are given independently of the extension:
             </para>
 
             <itemizedlist>
                 <listitem>
                     <para>
                         <emphasis>id</emphasis>: The ID of this upload. This ID identifies the
-                        upload within the extension. It is filled automatically. You should never change or
-                        give this value yourself.
+                        upload within the extension. It is filled automatically. You should never
+                        change or give this value yourself.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
-                        <emphasis>total</emphasis>: The total filesize of the uploaded files in bytes
-                        as integer.
+                        <emphasis>total</emphasis>: The total filesize of the uploaded files in
+                        bytes as integer.
                     </para>
                 </listitem>
 
@@ -460,8 +477,8 @@ while (!$upload['done']) {
 
                 <listitem>
                     <para>
-                        <emphasis>done</emphasis>: Returns true when the upload is finished and false
-                        otherwise.
+                        <emphasis>done</emphasis>: Returns true when the upload is finished and
+                        false otherwise.
                     </para>
                 </listitem>
 
@@ -469,31 +486,33 @@ while (!$upload['done']) {
                     <para>
                         <emphasis>message</emphasis>: The actual message. Eighter the progress as
                         text in the form <emphasis>10kB / 200kB</emphasis>, or a helpful message
-                        in the case of a problem. Problems could be, that there is no upload in progress, that
-                        there was a failure while retrieving the data for the progress, or that the upload has
-                        been canceled.
+                        in the case of a problem. Problems could be, that there is no upload in
+                        progress, that there was a failure while retrieving the data for the
+                        progress, or that the upload has been canceled.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
                         <emphasis>progress</emphasis>: This optional key takes a instance of
-                        Zend_ProgressBar_Adapter or Zend_ProgressBar and allows to get the actual upload state
-                        within a progressbar.
+                        Zend_ProgressBar_Adapter or Zend_ProgressBar and allows to get the actual
+                        upload state within a progressbar.
                     </para>
                 </listitem>
 
                 <listitem>
                     <para>
                         <emphasis>session</emphasis>: This optional key takes the name of a session
-                        namespace which will be used within Zend_ProgressBar. When this key is not given it
-                        defaults to <classname>Zend_File_Transfer_Adapter_Http_ProgressBar</classname>.
+                        namespace which will be used within Zend_ProgressBar. When this key is not
+                        given it defaults to
+                        <classname>Zend_File_Transfer_Adapter_Http_ProgressBar</classname>.
                     </para>
                 </listitem>
             </itemizedlist>
 
             <para>
-                All other returned keys are provided directly from the extensions and will not be checked.
+                All other returned keys are provided directly from the extensions and will not be
+                checked.
             </para>
 
             <para>

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

@@ -39,12 +39,13 @@
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Filter_File_Rename($oldfile, $newfile, $overwrite)</classname>
+                        Old method API: <classname>Zend_Filter_File_Rename($oldfile, $newfile,
+                            $overwrite)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Filter_File_Rename($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API: <classname>Zend_Filter_File_Rename($options)</classname>
+                        where $options accepts the following array keys:
                         <emphasis>source</emphasis> equals to $oldfile,
                         <emphasis>target</emphasis> equals to $newfile,
                         <emphasis>overwrite</emphasis> equals to $overwrite
@@ -79,8 +80,8 @@ $upload->addFilter('Rename',
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Count($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API: <classname>Zend_Validate_File_Count($options)</classname>
+                        where $options accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,
                     </para></listitem>
@@ -110,12 +111,14 @@ $upload->addValidator('Count',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Extension($extension, $case)</classname>
+                        Old method API: <classname>Zend_Validate_File_Extension($extension,
+                            $case)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Extension($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API:
+                        <classname>Zend_Validate_File_Extension($options)</classname> where $options
+                        accepts the following array keys:
                         <emphasis>*</emphasis> equals to $extension and can have any other key,
                         <emphasis>case</emphasis> equals to $case,
                     </para></listitem>
@@ -145,12 +148,14 @@ $upload->addValidator('Extension',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_FilesSize($min, $max, $bytestring)</classname>
+                        Old method API: <classname>Zend_Validate_File_FilesSize($min, $max,
+                            $bytestring)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_FilesSize($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API:
+                        <classname>Zend_Validate_File_FilesSize($options)</classname> where $options
+                        accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,
                         <emphasis>bytestring</emphasis> equals to $bytestring
@@ -196,12 +201,13 @@ $upload->setUseByteSting(true); // set flag
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Hash($hash, $algorithm)</classname>
+                        Old method API: <classname>Zend_Validate_File_Hash($hash,
+                            $algorithm)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Hash($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API: <classname>Zend_Validate_File_Hash($options)</classname>
+                        where $options accepts the following array keys:
                         <emphasis>*</emphasis> equals to $hash and can have any other key,
                         <emphasis>algorithm</emphasis> equals to $algorithm,
                     </para></listitem>
@@ -231,14 +237,15 @@ $upload->addValidator('Hash',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_ImageSize($minwidth, $minheight, $maxwidth, $maxheight)</classname>
+                        Old method API: <classname>Zend_Validate_File_ImageSize($minwidth,
+                            $minheight, $maxwidth, $maxheight)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_FilesSize($options)</classname> where $options accepts
-                        the following array keys:
-                        <emphasis>minwidth</emphasis> equals to $minwidth,
-                        <emphasis>maxwidth</emphasis> equals to $maxwidth,
+                        New method API:
+                        <classname>Zend_Validate_File_FilesSize($options)</classname> where $options
+                        accepts the following array keys: <emphasis>minwidth</emphasis> equals to
+                        $minwidth, <emphasis>maxwidth</emphasis> equals to $maxwidth,
                         <emphasis>minheight</emphasis> equals to $minheight,
                         <emphasis>maxheight</emphasis> equals to $maxheight,
                     </para></listitem>
@@ -270,12 +277,13 @@ $upload->addValidator('ImageSize',
 
                 <itemizedlist>
                     <listitem><para>
-                        Old method API: <classname>Zend_Validate_File_Size($min, $max, $bytestring)</classname>
+                        Old method API: <classname>Zend_Validate_File_Size($min, $max,
+                            $bytestring)</classname>
                     </para></listitem>
 
                     <listitem><para>
-                        New method API: <classname>Zend_Validate_File_Size($options)</classname> where $options accepts
-                        the following array keys:
+                        New method API: <classname>Zend_Validate_File_Size($options)</classname>
+                        where $options accepts the following array keys:
                         <emphasis>min</emphasis> equals to $min,
                         <emphasis>max</emphasis> equals to $max,
                         <emphasis>bytestring</emphasis> equals to $bytestring
@@ -311,10 +319,10 @@ $upload->addValidator('Size',
 
             <para>
                 As noted by users, the validators from <classname>Zend_File_Transfer</classname>
-                do not work the same way like the default ones from <classname>Zend_Form</classname>.
-                <classname>Zend_Form</classname> allows the usage of a <code>breakChainOnFailure</code>
-                parameter which breaks the validation for all further validators when an
-                validation error has occurred.
+                do not work the same way like the default ones from
+                <classname>Zend_Form</classname>. <classname>Zend_Form</classname> allows the usage
+                of a <code>breakChainOnFailure</code> parameter which breaks the validation for all
+                further validators when an validation error has occurred.
             </para>
 
             <para>
@@ -328,7 +336,8 @@ $upload->addValidator('Size',
                 </para></listitem>
 
                 <listitem><para>
-                    New method API: <code>addValidator($validator, $breakChainOnFailure, $options, $files)</code>.
+                    New method API: <code>addValidator($validator, $breakChainOnFailure, $options,
+                        $files)</code>.
                 </para></listitem>
             </itemizedlist>
 

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

@@ -5,86 +5,89 @@
     <title>Validators for Zend_File_Transfer</title>
 
     <para>
-        <classname>Zend_File_Transfer</classname> is delivered with several file-related validators which can be
-        used to increase security and prevent possible attacks. Note that these validators are only as effective
-        as how effectively you apply them. All validators provided with <classname>Zend_File_Transfer</classname> can
-        be found in the <classname>Zend_Validator</classname> component and are named <classname>Zend_Validate_File_*</classname>.
-        The following validators are available:
+        <classname>Zend_File_Transfer</classname> is delivered with several file-related validators
+        which can be used to increase security and prevent possible attacks. Note that these
+        validators are only as effective as how effectively you apply them. All validators provided
+        with <classname>Zend_File_Transfer</classname> can be found in the
+        <classname>Zend_Validator</classname> component and are named
+        <classname>Zend_Validate_File_*</classname>. The following validators are available:
     </para>
 
     <itemizedlist>
         <listitem>
             <para>
-                <code>Count</code>: This validator checks for the number of files. A minimum and maximum range can be specified.
-                An error will be thrown if either limit is crossed.
+                <code>Count</code>: This validator checks for the number of files. A minimum and
+                maximum range can be specified. An error will be thrown if either limit is crossed.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Crc32</code>: This validator checks for the crc32 hash value of the content from a file.
-                It is based on the <code>Hash</code> validator and provides a convenient and simple validator that only supports Crc32.
+                <code>Crc32</code>: This validator checks for the crc32 hash value of the content
+                from a file. It is based on the <code>Hash</code> validator and provides a
+                convenient and simple validator that only supports Crc32.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>ExcludeExtension</code>: This validator checks the extension of files. It will throw an
-                error when an given file has a defined extension. With this validator, you can exclude defined extensions
-                from being validated.
+                <code>ExcludeExtension</code>: This validator checks the extension of files. It will
+                throw an error when an given file has a defined extension. With this validator, you
+                can exclude defined extensions from being validated.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>ExcludeMimeType</code>: This validator validates the MIME type of files. It can also
-                validate MIME types and will throw an error if the MIME type of specified
+                <code>ExcludeMimeType</code>: This validator validates the MIME type of files. It
+                can also validate MIME types and will throw an error if the MIME type of specified
                 file matches.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Exists</code>: This validator checks for the existence of files. It will throw an
-                error when a specified file does not exist.
+                <code>Exists</code>: This validator checks for the existence of files. It will throw
+                an error when a specified file does not exist.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Extension</code>: This validator checks the extension of files. It will throw an
-                error when a specified file has an undefined extension.
+                <code>Extension</code>: This validator checks the extension of files. It will throw
+                an error when a specified file has an undefined extension.
             </para>
         </listitem>
 
         <listitem>
             <para>
                 <code>FilesSize</code>: This validator checks the size of validated files.
-                It remembers internally the size of all checked files and throws an error when the sum of
-                all specified files exceed the defined size. It also provides minimum and maximum values.
+                It remembers internally the size of all checked files and throws an error when the
+                sum of all specified files exceed the defined size. It also provides minimum and
+                maximum values.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>ImageSize</code>: This validator checks the size of image. It validates the width
-                and height and enforces minimum and maximum dimensions.
+                <code>ImageSize</code>: This validator checks the size of image. It validates the
+                width and height and enforces minimum and maximum dimensions.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>IsCompressed</code>: This validator checks whether the file is compressed. It is based on
-                the <code>MimeType</code> validator and validates for compression archives like zip or arc.
-                You can also limit it to other archives.
+                <code>IsCompressed</code>: This validator checks whether the file is compressed. It
+                is based on the <code>MimeType</code> validator and validates for compression
+                archives like zip or arc. You can also limit it to other archives.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>IsImage</code>: This validator checks whether the file is an image. It is based on
-                the <code>MimeType</code> validator and validates for image files like jpg or gif.
-                You can also limit it to other image types.
+                <code>IsImage</code>: This validator checks whether the file is an image. It is
+                based on the <code>MimeType</code> validator and validates for image files like jpg
+                or gif. You can also limit it to other image types.
             </para>
         </listitem>
 
@@ -97,8 +100,9 @@
 
         <listitem>
             <para>
-                <code>Md5</code>: This validator checks for the md5 hash value of the content from a file.
-                It is based on the <code>Hash</code> validator and provides a convenient and simple validator that only supports Md5.
+                <code>Md5</code>: This validator checks for the md5 hash value of the content from a
+                file. It is based on the <code>Hash</code> validator and provides a convenient and
+                simple validator that only supports Md5.
             </para>
         </listitem>
 
@@ -112,22 +116,24 @@
 
         <listitem>
             <para>
-                <code>NotExists</code>: This validator checks for the existence of files. It will throw an
-                error when an given file does exist.
+                <code>NotExists</code>: This validator checks for the existence of files. It will
+                throw an error when an given file does exist.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Sha1</code>: This validator checks for the sha1 hash value of the content from a file.
-                It is based on the <code>Hash</code> validator and provides a convenient and simple validator that only supports sha1.
+                <code>Sha1</code>: This validator checks for the sha1 hash value of the content from
+                a file. It is based on the <code>Hash</code> validator and provides a convenient and
+                simple validator that only supports sha1.
             </para>
         </listitem>
 
         <listitem>
             <para>
                 <code>Size</code>: This validator is able to check files for its file size. It
-                provides a minimum and maximum size range and will throw an error when either of these thesholds are crossed.
+                provides a minimum and maximum size range and will throw an error when either of
+                these thesholds are crossed.
             </para>
         </listitem>
 
@@ -135,16 +141,16 @@
             <para>
                 <code>Upload</code>: This validator is internal. It checks if an upload has
                 resulted in an error. You must not set it, as it's automatically set by
-                <classname>Zend_File_Transfer</classname> itself. So you do not use this validator directly. You should only
-                know that it exists.
+                <classname>Zend_File_Transfer</classname> itself. So you do not use this validator
+                directly. You should only know that it exists.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>WordCount</code>: This validator is able to check the number of words within files. It
-                provides a minimum and maximum count and will throw an error when either of these thresholds
-                are crossed.
+                <code>WordCount</code>: This validator is able to check the number of words within
+                files. It provides a minimum and maximum count and will throw an error when either
+                of these thresholds are crossed.
             </para>
         </listitem>
     </itemizedlist>
@@ -153,15 +159,16 @@
         <title>Using Validators with Zend_File_Transfer</title>
 
         <para>
-            Putting validators to work is quite simple. There are several methods for adding and manipulating validators:
+            Putting validators to work is quite simple. There are several methods for adding and
+            manipulating validators:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>isValid($files = null)</code>: Checks the specified files using all validators.
-                    <code>$files</code> may be either a real filename, the element's name or the name
-                    of the temporary file.
+                    <code>isValid($files = null)</code>: Checks the specified files using all
+                    validators. <code>$files</code> may be either a real filename, the element's
+                    name or the name of the temporary file.
                 </para>
             </listitem>
 
@@ -282,9 +289,10 @@ $upload->addValidator('Size', false, 20000, 'file2');
             <title>Add Multiple Validators</title>
 
             <para>
-                Often it's simpler just to call <code>addValidator()</code> multiple times with one call for each
-                validator. This also increases readability and makes your code more maintainable. All
-                methods provide a fluent interface, so you can couple the calls as shown below:
+                Often it's simpler just to call <code>addValidator()</code> multiple times with one
+                call for each validator. This also increases readability and makes your code more
+                maintainable. All methods provide a fluent interface, so you can couple the calls as
+                shown below:
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -314,9 +322,9 @@ $upload->addValidator('Size', false, 20000)
             <title>Validate the Files</title>
 
             <para>
-                <code>isValid()</code> accepts the file name of the uploaded or downloaded file, the temporary file name and
-                or the name of the form element. If no parameter or null is given all files
-                will be validated
+                <code>isValid()</code> accepts the file name of the uploaded or downloaded file, the
+                temporary file name and or the name of the form element. If no parameter or null is
+                given all files will be validated
             </para>
 
             <programlisting language="php"><![CDATA[
@@ -336,16 +344,17 @@ if ($upload->isValid()) {
 
         <note>
             <para>
-                Note that <code>isValid()</code> will be called automatically when you receive the files
-                and have not called it previously.
+                Note that <code>isValid()</code> will be called automatically when you receive the
+                files and have not called it previously.
             </para>
         </note>
 
         <para>
             When validation has failed it is a good idea to get information about the
-            problems found. To get this information, you can use the methods <code>getMessages()</code> which returns all
-            validation messages as array, <code>getErrors()</code> which returns all error codes, and
-            <code>hasErrors()</code> which returns true as soon as a validation error has been found.
+            problems found. To get this information, you can use the methods
+            <code>getMessages()</code> which returns all validation messages as array,
+            <code>getErrors()</code> which returns all error codes, and <code>hasErrors()</code>
+            which returns true as soon as a validation error has been found.
         </para>
 
     </sect2>
@@ -367,12 +376,14 @@ if ($upload->isValid()) {
                 <note>
                     <para>
                         When using this option you must give the minimum number of files when
-                        calling this validator the first time; otherwise you will get an error in return.
+                        calling this validator the first time; otherwise you will get an error in
+                        return.
                     </para>
                 </note>
 
                 <para>
-                    With this option you can define the minimum number of files you expect to receive.
+                    With this option you can define the minimum number of files you expect to
+                    receive.
                 </para>
             </listitem>
 
@@ -382,17 +393,17 @@ if ($upload->isValid()) {
                 </para>
 
                 <para>
-                    With this option you can limit the number of files which are accepted but also detect a possible
-                    attack when more files are given than defined in your form.
+                    With this option you can limit the number of files which are accepted but also
+                    detect a possible attack when more files are given than defined in your form.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            If you initiate this validator with a string or integer, the value will be used as <code>max</code>.
-            Or you can also use the methods <code>setMin()</code> and <code>setMax()</code> to set both
-            options afterwards and <code>getMin()</code> and <code>getMax()</code> to retrieve the actual
-            set values.
+            If you initiate this validator with a string or integer, the value will be used as
+            <code>max</code>. Or you can also use the methods <code>setMin()</code> and
+            <code>setMax()</code> to set both options afterwards and <code>getMin()</code> and
+            <code>getMax()</code> to retrieve the actual set values.
         </para>
 
         <example id="zend.file.transfer.validators.count.example">
@@ -411,8 +422,8 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
         </example>
         <note>
             <para>
-                Note that this validator stores the number of checked files internally. The file which
-                exceeds the maximum will be returned as error.
+                Note that this validator stores the number of checked files internally. The file
+                which exceeds the maximum will be returned as error.
             </para>
         </note>
     </sect2>
@@ -434,8 +445,8 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
                 </para>
 
                 <para>
-                    You can set multiple hashes by using different keys. Each will be checked and the validation will fail only
-                    if all values fail.
+                    You can set multiple hashes by using different keys. Each will be checked and
+                    the validation will fail only if all values fail.
                 </para>
             </listitem>
         </itemizedlist>
@@ -459,8 +470,8 @@ $upload->addValidator('Crc32', false, array('3b3652f', 'e612b69'));
         <title>ExcludeExtension Validator</title>
 
         <para>
-            The <code>ExcludeExtension</code> validator checks the file extension of the specified files. It
-            supports the following options:
+            The <code>ExcludeExtension</code> validator checks the file extension of the specified
+            files. It supports the following options:
         </para>
 
         <itemizedlist>
@@ -473,21 +484,24 @@ $upload->addValidator('Crc32', false, array('3b3652f', 'e612b69'));
 
             <listitem>
                 <para>
-                    <code>case</code>: Sets a boolean indicating whether validation should be case-sensitive. The default is not
-                    case sensitive. Note that this key can be applied to for all available extensions.
+                    <code>case</code>: Sets a boolean indicating whether validation should be
+                    case-sensitive. The default is not case sensitive. Note that this key can be
+                    applied to for all available extensions.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             This validator accepts multiple extensions, either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setExtension()</code>, <code>addExtension()</code>,
-            and <code>getExtension()</code> to set and retrieve extensions.
+            array. You may also use the methods <code>setExtension()</code>,
+            <code>addExtension()</code>, and <code>getExtension()</code> to set and retrieve
+            extensions.
         </para>
 
         <para>
-            In some cases it is useful to match in a case-sensitive fashion. So the constructor allows a
-            second parameter called <code>$case</code> which, if set to true, validates the extension by comparing it with the specified values in a case-sensitive fashion.
+            In some cases it is useful to match in a case-sensitive fashion. So the constructor
+            allows a second parameter called <code>$case</code> which, if set to true, validates the
+            extension by comparing it with the specified values in a case-sensitive fashion.
         </para>
 
         <example id="zend.file.transfer.validators.excludeextension.example">
@@ -514,7 +528,8 @@ $upload->addValidator('ExcludeExtension',
         </example>
         <note>
             <para>
-                Note that this validator only checks the file extension. It does not check the file's MIME type.
+                Note that this validator only checks the file extension. It does not check the
+                file's MIME type.
             </para>
         </note>
     </sect2>
@@ -530,20 +545,22 @@ $upload->addValidator('ExcludeExtension',
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key individually or use a numeric array. Sets the MIME type to
-                    validate against.
+                    <code>*</code>: Sets any key individually or use a numeric array. Sets the MIME
+                    type to validate against.
                 </para>
 
                 <para>
-                    With this option you can define the MIME type of files that are not to be accepted.
+                    With this option you can define the MIME type of files that are not to be
+                    accepted.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             This validator accepts multiple MIME types, either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setMimeType()</code>, <code>addMimeType()</code>,
-            and <code>getMimeType()</code> to set and retrieve the MIME types.
+            array. You may also use the methods <code>setMimeType()</code>,
+            <code>addMimeType()</code>, and <code>getMimeType()</code> to set and retrieve the MIME
+            types.
         </para>
 
         <example id="zend.file.transfer.validators.excludemimetype.example">
@@ -566,16 +583,17 @@ $upload->addValidator('ExcludeMimeType', false, 'image');
 
         <para>
             The above example shows that it is also possible to disallow groups of MIME types.
-            For example, to disallow all images, just use 'image' as the MIME type. This can be used for all groups
-            of MIME types like 'image', 'audio', 'video', 'text', etc.
+            For example, to disallow all images, just use 'image' as the MIME type. This can be used
+            for all groups of MIME types like 'image', 'audio', 'video', 'text', etc.
         </para>
 
         <note>
             <para>
-                Note that disallowing groups of MIME types will disallow all members of this group even if this
-                is not intentional. When you disallow 'image' you will disallow all types of images like
-                'image/jpeg' or 'image/vasa'. When you are not sure if you want to disallow all types,
-                you should disallow only specific MIME types instead of complete groups.
+                Note that disallowing groups of MIME types will disallow all members of this group
+                even if this is not intentional. When you disallow 'image' you will disallow all
+                types of images like 'image/jpeg' or 'image/vasa'. When you are not sure if you want
+                to disallow all types, you should disallow only specific MIME types instead of
+                complete groups.
             </para>
         </note>
     </sect2>
@@ -591,16 +609,17 @@ $upload->addValidator('ExcludeMimeType', false, 'image');
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array to check if the specific file exists
-                    in the given directory.
+                    <code>*</code>: Sets any key or use a numeric array to check if the specific
+                    file exists in the given directory.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            This validator accepts multiple directories, either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setDirectory()</code>, <code>addDirectory()</code>,
-            and <code>getDirectory()</code> to set and retrieve directories.
+            This validator accepts multiple directories, either as a comma-delimited string, or as
+            an array. You may also use the methods <code>setDirectory()</code>,
+            <code>addDirectory()</code>, and <code>getDirectory()</code> to set and retrieve
+            directories.
         </para>
 
         <example id="zend.file.transfer.validators.exists.example">
@@ -621,8 +640,9 @@ $upload->addValidator('Exists',
         </example>
         <note>
             <para>
-                Note that this validator checks whether the specified file exists in all of the given directories. The validation will fail
-                if the file does not exist in any of the given directories.
+                Note that this validator checks whether the specified file exists in all of the
+                given directories. The validation will fail if the file does not exist in any of the
+                given directories.
             </para>
         </note>
     </sect2>
@@ -631,35 +651,38 @@ $upload->addValidator('Exists',
         <title>Extension Validator</title>
 
         <para>
-            The <code>Extension</code> validator checks the file extension of the specified files. It
-            supports the following options:
+            The <code>Extension</code> validator checks the file extension of the specified files.
+            It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array to check whether the specified file
-                    has this file extension.
+                    <code>*</code>: Sets any key or use a numeric array to check whether the
+                    specified file has this file extension.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>case</code>: Sets whether validation should be done in a case-sensitive fashion. The default is no
-                    case sensitivity. Note the this key is used for all given extensions.
+                    <code>case</code>: Sets whether validation should be done in a case-sensitive
+                    fashion. The default is no case sensitivity. Note the this key is used for all
+                    given extensions.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             This validator accepts multiple extensions, either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setExtension()</code>, <code>addExtension()</code>,
-            and <code>getExtension()</code> to set and retrieve extension values.
+            array. You may also use the methods <code>setExtension()</code>,
+            <code>addExtension()</code>, and <code>getExtension()</code> to set and retrieve
+            extension values.
         </para>
 
         <para>
-            In some cases it is useful to test in a case-sensitive fashion. Therefore the constructor takes a
-            second parameter <code>$case</code>, which, if set to true, will validate the extension in a case-sensitive fashion.
+            In some cases it is useful to test in a case-sensitive fashion. Therefore the
+            constructor takes a second parameter <code>$case</code>, which, if set to true, will
+            validate the extension in a case-sensitive fashion.
         </para>
 
         <example id="zend.file.transfer.validators.extension.example">
@@ -684,7 +707,8 @@ if (!$upload->isValid('C:\temp\myfile.MO')) {
         </example>
         <note>
             <para>
-                Note that this validator only checks the file extension. It does not check the file's MIME type.
+                Note that this validator only checks the file extension. It does not check the
+                file's MIME type.
             </para>
         </note>
     </sect2>
@@ -693,8 +717,8 @@ if (!$upload->isValid('C:\temp\myfile.MO')) {
         <title>FilesSize Validator</title>
 
         <para>
-            The <code>FilesSize</code> validator checks for the aggregate size of all transferred files.
-            It supports the following options:
+            The <code>FilesSize</code> validator checks for the aggregate size of all transferred
+            files. It supports the following options:
         </para>
 
         <itemizedlist>
@@ -718,29 +742,32 @@ if (!$upload->isValid('C:\temp\myfile.MO')) {
 
             <listitem>
                 <para>
-                    <code>bytestring</code>: Defines whether a failure is to return a user-friendly number or
-                    the plain file size.
+                    <code>bytestring</code>: Defines whether a failure is to return a user-friendly
+                    number or the plain file size.
                 </para>
 
                 <para>
-                    This option defines whether the user sees '10864' or '10MB'. The default value is true, so
-                    '10MB' is returned if you did not specify otherwise.
+                    This option defines whether the user sees '10864' or '10MB'. The default value
+                    is true, so '10MB' is returned if you did not specify otherwise.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            You can initialize this validator with a string, which will then be used to set the <code>max</code> option.
-            You can also use the methods <code>setMin()</code> and <code>setMax()</code> to set both
-            options after construction, along with <code>getMin()</code> and <code>getMax()</code> to retrieve the
-            values that have been set previously.
+            You can initialize this validator with a string, which will then be used to set the
+            <code>max</code> option. You can also use the methods <code>setMin()</code> and
+            <code>setMax()</code> to set both options after construction, along with
+            <code>getMin()</code> and <code>getMax()</code> to retrieve the values that have been
+            set previously.
         </para>
 
         <para>
-            The size itself is also accepted in SI notation as handled by most operating systems. That is, instead of
-            specifying <emphasis>20000 bytes</emphasis>, <emphasis>20kB</emphasis> may be given. All file sizes are converted
-            using 1024 as the base value. The following Units are accepted: <code>kB</code>, <code>MB</code>,
-            <code>GB</code>, <code>TB</code>, <code>PB</code> and <code>EB</code>. Note that 1kB is equal to 1024 bytes, 1MB is equal to 1024kB, and so on.
+            The size itself is also accepted in SI notation as handled by most operating systems.
+            That is, instead of specifying <emphasis>20000 bytes</emphasis>,
+            <emphasis>20kB</emphasis> may be given. All file sizes are converted using 1024 as the
+            base value. The following Units are accepted: <code>kB</code>, <code>MB</code>,
+            <code>GB</code>, <code>TB</code>, <code>PB</code> and <code>EB</code>. Note that 1kB is
+            equal to 1024 bytes, 1MB is equal to 1024kB, and so on.
         </para>
 
         <example id="zend.file.transfer.validators.filessize.example">
@@ -768,8 +795,8 @@ $upload->addValidator('FilesSize',
         </example>
         <note>
             <para>
-                Note that this validator internally stores the file size of checked files. The file which
-                exceeds the size will be returned as an error.
+                Note that this validator internally stores the file size of checked files. The file
+                which exceeds the size will be returned as an error.
             </para>
         </note>
     </sect2>
@@ -815,13 +842,15 @@ $upload->addValidator('FilesSize',
         </para>
 
         <para>
-            For your convenience there are also the <code>setImageWidth()</code> and <code>setImageHeight()</code>
-            methods, which set the minimum and maximum height and width of the image file. They, too, have corresponding
-            <code>getImageWidth()</code> and <code>getImageHeight()</code> methods to retrieve the currently set values.
+            For your convenience there are also the <code>setImageWidth()</code> and
+            <code>setImageHeight()</code> methods, which set the minimum and maximum height and
+            width of the image file. They, too, have corresponding <code>getImageWidth()</code> and
+            <code>getImageHeight()</code> methods to retrieve the currently set values.
         </para>
 
         <para>
-            To bypass validation of a particular dimension, the relevent option simply should not be set.
+            To bypass validation of a particular dimension, the relevent option simply should not be
+            set.
         </para>
 
         <example id="zend.file.transfer.validators.imagesize.example">
@@ -849,10 +878,10 @@ $upload->setImageWidth(array('minwidth' => 20, 'maxwidth' => 200));
         <title>IsCompressed Validator</title>
 
         <para>
-            The <code>IsCompressed</code> validator checks if a transferred file is a compressed archive,
-            such as zip or arc. This validator is based on the <code>MimeType</code> validator and supports
-            the same methods and options. You may also limit this validator to particular compression types with
-            the methods described there.
+            The <code>IsCompressed</code> validator checks if a transferred file is a compressed
+            archive, such as zip or arc. This validator is based on the <code>MimeType</code>
+            validator and supports the same methods and options. You may also limit this validator
+            to particular compression types with the methods described there.
         </para>
 
         <example id="zend.file.transfer.validators.iscompressed.example">
@@ -874,9 +903,10 @@ $upload->addValidator('IsCompressed', false, 'zip');
 
         <note>
             <para>
-                Note that there is no check if you set a MIME type that is not a archive. For example, it
-                would be possible to define gif files to be accepted by this validator. Using the
-                'MimeType' validator for files which are not archived will result in more readable code.
+                Note that there is no check if you set a MIME type that is not a archive. For
+                example, it would be possible to define gif files to be accepted by this validator.
+                Using the 'MimeType' validator for files which are not archived will result in more
+                readable code.
             </para>
         </note>
     </sect2>
@@ -885,10 +915,10 @@ $upload->addValidator('IsCompressed', false, 'zip');
         <title>IsImage Validator</title>
 
         <para>
-            The <code>IsImage</code> validator checks if a transferred file is a image file, such as gif or
-            jpeg. This validator is based on the <code>MimeType</code> validator and supports
-            the same methods and options. You can limit this validator to particular image types with
-            the methods described there.
+            The <code>IsImage</code> validator checks if a transferred file is a image file, such as
+            gif or jpeg. This validator is based on the <code>MimeType</code> validator and supports
+            the same methods and options. You can limit this validator to particular image types
+            with the methods described there.
         </para>
 
         <example id="zend.file.transfer.validators.isimage.example">
@@ -910,9 +940,10 @@ $upload->addValidator('IsImage', false, 'jpeg');
 
         <note>
             <para>
-                Note that there is no check if you set a MIME type that is not an image. For example, it
-                would be possible to define zip files to be accepted by this validator. Using the
-                'MimeType' validator for files which are not images will result in more readable code.
+                Note that there is no check if you set a MIME type that is not an image. For
+                example, it would be possible to define zip files to be accepted by this validator.
+                Using the 'MimeType' validator for files which are not images will result in more
+                readable code.
             </para>
         </note>
     </sect2>
@@ -928,11 +959,13 @@ $upload->addValidator('IsImage', false, 'jpeg');
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Takes any key or use a numeric array. Sets the hash to validate against.
+                    <code>*</code>: Takes any key or use a numeric array. Sets the hash to validate
+                    against.
                 </para>
 
                 <para>
-                    You can set multiple hashes by passing them as an array. Each file is checked, and the validation will fail only if all files fail validation.
+                    You can set multiple hashes by passing them as an array. Each file is checked,
+                    and the validation will fail only if all files fail validation.
                 </para>
             </listitem>
 
@@ -942,7 +975,8 @@ $upload->addValidator('IsImage', false, 'jpeg');
                 </para>
 
                 <para>
-                    You can set multiple algorithm by calling the <code>addHash()</code> method multiple times.
+                    You can set multiple algorithm by calling the <code>addHash()</code> method
+                    multiple times.
                 </para>
             </listitem>
         </itemizedlist>
@@ -969,9 +1003,10 @@ $upload->addValidator('Hash',
 
         <note>
             <para>
-                This validator supports about 34 different hash algorithms. The most common include 'crc32',
-                'md5' and 'sha1'. A comprehesive list of supports hash algorithms can be found at the
-                <ulink url="http://php.net/hash_algos">hash_algos method</ulink> on the <ulink url="http://php.net">php.net site</ulink>.
+                This validator supports about 34 different hash algorithms. The most common include
+                'crc32', 'md5' and 'sha1'. A comprehesive list of supports hash algorithms can be
+                found at the <ulink url="http://php.net/hash_algos">hash_algos method</ulink> on the
+                <ulink url="http://php.net">php.net site</ulink>.
             </para>
         </note>
     </sect2>
@@ -992,7 +1027,8 @@ $upload->addValidator('Hash',
                 </para>
 
                 <para>
-                    You can set multiple hashes by passing them as an array. Each file is checked, and the validation will fail only if all files fail validation.
+                    You can set multiple hashes by passing them as an array. Each file is checked,
+                    and the validation will fail only if all files fail validation.
                 </para>
             </listitem>
         </itemizedlist>
@@ -1026,7 +1062,8 @@ $upload->addValidator('Md5',
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array. Sets the MIME type type to validate against.
+                    <code>*</code>: Sets any key or use a numeric array. Sets the MIME type type to
+                    validate against.
                 </para>
 
                 <para>
@@ -1040,23 +1077,25 @@ $upload->addValidator('Md5',
                 </para>
 
                 <para>
-                    With this option you can define which magicfile to use. When it's not set or empty, the
-                    MAGIC constant will be used instead. This option is available since Zend Framework 1.7.1.
+                    With this option you can define which magicfile to use. When it's not set or
+                    empty, the MAGIC constant will be used instead. This option is available since
+                    Zend Framework 1.7.1.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             This validator accepts multiple MIME type, either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setMimeType()</code>, <code>addMimeType()</code>,
-            and <code>getMimeType()</code> to set and retrieve MIME type.
+            array. You may also use the methods <code>setMimeType()</code>,
+            <code>addMimeType()</code>, and <code>getMimeType()</code> to set and retrieve MIME
+            type.
         </para>
 
         <para>
-            You can also set the magicfile which shall be used by fileinfo with the 'magicfile' option.
-            Additionally there are convenient <code>setMagicFile()</code> and <code>getMagicFile()</code>
-            methods which allow later setting and retrieving of the magicfile parameter. This methods are
-            available since Zend Framework 1.7.1.
+            You can also set the magicfile which shall be used by fileinfo with the 'magicfile'
+            option. Additionally there are convenient <code>setMagicFile()</code> and
+            <code>getMagicFile()</code> methods which allow later setting and retrieving of the
+            magicfile parameter. This methods are available since Zend Framework 1.7.1.
         </para>
 
         <example id="zend.file.transfer.validators.mimetype.example">
@@ -1083,32 +1122,32 @@ $upload->addValidator('MimeType',
         </example>
 
         <para>
-            The above example shows that it is also possible to limit the accepted MIME type to a group of
-            MIME types. To allow all images just use 'image' as MIME type. This can be used for all groups
-            of MIME types like 'image', 'audio', 'video', 'text, and so on.
+            The above example shows that it is also possible to limit the accepted MIME type to a
+            group of MIME types. To allow all images just use 'image' as MIME type. This can be used
+            for all groups of MIME types like 'image', 'audio', 'video', 'text, and so on.
         </para>
 
         <note>
             <para>
-                Note that allowing groups of MIME types will accept all members of this group even if your
-                application does not support them. When you allow 'image' you will also get
-                'image/xpixmap' or 'image/vasa' which could be problematic. When you are not sure if your
-                application supports all types you should better allow only defined MIME types instead
-                of the complete group.
+                Note that allowing groups of MIME types will accept all members of this group even
+                if your application does not support them. When you allow 'image' you will also get
+                'image/xpixmap' or 'image/vasa' which could be problematic. When you are not sure if
+                your application supports all types you should better allow only defined MIME types
+                instead of the complete group.
             </para>
         </note>
 
         <note>
             <para>
-                This component will use the <code>fileinfo</code> extension if it is available. If it's not,
-                it will degrade to the <code>mime_content_type</code> function. And if the function call fails
-                it will use the MIME type which is given by HTTP.
+                This component will use the <code>fileinfo</code> extension if it is available. If
+                it's not, it will degrade to the <code>mime_content_type</code> function. And if the
+                function call fails it will use the MIME type which is given by HTTP.
             </para>
 
             <para>
-                You should be aware of possible security problems when you have whether <code>fileinfo</code>
-                nor <code>mime_content_type</code> available. The MIME type given by HTTP is not secure and
-                can be easily manipulated.
+                You should be aware of possible security problems when you have whether
+                <code>fileinfo</code> nor <code>mime_content_type</code> available. The MIME type
+                given by HTTP is not secure and can be easily manipulated.
             </para>
         </note>
     </sect2>
@@ -1124,15 +1163,17 @@ $upload->addValidator('MimeType',
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Set any key or use a numeric array. Checks whether the file exists in the given directory.
+                    <code>*</code>: Set any key or use a numeric array. Checks whether the file
+                    exists in the given directory.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             This validator accepts multiple directories either as a comma-delimited string, or as an
-            array. You may also use the methods <code>setDirectory()</code>, <code>addDirectory()</code>,
-            and <code>getDirectory()</code> to set and retrieve directories.
+            array. You may also use the methods <code>setDirectory()</code>,
+            <code>addDirectory()</code>, and <code>getDirectory()</code> to set and retrieve
+            directories.
         </para>
 
         <example id="zend.file.transfer.validators.notexists.example">
@@ -1154,13 +1195,14 @@ $upload->addValidator('NotExists', false,
         </example>
         <note>
             <para>
-                Note that this validator checks if the file does not exist in all of the provided directories.
-                The validation will fail if the file does exist in any of the given directories.
+                Note that this validator checks if the file does not exist in all of the provided
+                directories. The validation will fail if the file does exist in any of the given
+                directories.
             </para>
         </note>
     </sect2>
 
-<sect2 id="zend.file.transfer.validators.sha1">
+    <sect2 id="zend.file.transfer.validators.sha1">
         <title>Sha1 Validator</title>
 
         <para>
@@ -1176,7 +1218,8 @@ $upload->addValidator('NotExists', false,
                 </para>
 
                 <para>
-                    You can set multiple hashes by passing them as an array. Each file is checked, and the validation will fail only if all files fail validation.
+                    You can set multiple hashes by passing them as an array. Each file is checked,
+                    and the validation will fail only if all files fail validation.
                 </para>
             </listitem>
         </itemizedlist>
@@ -1221,29 +1264,32 @@ $upload->addValidator('Sha1',
 
             <listitem>
                 <para>
-                    <code>bytestring</code>: Defines whether a failure is returned with a user-friendly number, or
-                    with the plain file size.
+                    <code>bytestring</code>: Defines whether a failure is returned with a
+                    user-friendly number, or with the plain file size.
                 </para>
 
                 <para>
-                    With this option you can define if the user gets '10864' or '10MB'. Default value is true
-                    which returns '10MB'.
+                    With this option you can define if the user gets '10864' or '10MB'. Default
+                    value is true which returns '10MB'.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
-            You can initialize this validator with a string, which will then be used to set the <code>max</code> option.
-            You can also use the methods <code>setMin()</code> and <code>setMax()</code> to set both
-            options after construction, along with <code>getMin()</code> and <code>getMax()</code> to retrieve the
-            values that have been set previously.
+            You can initialize this validator with a string, which will then be used to set the
+            <code>max</code> option. You can also use the methods <code>setMin()</code> and
+            <code>setMax()</code> to set both options after construction, along with
+            <code>getMin()</code> and <code>getMax()</code> to retrieve the values that have been
+            set previously.
         </para>
 
         <para>
-            The size itself is also accepted in SI notation as handled by most operating systems. That is, instead of
-            specifying <emphasis>20000 bytes</emphasis>, <emphasis>20kB</emphasis> may be given. All file sizes are converted
-            using 1024 as the base value. The following Units are accepted: <code>kB</code>, <code>MB</code>,
-            <code>GB</code>, <code>TB</code>, <code>PB</code> and <code>EB</code>. Note that 1kB is equal to 1024 bytes, 1MB is equal to 1024kB, and so on.
+            The size itself is also accepted in SI notation as handled by most operating systems.
+            That is, instead of specifying <emphasis>20000 bytes</emphasis>,
+            <emphasis>20kB</emphasis> may be given. All file sizes are converted using 1024 as the
+            base value. The following Units are accepted: <code>kB</code>, <code>MB</code>,
+            <code>GB</code>, <code>TB</code>, <code>PB</code> and <code>EB</code>. Note that 1kB is
+            equal to 1024 bytes, 1MB is equal to 1024kB, and so on.
         </para>
 
         <example id="zend.file.transfer.validators.size.example">
@@ -1271,8 +1317,8 @@ $upload->addValidator('Size',
         <title>WordCount Validator</title>
 
         <para>
-            The <code>WordCount</code> validator checks for the number of words within provided files. It
-            supports the following option keys:
+            The <code>WordCount</code> validator checks for the number of words within provided
+            files. It supports the following option keys:
         </para>
 
         <itemizedlist>
@@ -1290,10 +1336,10 @@ $upload->addValidator('Size',
         </itemizedlist>
 
         <para>
-            If you initiate this validator with a string or integer, the value will be used as <code>max</code>.
-            Or you can also use the methods <code>setMin()</code> and <code>setMax()</code> to set both
-            options afterwards and <code>getMin()</code> and <code>getMax()</code> to retrieve the actual
-            set values.
+            If you initiate this validator with a string or integer, the value will be used as
+            <code>max</code>. Or you can also use the methods <code>setMin()</code> and
+            <code>setMax()</code> to set both options afterwards and <code>getMin()</code> and
+            <code>getMax()</code> to retrieve the actual set values.
         </para>
 
         <example id="zend.file.transfer.validators.wordcount.example">

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

@@ -3,28 +3,29 @@
 <sect2 id="zend.filter.set.decrypt">
     <title>Decrypt</title>
     <para>
-        This filter will decrypt any given string with the provided setting. Therefor it makes use of
-        Adapters. Actually there are adapters for the <code>Mcrypt</code> and <code>OpenSSL</code>
-        extensions from php.
+        This filter will decrypt any given string with the provided setting. Therefor it makes use
+        of Adapters. Actually there are adapters for the <code>Mcrypt</code> and
+        <code>OpenSSL</code> extensions from php.
     </para>
 
     <para>
-        For details about how to encrypt content look at the <code>Encrypt</code> filter. As the basics are
-        covered within the <code>Encrypt</code> filter, we will describe here only the needed additional
-        methods and changes for decryption.
+        For details about how to encrypt content look at the <code>Encrypt</code> filter. As the
+        basics are covered within the <code>Encrypt</code> filter, we will describe here only the
+        needed additional methods and changes for decryption.
     </para>
 
     <sect3 id="zend.filter.set.decrypt.mcrypt">
         <title>Decryption with Mcrypt</title>
         <para>
-            For decrypting content which was previously encrypted with <code>Mcrypt</code> you need to have
-            the options with which the encryption has been called.
+            For decrypting content which was previously encrypted with <code>Mcrypt</code> you need
+            to have the options with which the encryption has been called.
         </para>
 
         <para>
-            There is one emminent difference for you. When you did not provide a vector at encryption you need
-            to get it after you encrypted the content by using the <code>getVector()</code> method on the
-            encryption filter. Without the correct vector you will not be able to decrypt the content.
+            There is one emminent difference for you. When you did not provide a vector at
+            encryption you need to get it after you encrypted the content by using the
+            <code>getVector()</code> method on the encryption filter. Without the correct vector you
+            will not be able to decrypt the content.
         </para>
 
         <para>
@@ -44,15 +45,16 @@ print $decrypted;
 
         <note>
             <para>
-                Note that you will get an exception if the mcrypt extension is not available in your environment.
+                Note that you will get an exception if the mcrypt extension is not available in your
+                environment.
             </para>
         </note>
 
         <note>
             <para>
-                You should also note that all settings which be checked when you create the instance or when
-                you call setEncryption(). If mcrypt detects problem with your settings an exception will be
-                thrown.
+                You should also note that all settings which be checked when you create the instance
+                or when you call setEncryption(). If mcrypt detects problem with your settings an
+                exception will be thrown.
             </para>
         </note>
     </sect3>
@@ -60,8 +62,8 @@ print $decrypted;
     <sect3 id="zend.filter.set.decrypt.openssl">
         <title>Decryption with OpenSSL</title>
         <para>
-            Decryption with <code>OpenSSL</code> is as simple as encryption. But you need to have all data
-            from the person who encrypted the content.
+            Decryption with <code>OpenSSL</code> is as simple as encryption. But you need to have
+            all data from the person who encrypted the content.
         </para>
 
         <para>
@@ -71,17 +73,17 @@ print $decrypted;
         <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>private</emphasis>: Your private key which will be used for decrypting the
-                    content. The private key can be eighter a filename with path of the key file, or
-                    just the content of the key file itself.
+                    <emphasis>private</emphasis>: Your private key which will be used for decrypting
+                    the content. The private key can be eighter a filename with path of the key
+                    file, or just the content of the key file itself.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>envelope</emphasis>: The encrypted envelope key from the user who encrypted
-                    the content. You can eigther provide the path and filename of the key file, or just
-                    the content of the key file itself.
+                    <emphasis>envelope</emphasis>: The encrypted envelope key from the user who
+                    encrypted the content. You can eigther provide the path and filename of the key
+                    file, or just the content of the key file itself.
                 </para>
             </listitem>
         </itemizedlist>
@@ -102,13 +104,14 @@ $filter->setEnvelopeKey(array(
 
         <note>
             <para>
-                Note that the <code>OpenSSL</code> adapter will not work when you do not provide valid keys.
+                Note that the <code>OpenSSL</code> adapter will not work when you do not provide
+                valid keys.
             </para>
         </note>
 
         <para>
-            Optionally it could be necessary to provide the passphrase for decrypting the keys themself by
-            using the <code>setPassphrase()</code> method.
+            Optionally it could be necessary to provide the passphrase for decrypting the keys
+            themself by using the <code>setPassphrase()</code> method.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -127,8 +130,8 @@ $filter->setPassphrase('mypassphrase');
 ]]></programlisting>
 
         <para>
-            At last, decode the content. Our complete example for decrypting the previously encrypted
-            content looks like this.
+            At last, decode the content. Our complete example for decrypting the previously
+            encrypted content looks like this.
         </para>
 
         <programlisting language="php"><![CDATA[

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

@@ -3,19 +3,19 @@
 <sect2 id="zend.filter.set.encrypt">
     <title>Encrypt</title>
     <para>
-        This filter will encrypt any given string with the provided setting. Therefor it makes use of
-        Adapters. Actually there are adapters for the <code>Mcrypt</code> and <code>OpenSSL</code>
-        extensions from php.
+        This filter will encrypt any given string with the provided setting. Therefor it makes use
+        of Adapters. Actually there are adapters for the <code>Mcrypt</code> and
+        <code>OpenSSL</code> extensions from php.
     </para>
 
     <para>
-        As these two encryption methodologies work completly different, also the usage of the adapters
-        differ. You have to select the adapter you want to use when initiating the filter.
+        As these two encryption methodologies work completly different, also the usage of the
+        adapters differ. You have to select the adapter you want to use when initiating the filter.
     </para>
 
     <para>
-        As these two encryption methodologies work completly different, also the usage of the adapters
-        differ. You have to select the adapter you want to use when initiating the filter.
+        As these two encryption methodologies work completly different, also the usage of the
+        adapters differ. You have to select the adapter you want to use when initiating the filter.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -27,8 +27,8 @@ $filter2 = new Zend_Filter_Encrypt(array('adapter' => 'openssl'));
 ]]></programlisting>
 
     <para>
-        To set another adapter you can also use <code>setAdapter()</code>, and the <code>getAdapter()</code>
-        method to receive the actual set adapter.
+        To set another adapter you can also use <code>setAdapter()</code>, and the
+        <code>getAdapter()</code> method to receive the actual set adapter.
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -39,8 +39,8 @@ $filter->setAdapter('openssl');
 
     <note>
         <para>
-            When you do not supply the <code>adapter</code> option or do not use setAdapter, then the
-            <code>Mcrypt</code> adapter will be used per default.
+            When you do not supply the <code>adapter</code> option or do not use setAdapter, then
+            the <code>Mcrypt</code> adapter will be used per default.
         </para>
     </note>
 
@@ -54,54 +54,54 @@ $filter->setAdapter('openssl');
         <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>key</emphasis>: The encryption key with which the input will be encrypted.
-                    You need the same key for decryption.
+                    <emphasis>key</emphasis>: The encryption key with which the input will be
+                    encrypted. You need the same key for decryption.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>algorithm</emphasis>: The algorithm which has to be used. It should be one of
-                    the algorithm ciphers which can be found under
-                    <ulink url="http://php.net/mcrypt">PHP's mcrypt ciphers</ulink>. If not set it defaults to
-                    <code>blowfish</code>.
+                    <emphasis>algorithm</emphasis>: The algorithm which has to be used. It should be
+                    one of the algorithm ciphers which can be found under
+                    <ulink url="http://php.net/mcrypt">PHP's mcrypt ciphers</ulink>. If not set it
+                    defaults to <code>blowfish</code>.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>algorithm_directory</emphasis>: The directory where the algorithm can be found.
-                    If not set it defaults to the path set within the mcrypt extension.
+                    <emphasis>algorithm_directory</emphasis>: The directory where the algorithm can
+                    be found. If not set it defaults to the path set within the mcrypt extension.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>mode</emphasis>: The encryption mode which has to be used. It should be one of
-                    the modes which can be found under
-                    <ulink url="http://php.net/mcrypt">PHP's mcrypt modes</ulink>. If not set it defaults to
-                    <code>cbc</code>.
+                    <emphasis>mode</emphasis>: The encryption mode which has to be used. It should
+                    be one of the modes which can be found under
+                    <ulink url="http://php.net/mcrypt">PHP's mcrypt modes</ulink>. If not set it
+                    defaults to <code>cbc</code>.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>mode_directory</emphasis>: The directory where the mode can be found. If not set
-                    it defaults to the path set within the <code>mcrypt</code> extension.
+                    <emphasis>mode_directory</emphasis>: The directory where the mode can be found.
+                    If not set it defaults to the path set within the <code>mcrypt</code> extension.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>vector</emphasis>: The initialization vector which shall be used. If not set
-                    it will be a random vector.
+                    <emphasis>vector</emphasis>: The initialization vector which shall be used. If
+                    not set it will be a random vector.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>salt</emphasis>: If the key should be used as salt value. The key used for
-                    encryption will then itself also be encrypted. Default is false.
+                    <emphasis>salt</emphasis>: If the key should be used as salt value. The key used
+                    for encryption will then itself also be encrypted. Default is false.
                 </para>
             </listitem>
         </itemizedlist>
@@ -111,33 +111,35 @@ $filter->setAdapter('openssl');
         </para>
 
         <para>
-            You can get/set the encryption values also afterwards with the <code>getEncryption()</code>
-            and <code>setEncryption()</code> methods.
+            You can get/set the encryption values also afterwards with the
+            <code>getEncryption()</code> and <code>setEncryption()</code> methods.
         </para>
 
         <note>
             <para>
-                Note that you will get an exception if the mcrypt extension is not available in your environment.
+                Note that you will get an exception if the mcrypt extension is not available in your
+                environment.
             </para>
         </note>
 
         <note>
             <para>
-                You should also note that all settings which be checked when you create the instance or when
-                you call setEncryption(). If mcrypt detects problem with your settings an exception will be
-                thrown.
+                You should also note that all settings which be checked when you create the instance
+                or when you call setEncryption(). If mcrypt detects problem with your settings an
+                exception will be thrown.
             </para>
         </note>
 
         <para>
-            You can get/set the encryption vector by calling <code>getVector()</code> and <code>setVector()</code>.
-            A given string will be truncated or padded to the needed vector size of the used algorithm.
+            You can get/set the encryption vector by calling <code>getVector()</code> and
+            <code>setVector()</code>. A given string will be truncated or padded to the needed
+            vector size of the used algorithm.
         </para>
 
         <note>
             <para>
-                Note that when you are not using an own vector, you must get the vector and store it. Otherwise
-                you will not be able to decode the encoded string.
+                Note that when you are not using an own vector, you must get the vector and store
+                it. Otherwise you will not be able to decode the encoded string.
             </para>
         </note>
 
@@ -167,26 +169,26 @@ print $encrypted;
         <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>public</emphasis>: The public key of the user whom you want to provide the
-                    encrpted content. You can give multiple public keys by using an array. You can eigther
-                    provide the path and filename of the key file, or just the content of the key file
-                    itself.
+                    <emphasis>public</emphasis>: The public key of the user whom you want to provide
+                    the encrpted content. You can give multiple public keys by using an array. You
+                    can eigther provide the path and filename of the key file, or just the content
+                    of the key file itself.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <emphasis>private</emphasis>: Your private key which will be used for encrypting the
-                    content. Also the private key can be eighter a filename with path of the key file, or
-                    just the content of the key file itself.
+                    <emphasis>private</emphasis>: Your private key which will be used for encrypting
+                    the content. Also the private key can be eighter a filename with path of the key
+                    file, or just the content of the key file itself.
                 </para>
             </listitem>
         </itemizedlist>
 
         <para>
             You can get/set the public keys also afterwards with the <code>getPublicKey()</code>
-            and <code>setPublicKey()</code> methods. The private key can also be get and set with the related
-            <code>getPrivateKey()</code> and <code>setPrivateKey()</code> methods.
+            and <code>setPublicKey()</code> methods. The private key can also be get and set with
+            the related <code>getPrivateKey()</code> and <code>setPrivateKey()</code> methods.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -205,15 +207,16 @@ $filter->setPublicKey(array(
 
         <note>
             <para>
-                Note that the <code>OpenSSL</code> adapter will not work when you do not provide valid keys.
+                Note that the <code>OpenSSL</code> adapter will not work when you do not provide
+                valid keys.
             </para>
         </note>
 
         <para>
             When you want to encode also the keys, then you have to provide a passphrase with the
-            <code>setPassphrase()</code> method. When you want to decode content which was encoded with
-            a passphrase you will not only need the public key, but also the passphrase to decode the
-            encrypted key.
+            <code>setPassphrase()</code> method. When you want to decode content which was encoded
+            with a passphrase you will not only need the public key, but also the passphrase to
+            decode the encrypted key.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -232,8 +235,8 @@ $filter->setPassphrase('mypassphrase');
 ]]></programlisting>
 
         <para>
-            At last, when you use OpenSSL you need to give the receiver the encrypted content, the passphrase
-            when have provided one, and the envelope keys for decryption.
+            At last, when you use OpenSSL you need to give the receiver the encrypted content, the
+            passphrase when have provided one, and the envelope keys for decryption.
         </para>
 
         <para>

documentation/manual/en/module_specs/Zend_Filter-FilterChains.xml

@@ -7,8 +7,9 @@
     <para>
         Often multiple filters should be applied to some value in a particular order. For example, a
         login form accepts a username that should be only lowercase, alphabetic characters.
-        <classname>Zend_Filter</classname> provides a simple method by which filters may be chained together. The
-        following code illustrates how to chain together two filters for the submitted username:
+        <classname>Zend_Filter</classname> provides a simple method by which filters may be chained
+        together. The following code illustrates how to chain together two filters for the submitted
+        username:
 
         <programlisting language="php"><![CDATA[
 <// Create a filter chain and add filters to the chain
@@ -20,14 +21,15 @@ $filterChain->addFilter(new Zend_Filter_Alpha())
 $username = $filterChain->filter($_POST['username']);
 ]]></programlisting>
 
-        Filters are run in the order they were added to <classname>Zend_Filter</classname>. In the above example, the
-        username is first removed of any non-alphabetic characters, and then any uppercase characters are
-        converted to lowercase.
+        Filters are run in the order they were added to <classname>Zend_Filter</classname>. In the
+        above example, the username is first removed of any non-alphabetic characters, and then any
+        uppercase characters are converted to lowercase.
 
     </para>
 
     <para>
-        Any object that implements <classname>Zend_Filter_Interface</classname> may be used in a filter chain.
+        Any object that implements <classname>Zend_Filter_Interface</classname> may be used in a
+        filter chain.
     </para>
 
 </sect1>

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

@@ -434,8 +434,8 @@ $inflector->addRules(array(
         <para>
             You can use <classname>Zend_Config</classname> to set rules, filter prefix
             paths, and other object state in your inflectors, either by passing
-            a <classname>Zend_Config</classname> object to the constructor or <code>setConfig()</code>.
-            The following settings may be specified:
+            a <classname>Zend_Config</classname> object to the constructor or
+            <code>setConfig()</code>. The following settings may be specified:
         </para>
 
         <itemizedlist>

documentation/manual/en/module_specs/Zend_Filter-LocalizedToNormalized.xml

@@ -16,8 +16,9 @@
 
     <note>
         <para>
-            Please note that normalization is not equal to translation. This filter can not translate
-            strings from one language into another like you could expect with months or names of days.
+            Please note that normalization is not equal to translation. This filter can not
+            translate strings from one language into another like you could expect with months or
+            names of days.
         </para>
     </note>
 
@@ -28,8 +29,8 @@
     <itemizedlist>
         <listitem>
             <para>
-                <emphasis>integer</emphasis>: Integer numbers, which are localized, will be normalized
-                to the english notation.
+                <emphasis>integer</emphasis>: Integer numbers, which are localized, will be
+                normalized to the english notation.
             </para>
         </listitem>
 
@@ -94,14 +95,16 @@ $filter->filter('123.456,78');
 
         <para>
             Let's expect you have set the locale 'de' as application wide locale.
-            <classname>Zend_Filter_LocalizedToNormalized</classname> will take the set locale and use it to
-            detect which sort of input you gave. In our example it was a value with precision. Now
-            the filter will return you the normalized representation for this value as string.
+            <classname>Zend_Filter_LocalizedToNormalized</classname> will take the set locale and
+            use it to detect which sort of input you gave. In our example it was a value with
+            precision. Now the filter will return you the normalized representation for this value
+            as string.
         </para>
 
         <para>
             You can also control how your normalized number has to look like. Therefor you can give
-            all options which are also used by <classname>Zend_Locale_Format</classname>. The most common are:
+            all options which are also used by <classname>Zend_Locale_Format</classname>. The most
+            common are:
         </para>
 
         <itemizedlist>

documentation/manual/en/module_specs/Zend_Filter-NormalizedToLocalized.xml

@@ -5,9 +5,10 @@
     <title>NormalizedToLocalized</title>
 
     <para>
-        This filter is the reverse of the filter <classname>Zend_Filter_LocalizedToNormalized</classname> and
-        will change any given normalized input to it's localized representation. It
-        uses in Background <classname>Zend_Locale</classname> to do this transformation for you.
+        This filter is the reverse of the filter
+        <classname>Zend_Filter_LocalizedToNormalized</classname> and will change any given
+        normalized input to it's localized representation. It uses in Background
+        <classname>Zend_Locale</classname> to do this transformation for you.
     </para>
 
     <para>
@@ -18,7 +19,8 @@
     <note>
         <para>
             Please note that localization is not equal to translation. This filter can not translate
-            strings from one language into another like you could expect with months or names of days.
+            strings from one language into another like you could expect with months or names of
+            days.
         </para>
     </note>
 
@@ -29,8 +31,8 @@
     <itemizedlist>
         <listitem>
             <para>
-                <emphasis>integer</emphasis>: Integer numbers, which are normalized, will be localized
-                to the set notation.
+                <emphasis>integer</emphasis>: Integer numbers, which are normalized, will be
+                localized to the set notation.
             </para>
         </listitem>
 
@@ -87,14 +89,16 @@ $filter->filter(123456.78);
 
         <para>
             Let's expect you have set the locale 'de' as application wide locale.
-            <classname>Zend_Filter_NormalizedToLocalized</classname> will take the set locale and use it to
-            detect which sort of output you want to have. In our example it was a value with precision. Now
-            the filter will return you the localized representation for this value as string.
+            <classname>Zend_Filter_NormalizedToLocalized</classname> will take the set locale and
+            use it to detect which sort of output you want to have. In our example it was a value
+            with precision. Now the filter will return you the localized representation for this
+            value as string.
         </para>
 
         <para>
             You can also control how your localized number has to look like. Therefor you can give
-            all options which are also used by <classname>Zend_Locale_Format</classname>. The most common are:
+            all options which are also used by <classname>Zend_Locale_Format</classname>. The most
+            common are:
         </para>
 
         <itemizedlist>
@@ -145,8 +149,8 @@ $filter->filter(123456.78901);
         <title>Localization for date and time</title>
 
         <para>
-            Normalized for date and time values can also be localized. All given date and time values
-            will be returned as string, with the format defined by the set locale.
+            Normalized for date and time values can also be localized. All given date and time
+            values will be returned as string, with the format defined by the set locale.
         </para>
 
         <programlisting language="php"><![CDATA[

documentation/manual/en/module_specs/Zend_Filter-RealPath.xml

@@ -12,10 +12,10 @@
     </para>
 
     <para>
-        <classname>Zend_Filter_RealPath</classname> will return <constant>FALSE</constant> on failure, e.g.
-        if the file does not exist. On BSD systems <classname>Zend_Filter_RealPath</classname>
-        doesn't fail if only the last path component doesn't exist, while other systems will return
-        <constant>FALSE</constant>.
+        <classname>Zend_Filter_RealPath</classname> will return <constant>FALSE</constant> on
+        failure, e.g. if the file does not exist. On BSD systems
+        <classname>Zend_Filter_RealPath</classname> doesn't fail if only the last path component
+        doesn't exist, while other systems will return <constant>FALSE</constant>.
     </para>
 
     <programlisting language="php"><![CDATA[

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

@@ -11,15 +11,15 @@
     <sect2 id="zend.filter.set.alnum">
         <title>Alnum</title>
         <para>
-            Returns the string <code>$value</code>, removing all but alphabetic and digit characters. This filter
-            includes an option to also allow white space characters.
+            Returns the string <code>$value</code>, removing all but alphabetic and digit
+            characters. This filter includes an option to also allow white space characters.
         </para>
 
         <note>
             <para>
                 The alphabetic characters mean characters that makes up words in each language.
-                However, the english alphabet is treated as the alphabetic characters in following languages: Chinese, Japanese, Korean.
-                The language is specified by Zend_Locale.
+                However, the english alphabet is treated as the alphabetic characters in following
+                languages: Chinese, Japanese, Korean. The language is specified by Zend_Locale.
             </para>
         </note>
 
@@ -28,8 +28,8 @@
     <sect2 id="zend.filter.set.alpha">
         <title>Alpha</title>
         <para>
-            Returns the string <code>$value</code>, removing all but alphabetic characters. This filter includes an
-            option to also allow white space characters.
+            Returns the string <code>$value</code>, removing all but alphabetic characters. This
+            filter includes an option to also allow white space characters.
         </para>
     </sect2>
 
@@ -90,32 +90,35 @@
     <sect2 id="zend.filter.set.stringtolower">
         <title>StringToLower</title>
         <para>
-            Returns the string <code>$value</code>, converting alphabetic characters to lowercase as necessary.
+            Returns the string <code>$value</code>, converting alphabetic characters to lowercase as
+            necessary.
         </para>
     </sect2>
 
     <sect2 id="zend.filter.set.stringtoupper">
         <title>StringToUpper</title>
         <para>
-            Returns the string <code>$value</code>, converting alphabetic characters to uppercase as necessary.
+            Returns the string <code>$value</code>, converting alphabetic characters to uppercase as
+            necessary.
         </para>
     </sect2>
 
     <sect2 id="zend.filter.set.stringtrim">
         <title>StringTrim</title>
         <para>
-            Returns the string <code>$value</code> with characters stripped from the beginning and end.
+            Returns the string <code>$value</code> with characters stripped from the beginning and
+            end.
         </para>
     </sect2>
 
     <sect2 id="zend.filter.set.striptags">
         <title>StripTags</title>
         <para>
-            This filter returns the input string, with all HTML and PHP tags stripped from it, except those that have
-            been explicitly allowed. In addition to the ability to specify which tags are allowed, developers can
-            specify which attributes are allowed across all allowed tags and for specific tags only. Finally, this
-            filter offers control over whether comments (e.g., <code>&lt;!-- ... --&gt;</code>) are removed or
-            allowed.
+            This filter returns the input string, with all HTML and PHP tags stripped from it,
+            except those that have been explicitly allowed. In addition to the ability to specify
+            which tags are allowed, developers can specify which attributes are allowed across all
+            allowed tags and for specific tags only. Finally, this filter offers control over
+            whether comments (e.g., <code>&lt;!-- ... --&gt;</code>) are removed or allowed.
         </para>
     </sect2>
 

documentation/manual/en/module_specs/Zend_Filter-WritingFilters.xml

@@ -5,15 +5,15 @@
     <title>Writing Filters</title>
 
     <para>
-        Zend_Filter supplies a set of commonly needed filters, but developers will often need to write custom
-        filters for their particular use cases. The task of writing a custom filter is facilitated by
-        implementing <classname>Zend_Filter_Interface</classname>.
+        Zend_Filter supplies a set of commonly needed filters, but developers will often need to
+        write custom filters for their particular use cases. The task of writing a custom filter is
+        facilitated by implementing <classname>Zend_Filter_Interface</classname>.
     </para>
 
     <para>
-        <classname>Zend_Filter_Interface</classname> defines a single method, <code>filter()</code>, that may be
-        implemented by user classes. An object that implements this interface may be added to a filter chain
-        with <classname>Zend_Filter::addFilter()</classname>.
+        <classname>Zend_Filter_Interface</classname> defines a single method, <code>filter()</code>,
+        that may be implemented by user classes. An object that implements this interface may be
+        added to a filter chain with <classname>Zend_Filter::addFilter()</classname>.
     </para>
 
     <para>

documentation/manual/en/module_specs/Zend_Filter_Input.xml

@@ -1020,18 +1020,21 @@ $input->addFilterPrefixPath('Foo_Namespace', 'Foo/Namespace');
             <para>
                 As of version 1.5 the function <code>addNamespace($namespace)</code> was deprecated
                 and exchanged with the plugin loader and the <code>addFilterPrefixPath</code> and
-                <code>addValidatorPrefixPath</code> were added. Also the constant <classname>Zend_Filter_Input::INPUT_NAMESPACE</classname>
-                is now deprecated. The constants <classname>Zend_Filter_Input::VALIDATOR_NAMESPACE</classname> and
-                <classname>Zend_Filter_Input::FILTER_NAMESPACE</classname> are available in releases after 1.7.0.
+                <code>addValidatorPrefixPath</code> were added. Also the constant
+                <classname>Zend_Filter_Input::INPUT_NAMESPACE</classname> is now deprecated. The
+                constants <classname>Zend_Filter_Input::VALIDATOR_NAMESPACE</classname> and
+                <classname>Zend_Filter_Input::FILTER_NAMESPACE</classname> are available in releases
+                after 1.7.0.
             </para>
         </note>
 
         <note>
             <para>
-                As of version 1.0.4, <classname>Zend_Filter_Input::NAMESPACE</classname>, having value <code>namespace</code>,
-                was changed to <classname>Zend_Filter_Input::INPUT_NAMESPACE</classname>, having value
-                <code>inputNamespace</code>, in order to comply with the PHP 5.3 reservation of the keyword
-                <code>namespace</code>.
+                As of version 1.0.4, <classname>Zend_Filter_Input::NAMESPACE</classname>, having
+                value <code>namespace</code>, was changed to
+                <classname>Zend_Filter_Input::INPUT_NAMESPACE</classname>, having value
+                <code>inputNamespace</code>, in order to comply with the PHP 5.3 reservation of the
+                keyword <code>namespace</code>.
             </para>
         </note>
 

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

@@ -182,9 +182,9 @@ $form->addElementPrefixPath('My_Decorator', 'My/Decorator/', 'decorator');
 ]]></programlisting>
 
             <para>
-                After it added as in the example above, the 'My/Decorator/' path will be searched first to see if the
-                decorator exists there when you add a decorator. As a result, 'My_Decorator_Label' will
-                now be used when the 'Label' decorator is requested.
+                After it added as in the example above, the 'My/Decorator/' path will be searched
+                first to see if the decorator exists there when you add a decorator. As a result,
+                'My_Decorator_Label' will now be used when the 'Label' decorator is requested.
             </para>
         </example>
     </sect2>
@@ -196,12 +196,12 @@ $form->addElementPrefixPath('My_Decorator', 'My/Decorator/', 'decorator');
             It's often useful and/or necessary to perform some normalization on
             input prior to validation. For example, you may want to strip out
             all HTML, but run your validations on what remains to ensure the
-            submission is valid. Or you may want to trim empty space surrounding input so that a StringLength validator will use the correct length of the input without counting leading or trailing whitespace characters.
-            These operations may be performed using
-            <classname>Zend_Filter</classname>. <classname>Zend_Form_Element</classname> has
-            support for filter chains, allowing you to specify multiple,
-            sequential filters. Filtering happens both during
-            validation and when you retrieve the element value via
+            submission is valid. Or you may want to trim empty space surrounding input so that a
+            StringLength validator will use the correct length of the input without counting leading
+            or trailing whitespace characters. These operations may be performed using
+            <classname>Zend_Filter</classname>. <classname>Zend_Form_Element</classname> has support
+            for filter chains, allowing you to specify multiple, sequential filters. Filtering
+            happens both during validation and when you retrieve the element value via
             <code>getValue()</code>:
         </para>
 
@@ -421,9 +421,9 @@ $validator = new Zend_Validate_StringLength(6, 20);
 
             <para>
                 Some developers may wish to provide custom error messages for a
-                validator. The <code>$options</code> argument of the <classname>Zend_Form_Element::addValidator()</classname> method
-                 allows you to do so by providing
-                the key 'messages' and mapping it to an array of key/value pairs
+                validator. The <code>$options</code> argument of the
+                <classname>Zend_Form_Element::addValidator()</classname> method allows you to do so
+                by providing the key 'messages' and mapping it to an array of key/value pairs
                 for setting the message templates. You will need to know the
                 error codes of the various validation error types for the
                 particular validator.
@@ -653,8 +653,8 @@ $messages = $element->getMessages();
             <listitem><para>
                     <code>setRequired($flag)</code> and
                     <code>isRequired()</code> allow you to set and retrieve the
-                    status of the 'required' flag. When set to boolean <constant>TRUE</constant>, this
-                    flag requires that the element be in the data processed by
+                    status of the 'required' flag. When set to boolean <constant>TRUE</constant>,
+                    this flag requires that the element be in the data processed by
                     <classname>Zend_Form</classname>.
             </para></listitem>
 
@@ -675,7 +675,8 @@ $messages = $element->getMessages();
             </para></listitem>
 
             <listitem><para>
-                <code>addValidator($nameOrValidator, $breakChainOnFailure = false, array $options = null)</code>
+                <code>addValidator($nameOrValidator, $breakChainOnFailure = false, array $options =
+                    null)</code>
             </para></listitem>
 
             <listitem><para>
@@ -814,8 +815,8 @@ $messages = $element->getMessages();
 
             <listitem><para>
                 <emphasis>Errors</emphasis>: appends error messages to the
-                element using <classname>Zend_View_Helper_FormErrors</classname>. If none are present,
-                nothing is appended.
+                element using <classname>Zend_View_Helper_FormErrors</classname>. If none are
+                present, nothing is appended.
             </para></listitem>
 
             <listitem><para>
@@ -832,8 +833,8 @@ $messages = $element->getMessages();
 
             <listitem><para>
                 <emphasis>Label</emphasis>: prepends a label to the element
-                using <classname>Zend_View_Helper_FormLabel</classname>, and wraps it in a &lt;dt&gt;
-                tag. If no label is provided, just the definition term tag is
+                using <classname>Zend_View_Helper_FormLabel</classname>, and wraps it in a
+                &lt;dt&gt; tag. If no label is provided, just the definition term tag is
                 rendered.
             </para></listitem>
         </itemizedlist>
@@ -1133,8 +1134,8 @@ $element->class = 'text;
         <title>Standard Elements</title>
 
         <para>
-            <classname>Zend_Form</classname> ships with a number of standard elements; please read the
-            <link linkend="zend.form.standardElements">Standard Elements</link>
+            <classname>Zend_Form</classname> ships with a number of standard elements; please read
+            the <link linkend="zend.form.standardElements">Standard Elements</link>
             chapter for full details.
         </para>
     </sect2>
@@ -1157,7 +1158,11 @@ $element->class = 'text;
 
             <listitem><para>I18n:</para>
                 <itemizedlist>
-                    <listitem><para><code>setTranslator(Zend_Translate_Adapter $translator = null)</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>setTranslator(Zend_Translate_Adapter $translator = null)</code>
+                        </para>
+                    </listitem>
                     <listitem><para><code>getTranslator()</code></para></listitem>
                     <listitem><para><code>setDisableTranslator($flag)</code></para></listitem>
                     <listitem><para><code>translatorIsDisabled()</code></para></listitem>
@@ -1181,7 +1186,9 @@ $element->class = 'text;
                     <listitem><para><code>getRequired()</code></para></listitem>
                     <listitem><para><code>setAllowEmpty($flag)</code></para></listitem>
                     <listitem><para><code>getAllowEmpty()</code></para></listitem>
-                    <listitem><para><code>setAutoInsertNotEmptyValidator($flag)</code></para></listitem>
+                    <listitem>
+                        <para><code>setAutoInsertNotEmptyValidator($flag)</code></para>
+                    </listitem>
                     <listitem><para><code>autoInsertNotEmptyValidator()</code></para></listitem>
                     <listitem><para><code>setIgnore($flag)</code></para></listitem>
                     <listitem><para><code>getIgnore()</code></para></listitem>
@@ -1195,16 +1202,28 @@ $element->class = 'text;
 
             <listitem><para>Plugin loaders and paths:</para>
                 <itemizedlist>
-                    <listitem><para><code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader,
+                                $type)</code>
+                        </para>
+                    </listitem>
                     <listitem><para><code>getPluginLoader($type)</code></para></listitem>
-                    <listitem><para><code>addPrefixPath($prefix, $path, $type = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>addPrefixPath($prefix, $path, $type = null)</code></para>
+                    </listitem>
                     <listitem><para><code>addPrefixPaths(array $spec)</code></para></listitem>
                 </itemizedlist>
             </listitem>
 
             <listitem><para>Validation:</para>
                 <itemizedlist>
-                    <listitem><para><code>addValidator($validator, $breakChainOnFailure = false, $options = array())</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>addValidator($validator, $breakChainOnFailure = false, $options =
+                                array())</code>
+                        </para>
+                    </listitem>
                     <listitem><para><code>addValidators(array $validators)</code></para></listitem>
                     <listitem><para><code>setValidators(array $validators)</code></para></listitem>
                     <listitem><para><code>getValidator($name)</code></para></listitem>
@@ -1219,7 +1238,9 @@ $element->class = 'text;
 
             <listitem><para>Filters:</para>
                 <itemizedlist>
-                    <listitem><para><code>addFilter($filter, $options = array())</code></para></listitem>
+                    <listitem>
+                        <para><code>addFilter($filter, $options = array())</code></para>
+                    </listitem>
                     <listitem><para><code>addFilters(array $filters)</code></para></listitem>
                     <listitem><para><code>setFilters(array $filters)</code></para></listitem>
                     <listitem><para><code>getFilter($name)</code></para></listitem>
@@ -1231,16 +1252,22 @@ $element->class = 'text;
 
             <listitem><para>Rendering:</para>
                 <itemizedlist>
-                    <listitem><para><code>setView(Zend_View_Interface $view = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>setView(Zend_View_Interface $view = null)</code></para>
+                    </listitem>
                     <listitem><para><code>getView()</code></para></listitem>
-                    <listitem><para><code>addDecorator($decorator, $options = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>addDecorator($decorator, $options = null)</code></para>
+                    </listitem>
                     <listitem><para><code>addDecorators(array $decorators)</code></para></listitem>
                     <listitem><para><code>setDecorators(array $decorators)</code></para></listitem>
                     <listitem><para><code>getDecorator($name)</code></para></listitem>
                     <listitem><para><code>getDecorators()</code></para></listitem>
                     <listitem><para><code>removeDecorator($name)</code></para></listitem>
                     <listitem><para><code>clearDecorators()</code></para></listitem>
-                    <listitem><para><code>render(Zend_View_Interface $view = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>render(Zend_View_Interface $view = null)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
         </itemizedlist>

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

@@ -49,8 +49,8 @@ $form = new My_Form()
 ]]></programlisting>
 
     <para>
-        You can optionally pass in a instance of <classname>Zend_Config</classname> or an array, which will be used to set
-        object state and potentially create new elements:
+        You can optionally pass in a instance of <classname>Zend_Config</classname> or an array,
+        which will be used to set object state and potentially create new elements:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -438,8 +438,8 @@ $form->setElementDecorators(
 
                     <para>
                         So, use this method wisely, and realize that you may
-                        need to exclude some elements or manually change some elements' decorators to
-                        prevent unwanted output.
+                        need to exclude some elements or manually change some elements' decorators
+                        to prevent unwanted output.
                     </para>
                 </note>
 
@@ -768,7 +768,9 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
                     <itemizedlist>
                         <listitem><para><code>setOptions(array $options)</code></para></listitem>
 
-                        <listitem><para><code>setConfig(Zend_Config $config)</code></para></listitem>
+                        <listitem>
+                            <para><code>setConfig(Zend_Config $config)</code></para>
+                        </listitem>
                     </itemizedlist>
                 </listitem>
 
@@ -808,9 +810,18 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
 
                 <listitem><para>Elements:</para>
                     <itemizedlist>
-                        <listitem><para><code>createElement($type, $name, array $options = array())</code></para></listitem>
-
-                        <listitem><para><code>addElement($typeOrElement, $name, array $options = array())</code></para></listitem>
+                        <listitem>
+                            <para>
+                                <code>createElement($type, $name, array $options = array())</code>
+                            </para>
+                        </listitem>
+
+                        <listitem>
+                            <para>
+                                <code>addElement($typeOrElement, $name, array $options =
+                                    array())</code>
+                            </para>
+                        </listitem>
 
                         <listitem><para><code>addElements(array $elements)</code></para></listitem>
 
@@ -828,7 +839,11 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
 
                 <listitem><para>Plugin loaders:</para>
                     <itemizedlist>
-                        <listitem><para><code>setPluginLoader(Zend_Loader_PluginLoader $loader)</code></para></listitem>
+                        <listitem>
+                            <para>
+                                <code>setPluginLoader(Zend_Loader_PluginLoader $loader)</code>
+                            </para>
+                        </listitem>
 
                         <listitem><para><code>getPluginLoader()</code></para></listitem>
 
@@ -840,11 +855,17 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
 
                 <listitem><para>Decorators:</para>
                     <itemizedlist>
-                        <listitem><para><code>addDecorator($decorator, $options = null)</code></para></listitem>
+                        <listitem>
+                            <para><code>addDecorator($decorator, $options = null)</code></para>
+                        </listitem>
 
-                        <listitem><para><code>addDecorators(array $decorators)</code></para></listitem>
+                        <listitem>
+                            <para><code>addDecorators(array $decorators)</code></para>
+                        </listitem>
 
-                        <listitem><para><code>setDecorators(array $decorators)</code></para></listitem>
+                        <listitem>
+                            <para><code>setDecorators(array $decorators)</code></para>
+                        </listitem>
 
                         <listitem><para><code>getDecorator($name)</code></para></listitem>
 
@@ -858,17 +879,26 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
 
                 <listitem><para>Rendering:</para>
                     <itemizedlist>
-                        <listitem><para><code>setView(Zend_View_Interface $view = null)</code></para></listitem>
+                        <listitem>
+                            <para><code>setView(Zend_View_Interface $view = null)</code></para>
+                        </listitem>
 
                         <listitem><para><code>getView()</code></para></listitem>
 
-                        <listitem><para><code>render(Zend_View_Interface $view = null)</code></para></listitem>
+                        <listitem>
+                            <para><code>render(Zend_View_Interface $view = null)</code></para>
+                        </listitem>
                     </itemizedlist>
                 </listitem>
 
                 <listitem><para>I18n:</para>
                     <itemizedlist>
-                        <listitem><para><code>setTranslator(Zend_Translate_Adapter $translator = null)</code></para></listitem>
+                        <listitem>
+                            <para>
+                                <code>setTranslator(Zend_Translate_Adapter $translator =
+                                    null)</code>
+                            </para>
+                        </listitem>
 
                         <listitem><para><code>getTranslator()</code></para></listitem>
 
@@ -1291,8 +1321,8 @@ echo $form->renderFieldset("<p>This is fieldset content</p>");
 
         <para>
             A primary use case for forms is validating submitted data.
-            <classname>Zend_Form</classname> allows you to validate an entire form, a partial form, or responses for
-            XmlHttpRequests (AJAX). If the submitted data is not valid, it has
+            <classname>Zend_Form</classname> allows you to validate an entire form, a partial form,
+            or responses for XmlHttpRequests (AJAX). If the submitted data is not valid, it has
             methods for retrieving the various error codes and messages for
             elements and sub forms.
         </para>
@@ -1476,19 +1506,32 @@ $messages = $form->getMessages('username');
 
             <listitem><para>Plugin Loaders and paths:</para>
                 <itemizedlist>
-                    <listitem><para><code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type = null)</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type
+                                = null)</code>
+                        </para>
+                    </listitem>
 
                     <listitem><para><code>getPluginLoader($type = null)</code></para></listitem>
 
-                    <listitem><para><code>addPrefixPath($prefix, $path, $type = null) </code></para></listitem>
+                    <listitem>
+                        <para><code>addPrefixPath($prefix, $path, $type = null) </code></para>
+                    </listitem>
 
                     <listitem><para><code>addPrefixPaths(array $spec)</code></para></listitem>
 
-                    <listitem><para><code>addElementPrefixPath($prefix, $path, $type = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>addElementPrefixPath($prefix, $path, $type = null)</code></para>
+                    </listitem>
 
-                    <listitem><para><code>addElementPrefixPaths(array $spec)</code></para></listitem>
+                    <listitem>
+                        <para><code>addElementPrefixPaths(array $spec)</code></para>
+                    </listitem>
 
-                    <listitem><para><code>addDisplayGroupPrefixPath($prefix, $path)</code></para></listitem>
+                    <listitem>
+                        <para><code>addDisplayGroupPrefixPath($prefix, $path)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
@@ -1552,13 +1595,17 @@ $messages = $form->getMessages('username');
 
                     <listitem><para><code>setElementFilters(array $filters)</code></para></listitem>
 
-                    <listitem><para><code>setElementDecorators(array $decorators)</code></para></listitem>
+                    <listitem>
+                        <para><code>setElementDecorators(array $decorators)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
             <listitem><para>Sub forms:</para>
                 <itemizedlist>
-                    <listitem><para><code>addSubForm(Zend_Form $form, $name, $order = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>addSubForm(Zend_Form $form, $name, $order = null)</code></para>
+                    </listitem>
 
                     <listitem><para><code>addSubForms(array $subForms)</code></para></listitem>
 
@@ -1572,13 +1619,19 @@ $messages = $form->getMessages('username');
 
                     <listitem><para><code>clearSubForms()</code></para></listitem>
 
-                    <listitem><para><code>setSubFormDecorators(array $decorators)</code></para></listitem>
+                    <listitem>
+                        <para><code>setSubFormDecorators(array $decorators)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
             <listitem><para>Display groups:</para>
                 <itemizedlist>
-                    <listitem><para><code>addDisplayGroup(array $elements, $name, $options = null)</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>addDisplayGroup(array $elements, $name, $options = null)</code>
+                        </para>
+                    </listitem>
 
                     <listitem><para><code>addDisplayGroups(array $groups)</code></para></listitem>
 
@@ -1592,7 +1645,9 @@ $messages = $form->getMessages('username');
 
                     <listitem><para><code>clearDisplayGroups()</code></para></listitem>
 
-                    <listitem><para><code>setDisplayGroupDecorators(array $decorators)</code></para></listitem>
+                    <listitem>
+                        <para><code>setDisplayGroupDecorators(array $decorators)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
@@ -1616,11 +1671,15 @@ $messages = $form->getMessages('username');
 
             <listitem><para>Rendering:</para>
                 <itemizedlist>
-                    <listitem><para><code>setView(Zend_View_Interface $view = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>setView(Zend_View_Interface $view = null)</code></para>
+                    </listitem>
 
                     <listitem><para><code>getView()</code></para></listitem>
 
-                    <listitem><para><code>addDecorator($decorator, $options = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>addDecorator($decorator, $options = null)</code></para>
+                    </listitem>
 
                     <listitem><para><code>addDecorators(array $decorators)</code></para></listitem>
 
@@ -1634,13 +1693,19 @@ $messages = $form->getMessages('username');
 
                     <listitem><para><code>clearDecorators()</code></para></listitem>
 
-                    <listitem><para><code>render(Zend_View_Interface $view = null)</code></para></listitem>
+                    <listitem>
+                        <para><code>render(Zend_View_Interface $view = null)</code></para>
+                    </listitem>
                 </itemizedlist>
             </listitem>
 
             <listitem><para>I18n:</para>
                 <itemizedlist>
-                    <listitem><para><code>setTranslator(Zend_Translate_Adapter $translator = null)</code></para></listitem>
+                    <listitem>
+                        <para>
+                            <code>setTranslator(Zend_Translate_Adapter $translator = null)</code>
+                        </para>
+                    </listitem>
 
                     <listitem><para><code>getTranslator()</code></para></listitem>
 
@@ -1695,7 +1760,9 @@ $messages = $form->getMessages('username');
                 <para>the following setters cannot be set in this way:</para>
 
                 <itemizedlist>
-                    <listitem><para><code>setAttrib (though setAttribs *will* work)</code></para></listitem>
+                    <listitem>
+                        <para><code>setAttrib (though setAttribs *will* work)</code></para>
+                    </listitem>
 
                     <listitem><para><code>setConfig</code></para></listitem>
 

documentation/manual/en/module_specs/Zend_Form-I18n.xml

@@ -5,8 +5,8 @@
 
     <para>
         Increasingly, developers need to tailor their content for multiple
-        languages and regions. <classname>Zend_Form</classname> aims to make such a task trivial, and
-        leverages functionality in both <link
+        languages and regions. <classname>Zend_Form</classname> aims to make such a task trivial,
+        and leverages functionality in both <link
             linkend="zend.translate">Zend_Translate</link> and <link
             linkend="zend.validate">Zend_Validate</link> to do so.
     </para>

documentation/manual/en/module_specs/Zend_Form-Introduction.xml

@@ -17,10 +17,11 @@
     </itemizedlist>
 
     <para>
-        <classname>Zend_Form</classname> makes use of several Zend Framework components to accomplish its
-        goals, including <classname>Zend_Config</classname>, <classname>Zend_Validate</classname>,
-        <classname>Zend_Filter</classname>, <classname>Zend_Loader_PluginLoader</classname>, and
-        optionally <classname>Zend_View</classname>.
+        <classname>Zend_Form</classname> makes use of several Zend Framework components to
+        accomplish its goals, including <classname>Zend_Config</classname>,
+        <classname>Zend_Validate</classname>, <classname>Zend_Filter</classname>,
+        <classname>Zend_Loader_PluginLoader</classname>, and optionally
+        <classname>Zend_View</classname>.
     </para>
 </sect1>
 <!--

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

@@ -157,8 +157,8 @@ $username->addValidator('alnum');
 ]]></programlisting>
 
         <para>
-            When using this second option, you can pass constructor arguments in an array as the third
-            parameter if the validator can accept tem:
+            When using this second option, you can pass constructor arguments in an array as the
+            third parameter if the validator can accept tem:
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -549,8 +549,8 @@ class UserController extends Zend_Controller_Action
 
         <para>
             As you'll note from the controller code, there's more work to do:
-            while the submission may be valid, you may still need to do some
-            authentication using <classname>Zend_Auth</classname> or another authorization mechanism.
+            while the submission may be valid, you may still need to do some authentication
+            using <classname>Zend_Auth</classname> or another authorization mechanism.
         </para>
     </sect2>
 

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

@@ -249,8 +249,8 @@ $location = $form->foo->getFileName();
             <para>
                 Within HTTP a file element has no value. For this reason and because of
                 security concerns <code>getValue()</code> returns only the uploaded filename
-                and not the complete path. If you need the file path,
-                call <code>getFileName()</code>, which returns both the path and the name of the file.
+                and not the complete path. If you need the file path, call
+                <code>getFileName()</code>, which returns both the path and the name of the file.
             </para>
         </note>
 
@@ -268,8 +268,8 @@ $form->getValues();
             <para>
                 Therefor another call of <code>receive()</code> after calling
                 <code>getValues()</code> will not have an effect. Also creating a instance of
-                <classname>Zend_File_Transfer</classname> will not have an effect as there no file anymore
-                to receive.
+                <classname>Zend_File_Transfer</classname> will not have an effect as there no file
+                anymore to receive.
             </para>
         </note>
 
@@ -445,9 +445,9 @@ $form->addElement($element, 'foo');
         <title>Zend_Form_Element_Hidden</title>
 
         <para>
-            Hidden elements inject data that should be submitted, but
-            that should not manipulated by the user .
-            <classname>Zend_Form_Element_Hidden</classname> accomplishes this with the 'formHidden' view helper.
+            Hidden elements inject data that should be submitted, but that should not manipulated by
+            the user . <classname>Zend_Form_Element_Hidden</classname> accomplishes this with the
+            'formHidden' view helper.
         </para>
     </sect2>
 
@@ -502,8 +502,8 @@ $form->addElement('hash', 'no_csrf_foo', array('salt' => 'unique'));
         <para>
             Images need an image source. <classname>Zend_Form_Element_Image</classname>
             allows you to specify this by using the <code>setImage()</code>
-            accessor (or 'image' configuration key). You can also optionally specify a value to use when
-            submitting the image using the <code>setImageValue()</code> accessor
+            accessor (or 'image' configuration key). You can also optionally specify a value to use
+            when submitting the image using the <code>setImageValue()</code> accessor
             (or 'imageValue' configuration key). When the value set for the
             element matches the <code>imageValue</code>, then the accessor
             <code>isChecked()</code> will return true.