Przeglądaj źródła

[MANUAL] English:

- manual fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21606 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 lat temu
rodzic
commit
018c56fa90

+ 89 - 93
documentation/manual/en/module_specs/Zend_Feed-ConsumingAtom.xml

@@ -36,104 +36,100 @@ foreach ($feed as $entry) {
         In an Atom feed you can expect to find the following feed properties:
     </para>
 
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <property>title</property> - The feed's title, same as <acronym>RSS</acronym>'s
-                    channel title
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>id</property> - Every feed and entry in Atom has a unique identifier
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>link</property> - Feeds can have multiple links, which are
-                    distinguished by a <property>type</property> attribute
-                </para>
-
-                <para>
-                    The equivalent to <acronym>RSS</acronym>'s channel link would be
-                    <command>type="text/html"</command>. if the link is to an alternate version of
-                    the same content that's in the feed, it would have a
-                    <command>rel="alternate"</command> attribute.
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>subtitle</property> - The feed's description, equivalent to
-                    <acronym>RSS</acronym>' channel description
-                </para>
-
-                <para><command>author->name()</command> - The feed author's name</para>
-                <para><command>author->email()</command> - The feed author's email address</para>
-            </listitem>
-        </itemizedlist>
-    </para>
+    <itemizedlist>
+        <listitem>
+            <para>
+                <property>title</property> - The feed's title, same as <acronym>RSS</acronym>'s
+                 channel title
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>id</property> - Every feed and entry in Atom has a unique identifier
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>link</property> - Feeds can have multiple links, which are
+                distinguished by a <property>type</property> attribute
+            </para>
+
+            <para>
+                The equivalent to <acronym>RSS</acronym>'s channel link would be
+                <command>type="text/html"</command>. if the link is to an alternate version of
+                the same content that's in the feed, it would have a
+                <command>rel="alternate"</command> attribute.
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>subtitle</property> - The feed's description, equivalent to
+                <acronym>RSS</acronym>' channel description
+            </para>
+
+            <para><property>author->name()</property> - The feed author's name</para>
+            <para><property>author->email()</property> - The feed author's email address</para>
+        </listitem>
+    </itemizedlist>
 
     <para>
         Atom entries commonly have the following properties:
     </para>
 
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para><property>id</property> - The entry's unique identifier</para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>title</property> - The entry's title, same as <acronym>RSS</acronym>
-                    item titles
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>link</property> - A link to another format or an alternate view of
-                    this entry
-                </para>
-            </listitem>
-
-            <listitem>
-                <para><property>summary</property> - A summary of this entry's content</para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>content</property> - The full content of the entry; can be skipped if
-                    the feed just contains summaries
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>author</property> - with <property>name</property> and
-                    <property>email</property> sub-tags like feeds have
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>published</property> - the date the entry was published, in
-                    <acronym>RFC</acronym> 3339 format
-                </para>
-            </listitem>
-
-            <listitem>
-                <para>
-                    <property>updated</property> - the date the entry was last updated, in
-                    <acronym>RFC</acronym> 3339 format
-                </para>
-            </listitem>
-        </itemizedlist>
-    </para>
+    <itemizedlist>
+        <listitem>
+            <para><property>id</property> - The entry's unique identifier</para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>title</property> - The entry's title, same as <acronym>RSS</acronym>
+                item titles
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>link</property> - A link to another format or an alternate view of
+                this entry
+            </para>
+        </listitem>
+
+        <listitem>
+            <para><property>summary</property> - A summary of this entry's content</para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>content</property> - The full content of the entry; can be skipped if
+                the feed just contains summaries
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>author</property> - with <property>name</property> and
+                <property>email</property> sub-tags like feeds have
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>published</property> - the date the entry was published, in
+                <acronym>RFC</acronym> 3339 format
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                <property>updated</property> - the date the entry was last updated, in
+                <acronym>RFC</acronym> 3339 format
+            </para>
+        </listitem>
+    </itemizedlist>
 
     <para>
         For more information on Atom and plenty of resources, see

+ 23 - 19
documentation/manual/en/module_specs/Zend_Feed-ConsumingRss.xml

@@ -51,8 +51,8 @@ echo $channel->category['domain'];
     <para>
         Most commonly you'll want to loop through the feed and do something with its entries.
         <classname>Zend_Feed_Abstract</classname> implements <acronym>PHP</acronym>'s
-        <code>Iterator</code> interface, so printing all titles of articles in a channel is just a
-        matter of:
+        <classname>Iterator</classname> interface, so printing all titles of articles in a channel
+        is just a matter of:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -74,18 +74,20 @@ foreach ($channel as $item) {
     <para>
         <itemizedlist>
             <listitem>
-                <para><code>title</code> - The name of the channel</para>
+                <para><property>title</property> - The name of the channel</para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>link</code> - The <acronym>URL</acronym> of the web site corresponding to
-                    the channel
+                    <property>link</property> - The <acronym>URL</acronym> of the web site
+                    corresponding to the channel
                 </para>
             </listitem>
 
             <listitem>
-                <para><code>description</code> - A sentence or several describing the channel</para>
+                <para>
+                    <property>description</property> - A sentence or several describing the channel
+                </para>
             </listitem>
         </itemizedlist>
     </para>
@@ -98,27 +100,28 @@ foreach ($channel as $item) {
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>pubDate</code> - The publication date of this set of content, in
+                    <property>pubDate</property> - The publication date of this set of content, in
                     <acronym>RFC</acronym> 822 date format
                 </para>
             </listitem>
 
             <listitem>
-                <para><code>language</code> - The language the channel is written in</para>
+                <para><property>language</property> - 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
+                    <property>category</property> - One or more (specified by multiple tags)
+                    categories the channel belongs to
                 </para>
             </listitem>
         </itemizedlist>
     </para>
 
     <para>
-        <acronym>RSS</acronym> <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.
+        <acronym>RSS</acronym> <emphasis>&lt;item&gt;</emphasis> elements do not have any strictly
+        required elements. However, either <property>title</property> or
+        <property>description</property> must be present.
     </para>
 
     <para>
@@ -128,36 +131,37 @@ foreach ($channel as $item) {
     <para>
         <itemizedlist>
             <listitem>
-                <para><code>title</code> - The title of the item</para>
+                <para><property>title</property> - The title of the item</para>
             </listitem>
 
             <listitem>
-                <para><code>link</code> - The <acronym>URL</acronym> of the item</para>
+                <para><property>link</property> - The <acronym>URL</acronym> of the item</para>
             </listitem>
 
             <listitem>
-                <para><code>description</code> - A synopsis of the item</para>
+                <para><property>description</property> - A synopsis of the item</para>
             </listitem>
 
             <listitem>
-                <para><code>author</code> - The author's email address</para>
+                <para><property>author</property> - The author's email address</para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>category</code> - One more categories that the item belongs to
+                    <property>category</property> - One more categories that the item belongs to
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>comments</code> - <acronym>URL</acronym> of comments relating to this item
+                    <property>comments</property> - <acronym>URL</acronym> of comments relating to
+                    this item
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>pubDate</code> - The date the item was published, in
+                    <property>pubDate</property> - The date the item was published, in
                     <acronym>RFC</acronym> 822 date format
                 </para>
             </listitem>

+ 39 - 37
documentation/manual/en/module_specs/Zend_File_Transfer-Filters.xml

@@ -17,32 +17,34 @@
     <itemizedlist>
         <listitem>
             <para>
-                <code>Decrypt</code>: This filter can decrypt a encrypted file.
+                <classname>Decrypt</classname>: This filter can decrypt a encrypted file.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Encrypt</code>: This filter can encrypt a file.
+                <classname>Encrypt</classname>: This filter can encrypt a file.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>LowerCase</code>: This filter can lowercase the content of a textfile.
+                <classname>LowerCase</classname>: This filter can lowercase the content of a
+                textfile.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Rename</code>: This filter can rename files, change the location and even
-                force overwriting of existing files.
+                <classname>Rename</classname>: This filter can rename files, change the location and
+                even force overwriting of existing files.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>UpperCase</code>: This filter can uppercase the content of a textfile.
+                <classname>UpperCase</classname>: This filter can uppercase the content of a
+                textfile.
             </para>
         </listitem>
     </itemizedlist>
@@ -58,8 +60,8 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>addFilter($filter, $options = null, $files =
-                    null)</code>: Adds the given filter to the filter
+                    <methodname>addFilter($filter, $options = null, $files =
+                        null)</methodname>: Adds the given filter to the filter
                     stack (optionally only to the file(s) specified).
                     <varname>$filter</varname> may be either an actual filter
                     instance, or a short name specifying the filter type
@@ -69,8 +71,8 @@
 
             <listitem>
                 <para>
-                    <code>addFilters(array $filters, $files =
-                        null)</code>: Adds the given filters to the stack of
+                    <methodname>addFilters(array $filters, $files =
+                        null)</methodname>: Adds the given filters to the stack of
                     filters. Each entry may be either a filter
                     type/options pair, or an array with the key 'filter'
                     specifying the filter (all other options will be
@@ -80,8 +82,8 @@
 
             <listitem>
                 <para>
-                    <code>setFilters(array $filters, $files =
-                        null)</code>: Overwrites any existing filters with
+                    <methodname>setFilters(array $filters, $files =
+                        null)</methodname>: Overwrites any existing filters with
                     the filters specified. The filters should follow the
                     syntax for <methodname>addFilters()</methodname>.
                 </para>
@@ -197,21 +199,21 @@ $upload->addFilter('Rename', 'C:\picture\newjpg', 'file1')
         <title>Decrypt filter</title>
 
         <para>
-            The <code>Decrypt</code> filter allows to decrypt a encrypted file.
+            The <classname>Decrypt</classname> filter allows to decrypt a encrypted file.
         </para>
 
         <para>
             This filter makes use of <classname>Zend_Filter_Decrypt</classname>. It supports the
-            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from <acronym>PHP</acronym>.
-            Please read the related section for details about how to set the options for decryption
-            and which options are supported.
+            <classname>Mcrypt</classname> and <classname>OpenSSL</classname> extensions from
+            <acronym>PHP</acronym>. 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.
+            with another filename. Set the <property>filename</property> 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,21 +249,21 @@ $upload->addFilter('Decrypt',
         <title>Encrypt filter</title>
 
         <para>
-            The <code>Encrypt</code> filter allows to encrypt a file.
+            The <classname>Encrypt</classname> filter allows to encrypt a file.
         </para>
 
         <para>
             This filter makes use of <classname>Zend_Filter_Encrypt</classname>. It supports the
-            <code>Mcrypt</code> and <code>OpenSSL</code> extensions from <acronym>PHP</acronym>.
-            Please read the related section for details about how to set the options for encryption
-            and which options are supported.
+            <classname>Mcrypt</classname> and <classname>OpenSSL</classname> extensions from
+            <acronym>PHP</acronym>. 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.
+            with another filename. Set the <property>filename</property> 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">
@@ -296,8 +298,8 @@ $upload->addFilter('Encrypt',
         <title>LowerCase filter</title>
 
         <para>
-            The <code>LowerCase</code> filter allows to change the content of a file to lowercase.
-            You should use this filter only on textfiles.
+            The <classname>LowerCase</classname> filter allows to change the content of a file to
+            lowercase. You should use this filter only on textfiles.
         </para>
 
         <para>
@@ -336,28 +338,28 @@ $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 <classname>Rename</classname> 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.
+                    <property>source</property>: The name and destination of the old file which
+                    shall be renamed.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>target</code>: The new directory, or filename of the file.
+                    <property>target</property>: The new directory, or filename of the file.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>overwrite</code>: Sets if the old file overwrites the new one if it
-                    already exists. The default value is <constant>FALSE</constant>.
+                    <property>overwrite</property>: Sets if the old file overwrites the new one if
+                    it already exists. The default value is <constant>FALSE</constant>.
                 </para>
             </listitem>
         </itemizedlist>
@@ -475,8 +477,8 @@ $upload->addFilter('Rename', 'C:\mypics\newgifs', 'uploadfile1');
         <title>UpperCase filter</title>
 
         <para>
-            The <code>UpperCase</code> filter allows to change the content of a file to uppercase.
-            You should use this filter only on textfiles.
+            The <classname>UpperCase</classname> filter allows to change the content of a file to
+            uppercase. You should use this filter only on textfiles.
         </para>
 
         <para>

+ 17 - 16
documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml

@@ -69,8 +69,8 @@
 
         <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.
+            located at <filename>/file/upload</filename>. So next we will create the 'file'
+            controller and the <methodname>upload()</methodname> action.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -87,8 +87,9 @@ if (!$adapter->receive()) {
         <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 <methodname>receive()</methodname> method
-            is called. if there are any upload errors, an error will be returned.
+            <methodname>setDestination()</methodname> method, then the
+            <methodname>receive()</methodname> method is called. if there are any upload errors, an
+            error will be returned.
         </para>
     </example>
 
@@ -154,8 +155,8 @@ if (!$adapter->receive()) {
                     If no files are specified, all files will be checked. You can call
                     <methodname>isValid()</methodname> before calling
                     <methodname>receive()</methodname>; in this case,
-                    <methodname>receive()</methodname> will not call <code>isValid</code> internally
-                    again when receiving the file.
+                    <methodname>receive()</methodname> will not call
+                    <methodname>isValid()</methodname> internally again when receiving the file.
                 </para>
             </listitem>
 
@@ -288,9 +289,9 @@ $names = $upload->getFileName('foo');
 
         <para>
             <methodname>getFileSize()</methodname> 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
-            <constant>FALSE</constant>.
+            notation which means you will get <emphasis>2kB</emphasis> instead of
+            <emphasis>2048</emphasis>. If you need only the plain size set the
+            <property>useByteString</property> option to <constant>FALSE</constant>.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.example.getfilesize">
@@ -323,7 +324,7 @@ $size = $upload->getFileSize();
             <methodname>getHash()</methodname> 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.
+            specify an algorithm, the <emphasis>crc32</emphasis> algorithm will be used by default.
         </para>
 
         <example id="zend.file.transfer.introduction.informations.example2">
@@ -413,14 +414,14 @@ $names = $upload->getMimeType('foo');
             <classname>Zend_File_Transfer</classname> can give you the actual state of a fileupload
             in progress. To use this feature you need either the <acronym>APC</acronym> extension
             which is provided with most default <acronym>PHP</acronym> installations, or the
-            <code>uploadprogress</code> extension. Both extensions are detected and used
+            <classname>UploadProgress</classname> 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 <acronym>APC</acronym> or <code>uploadprogress</code> to
-            be enabled. Note that you can disable this feature of <acronym>APC</acronym> within your
-            php.ini.
+            First, you need to have either <acronym>APC</acronym> or
+            <classname>UploadProgress</classname> to be enabled. Note that you can disable this
+            feature of <acronym>APC</acronym> within your <filename>php.ini</filename>.
         </para>
 
         <para>
@@ -431,8 +432,8 @@ $names = $upload->getMimeType('foo');
 
         <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.
+            the file upload by using the <methodname>getProgress()</methodname> method. Actually
+            there are 2 official ways to handle this.
         </para>
 
         <sect3 id="zend.file.transfer.introduction.uploadprogress.progressadapter">

+ 172 - 161
documentation/manual/en/module_specs/Zend_File_Transfer-Validators.xml

@@ -15,52 +15,54 @@
     <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.
+                <classname>Count</classname>: 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.
+                <classname>Crc32</classname>: This validator checks for the crc32 hash value of the
+                content from a file. It is based on the <classname>Hash</classname> 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.
+                <classname>ExcludeExtension</classname>: 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 <acronym>MIME</acronym>
-                type of files. It can also validate <acronym>MIME</acronym> types and will throw an
-                error if the <acronym>MIME</acronym> type of specified file matches.
+                <classname>ExcludeMimeType</classname>: This validator validates the
+                <acronym>MIME</acronym> type of files. It can also validate <acronym>MIME</acronym>
+                types and will throw an error if the <acronym>MIME</acronym> 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.
+                <classname>Exists</classname>: 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.
+                <classname>Extension</classname>: 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.
+                <classname>FilesSize</classname>: 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.
@@ -69,77 +71,79 @@
 
         <listitem>
             <para>
-                <code>ImageSize</code>: This validator checks the size of image. It validates the
-                width and height and enforces minimum and maximum dimensions.
+                <classname>ImageSize</classname>: 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.
+                <classname>IsCompressed</classname>: This validator checks whether the file is
+                compressed. It is based on the <classname>MimeType</classname> 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.
+                <classname>IsImage</classname>: This validator checks whether the file is an image.
+                It is based on the <classname>MimeType</classname> validator and validates for image
+                files like jpg or gif. You can also limit it to other image types.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>Hash</code>: This validator checks the hash value of the content from a file.
-                It supports multiple algorithms.
+                <classname>Hash</classname>: This validator checks the hash value of the content
+                from a file. It supports multiple algorithms.
             </para>
         </listitem>
 
         <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.
+                <classname>Md5</classname>: This validator checks for the md5 hash value of the
+                content from a file. It is based on the <classname>Hash</classname> validator and
+                provides a convenient and simple validator that only supports Md5.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>MimeType</code>: This validator validates the <acronym>MIME</acronym> type of
-                files. It can also validate <acronym>MIME</acronym> types and will throw an error if
-                the <acronym>MIME</acronym> type of a specified file does not match.
+                <classname>MimeType</classname>: This validator validates the
+                <acronym>MIME</acronym> type of files. It can also validate <acronym>MIME</acronym>
+                types and will throw an error if the <acronym>MIME</acronym> type of a specified
+                file does not match.
             </para>
         </listitem>
 
         <listitem>
             <para>
-                <code>NotExists</code>: This validator checks for the existence of files. It will
-                throw an error when an given file does exist.
+                <classname>NotExists</classname>: 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.
+                <classname>Sha1</classname>: This validator checks for the sha1 hash value of the
+                content from a file. It is based on the <classname>Hash</classname> 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.
+                <classname>Size</classname>: 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.
             </para>
         </listitem>
 
         <listitem>
             <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>Upload</classname>: 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.
             </para>
@@ -147,9 +151,9 @@
 
         <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.
+                <classname>WordCount</classname>: 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>
@@ -173,8 +177,8 @@
 
             <listitem>
                 <para>
-                    <code>addValidator($validator, $breakChainOnFailure, $options = null, $files =
-                    null)</code>: Adds the specified validator to the validator
+                    <methodname>addValidator($validator, $breakChainOnFailure, $options = null,
+                        $files = null)</methodname>: Adds the specified validator to the validator
                     stack (optionally only to the file(s) specified).
                     <varname>$validator</varname> may be either an actual validator
                     instance or a short name specifying the validator type (e.g., 'Count').
@@ -183,8 +187,8 @@
 
             <listitem>
                 <para>
-                    <code>addValidators(array $validators, $files =
-                        null)</code>: Adds the specified validators to the stack of
+                    <methodname>addValidators(array $validators, $files =
+                        null)</methodname>: Adds the specified validators to the stack of
                     validators. Each entry may be either a validator
                     type/options pair or an array with the key 'validator'
                     specifying the validator. All other options will be
@@ -194,8 +198,8 @@
 
             <listitem>
                 <para>
-                    <code>setValidators(array $validators, $files =
-                        null)</code>: Overwrites any existing validators with
+                    <methodname>setValidators(array $validators, $files =
+                        null)</methodname>: Overwrites any existing validators with
                     the validators specified. The validators should follow the
                     syntax for <methodname>addValidators()</methodname>.
                 </para>
@@ -361,14 +365,14 @@ if ($upload->isValid()) {
         <title>Count Validator</title>
 
         <para>
-            The <code>Count</code> validator checks for the number of files which are provided. It
-            supports the following option keys:
+            The <classname>Count</classname> validator checks for the number of files which are
+            provided. It supports the following option keys:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>min</code>: Sets the minimum number of files to transfer.
+                    <property>min</property>: Sets the minimum number of files to transfer.
                 </para>
 
                 <note>
@@ -387,7 +391,7 @@ if ($upload->isValid()) {
 
             <listitem>
                 <para>
-                    <code>max</code>: Sets the maximum number of files to transfer.
+                    <property>max</property>: Sets the maximum number of files to transfer.
                 </para>
 
                 <para>
@@ -399,10 +403,10 @@ if ($upload->isValid()) {
 
         <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 <methodname>setMin()</methodname> and
-            <methodname>setMax()</methodname> to set both options afterwards and
-            <methodname>getMin()</methodname> and <methodname>getMax()</methodname> to retrieve
-            the actual set values.
+            <property>max</property>. Or you can also use the methods
+            <methodname>setMin()</methodname> and <methodname>setMax()</methodname> to set both
+            options afterwards and <methodname>getMin()</methodname> and
+            <methodname>getMax()</methodname> to retrieve the actual set values.
         </para>
 
         <example id="zend.file.transfer.validators.count.example">
@@ -431,7 +435,7 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
         <title>Crc32 Validator</title>
 
         <para>
-            The <code>Crc32</code> validator checks the content of a transferred file by hashing it.
+            The <classname>Crc32</classname> validator checks the content of a transferred file by hashing it.
             This validator uses the hash extension from <acronym>PHP</acronym> with the crc32
             algorithm. It supports the following options:
         </para>
@@ -439,7 +443,7 @@ $upload->addValidator('Count', false, array('min' =>1, 'max' => 5));
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array. The values will be used
+                    <property>*</property>: Sets any key or use a numeric array. The values will be used
                     as hash to validate against.
                 </para>
 
@@ -469,22 +473,22 @@ $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 <classname>ExcludeExtension</classname> 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. The values will be used
-                    to check whether the given file does not use this file extension.
+                    <property>*</property>: Sets any key or use a numeric array. The values will be
+                    used to check whether the given file does not use this file extension.
                 </para>
             </listitem>
 
             <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
+                    <property>case</property>: 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>
@@ -538,15 +542,15 @@ $upload->addValidator('ExcludeExtension',
         <title>ExcludeMimeType Validator</title>
 
         <para>
-            The <code>ExcludeMimeType</code> validator checks the <acronym>MIME</acronym> type of
-            transferred files. It supports the following options:
+            The <classname>ExcludeMimeType</classname> validator checks the <acronym>MIME</acronym>
+            type of transferred files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key individually or use a numeric array. Sets the
-                    <acronym>MIME</acronym> type to validate against.
+                    <property>*</property>: Sets any key individually or use a numeric array. Sets
+                    the <acronym>MIME</acronym> type to validate against.
                 </para>
 
                 <para>
@@ -557,10 +561,11 @@ $upload->addValidator('ExcludeExtension',
 
             <listitem>
                 <para>
-                    <code>headerCheck</code>: If set to <constant>TRUE</constant> this option will
-                    check the <acronym>HTTP</acronym> Information for the file type when the
-                    <emphasis>fileInfo</emphasis> or <emphasis>mimeMagic</emphasis> extensions can
-                    not be found. The default value for this option is <constant>FALSE</constant>.
+                    <property>headerCheck</property>: If set to <constant>TRUE</constant> this
+                    option will check the <acronym>HTTP</acronym> Information for the file type when
+                    the <emphasis>fileInfo</emphasis> or <emphasis>mimeMagic</emphasis> extensions
+                    can not be found. The default value for this option is
+                    <constant>FALSE</constant>.
                 </para>
             </listitem>
         </itemizedlist>
@@ -613,15 +618,15 @@ $upload->addValidator('ExcludeMimeType', false, 'image');
         <title>Exists Validator</title>
 
         <para>
-            The <code>Exists</code> validator checks for the existence of specified files. It
-            supports the following options:
+            The <classname>Exists</classname> validator checks for the existence of specified
+            files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array to check if the specific
-                    file exists in the given directory.
+                    <property>*</property>: Sets any key or use a numeric array to check if the
+                    specific file exists in the given directory.
                 </para>
             </listitem>
         </itemizedlist>
@@ -662,23 +667,23 @@ $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 <classname>Extension</classname> 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
+                    <property>*</property>: 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.
+                    <property>case</property>: 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>
@@ -728,21 +733,21 @@ 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 <classname>FilesSize</classname> validator checks for the aggregate size of all
+            transferred files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>min</code>: Sets the minimum aggregate file size.
+                    <property>min</property>: Sets the minimum aggregate file size.
                     This option defines the minimum aggregate file size to be transferred.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>max</code>: Sets the maximum aggregate file size.
+                    <property>max</property>: Sets the maximum aggregate file size.
                 </para>
 
                 <para>
@@ -753,8 +758,8 @@ 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.
+                    <property>bytestring</property>: Defines whether a failure is to return a
+                    user-friendly number or the plain file size.
                 </para>
 
                 <para>
@@ -767,19 +772,20 @@ if (!$upload->isValid('C:\temp\myfile.MO')) {
 
         <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 <methodname>setMin()</methodname>
-            and <methodname>setMax()</methodname> to set both options after construction, along with
-            <methodname>getMin()</methodname> and <methodname>getMax()</methodname> to retrieve the
-            values that have been set previously.
+            <property>max</property> option. You can also use the methods
+            <methodname>setMin()</methodname> and <methodname>setMax()</methodname> to set both
+            options after construction, along with <methodname>getMin()</methodname> and
+            <methodname>getMax()</methodname> 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.
+            base value. The following Units are accepted: <emphasis>kB</emphasis>,
+            <emphasis>MB</emphasis>, <emphasis>GB</emphasis>, <emphasis>TB</emphasis>,
+            <emphasis>PB</emphasis> and <emphasis>EB</emphasis>. 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">
@@ -817,32 +823,32 @@ $upload->addValidator('FilesSize',
         <title>ImageSize Validator</title>
 
         <para>
-            The <code>ImageSize</code> validator checks the size of image files.
+            The <classname>ImageSize</classname> validator checks the size of image files.
             It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>minheight</code>: Sets the minimum image height.
+                    <property>minheight</property>: Sets the minimum image height.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>maxheight</code>: Sets the maximum image height.
+                    <property>maxheight</property>: Sets the maximum image height.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>minwidth</code>: Sets the minimum image width.
+                    <property>minwidth</property>: Sets the minimum image width.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>maxwidth</code>: Sets the maximum image width.
+                    <property>maxwidth</property>: Sets the maximum image width.
                 </para>
             </listitem>
         </itemizedlist>
@@ -892,10 +898,11 @@ $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 <classname>IsCompressed</classname> validator checks if a transferred file is a
+            compressed archive, such as zip or arc. This validator is based on the
+            <classname>MimeType</classname> 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">
@@ -929,10 +936,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 <classname>IsImage</classname> validator checks if a transferred file is a image
+            file, such as gif or jpeg. This validator is based on the
+            <classname>MimeType</classname> 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">
@@ -966,16 +973,16 @@ $upload->addValidator('IsImage', false, 'jpeg');
         <title>Hash Validator</title>
 
         <para>
-            The <code>Hash</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension from <acronym>PHP</acronym>. It supports the
-            following options:
+            The <classname>Hash</classname> validator checks the content of a transferred file by
+            hashing it. This validator uses the hash extension from <acronym>PHP</acronym>. It
+            supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Takes any key or use a numeric array. Sets the hash to validate
-                    against.
+                    <property>*</property>: Takes any key or use a numeric array. Sets the hash to
+                    validate against.
                 </para>
 
                 <para>
@@ -986,7 +993,8 @@ $upload->addValidator('IsImage', false, 'jpeg');
 
             <listitem>
                 <para>
-                    <code>algorithm</code>: Sets the algorithm to use for hashing the content.
+                    <property>algorithm</property>: Sets the algorithm to use for hashing the
+                    content.
                 </para>
 
                 <para>
@@ -1030,15 +1038,15 @@ $upload->addValidator('Hash',
         <title>Md5 Validator</title>
 
         <para>
-            The <code>Md5</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension for <acronym>PHP</acronym> with the md5
-            algorithm. It supports the following options:
+            The <classname>Md5</classname> validator checks the content of a transferred file by
+            hashing it. This validator uses the hash extension for <acronym>PHP</acronym> with the
+            md5 algorithm. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Takes any key or use a numeric array.
+                    <property>*</property>: Takes any key or use a numeric array.
                 </para>
 
                 <para>
@@ -1070,14 +1078,14 @@ $upload->addValidator('Md5',
         <title>MimeType Validator</title>
 
         <para>
-            The <code>MimeType</code> validator checks the <acronym>MIME</acronym> type of
+            The <classname>MimeType</classname> validator checks the <acronym>MIME</acronym> type of
             transferred files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Sets any key or use a numeric array. Sets the
+                    <property>*</property>: Sets any key or use a numeric array. Sets the
                     <acronym>MIME</acronym> type to validate against.
                 </para>
 
@@ -1088,16 +1096,17 @@ $upload->addValidator('Md5',
 
             <listitem>
                 <para>
-                    <code>headerCheck</code>: If set to <constant>TRUE</constant> this option will
-                    check the <acronym>HTTP</acronym> Information for the file type when the
-                    <emphasis>fileInfo</emphasis> or <emphasis>mimeMagic</emphasis> extensions can
-                    not be found. The default value for this option is <constant>FALSE</constant>.
+                    <property>headerCheck</property>: If set to <constant>TRUE</constant> this
+                    option will check the <acronym>HTTP</acronym> Information for the file type when
+                    the <emphasis>fileInfo</emphasis> or <emphasis>mimeMagic</emphasis> extensions
+                    can not be found. The default value for this option is
+                    <constant>FALSE</constant>.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>magicfile</code>: The magicfile to be used.
+                    <property>magicfile</property>: The magicfile to be used.
                 </para>
 
                 <para>
@@ -1165,17 +1174,18 @@ $upload->addValidator('MimeType',
 
         <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 <acronym>MIME</acronym> type which is given by
+                This component will use the <classname>FileInfo</classname> extension if it is
+                available. If it's not, it will degrade to the
+                <methodname>mime_content_type()</methodname> function. And if the function call
+                fails it will use the <acronym>MIME</acronym> type which is given by
                 <acronym>HTTP</acronym>.
             </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
-                <acronym>MIME</acronym> type given by <acronym>HTTP</acronym> is not secure and can
-                be easily manipulated.
+                <classname>FileInfo</classname> nor <classname>mime_content_type()</methodname>
+                available. The <acronym>MIME</acronym> type given by <acronym>HTTP</acronym> is not
+                secure and can be easily manipulated.
             </para>
         </note>
     </sect2>
@@ -1184,15 +1194,15 @@ $upload->addValidator('MimeType',
         <title>NotExists Validator</title>
 
         <para>
-            The <code>NotExists</code> validator checks for the existence of the provided files. It
-            supports the following options:
+            The <classname>NotExists</classname> validator checks for the existence of the provided
+            files. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Set any key or use a numeric array. Checks whether the file
-                    exists in the given directory.
+                    <property>*</property>: Set any key or use a numeric array. Checks whether the
+                    file exists in the given directory.
                 </para>
             </listitem>
         </itemizedlist>
@@ -1234,15 +1244,15 @@ $upload->addValidator('NotExists', false,
         <title>Sha1 Validator</title>
 
         <para>
-            The <code>Sha1</code> validator checks the content of a transferred file by hashing it.
-            This validator uses the hash extension for <acronym>PHP</acronym> with the sha1
-            algorithm. It supports the following options:
+            The <classname>Sha1</classname> validator checks the content of a transferred file by
+            hashing it. This validator uses the hash extension for <acronym>PHP</acronym> with the
+            sha1 algorithm. It supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>*</code>: Takes any key or use a numeric array.
+                    <property>*</property>: Takes any key or use a numeric array.
                 </para>
 
                 <para>
@@ -1273,26 +1283,26 @@ $upload->addValidator('Sha1',
         <title>Size Validator</title>
 
         <para>
-            The <code>Size</code> validator checks for the size of a single file. It
+            The <classname>Size</classname> validator checks for the size of a single file. It
             supports the following options:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>min</code>: Sets the minimum file size.
+                    <property>min</property>: Sets the minimum file size.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>max</code>: Sets the maximum file size.
+                    <property>max</property>: Sets the maximum file size.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>bytestring</code>: Defines whether a failure is returned with a
+                    <property>bytestring</property>: Defines whether a failure is returned with a
                     user-friendly number, or with the plain file size.
                 </para>
 
@@ -1305,19 +1315,20 @@ $upload->addValidator('Sha1',
 
         <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 <methodname>setMin()</methodname>
-            and <methodname>setMax()</methodname> to set both options after construction, along with
-            <methodname>getMin()</methodname> and <methodname>getMax()</methodname> to retrieve the
-            values that have been set previously.
+            <property>max</property> option. You can also use the methods
+            <methodname>setMin()</methodname> and <methodname>setMax()</methodname> to set both
+            options after construction, along with <methodname>getMin()</methodname> and
+            <methodname>getMax()</methodname> 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.
+            base value. The following Units are accepted: <emphasis>kB</emphasis>,
+            <emphasis>MB</emphasis>, <emphasis>GB</emphasis>, <emphasis>TB</emphasis>,
+            <emphasis>PB</emphasis> and <emphasis>EB</emphasis>. 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">
@@ -1345,30 +1356,30 @@ $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 <classname>WordCount</classname> validator checks for the number of words within
+            provided files. It supports the following option keys:
         </para>
 
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>min</code>: Sets the minimum number of words to be found.
+                    <property>min</property>: Sets the minimum number of words to be found.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>max</code>: Sets the maximum number of words to be found.
+                    <property>max</property>: Sets the maximum number of words to be found.
                 </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 <methodname>setMin()</methodname> and
-            <methodname>setMax()</methodname> to set both options afterwards and
-            <methodname>getMin()</methodname> and <methodname>getMax()</methodname> to retrieve the
-            actual set values.
+            <property>max</property>. Or you can also use the methods
+            <methodname>setMin()</methodname> and <methodname>setMax()</methodname> to set both
+            options afterwards and <methodname>getMin()</methodname> and
+            <methodname>getMax()</methodname> to retrieve the actual set values.
         </para>
 
         <example id="zend.file.transfer.validators.wordcount.example">

+ 18 - 14
documentation/manual/en/module_specs/Zend_Filter-Encryption.xml

@@ -5,8 +5,8 @@
 
     <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.
+        of Adapters. Actually there are adapters for the <classname>Mcrypt</classname> and
+        <classname>OpenSSL</classname> extensions from php.
     </para>
 
     <para>
@@ -35,8 +35,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 <property>adapter</property> option or do not use setAdapter,
+            then the <classname>Mcrypt</classname> adapter will be used per default.
         </para>
     </note>
 
@@ -44,8 +44,9 @@ $filter->setAdapter('openssl');
         <title>Encryption with Mcrypt</title>
 
         <para>
-            When you have installed the <code>Mcrypt</code> extension you can use the
-            <code>Mcrypt</code> adapter. This adapter supports the following options at initiation:
+            When you have installed the <classname>Mcrypt</classname> extension you can use the
+            <classname>Mcrypt</classname> adapter. This adapter supports the following options at
+            initiation:
         </para>
 
         <itemizedlist>
@@ -61,7 +62,7 @@ $filter->setAdapter('openssl');
                     <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>.
+                    defaults to 'blowfish'.
                 </para>
             </listitem>
 
@@ -77,14 +78,15 @@ $filter->setAdapter('openssl');
                     <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>.
+                    defaults to 'cbc'.
                 </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.
+                    If not set it defaults to the path set within the <classname>Mcrypt</classname>
+                    extension.
                 </para>
             </listitem>
 
@@ -171,8 +173,9 @@ print $encrypted;
         <title>Encryption with OpenSSL</title>
 
         <para>
-            When you have installed the <code>OpenSSL</code> extension you can use the
-            <code>OpenSSL</code> adapter. This adapter supports the following options at initiation:
+            When you have installed the <classname>OpenSSL</classname> extension you can use the
+            <classname>OpenSSL</classname> adapter. This adapter supports the following options at
+            initiation:
         </para>
 
         <itemizedlist>
@@ -232,8 +235,8 @@ $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 <classname>OpenSSL</classname> adapter will not work when you do not
+                provide valid keys.
             </para>
         </note>
 
@@ -270,7 +273,8 @@ $filter->setPassphrase('mypassphrase');
         </para>
 
         <para>
-            So our complete example for encrypting content with <code>OpenSSL</code> look like this.
+            So our complete example for encrypting content with <classname>OpenSSL</classname> look
+            like this.
         </para>
 
         <programlisting language="php"><![CDATA[

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

@@ -48,7 +48,7 @@ $filtered = $inflector->filter(array('page' => $string));
             An inflector requires a <emphasis>target</emphasis> and one or more
             <emphasis>rules</emphasis>. A target is basically a string that
             defines placeholders for variables you wish to substitute. These are
-            specified by prefixing with a ':': <code>:script</code>.
+            specified by prefixing with a ':': <emphasis>:script</emphasis>.
         </para>
 
         <para>
@@ -146,7 +146,7 @@ $inflector->setTargetReplacementIdentifier('#');
             Typically, you will set the target via the constructor. However, you
             may want to re-set the target later (for instance, to modify the
             default inflector in core components, such as the
-            <code>ViewRenderer</code> or <classname>Zend_Layout</classname>).
+            <classname>ViewRenderer</classname> or <classname>Zend_Layout</classname>).
             <methodname>setTarget()</methodname> can be used for this purpose:
         </para>
 
@@ -461,20 +461,20 @@ $inflector->addRules(array(
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>target</code> specifies the inflection target.
+                    <property>target</property> specifies the inflection target.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>filterPrefixPath</code> specifies one or more filter
+                    <property>filterPrefixPath</property> specifies one or more filter
                     prefix/path pairs for use with the inflector.
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>throwTargetExceptionsOn</code> should be a boolean
+                    <property>throwTargetExceptionsOn</property> should be a boolean
                     indicating whether or not to throw exceptions when a
                     replacement identifier is still present after inflection.
                 </para>
@@ -482,7 +482,7 @@ $inflector->addRules(array(
 
             <listitem>
                 <para>
-                    <code>targetReplacementIdentifier</code> specifies the
+                    <property>targetReplacementIdentifier</property> specifies the
                     character to use when identifying replacement variables in
                     the target string.
                 </para>
@@ -490,7 +490,7 @@ $inflector->addRules(array(
 
             <listitem>
                 <para>
-                    <code>rules</code> specifies an array of inflection rules;
+                    <property>rules</property> specifies an array of inflection rules;
                     it should consist of keys that specify either values or
                     arrays of values, consistent with <methodname>addRules()</methodname>.
                 </para>

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

@@ -36,8 +36,8 @@
             HTML entities operates within the scope of the first definition of
             filter - an operator that produces a subset of the input. A filter
             that escapes the HTML entities, however, transforms the input
-            (e.g., "<code>&amp;</code>" is transformed to
-            "<code>&amp;amp;</code>"). Supporting such use cases for web
+            (e.g., "&amp;" is transformed to
+            "&amp;amp;"). Supporting such use cases for web
             developers is important, and "to filter," in the context of using
             <classname>Zend_Filter</classname>, means to perform some transformations upon input
             data.
@@ -56,8 +56,8 @@
 
         <para>
             Following is a basic example of using a filter upon two input data,
-            the ampersand (<code>&amp;</code>) and double quote
-            (<code>&quot;</code>) characters:
+            the ampersand (<emphasis>&amp;</emphasis>) and double quote
+            (<emphasis>&quot;</emphasis>) characters:
 
             <programlisting language="php"><![CDATA[
 $htmlEntities = new Zend_Filter_HtmlEntities();

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

@@ -190,7 +190,7 @@ $validators = array(
         </note>
 
         <para>
-            You can use a special "wildcard" rule key <code>'*'</code> in
+            You can use a special "wildcard" rule key <emphasis>'*'</emphasis> in
             either the filters array or the validators array. This means that
             the filters or validators declared in this rule will be applied to
             all input data fields. Note that the order of entries in the
@@ -311,7 +311,7 @@ if ($input->isValid('month')) {
                         <emphasis>Missing</emphasis> fields are
                         those that are not present in the input data, but were
                         declared with the metacommand
-                        <code>'presence'=>'required'</code> (see the
+                        <command>'presence'=>'required'</command> (see the
                         <link linkend="zend.filter.input.metacommands.presence">later section</link>
                         on metacommands).
                     </para>
@@ -605,10 +605,9 @@ $validators = array(
 ]]></programlisting>
 
             <para>
-                If the validation of this rule fails, the rule key
-                (<code>'password'</code>) is used in the return value of
-                <methodname>getInvalid()</methodname>, not any of the fields named in
-                the 'fields' metacommand.
+                If the validation of this rule fails, the rule key ('password') is used in the
+                return value of <methodname>getInvalid()</methodname>, not any of the fields named
+                in the 'fields' metacommand.
             </para>
         </sect3>
 
@@ -703,7 +702,7 @@ echo $input->month; // echoes 1
             <para>
                 By default, if a field exists in the input data, then
                 validators are applied to it, even if the value of the field is
-                an empty string (<code>''</code>). This is likely to result in
+                an empty string (<emphasis>''</emphasis>). This is likely to result in
                 a failure to validate. For example, if the validator checks
                 for digit characters, and there are none because a zero-length
                 string has no characters, then the validator reports the data
@@ -1041,10 +1040,10 @@ $input->addFilterPrefixPath('Foo_Namespace', 'Foo/Namespace');
             <para>
                 As of version 1.5 the function <methodname>addNamespace($namespace)</methodname>
                 was deprecated and exchanged with the plugin loader and the
-                <code>addFilterPrefixPath</code> and <code>addValidatorPrefixPath</code> were
-                added. Also the constant <constant>Zend_Filter_Input::INPUT_NAMESPACE</constant>
-                is now deprecated. The constants
-                <constant>Zend_Filter_Input::VALIDATOR_NAMESPACE</constant> and
+                <methodname>addFilterPrefixPath()</methodname> and
+                <methodname>addValidatorPrefixPath()</methodname> were added. Also the constant
+                <constant>Zend_Filter_Input::INPUT_NAMESPACE</constant> is now deprecated. The
+                constants <constant>Zend_Filter_Input::VALIDATOR_NAMESPACE</constant> and
                 <constant>Zend_Filter_Input::FILTER_NAMESPACE</constant> are available in releases
                 after 1.7.0.
             </para>
@@ -1053,10 +1052,11 @@ $input->addFilterPrefixPath('Foo_Namespace', 'Foo/Namespace');
         <note>
             <para>
                 As of version 1.0.4, <constant>Zend_Filter_Input::NAMESPACE</constant>, having
-                value <code>namespace</code>, was changed to
+                value <property>namespace</property>, was changed to
                 <constant>Zend_Filter_Input::INPUT_NAMESPACE</constant>, having value
-                <code>inputNamespace</code>, in order to comply with the <acronym>PHP</acronym> 5.3
-                reservation of the keyword <code>namespace</code>.
+                <property>inputNamespace</property>, in order to comply with the
+                <acronym>PHP</acronym> 5.3 reservation of the keyword
+                <property>namespace</property>.
             </para>
         </note>
     </sect2>

+ 4 - 4
documentation/manual/en/module_specs/Zend_Form-Decorators.xml

@@ -54,7 +54,7 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>placement</code>: Placement can be either 'append' or
+                    <property>placement</property>: Placement can be either 'append' or
                     'prepend' (case insensitive), and indicates whether content
                     passed to <methodname>render()</methodname> will be appended or
                     prepended, respectively. In the case that a decorator
@@ -65,7 +65,7 @@
 
             <listitem>
                 <para>
-                    <code>separator</code>: The separator is used between the
+                    <property>separator</property>: The separator is used between the
                     content passed to <methodname>render()</methodname> and new content
                     generated by the decorator, or between items rendered by the
                     decorator (e.g. FormElements uses the separator between each
@@ -185,7 +185,7 @@ interface Zend_Form_Decorator_Interface
             As an example, let's say you want to reduce the number of
             decorators you use, and build a "composite" decorator to take care
             of rendering the label, element, any error messages, and description
-            in an HTML <code>div</code>. You might build such a 'Composite'
+            in an HTML 'div'. You might build such a 'Composite'
             decorator as follows:
         </para>
 
@@ -363,7 +363,7 @@ class My_Decorator_Errors
         </para>
 
         <para>
-            To do so, simply call <code>render[DecoratorName]()</code>, where
+            To do so, simply call <methodname>render[DecoratorName]()</methodname>, where
             "[DecoratorName]" is the "short name" of your decorator; optionally,
             you can pass in content you want decorated. For example:
         </para>

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

@@ -598,7 +598,7 @@ class My_Validate_PasswordConfirmation extends Zend_Validate_Abstract
         <para>
             Validators are processed in order. Each validator is processed,
             unless a validator created with a <constant>TRUE</constant>
-            <code>breakChainOnFailure</code> value fails its validation. Be
+            <varname>$breakChainOnFailure</varname> value fails its validation. Be
             sure to specify your validators in a reasonable order.
         </para>
 
@@ -643,7 +643,7 @@ $messages = $element->getMessages();
                     By default, if an element is required but does not contain
                     a 'NotEmpty' validator, <methodname>isValid()</methodname> will add one
                     to the top of the stack, with the
-                    <code>breakChainOnFailure</code> flag set. This behavior lends
+                    <varname>$breakChainOnFailure</varname> flag set. This behavior lends
                     required flag semantic meaning: if no value is passed,
                     we immediately invalidate the submission and notify the
                     user, and prevent other validators from running on what we
@@ -733,8 +733,8 @@ $messages = $element->getMessages();
 
             <listitem>
                 <para>
-                    <code>addValidator($nameOrValidator, $breakChainOnFailure = false, array
-                        $options = null)</code>
+                    <methodname>addValidator($nameOrValidator, $breakChainOnFailure = false, array
+                        $options = null)</methodname>
                 </para>
             </listitem>
 
@@ -1389,8 +1389,8 @@ $element->class = 'text;
                 <itemizedlist>
                     <listitem>
                         <para>
-                            <code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader,
-                                $type)</code>
+                            <methodname>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader,
+                                $type)</methodname>
                         </para>
                     </listitem>
 
@@ -1416,8 +1416,8 @@ $element->class = 'text;
                 <itemizedlist>
                     <listitem>
                         <para>
-                            <code>addValidator($validator, $breakChainOnFailure = false, $options =
-                                array())</code>
+                            <methodname>addValidator($validator, $breakChainOnFailure = false,
+                                $options = array())</methodname>
                         </para>
                     </listitem>
 
@@ -1548,7 +1548,7 @@ $element->class = 'text;
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>prefixPath</code> will be passed to
+                    <property>prefixPath</property> will be passed to
                     <methodname>addPrefixPaths()</methodname>
                 </para>
             </listitem>
@@ -1561,16 +1561,16 @@ $element->class = 'text;
                 <itemizedlist>
                     <listitem>
                         <para>
-                            <code>setAttrib</code> (though
-                            <code>setAttribs</code> <emphasis>will</emphasis> work)
+                            <property>setAttrib</property> (though
+                            <property>setAttribs</property> <emphasis>will</emphasis> work)
                         </para>
                     </listitem>
 
-                    <listitem><para><code>setConfig</code></para></listitem>
-                    <listitem><para><code>setOptions</code></para></listitem>
-                    <listitem><para><code>setPluginLoader</code></para></listitem>
-                    <listitem><para><code>setTranslator</code></para></listitem>
-                    <listitem><para><code>setView</code></para></listitem>
+                    <listitem><para><property>setConfig</property></para></listitem>
+                    <listitem><para><property>setOptions</property></para></listitem>
+                    <listitem><para><property>setPluginLoader</property></para></listitem>
+                    <listitem><para><property>setTranslator</property></para></listitem>
+                    <listitem><para><property>setView</property></para></listitem>
                 </itemizedlist>
             </listitem>
         </itemizedlist>
@@ -1643,7 +1643,7 @@ decorators.label.decorator = "Label"
 
         <para>
             As an example, let's say that all text elements in a form you are
-            creating need to be filtered with <code>StringTrim</code>,
+            creating need to be filtered with <classname>StringTrim</classname>,
             validated with a common regular expression, and that you want to
             use a custom decorator you've created for displaying them,
             'My_Decorator_TextItem'. In addition, you have a number of standard

+ 22 - 20
documentation/manual/en/module_specs/Zend_Form-Forms.xml

@@ -918,8 +918,8 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
 
                         <listitem>
                             <para>
-                                <code>addElement($typeOrElement, $name, array $options =
-                                    array())</code>
+                                <methodname>addElement($typeOrElement, $name, array $options =
+                                    array())</methodname>
                             </para>
                         </listitem>
 
@@ -1023,8 +1023,8 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
                     <itemizedlist>
                         <listitem>
                             <para>
-                                <code>setTranslator(Zend_Translate_Adapter $translator =
-                                    null)</code>
+                                <methodname>setTranslator(Zend_Translate_Adapter $translator =
+                                    null)</methodname>
                             </para>
                         </listitem>
 
@@ -1252,7 +1252,7 @@ $form->setAction('/user/login')
         </note>
 
         <para>
-            <classname>Zend_Form</classname> implements the <code>Countable</code>
+            <classname>Zend_Form</classname> implements the <classname>Countable</classname>
             interface, allowing you to pass it as an argument to count:
         </para>
 
@@ -1334,7 +1334,7 @@ $form->setDecorators(array(
 
         <para>
             Any attributes set on the form object will be used as HTML
-            attributes of the <code>&lt;form&gt;</code> tag.
+            attributes of the <emphasis>&lt;form&gt;</emphasis> tag.
         </para>
 
         <note>
@@ -1721,8 +1721,8 @@ $validValues = $form->getValidValues($_POST);
                 <itemizedlist>
                     <listitem>
                         <para>
-                            <code>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type
-                                = null)</code>
+                            <methodname>setPluginLoader(Zend_Loader_PluginLoader_Interface $loader,
+                                $type = null)</methodname>
                         </para>
                     </listitem>
 
@@ -1731,7 +1731,9 @@ $validValues = $form->getValidValues($_POST);
                     </listitem>
 
                     <listitem>
-                        <para><code>addPrefixPath($prefix, $path, $type = null) </code></para>
+                        <para>
+                            <methodname>addPrefixPath($prefix, $path, $type = null) </methodname>
+                        </para>
                     </listitem>
 
                     <listitem>
@@ -2034,21 +2036,21 @@ $validValues = $form->getValidValues($_POST);
         <itemizedlist>
             <listitem>
                 <para>
-                    <code>prefixPaths</code> will be passed to
+                    <property>prefixPaths</property> will be passed to
                     <methodname>addPrefixPaths()</methodname>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>elementPrefixPaths</code> will be passed to
+                    <property>elementPrefixPaths</property> will be passed to
                     <methodname>addElementPrefixPaths()</methodname>
                 </para>
             </listitem>
 
             <listitem>
                 <para>
-                    <code>displayGroupPrefixPaths</code> will be passed to
+                    <property>displayGroupPrefixPaths</property> will be passed to
                     <methodname>addDisplayGroupPrefixPaths()</methodname>
                 </para>
             </listitem>
@@ -2058,16 +2060,16 @@ $validValues = $form->getValidValues($_POST);
 
                 <itemizedlist>
                     <listitem>
-                        <para><code>setAttrib (though setAttribs *will* work)</code></para>
+                        <para><property>setAttrib</property> (though setAttribs *will* work)</para>
                     </listitem>
 
-                    <listitem><para><code>setConfig</code></para></listitem>
-                    <listitem><para><code>setDefault</code></para></listitem>
-                    <listitem><para><code>setOptions</code></para></listitem>
-                    <listitem><para><code>setPluginLoader</code></para></listitem>
-                    <listitem><para><code>setSubForms</code></para></listitem>
-                    <listitem><para><code>setTranslator</code></para></listitem>
-                    <listitem><para><code>setView</code></para></listitem>
+                    <listitem><para><property>setConfig</property></para></listitem>
+                    <listitem><para><property>setDefault</property></para></listitem>
+                    <listitem><para><property>setOptions</property></para></listitem>
+                    <listitem><para><property>setPluginLoader</property></para></listitem>
+                    <listitem><para><property>setSubForms</property></para></listitem>
+                    <listitem><para><property>setTranslator</property></para></listitem>
+                    <listitem><para><property>setView</property></para></listitem>
                 </itemizedlist>
             </listitem>
         </itemizedlist>