[MANUAL] English:

- unified "HTML" with acronym

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

documentation/manual/en/module_specs/Zend_Feed_Reader.xml

@@ -465,9 +465,9 @@ foreach ($links as $link) {
             contain, per category, three fields of data: term, scheme and label. The "term" is the
             basic category name, often machine readable (i.e. plays nice with URIs). The scheme
             represents a categorisation scheme (usually a URI identifier) also known as a "domain"
-            in RSS 2.0. The "label" is a human readable category name which supports html entities.
-            In RSS 2.0, there is no label attribute so it is always set to the same value as the
-            term for convenience.
+            in RSS 2.0. The "label" is a human readable category name which supports
+            <acronym>HTML</acronym> entities. In RSS 2.0, there is no label attribute so it is
+            always set to the same value as the term for convenience.
         </para>
 
         <para>
@@ -696,10 +696,10 @@ $labels = $categories->getValues();
                             object containing the details of any categories associated with the
                             overall feed. The supported fields include "term" (the machine readable
                             category name), "scheme" (the categorisation scheme/domain for this
-                            category), and "label" (a html decoded human readable category name).
-                            Where any of the three fields are absent from the field, they are either
-                            set to the closest available alternative or, in the case of "scheme",
-                            set to <constant>NULL</constant>.
+                            category), and "label" (a <acronym>HTML</acronym> decoded human readable
+                            category name). Where any of the three fields are absent from the field,
+                            they are either set to the closest available alternative or, in the case
+                            of "scheme", set to <constant>NULL</constant>.
                         </entry>
                     </row>
                 </tbody>
@@ -1042,10 +1042,10 @@ $labels = $categories->getValues();
                             object containing the details of any categories associated with the
                             entry. The supported fields include "term" (the machine readable
                             category name), "scheme" (the categorisation scheme/domain for this
-                            category), and "label" (a html decoded human readable category name).
-                            Where any of the three fields are absent from the field, they are either
-                            set to the closest available alternative or, in the case of "scheme",
-                            set to <constant>NULL</constant>.
+                            category), and "label" (a <acronym>HTML</acronym> decoded human readable
+                            category name). Where any of the three fields are absent from the field,
+                            they are either set to the closest available alternative or, in the case
+                            of "scheme", set to <constant>NULL</constant>.
                         </entry>
                     </row>
                 </tbody>

documentation/manual/en/module_specs/Zend_Feed_Writer.xml

@@ -408,12 +408,12 @@ $out = $feed->export('atom');
                             itself an array whose possible keys include "term", "label" and
                             "scheme". The "term" is a typically a category name suitable for
                             inclusion in a <acronym>URI</acronym>. The "label" may be a human
-                            readable category name supporting special characters (it is HTML encoded
-                            during rendering) and is a required key. The "scheme" (called the domain
-                            in <acronym>RSS</acronym>) is optional but must be a valid
-                            <acronym>URI</acronym>.
-                            The method <methodname>addCategory()</methodname> allows adding
-                            a single category at a time.
+                            readable category name supporting special characters (it is
+                            <acronym>HTML</acronym> encoded during rendering) and is a required key.
+                            The "scheme" (called the domain in <acronym>RSS</acronym>) is optional
+                            but must be a valid <acronym>URI</acronym>. The method
+                            <methodname>addCategory()</methodname> allows adding a single category
+                            at a time.
                         </entry>
                     </row>
 
@@ -636,8 +636,8 @@ $out = $feed->export('atom');
                         <entry><methodname>setCommentLink()</methodname></entry>
 
                         <entry>
-                            Seta a link to a HTML page containing comments associated with this
-                            entry.
+                            Seta a link to a <acronym>HTML</acronym> page containing comments
+                            associated with this entry.
                         </entry>
                     </row>
 

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

@@ -64,7 +64,7 @@
         <para>
            For convenience, you can use <link
                linkend="zend.form.standardElements.file">Zend_Form_Element_File</link> instead of
-           building the HTML manually.
+           building the <acronym>HTML</acronym> manually.
         </para>
 
         <para>

documentation/manual/en/module_specs/Zend_Filter.xml

@@ -25,17 +25,17 @@
         <para>
             This basic definition of a filter may be extended to include
             generalized transformations upon input. A common transformation
-            applied in web applications is the escaping of HTML entities. For
+            applied in web applications is the escaping of <acronym>HTML</acronym> entities. For
             example, if a form field is automatically populated with untrusted
             input (e.g., from a web browser), this value should either be free
-            of HTML entities or contain only escaped HTML entities, in order to
-            prevent undesired behavior and security vulnerabilities. To meet
-            this requirement, HTML entities that appear in the input must
+            of <acronym>HTML</acronym> entities or contain only escaped <acronym>HTML</acronym>
+            entities, in order to prevent undesired behavior and security vulnerabilities. To meet
+            this requirement, <acronym>HTML</acronym> entities that appear in the input must
             either be removed or escaped. Of course, which approach is more
             appropriate depends on the situation. A filter that removes the
-            HTML entities operates within the scope of the first definition of
+            <acronym>HTML</acronym> 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
+            that escapes the <acronym>HTML</acronym> entities, however, transforms the input
             (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

documentation/manual/en/module_specs/Zend_Filter_Input.xml

@@ -8,7 +8,7 @@
         multiple filters and validators, apply them to collections of data, and
         to retrieve input values after they have been processed by the filters
         and validators. Values are returned in escaped format by default for
-        safe HTML output.
+        safe <acronym>HTML</acronym> output.
     </para>
 
     <para>
@@ -52,10 +52,10 @@
                 <emphasis>Escapers</emphasis> transform a value
                 by removing magic behavior of certain characters. In some
                 output contexts, special characters have meaning. For example,
-                the characters '&lt;' and '&gt;' delimit HTML tags, and if a
-                string containing those characters is output in an HTML
+                the characters '&lt;' and '&gt;' delimit <acronym>HTML</acronym> tags, and if a
+                string containing those characters is output in an <acronym>HTML</acronym>
                 context, the content between them might affect the output or
-                functionality of the HTML presentation. Escaping the
+                functionality of the <acronym>HTML</acronym> presentation. Escaping the
                 characters removes the special meaning, so they are output as
                 literal characters.
             </para>
@@ -445,7 +445,7 @@ $m = $input->getUnescaped('month'); // not escaped
                 By default, when retrieving a value, it is filtered with the
                 <classname>Zend_Filter_HtmlEntities</classname>. This is the default because it is
                 considered the most common usage to output the value of a field
-                in HTML. The HtmlEntities filter helps prevent unintentional
+                in <acronym>HTML</acronym>. The HtmlEntities filter helps prevent unintentional
                 output of code, which can result in security problems.
             </para>
 

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

@@ -152,7 +152,7 @@
             <classname>Zend_Form</classname> attempts to automate this process with its
             <link linkend="zend.form.forms.subforms">sub forms</link>. By
             default, sub forms render using the array notation as shown in the
-            previous HTML form listing, complete with ids. The array name is
+            previous <acronym>HTML</acronym> form listing, complete with ids. The array name is
             based on the sub form name, with the keys based on the elements
             contained in the sub form. Sub forms may be nested arbitrarily deep,
             and this will create nested arrays to reflect the structure.

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

@@ -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 'div'. You might build such a 'Composite'
+            in an <acronym>HTML</acronym> 'div'. You might build such a 'Composite'
             decorator as follows:
         </para>
 

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

@@ -4,7 +4,7 @@
     <title>Creating Form Elements Using Zend_Form_Element</title>
 
     <para>
-        A form is made of elements that typically correspond to HTML form
+        A form is made of elements that typically correspond to <acronym>HTML</acronym> form
         input. <classname>Zend_Form_Element</classname> encapsulates single form elements, with the
         following areas of responsibility:
     </para>
@@ -205,7 +205,7 @@ $form->addElementPrefixPath('My_Decorator', 'My/Decorator/', 'decorator');
         <para>
             It's often useful and/or necessary to perform some normalization on
             input prior to validation. For example, you may want to strip out
-            all HTML, but run your validations on what remains to ensure the
+            all <acronym>HTML</acronym>, but run your validations on what remains to ensure the
             submission is valid. Or you may want to trim empty space surrounding input so that a
             StringLength validator will use the correct length of the input without counting leading
             or trailing whitespace characters. These operations may be performed using
@@ -928,7 +928,7 @@ $messages = $element->getMessages();
             <listitem>
                 <para>
                     <emphasis>HtmlTag</emphasis>: wraps the element and errors in
-                    an HTML &lt;dd&gt; tag.
+                    an <acronym>HTML</acronym> &lt;dd&gt; tag.
                 </para>
             </listitem>
 
@@ -991,9 +991,9 @@ $this->addDecorators(array(
             description is present, the 'Description' decorator will append a
             paragraph of class 'description' containing the descriptive text to
             the aggregated content. The next decorator, 'HtmlTag', wraps the
-            element, errors, and description in an HTML &lt;dd&gt; tag.
+            element, errors, and description in an <acronym>HTML</acronym> &lt;dd&gt; tag.
             Finally, the last decorator, 'label', retrieves the element's label
-            and passes it to the 'FormLabel' view helper, wrapping it in an HTML
+            and passes it to the 'FormLabel' view helper, wrapping it in an <acronym>HTML</acronym>
             &lt;dt&gt; tag; the value is prepended to the content by default.
             The resulting output looks basically like this:
         </para>
@@ -1273,7 +1273,7 @@ $element->class = 'text;
 
         <para>
             By default, all attributes are passed to the view helper used by
-            the element during rendering, and rendered as HTML attributes of
+            the element during rendering, and rendered as <acronym>HTML</acronym> attributes of
             the element tag.
         </para>
     </sect2>

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

@@ -1081,7 +1081,7 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup');
             A sub form may be a <classname>Zend_Form</classname> object, or, more
             typically, a <classname>Zend_Form_SubForm</classname> object. The latter
             contains decorators suitable for inclusion in a larger form (i.e.,
-            it does not render additional HTML form tags, but does group
+            it does not render additional <acronym>HTML</acronym> form tags, but does group
             elements). To attach a sub form, simply add it to the form and give
             it a name:
         </para>
@@ -1197,9 +1197,9 @@ $form->setSubFormDecorators(array(
         <para>
             While a form's usefulness primarily derives from the elements it
             contains, it can also contain other metadata, such as a name (often
-            used as a unique ID in the HTML markup); the form action and method;
+            used as a unique ID in the <acronym>HTML</acronym> markup); the form action and method;
             the number of elements, groups, and sub forms it contains; and
-            arbitrary metadata (usually used to set HTML attributes for the form
+            arbitrary metadata (usually used to set <acronym>HTML</acronym> attributes for the form
             tag itself).
         </para>
 
@@ -1333,7 +1333,7 @@ $form->setDecorators(array(
 ]]></programlisting>
 
         <para>
-            Any attributes set on the form object will be used as HTML
+            Any attributes set on the form object will be used as <acronym>HTML</acronym>
             attributes of the <emphasis>&lt;form&gt;</emphasis> tag.
         </para>
 
@@ -1407,8 +1407,8 @@ $fooBar  = $form->getDecorator('FooBar');
 
         <para>
             You may create your own decorators for generating the form. One
-            common use case is if you know the exact HTML you wish to use; your
-            decorator could create the exact HTML and simply return it,
+            common use case is if you know the exact <acronym>HTML</acronym> you wish to use; your
+            decorator could create the exact <acronym>HTML</acronym> and simply return it,
             potentially using the decorators from individual elements or display
             groups.
         </para>

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

@@ -45,7 +45,7 @@ $form->setAction('/resource/process')
         </para>
 
         <para>
-            You can set additional HTML attributes for the
+            You can set additional <acronym>HTML</acronym> attributes for the
             <emphasis>&lt;form&gt;</emphasis> tag by using the <methodname>setAttrib()</methodname>
             or <methodname>setAttribs()</methodname> methods. For instance, if you wish to set the
             id, set the "<property>id</property>" attribute:

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

@@ -150,9 +150,9 @@ class Util
             fieldsets by default. The Fieldset decorator checks for either a
             'legend' option or a <methodname>getLegend()</methodname> method in the
             registered element, and uses that as a legend if non-empty. Any
-            content passed in is wrapped in the HTML fieldset, replacing the
+            content passed in is wrapped in the <acronym>HTML</acronym> fieldset, replacing the
             original content. Any attributes set in the decorated item are
-            passed to the fieldset as HTML attributes.
+            passed to the fieldset as <acronym>HTML</acronym> attributes.
         </para>
     </sect2>
 
@@ -172,11 +172,11 @@ class Util
         <title>Zend_Form_Decorator_Form</title>
 
         <para>
-            <classname>Zend_Form</classname> objects typically need to render an HTML
-            form tag. The Form decorator proxies to the Form view helper. It
-            wraps any provided content in an HTML form element, using the
+            <classname>Zend_Form</classname> objects typically need to render an
+            <acronym>HTML</acronym> form tag. The Form decorator proxies to the Form view helper. It
+            wraps any provided content in an <acronym>HTML</acronym> form element, using the
             <classname>Zend_Form</classname> object's action and method, and any
-            attributes as HTML attributes.
+            attributes as <acronym>HTML</acronym> attributes.
         </para>
     </sect2>
 
@@ -288,9 +288,9 @@ class Util
         <title>Zend_Form_Decorator_HtmlTag</title>
 
         <para>
-            The HtmlTag decorator allows you to utilize HTML tags to
+            The HtmlTag decorator allows you to utilize <acronym>HTML</acronym> tags to
             decorate content; the tag utilized is passed in the 'tag'
-            option, and any other options are used as HTML attributes to
+            option, and any other options are used as <acronym>HTML</acronym> attributes to
             that tag. The tag by default is assumed to be block level, and
             replaces the content by wrapping it in the given tag. However,
             you can specify a placement to append or prepend a tag as well.
@@ -301,9 +301,9 @@ class Util
         <title>Zend_Form_Decorator_Image</title>
 
         <para>
-            The Image decorator allows you to create an HTML image input
+            The Image decorator allows you to create an <acronym>HTML</acronym> image input
             (<code>&lt;input type="image" ... /&gt;</code>), and optionally
-            render it within another HTML tag.
+            render it within another <acronym>HTML</acronym> tag.
         </para>
 
         <para>
@@ -316,7 +316,7 @@ class Util
         </para>
 
         <para>
-            To specify an HTML tag with which to wrap the element, either pass a
+            To specify an <acronym>HTML</acronym> tag with which to wrap the element, either pass a
             'tag' option to the decorator, or explicitly call
             <methodname>setTag()</methodname>.
         </para>

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

@@ -4,7 +4,7 @@
     <title>Standard Form Elements Shipped With Zend Framework</title>
 
     <para>
-        Zend Framework ships with concrete element classes covering most HTML
+        Zend Framework ships with concrete element classes covering most <acronym>HTML</acronym>
         form elements. Most simply specify a particular view helper for use when
         decorating the element, but several offer additional functionality. The
         following is a list of all such classes, as well as descriptions of the
@@ -15,7 +15,7 @@
         <title>Zend_Form_Element_Button</title>
 
         <para>
-            Used for creating HTML button elements,
+            Used for creating <acronym>HTML</acronym> button elements,
             <classname>Zend_Form_Element_Button</classname> extends <link
                 linkend="zend.form.standardElements.submit">Zend_Form_Element_Submit</link>,
             specifying some custom functionality. It specifies the 'formButton'
@@ -134,7 +134,7 @@ $element = new Zend_Form_Element_Captcha('foo', array(
         <title>Zend_Form_Element_Checkbox</title>
 
         <para>
-            HTML checkboxes allow you return a specific value, but basically
+            <acronym>HTML</acronym> checkboxes allow you return a specific value, but basically
             operate as booleans. When checked, the checkbox's value is submitted.
             When the checkbox is not checked, nothing is submitted. Internally,
             <classname>Zend_Form_Element_Checkbox</classname> enforces this state.

documentation/manual/en/module_specs/Zend_Gdata_YouTube.xml

@@ -414,8 +414,8 @@ echo "hometown: " . $userProfile->hometown->text . "\n";
                 url="http://code.google.com/apis/youtube/developers_guide_protocol.html#Process_Flows_for_Uploading_Videos">protocol
                 guide</ulink> on code.google.com for a high-level
             overview of the upload process. Uploading videos can be done in one of
-            two ways: either by uploading the video directly or by sending just the
-            video meta-data and having a user upload the video through an HTML form.
+            two ways: either by uploading the video directly or by sending just the video
+            meta-data and having a user upload the video through an <acronym>HTML</acronym> form.
         </para>
 
         <para>
@@ -570,7 +570,8 @@ try {
             object to the <ulink
                 url="http://framework.zend.com/apidoc/core/Zend_Gdata/Zend_Gdata_YouTube_VideoEntry.html">Zend_Gdata_YouTube_VideoEntry</ulink>
             you are constructing. Instead you simply submit all of your video's meta-data to receive
-            back a token element which can be used to construct an HTML upload form.
+            back a token element which can be used to construct an <acronym>HTML</acronym> upload
+            form.
         </para>
 
         <example id="zend.gdata.youtube.uploads.browser.example-1">
@@ -596,8 +597,8 @@ $postUrl = $tokenArray['url'];
 
         <para>
             The above code prints out a link and a token that is used to construct an
-            HTML form to display in the user's browser. A simple example form is shown
-            below with $tokenValue representing the content of the returned token element,
+            <acronym>HTML</acronym> form to display in the user's browser. A simple example form is
+            shown below with $tokenValue representing the content of the returned token element,
             as shown being retrieved from $myVideoEntry above. In order for the user
             to be redirected to your website after submitting the form, make sure to
             append a $nextUrl parameter to the $postUrl above, which functions in the

documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml

@@ -173,7 +173,7 @@ $client->setHeaders(array(
             but no actual file needs to exist on the disk.
             The second form name parameter is always required, and is equivalent
             to the "name" attribute of an >input< tag, if the file was to
-            be uploaded through an HTML form.
+            be uploaded through an <acronym>HTML</acronym> form.
             A fourth optional parameter provides the file's content-type. If
             not specified, and <classname>Zend_Http_Client</classname> reads the file from the disk,
             the mime_content_type function will be used to guess the file's

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

@@ -24,8 +24,8 @@
             either as part of the larger <classname>Zend_Auth</classname> component via
             the <classname>Zend_InfoCard</classname> authentication adapter or as a
             stand-alone component. In both cases an information card can be
-            requested from a user by using the following HTML block in your HTML
-            login form:
+            requested from a user by using the following <acronym>HTML</acronym> block in your
+            <acronym>HTML</acronym> login form:
         </para>
 
         <programlisting language="html"><![CDATA[
@@ -55,7 +55,7 @@
         </para>
 
         <para>
-            When the above HTML is activated by a user (clicks on it), the
+            When the above <acronym>HTML</acronym> is activated by a user (clicks on it), the
             browser will bring up a card selection program which not only shows
             them which information cards meet the requirements of the site, but
             also allows them to select which information card to use if multiple

documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml

@@ -63,10 +63,11 @@ $log->error('unable to connect to database');
         <title>Zend_Layout Usage</title>
 
         <para>
-            A <classname>Zend_Layout</classname> instance may be used to generate the HTML
-            portion of a multipart email. If a <classname>Zend_Layout</classname> instance
-            is in use, <classname>Zend_Log_Writer_Mail</classname> assumes that it is
-            being used to render HTML and sets the body HTML for the message as
+            A <classname>Zend_Layout</classname> instance may be used to generate the
+            <acronym>HTML</acronym> portion of a multipart email. If a
+            <classname>Zend_Layout</classname> instance is in use,
+            <classname>Zend_Log_Writer_Mail</classname> assumes that it is being used to render
+            <acronym>HTML</acronym> and sets the body <acronym>HTML</acronym> for the message as
             the <classname>Zend_Layout</classname>-rendered value.
         </para>
 

documentation/manual/en/module_specs/Zend_Mail-Encoding.xml

@@ -4,13 +4,13 @@
     <title>Encoding</title>
 
     <para>
-        Text and HTML message bodies are encoded with the quotedprintable mechanism by default.
-        Message headers are also encoded with the quotedprintable mechanism if you do not specify
-        base64 in <methodname>setHeaderEncoding()</methodname>. If you use language that is not
-        Roman letters-based, the base64 would be more suitable. All other attachments are encoded
-        via base64 if no other encoding is given in the <methodname>addAttachment()</methodname>
-        call or assigned to the <acronym>MIME</acronym> part object later. 7Bit and 8Bit encoding
-        currently only pass on the binary content data.
+        Text and <acronym>HTML</acronym> message bodies are encoded with the quotedprintable
+        mechanism by default. Message headers are also encoded with the quotedprintable mechanism if
+        you do not specify base64 in <methodname>setHeaderEncoding()</methodname>. If you use
+        language that is not Roman letters-based, the base64 would be more suitable. All other
+        attachments are encoded via base64 if no other encoding is given in the
+        <methodname>addAttachment()</methodname> call or assigned to the <acronym>MIME</acronym>
+        part object later. 7Bit and 8Bit encoding currently only pass on the binary content data.
     </para>
 
     <para>

documentation/manual/en/module_specs/Zend_Mail-HtmlMails.xml

@@ -4,11 +4,11 @@
     <title>HTML E-Mail</title>
 
     <para>
-        To send an e-mail in HTML format, set the body using the method
+        To send an e-mail in <acronym>HTML</acronym> format, set the body using the method
         <methodname>setBodyHTML()</methodname> instead of <methodname>setBodyText()</methodname>.
         The <acronym>MIME</acronym> content type will automatically be set to <code>text/html</code>
-        then. If you use both HTML and Text bodies, a multipart/alternative <acronym>MIME</acronym>
-        message will automatically be generated:
+        then. If you use both <acronym>HTML</acronym> and Text bodies, a multipart/alternative
+        <acronym>MIME</acronym> message will automatically be generated:
     </para>
 
     <example id="zend.mail.html-mails.example-1">

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

@@ -39,7 +39,7 @@ $mail->send();
             <para>
                 In order to send an e-mail with <classname>Zend_Mail</classname> you have to specify
                 at least one recipient, a sender (e.g., with <methodname>setFrom()</methodname>),
-                and a message body (text and/or HTML).
+                and a message body (text and/or <acronym>HTML</acronym>).
             </para>
         </note>
 

documentation/manual/en/module_specs/Zend_Markup-Renderers.xml

@@ -49,7 +49,7 @@ echo $bbcode->render('my [foo]markup[/foo]');
         </para>
 
         <para>
-            Some renderers (like the HTML renderer) also have support for a
+            Some renderers (like the <acronym>HTML</acronym> renderer) also have support for a
             'markup' parameter. This replaces the 'start' and 'end' parameters, and
             it renders the markups including some default attributes and the
             closing markup.

documentation/manual/en/module_specs/Zend_Markup.xml

@@ -15,7 +15,7 @@
         <classname>Zend_Markup_Renderer_Abstract</classname>. The factory
         method accepts three arguments. The first one is the parser used to
         tokenize the text (e.g. BbCode). The second (optional) parameter is
-        the renderer to use, Html by default. Thirdly an array with options
+        the renderer to use, <acronym>HTML</acronym> by default. Thirdly an array with options
         to use for the renderer can be specified.
     </para>
 </sect1>

documentation/manual/en/module_specs/Zend_Mime_Part.xml

@@ -62,13 +62,13 @@ public $language;
                 <listitem>
                     <para>
                         <varname>$charset</varname> has to be set to the actual charset of the
-                        content if it is a text type (Text or HTML).
+                        content if it is a text type (Text or <acronym>HTML</acronym>).
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        <varname>$id</varname>
-                        may be set to identify a content-id for inline images in a HTML mail.
+                        <varname>$id</varname> may be set to identify a content-id for inline images
+                        in a <acronym>HTML</acronym> mail.
                     </para>
                 </listitem>
                 <listitem>

documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml

@@ -47,8 +47,8 @@ $color3 = new Zend_Pdf_Color_Cmyk($c, $m, $y, $k);
 ]]></programlisting>
 
         <para>
-            HTML style colors are also provided with <classname>Zend_Pdf_Color_Html</classname>
-            class:
+            <acronym>HTML</acronym> style colors are also provided with
+            <classname>Zend_Pdf_Color_Html</classname> class:
         </para>
 
         <programlisting language="php"><![CDATA[

documentation/manual/en/module_specs/Zend_ProgressBar_Adapter_JsPush.xml

@@ -38,7 +38,7 @@
     <para>
         The usage of this adapter is quite simple. First you create a progressbar
         in your browser, either with JavaScript or previously created with plain
-        HTML. Then you define the update method and optionally the finish method
+        <acronym>HTML</acronym>. Then you define the update method and optionally the finish method
         in JavaScript, both taking a json object as single argument. Then you
         call a webpage with the long-running process in a hidden
         <code>iframe</code> or <code>object</code> tag. While the process is
@@ -88,8 +88,8 @@
         <title>Basic example for the client-side stuff</title>
 
         <para>
-            This example illustrates a basic setup of HTML, <acronym>CSS</acronym> and JavaScript
-            for the JsPush adapter
+            This example illustrates a basic setup of <acronym>HTML</acronym>,
+            <acronym>CSS</acronym> and JavaScript for the JsPush adapter
         </para>
 
         <programlisting language="html"><![CDATA[

documentation/manual/en/module_specs/Zend_Search_Lucene-Overview.xml

@@ -80,7 +80,7 @@
             It is the responsibility of your application to control the indexer.
             This means that data can be indexed from any source
             that is accessible by your application. For example, this could be the
-            filesystem, a database, an HTML form, etc.
+            filesystem, a database, an <acronym>HTML</acronym> form, etc.
         </para>
 
         <para>
@@ -286,8 +286,9 @@ $doc->addField(Zend_Search_Lucene_Field::UnStored('contents', $contents));
         <title>HTML documents</title>
 
         <para>
-            <classname>Zend_Search_Lucene</classname> offers a HTML parsing feature. Documents can
-            be created directly from a HTML file or string:
+            <classname>Zend_Search_Lucene</classname> offers a <acronym>HTML</acronym> parsing
+            feature. Documents can be created directly from a <acronym>HTML</acronym> file or
+            string:
 
             <programlisting language="php"><![CDATA[
 $doc = Zend_Search_Lucene_Document_Html::loadHTMLFile($filename);
@@ -301,10 +302,10 @@ $index->addDocument($doc);
         <para>
             <classname>Zend_Search_Lucene_Document_Html</classname> class uses the
             <methodname>DOMDocument::loadHTML()</methodname> and
-            <methodname>DOMDocument::loadHTMLFile()</methodname> methods to parse the source HTML,
-            so it doesn't need HTML to be well formed or to be <acronym>XHTML</acronym>. On the
-            other hand, it's sensitive to the encoding specified by the "meta http-equiv" header
-            tag.
+            <methodname>DOMDocument::loadHTMLFile()</methodname> methods to parse the source
+            <acronym>HTML</acronym>, so it doesn't need <acronym>HTML</acronym> to be well formed or
+            to be <acronym>XHTML</acronym>. On the other hand, it's sensitive to the encoding
+            specified by the "meta http-equiv" header tag.
         </para>
 
         <para>
@@ -318,8 +319,8 @@ $index->addDocument($doc);
         </para>
 
         <para>
-            The 'body' field is the actual body content of the HTML file or string. It doesn't
-            include scripts, comments or attributes.
+            The 'body' field is the actual body content of the <acronym>HTML</acronym> file or
+            string. It doesn't include scripts, comments or attributes.
         </para>
 
         <para>
@@ -332,9 +333,9 @@ $index->addDocument($doc);
 
         <para>
             The third parameter of <methodname>loadHTML()</methodname> and
-            <methodname>loadHTMLFile()</methodname> methods optionally specifies source HTML
-            document encoding. It's used if encoding is not specified using Content-type HTTP-EQUIV
-            meta tag.
+            <methodname>loadHTMLFile()</methodname> methods optionally specifies source
+            <acronym>HTML</acronym> document encoding. It's used if encoding is not specified using
+            Content-type HTTP-EQUIV meta tag.
         </para>
 
         <para>

documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml

@@ -410,8 +410,9 @@ public function highlightExtended($words, $callback, $params = array())
 
             <footnote>
                 <para>
-                    The first is an HTML fragment for highlighting and others are callback behavior
-                    dependent. Returned value is a highlighted HTML fragment.
+                    The first is an <acronym>HTML</acronym> fragment for highlighting and others are
+                    callback behavior dependent. Returned value is a highlighted
+                    <acronym>HTML</acronym> fragment.
                 </para>
             </footnote>
             , or extend <classname>Zend_Search_Lucene_Document_Html</classname> class and redefine
@@ -420,8 +421,8 @@ public function highlightExtended($words, $callback, $params = array())
 
             <footnote>
                 <para>
-                    In both cases returned HTML is automatically transformed into valid
-                    <acronym>XHTML</acronym>.
+                    In both cases returned <acronym>HTML</acronym> is automatically transformed into
+                    valid <acronym>XHTML</acronym>.
                 </para>
             </footnote>
         </para>
@@ -476,8 +477,8 @@ $highlightedHTML = $query->highlightMatches($sourceHTML);
         </para>
 
         <para>
-            Optional second parameter is a default HTML document encoding. It's used if encoding is
-            not specified using Content-type HTTP-EQUIV meta tag.
+            Optional second parameter is a default <acronym>HTML</acronym> document encoding. It's
+            used if encoding is not specified using Content-type HTTP-EQUIV meta tag.
         </para>
 
         <para>
@@ -512,7 +513,7 @@ interface Zend_Search_Lucene_Search_Highlighter_Interface
 ]]></programlisting>
 
             Where <classname>Zend_Search_Lucene_Document_Html</classname> object is an object
-            constructed from the source HTML provided to the
+            constructed from the source <acronym>HTML</acronym> provided to the
             <classname>Zend_Search_Lucene_Search_Query->highlightMatches()</classname> method.
         </para>
 
@@ -534,9 +535,9 @@ interface Zend_Search_Lucene_Search_Highlighter_Interface
 
         <para>
             <code>Zend_Search_Lucene_Search_Query->htmlFragmentHighlightMatches()</code> has similar
-            behavior. The only difference is that it takes as an input and returns HTML fragment
-            without &lt;>HTML>, &lt;HEAD>, &lt;BODY> tags. Nevertheless, fragment is automatically
-            transformed to valid <acronym>XHTML</acronym>.
+            behavior. The only difference is that it takes as an input and returns
+            <acronym>HTML</acronym> fragment without &lt;>HTML>, &lt;HEAD>, &lt;BODY> tags.
+            Nevertheless, fragment is automatically transformed to valid <acronym>XHTML</acronym>.
         </para>
     </sect2>
 </sect1>

documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml

@@ -46,7 +46,8 @@ echo $result->listingName;
             <ulink url="http://janschneider.de">Jan Schneider</ulink> from the <ulink
                 url="http://horde.org">Horde project</ulink> has written a <ulink
                 url="http://janschneider.de/news/25/268">small <acronym>PHP</acronym>
-                routine</ulink> that will format a WSDL file into more readable HTML.
+                routine</ulink> that will format a WSDL file into more readable
+            <acronym>HTML</acronym>.
         </para>
 
         <para>

documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml

@@ -47,8 +47,8 @@ Zend_Session::start();
                         <code>session.auto_start</code> setting</ulink>. If you do not have the
                     ability to disable this setting in php.ini, you are using mod_php (or
                     equivalent), and the setting is already enabled in <code>php.ini</code>, then
-                    add the following to your <code>.htaccess</code> file (usually in your HTML
-                    document root directory):
+                    add the following to your <code>.htaccess</code> file (usually in your
+                    <acronym>HTML</acronym> document root directory):
                     <programlisting language="httpd.conf"><![CDATA[
 php_value session.auto_start 0
 ]]></programlisting>

documentation/manual/en/module_specs/Zend_Tag_Cloud.xml

@@ -5,7 +5,7 @@
 
     <para>
         <classname>Zend_Tag_Cloud</classname> is the rendering part of
-        <classname>Zend_Tag</classname>. By default it comes with a set of HTML
+        <classname>Zend_Tag</classname>. By default it comes with a set of <acronym>HTML</acronym>
         decorators, which allow you to create tag clouds for a website, but
         also supplies you with two abstract classes to create your own
         decorators, to create tag clouds in <acronym>PDF</acronym> documents for example.
@@ -115,7 +115,7 @@ echo $cloud;
             able to render a tag cloud. This includes a decorator which renders
             the single tags as well as a decorator which renders the surounding
             cloud. <classname>Zend_Tag_Cloud</classname> ships a default decorator set for
-            formatting a tag cloud in HTML. This set will by default create a
+            formatting a tag cloud in <acronym>HTML</acronym>. This set will by default create a
             tag cloud as ul/li-list, spread with different font-sizes according
             to the weight values of the tags assigned to them.
         </para>
@@ -124,7 +124,7 @@ echo $cloud;
             <title>HTML Tag decorator</title>
 
             <para>
-                The HTML tag decorator will by default render every tag in an
+                The <acronym>HTML</acronym> tag decorator will by default render every tag in an
                 anchor element, surounded by a li element. The anchor itself is
                 fixed and cannot be changed, but the surounding element(s) can.
             </para>
@@ -133,7 +133,7 @@ echo $cloud;
                 <title>URL parameter</title>
 
                 <para>
-                    As the HTML tag decorator always surounds the tag title with
+                    As the <acronym>HTML</acronym> tag decorator always surounds the tag title with
                     an anchor, you should define an <acronym>URL</acronym> parameter for every
                     tag used in it.
                 </para>
@@ -179,7 +179,7 @@ echo $cloud;
 
                 <listitem>
                     <para>
-                        <code>htmlTags</code>: an array of HTML tags surounding
+                        <code>htmlTags</code>: an array of <acronym>HTML</acronym> tags surounding
                         the anchor. Each element can either be a string, which
                         is used as element type then, or an array containing
                         an attribute list for the element, defined as key/value
@@ -194,9 +194,9 @@ echo $cloud;
             <title>HTML Cloud decorator</title>
 
             <para>
-                The HTML cloud decorator will suround the HTML tags with an
-                ul-element by default and add no separation. Like in the tag
-                decorator, you can define multiple surounding HTML tags and
+                The <acronym>HTML</acronym> cloud decorator will suround the <acronym>HTML</acronym>
+                tags with an ul-element by default and add no separation. Like in the tag
+                decorator, you can define multiple surounding <acronym>HTML</acronym> tags and
                 additionally define a separator. The available options are:
             </para>
 
@@ -210,7 +210,7 @@ echo $cloud;
 
                 <listitem>
                     <para>
-                        <code>htmlTags</code>: an array of HTML tags surounding
+                        <code>htmlTags</code>: an array of <acronym>HTML</acronym> tags surounding
                         all tags. Each element can either be a string, which
                         is used as element type then, or an array containing
                         an attribute list for the element, defined as key/value

documentation/manual/en/module_specs/Zend_Translate-Adapters.xml

@@ -329,7 +329,7 @@
             <para>
                 The XmlTm Adapter is the Adapter which will be used by customers
                 which do their layout themself. XmlTm is a format which allows the
-                complete html source to be included in the translation source, so
+                complete <acronym>HTML</acronym> source to be included in the translation source, so
                 the translation is coupled with the layout.
                 XLIFF is a <acronym>XML</acronym> file based format, which is related to XLIFF but
                 its not as simple to read.

documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml

@@ -4,7 +4,7 @@
     <title>Doctype Helper</title>
 
     <para>
-        Valid HTML and <acronym>XHTML</acronym> documents should include a
+        Valid <acronym>HTML</acronym> and <acronym>XHTML</acronym> documents should include a
         <constant>DOCTYPE</constant> declaration. Besides being difficult to remember, these can
         also affect how certain elements in your document should be rendered (for instance,
         CDATA escaping in <emphasis>&lt;script&gt;</emphasis> and

documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml

@@ -4,8 +4,8 @@
     <title>HeadLink Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;link&gt;</emphasis> element is increasingly used for
-        linking a variety of resources for your site: stylesheets, feeds,
+        The <acronym>HTML</acronym> <emphasis>&lt;link&gt;</emphasis> element is increasingly used
+        for linking a variety of resources for your site: stylesheets, feeds,
         favicons, trackbacks, and more. The <classname>HeadLink</classname> helper
         provides a simple interface for creating and aggregating these elements
         for later retrieval and output in your layout script.

documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml

@@ -4,8 +4,8 @@
     <title>HeadMeta Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;meta&gt;</emphasis> element is used to provide meta
-        information about your HTML document -- typically keywords, document
+        The <acronym>HTML</acronym> <emphasis>&lt;meta&gt;</emphasis> element is used to provide
+        meta information about your <acronym>HTML</acronym> document -- typically keywords, document
         character set, caching pragmas, etc. Meta tags may be either of the
         'http-equiv' or 'name' types, must contain a 'content' attribute, and
         can also have either of the 'lang' or 'scheme' modifier attributes.
@@ -151,7 +151,8 @@ $this->headMeta()->appendHttpEquiv('Content-Type',
 ]]></programlisting>
 
         <para>
-            If you are serving an HTML5 document, you should provide the character set like this:
+            If you are serving an <acronym>HTML</acronym>5 document, you should provide the
+            character set like this:
         </para>
 
         <programlisting language="php"><![CDATA[

documentation/manual/en/module_specs/Zend_View-Helpers-HeadScript.xml

@@ -4,8 +4,8 @@
     <title>HeadScript Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;script&gt;</emphasis> element is used to either provide
-        inline client-side scripting elements or link to a remote resource
+        The <acronym>HTML</acronym> <emphasis>&lt;script&gt;</emphasis> element is used to either
+        provide inline client-side scripting elements or link to a remote resource
         containing client-side scripting code. The <classname>HeadScript</classname>
         helper allows you to manage both.
     </para>
@@ -138,7 +138,7 @@ $this->headScript()->appendFile(
         <para>
             <classname>HeadScript</classname>'s sibling helper, <link
                 linkend="zend.view.helpers.initial.inlinescript">InlineScript</link>,
-            should be used when you wish to include scripts inline in the HTML
+            should be used when you wish to include scripts inline in the <acronym>HTML</acronym>
             <emphasis>body</emphasis>. Placing scripts at the end of your document is a
             good practice for speeding up delivery of your page, particularly
             when using 3rd party analytics scripts.

documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml

@@ -4,9 +4,9 @@
     <title>HeadStyle Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;style&gt;</emphasis> element is used to include
-        <acronym>CSS</acronym> stylesheets inline in the HTML <emphasis>&lt;head&gt;</emphasis>
-        element.
+        The <acronym>HTML</acronym> <emphasis>&lt;style&gt;</emphasis> element is used to include
+        <acronym>CSS</acronym> stylesheets inline in the <acronym>HTML</acronym>
+        <emphasis>&lt;head&gt;</emphasis> element.
     </para>
 
     <note>

documentation/manual/en/module_specs/Zend_View-Helpers-HeadTitle.xml

@@ -4,10 +4,9 @@
     <title>HeadTitle Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;title&gt;</emphasis> element is used to provide a title
-        for an HTML document. The <classname>HeadTitle</classname> helper allows you to
-        programmatically create and store the title for later retrieval and
-        output.
+        The <acronym>HTML</acronym> <emphasis>&lt;title&gt;</emphasis> element is used to provide a
+        title for an <acronym>HTML</acronym> document. The <classname>HeadTitle</classname> helper
+        allows you to programmatically create and store the title for later retrieval and output.
     </para>
 
     <para>

documentation/manual/en/module_specs/Zend_View-Helpers-HtmlObject.xml

@@ -4,7 +4,7 @@
     <title>HTML Object Helpers</title>
 
     <para>
-        The HTML <emphasis><![CDATA[
+        The <acronym>HTML</acronym> <emphasis><![CDATA[
 <object>]]></emphasis> element is used for embedding
         media like Flash or QuickTime in web pages. The object view helpers take
         care of embedding media with minimum effort.
@@ -62,7 +62,7 @@
 ]]></programlisting>
 
         <para>
-            This outputs the following HTML:
+            This outputs the following <acronym>HTML</acronym>:
         </para>
 
         <programlisting language="html"><![CDATA[

documentation/manual/en/module_specs/Zend_View-Helpers-InlineScript.xml

@@ -4,8 +4,8 @@
     <title>InlineScript Helper</title>
 
     <para>
-        The HTML <emphasis>&lt;script&gt;</emphasis> element is used to either provide
-        inline client-side scripting elements or link to a remote resource
+        The <acronym>HTML</acronym> <emphasis>&lt;script&gt;</emphasis> element is used to either
+        provide inline client-side scripting elements or link to a remote resource
         containing client-side scripting code. The <classname>InlineScript</classname>
         helper allows you to manage both. It is derived from <link
             linkend="zend.view.helpers.initial.headscript">HeadScript</link>,
@@ -19,15 +19,15 @@
 
         <para>
             <classname>InlineScript</classname>, should be used when you wish to include
-            scripts inline in the HTML <emphasis>body</emphasis>. Placing scripts at the
-            end of your document is a good practice for speeding up delivery of
+            scripts inline in the <acronym>HTML</acronym> <emphasis>body</emphasis>. Placing scripts
+            at the end of your document is a good practice for speeding up delivery of
             your page, particularly when using 3rd party analytics scripts.
         </para>
 
         <para>
-            Some JS libraries need to be included in the HTML <emphasis>head</emphasis>;
-            use <link linkend="zend.view.helpers.initial.headscript">HeadScript</link>
-            for those scripts.
+            Some JS libraries need to be included in the <acronym>HTML</acronym>
+            <emphasis>head</emphasis>; use <link
+                linkend="zend.view.helpers.initial.headscript">HeadScript</link> for those scripts.
         </para>
     </note>
 </sect3>

documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -186,8 +186,9 @@
 
         <listitem>
             <para>
-                <methodname>htmlify()</methodname> renders an <emphasis>'a'</emphasis> HTML
-                element from a <classname>Zend_Navigation_Page</classname> instance.
+                <methodname>htmlify()</methodname> renders an <emphasis>'a'</emphasis>
+                <acronym>HTML</acronym> element from a <classname>Zend_Navigation_Page</classname>
+                instance.
             </para>
         </listitem>
 
@@ -779,14 +780,14 @@ Products, Foo Server, FAQ
         <title>Links Helper</title>
 
         <para>
-            The links helper is used for rendering HTML <constant>LINK</constant>
+            The links helper is used for rendering <acronym>HTML</acronym> <constant>LINK</constant>
             elements. Links are used for describing document relationships
             of the currently active page. Read more about links and link
             types at <ulink url="http://www.w3.org/TR/html4/struct/links.html#h-12.3">Document
                 relationships: the LINK element (HTML4 W3C Rec.)</ulink>
             and <ulink
                 url="http://www.w3.org/TR/html4/types.html#h-6.12">Link types (HTML4 W3C
-                Rec.)</ulink> in the HTML4 W3C Recommendation.
+                Rec.)</ulink> in the <acronym>HTML</acronym>4 W3C Recommendation.
         </para>
 
         <para>
@@ -1040,7 +1041,7 @@ Products, Foo Server, FAQ
 
         <para>
             The constants from <constant>RENDER_ALTERNATE</constant> to
-            <constant>RENDER_BOOKMARK</constant> denote standard HTML link types.
+            <constant>RENDER_BOOKMARK</constant> denote standard <acronym>HTML</acronym> link types.
             <constant>RENDER_CUSTOM</constant> denotes non-standard relations that
             specified in pages. <constant>RENDER_ALL</constant> denotes standard and
             non-standard relations.
@@ -1230,7 +1231,7 @@ Output:
         <para>
             The Menu helper is used for rendering menus from navigation
             containers. By default, the menu will be rendered using
-            HTML <code>UL</code> and <code>LI</code> tags, but the helper also
+            <acronym>HTML</acronym> <code>UL</code> and <code>LI</code> tags, but the helper also
             allows using a partial view script.
         </para>
 
@@ -1294,7 +1295,7 @@ Output:
                 <para>
                     <methodname>renderMenu($container = null, $options = array())</methodname>
                     is the default render method, and will render a container as
-                    a HTML <code>UL</code> list.
+                    a <acronym>HTML</acronym> <code>UL</code> list.
                 </para>
 
                 <para>

documentation/manual/en/module_specs/Zend_View-Helpers.xml

@@ -60,8 +60,8 @@
             <classname>Zend_View</classname> comes with an initial set of helper classes,
             most of which relate to form element generation and perform
             the appropriate output escaping automatically. In addition, there
-            are helpers for creating route-based <acronym>URL</acronym>s and HTML lists, as well as
-            declaring variables. The currently shipped helpers include:
+            are helpers for creating route-based <acronym>URL</acronym>s and <acronym>HTML</acronym>
+            lists, as well as declaring variables. The currently shipped helpers include:
         </para>
 
         <itemizedlist>
@@ -255,9 +255,9 @@ echo $this->formCheckbox('foo',
                     <varname>$options</varname> should be an associative array, and may be
                     arbitrarily deep. <varname>$value</varname> may be a single value or
                     an array of selected values that match the keys in the
-                    <varname>$options</varname> array. <varname>$listsep</varname> is an HTML
-                    break ("&lt;br /&gt;") by default. By default, this element is
-                    treated as an array; all checkboxes share the same name, and are
+                    <varname>$options</varname> array. <varname>$listsep</varname> is an
+                    <acronym>HTML</acronym> break ("&lt;br /&gt;") by default. By default, this
+                    element is treated as an array; all checkboxes share the same name, and are
                     submitted as an array.
                 </para>
             </listitem>

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

@@ -189,7 +189,7 @@ base/path/
                 url="http://us.php.net/manual/en/control-structures.alternative-syntax.php">alternate
                 syntax for control structures</ulink>. These are convenient shorthands to use when
             writing view scripts, as they make the constructs more terse, keep statements on single
-            lines, and eliminate the need to hunt for brackets within HTML.
+            lines, and eliminate the need to hunt for brackets within <acronym>HTML</acronym>.
         </para>
 
         <para>

documentation/manual/en/ref/migration-110.xml

@@ -212,13 +212,15 @@ $authors = $feed->getAuthors()->getValues();
         <para>
             <classname>Zend_Filter_StripTags</classname> contains a flag,
             <varname>commentsAllowed</varname>, that, in previous versions, allowed you to
-            optionally whitelist HTML comments in HTML text filtered by the class. However, this
-            opens code enabling the flag to <acronym>XSS</acronym> attacks, particularly in Internet
-            Explorer (which allows specifying conditional functionality via HTML comments). Starting
+            optionally whitelist <acronym>HTML</acronym> comments in <acronym>HTML</acronym> text
+            filtered by the class. However, this opens code enabling the flag to
+            <acronym>XSS</acronym> attacks, particularly in Internet Explorer (which allows
+            specifying conditional functionality via <acronym>HTML</acronym> comments). Starting
             in version 1.9.7 (and backported to versions 1.8.5 and 1.7.9), the
-            <varname>commentsAllowed</varname> flag no longer has any meaning, and all HTML
-            comments, including those containing other HTML tags or nested commments, will be
-            stripped from the final output of the filter.
+            <varname>commentsAllowed</varname> flag no longer has any meaning, and all
+            <acronym>HTML</acronym> comments, including those containing other
+            <acronym>HTML</acronym> tags or nested commments, will be stripped from the final output
+            of the filter.
         </para>
     </sect2>
 

documentation/manual/en/ref/migration-19.xml

@@ -424,13 +424,15 @@ $container = new Zend_Navigation(array(
             <para>
                 <classname>Zend_Filter_StripTags</classname> contains a flag,
                 <varname>commentsAllowed</varname>, that, in previous versions, allowed you to
-                optionally whitelist HTML comments in HTML text filtered by the class. However, this
-                opens code enabling the flag to <acronym>XSS</acronym> attacks, particularly in
-                Internet Explorer (which allows specifying conditional functionality via HTML
-                comments). Starting in version 1.9.7 (and backported to versions 1.8.5 and 1.7.9),
-                the <varname>commentsAllowed</varname> flag no longer has any meaning, and all HTML
-                comments, including those containing other HTML tags or nested commments, will be
-                stripped from the final output of the filter.
+                optionally whitelist <acronym>HTML</acronym> comments in <acronym>HTML</acronym>
+                text filtered by the class. However, this opens code enabling the flag to
+                <acronym>XSS</acronym> attacks, particularly in Internet Explorer (which allows
+                specifying conditional functionality via <acronym>HTML</acronym> comments). Starting
+                in version 1.9.7 (and backported to versions 1.8.5 and 1.7.9), the
+                <varname>commentsAllowed</varname> flag no longer has any meaning, and all
+                <acronym>HTML</acronym> comments, including those containing other
+                <acronym>HTML</acronym> tags or nested commments, will be stripped from the final
+                output of the filter.
             </para>
         </sect3>
     </sect2>

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

@@ -226,8 +226,8 @@ foreach ($form->getElements() as $element) {
 ]]></programlisting>
 
     <para>
-        If you use the above view script, you'll get approximately the following HTML (approximate,
-        as the HTML below is formatted):
+        If you use the above view script, you'll get approximately the following
+        <acronym>HTML</acronym> (approximate, as the <acronym>HTML</acronym> below is formatted):
     </para>
 
     <programlisting language="html"><![CDATA[

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

@@ -106,12 +106,12 @@ $element->addValidator('NotEmpty')
             For example, let's consider <classname>Zend_View_Helper_FormButton</classname> (view
             helpers are one form of plugin). This view helper accepts three arguments, an element
             name (also used as the element's DOM identifier), a value (used as the button label),
-            and an optional array of attributes. The helper then generates HTML markup for a form
-            input element.
+            and an optional array of attributes. The helper then generates <acronym>HTML</acronym>
+            markup for a form input element.
         </para>
 
         <para>
-            Let's say you want the helper to instead generate a true HTML
+            Let's say you want the helper to instead generate a true <acronym>HTML</acronym>
             <constant>button</constant> element; don't want the helper to generate a DOM identifier,
             but instead use the value for a CSS class selector; and that you have no interest in
             handling arbitrary attributes. You could accomplish this in a couple of ways. In both

documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -4,15 +4,15 @@
     <title>Create A Layout</title>
 
     <para>
-        You may have noticed that the view scripts in the previous sections were HTML fragments- not
-        complete pages. This is by design; we want our actions to return content only related to the
-        action itself, not the application as a whole.
+        You may have noticed that the view scripts in the previous sections were
+        <acronym>HTML</acronym> fragments- not complete pages. This is by design; we want our
+        actions to return content only related to the action itself, not the application as a whole.
     </para>
 
     <para>
-        Now we must compose that generated content into a full HTML page. We'd also like to have a
-        consistent look and feel for the application. We will use a global site layout to accomplish
-        both of these tasks.
+        Now we must compose that generated content into a full <acronym>HTML</acronym> page. We'd
+        also like to have a consistent look and feel for the application. We will use a global site
+        layout to accomplish both of these tasks.
     </para>
 
     <para>
@@ -213,9 +213,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
     <para>
         Note also the use of the <methodname>headLink()</methodname> placeholder. This is an easy
-        way to generate the HTML for &lt;link&gt; elements, as well as to keep track of them
-        throughout your application. If you need to add additional CSS sheets to support a single
-        action, you can do so, and be assured it will be present in the final rendered page.
+        way to generate the <acronym>HTML</acronym> for &lt;link&gt; elements, as well as to keep
+        track of them throughout your application. If you need to add additional CSS sheets to
+        support a single action, you can do so, and be assured it will be present in the final
+        rendered page.
     </para>
 
     <note>