From 1158eff936ba86dc61cd0fff07c42993cd7cf190 Mon Sep 17 00:00:00 2001 From: thomas Date: Sun, 11 Apr 2010 13:52:14 +0000 Subject: [PATCH] [MANUAL] English: - unified "HTML" with acronym git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21825 44c647ce-9c0f-0410-b52a-842ac1e357ba --- .../manual/en/module_specs/Zend_Feed_Reader.xml | 22 +++++++++---------- .../manual/en/module_specs/Zend_Feed_Writer.xml | 16 +++++++------- .../Zend_File_Transfer-Introduction.xml | 2 +- .../manual/en/module_specs/Zend_Filter.xml | 12 +++++------ .../manual/en/module_specs/Zend_Filter_Input.xml | 10 ++++----- .../manual/en/module_specs/Zend_Form-Advanced.xml | 2 +- .../en/module_specs/Zend_Form-Decorators.xml | 2 +- .../manual/en/module_specs/Zend_Form-Elements.xml | 12 +++++------ .../manual/en/module_specs/Zend_Form-Forms.xml | 12 +++++------ .../en/module_specs/Zend_Form-QuickStart.xml | 2 +- .../module_specs/Zend_Form-StandardDecorators.xml | 22 +++++++++---------- .../en/module_specs/Zend_Form-StandardElements.xml | 6 +++--- .../manual/en/module_specs/Zend_Gdata_YouTube.xml | 11 +++++----- .../en/module_specs/Zend_Http_Client-Advanced.xml | 2 +- .../en/module_specs/Zend_InfoCard-Basics.xml | 6 +++--- .../en/module_specs/Zend_Log-Writers-Mail.xml | 9 ++++---- .../manual/en/module_specs/Zend_Mail-Encoding.xml | 14 ++++++------ .../manual/en/module_specs/Zend_Mail-HtmlMails.xml | 6 +++--- .../en/module_specs/Zend_Mail-Introduction.xml | 2 +- .../en/module_specs/Zend_Markup-Renderers.xml | 2 +- .../manual/en/module_specs/Zend_Markup.xml | 2 +- .../manual/en/module_specs/Zend_Mime_Part.xml | 6 +++--- .../manual/en/module_specs/Zend_Pdf-Drawing.xml | 4 ++-- .../Zend_ProgressBar_Adapter_JsPush.xml | 6 +++--- .../module_specs/Zend_Search_Lucene-Overview.xml | 25 +++++++++++----------- .../module_specs/Zend_Search_Lucene-Searching.xml | 21 +++++++++--------- .../Zend_Service_StrikeIron-AdvancedUses.xml | 3 ++- .../en/module_specs/Zend_Session-AdvancedUsage.xml | 4 ++-- .../manual/en/module_specs/Zend_Tag_Cloud.xml | 18 ++++++++-------- .../en/module_specs/Zend_Translate-Adapters.xml | 2 +- .../en/module_specs/Zend_View-Helpers-Doctype.xml | 2 +- .../en/module_specs/Zend_View-Helpers-HeadLink.xml | 4 ++-- .../en/module_specs/Zend_View-Helpers-HeadMeta.xml | 7 +++--- .../module_specs/Zend_View-Helpers-HeadScript.xml | 6 +++--- .../module_specs/Zend_View-Helpers-HeadStyle.xml | 6 +++--- .../module_specs/Zend_View-Helpers-HeadTitle.xml | 7 +++--- .../module_specs/Zend_View-Helpers-HtmlObject.xml | 4 ++-- .../Zend_View-Helpers-InlineScript.xml | 14 ++++++------ .../module_specs/Zend_View-Helpers-Navigation.xml | 15 +++++++------ .../manual/en/module_specs/Zend_View-Helpers.xml | 10 ++++----- .../en/module_specs/Zend_View-Introduction.xml | 2 +- documentation/manual/en/ref/migration-110.xml | 14 ++++++------ documentation/manual/en/ref/migration-19.xml | 16 ++++++++------ .../en/tutorials/form-decorators-individual.xml | 4 ++-- .../manual/en/tutorials/plugins-usage.xml | 6 +++--- .../en/tutorials/quickstart-create-layout.xml | 19 ++++++++-------- 46 files changed, 205 insertions(+), 194 deletions(-) diff --git a/documentation/manual/en/module_specs/Zend_Feed_Reader.xml b/documentation/manual/en/module_specs/Zend_Feed_Reader.xml index e5f9db642..1f5c6fee2 100644 --- a/documentation/manual/en/module_specs/Zend_Feed_Reader.xml +++ b/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 + 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. @@ -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 NULL. + 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 NULL. @@ -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 NULL. + 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 NULL. diff --git a/documentation/manual/en/module_specs/Zend_Feed_Writer.xml b/documentation/manual/en/module_specs/Zend_Feed_Writer.xml index 7a7b9146b..fd19291b5 100644 --- a/documentation/manual/en/module_specs/Zend_Feed_Writer.xml +++ b/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 URI. 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 RSS) is optional but must be a valid - URI. - The method addCategory() allows adding - a single category at a time. + readable category name supporting special characters (it is + HTML encoded during rendering) and is a required key. + The "scheme" (called the domain in RSS) is optional + but must be a valid URI. The method + addCategory() allows adding a single category + at a time. @@ -636,8 +636,8 @@ $out = $feed->export('atom'); setCommentLink() - Seta a link to a HTML page containing comments associated with this - entry. + Seta a link to a HTML page containing comments + associated with this entry. diff --git a/documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml b/documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml index 5ca4026fb..c7d83da8a 100644 --- a/documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml +++ b/documentation/manual/en/module_specs/Zend_File_Transfer-Introduction.xml @@ -64,7 +64,7 @@ For convenience, you can use Zend_Form_Element_File instead of - building the HTML manually. + building the HTML manually. diff --git a/documentation/manual/en/module_specs/Zend_Filter.xml b/documentation/manual/en/module_specs/Zend_Filter.xml index c58ec9105..2389893d5 100644 --- a/documentation/manual/en/module_specs/Zend_Filter.xml +++ b/documentation/manual/en/module_specs/Zend_Filter.xml @@ -25,17 +25,17 @@ 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 HTML entities. For example, if a form field is automatically populated with untrusted input (e.g., from a web browser), this value should either be free - 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 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 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 + 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 + that escapes the HTML entities, however, transforms the input (e.g., "&" is transformed to "&amp;"). Supporting such use cases for web developers is important, and "to filter," in the context of using diff --git a/documentation/manual/en/module_specs/Zend_Filter_Input.xml b/documentation/manual/en/module_specs/Zend_Filter_Input.xml index eadd147cd..d17cb4977 100644 --- a/documentation/manual/en/module_specs/Zend_Filter_Input.xml +++ b/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 HTML output. @@ -52,10 +52,10 @@ Escapers transform a value by removing magic behavior of certain characters. In some output contexts, special characters have meaning. For example, - the characters '<' and '>' delimit HTML tags, and if a - string containing those characters is output in an HTML + the characters '<' and '>' delimit HTML tags, and if a + string containing those characters is output in an HTML context, the content between them might affect the output or - functionality of the HTML presentation. Escaping the + functionality of the HTML presentation. Escaping the characters removes the special meaning, so they are output as literal characters. @@ -445,7 +445,7 @@ $m = $input->getUnescaped('month'); // not escaped By default, when retrieving a value, it is filtered with the Zend_Filter_HtmlEntities. This is the default because it is considered the most common usage to output the value of a field - in HTML. The HtmlEntities filter helps prevent unintentional + in HTML. The HtmlEntities filter helps prevent unintentional output of code, which can result in security problems. diff --git a/documentation/manual/en/module_specs/Zend_Form-Advanced.xml b/documentation/manual/en/module_specs/Zend_Form-Advanced.xml index e1a5b8c44..7f3082ff9 100644 --- a/documentation/manual/en/module_specs/Zend_Form-Advanced.xml +++ b/documentation/manual/en/module_specs/Zend_Form-Advanced.xml @@ -152,7 +152,7 @@ Zend_Form attempts to automate this process with its sub forms. 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 HTML 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. diff --git a/documentation/manual/en/module_specs/Zend_Form-Decorators.xml b/documentation/manual/en/module_specs/Zend_Form-Decorators.xml index 4512ab1ac..f9844b8bc 100644 --- a/documentation/manual/en/module_specs/Zend_Form-Decorators.xml +++ b/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 HTML 'div'. You might build such a 'Composite' decorator as follows: diff --git a/documentation/manual/en/module_specs/Zend_Form-Elements.xml b/documentation/manual/en/module_specs/Zend_Form-Elements.xml index f4b550fa0..852b61e79 100644 --- a/documentation/manual/en/module_specs/Zend_Form-Elements.xml +++ b/documentation/manual/en/module_specs/Zend_Form-Elements.xml @@ -4,7 +4,7 @@ Creating Form Elements Using Zend_Form_Element - A form is made of elements that typically correspond to HTML form + A form is made of elements that typically correspond to HTML form input. Zend_Form_Element encapsulates single form elements, with the following areas of responsibility: @@ -205,7 +205,7 @@ $form->addElementPrefixPath('My_Decorator', 'My/Decorator/', 'decorator'); It's often useful and/or necessary to perform some normalization on input prior to validation. For example, you may want to strip out - all HTML, but run your validations on what remains to ensure the + all HTML, but run your validations on what remains to ensure the submission is valid. Or you may want to trim empty space surrounding input so that a StringLength validator will use the correct length of the input without counting leading or trailing whitespace characters. These operations may be performed using @@ -928,7 +928,7 @@ $messages = $element->getMessages(); HtmlTag: wraps the element and errors in - an HTML <dd> tag. + an HTML <dd> tag. @@ -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 <dd> tag. + element, errors, and description in an HTML <dd> 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 HTML <dt> tag; the value is prepended to the content by default. The resulting output looks basically like this: @@ -1273,7 +1273,7 @@ $element->class = 'text; 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 HTML attributes of the element tag. diff --git a/documentation/manual/en/module_specs/Zend_Form-Forms.xml b/documentation/manual/en/module_specs/Zend_Form-Forms.xml index 43ac0955f..5bb76895d 100644 --- a/documentation/manual/en/module_specs/Zend_Form-Forms.xml +++ b/documentation/manual/en/module_specs/Zend_Form-Forms.xml @@ -1081,7 +1081,7 @@ $form->setDefaultDisplayGroupClass('My_DisplayGroup'); A sub form may be a Zend_Form object, or, more typically, a Zend_Form_SubForm 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 HTML form tags, but does group elements). To attach a sub form, simply add it to the form and give it a name: @@ -1197,9 +1197,9 @@ $form->setSubFormDecorators(array( 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 HTML 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 HTML attributes for the form tag itself). @@ -1333,7 +1333,7 @@ $form->setDecorators(array( ]]> - Any attributes set on the form object will be used as HTML + Any attributes set on the form object will be used as HTML attributes of the <form> tag. @@ -1407,8 +1407,8 @@ $fooBar = $form->getDecorator('FooBar'); 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 HTML you wish to use; your + decorator could create the exact HTML and simply return it, potentially using the decorators from individual elements or display groups. diff --git a/documentation/manual/en/module_specs/Zend_Form-QuickStart.xml b/documentation/manual/en/module_specs/Zend_Form-QuickStart.xml index b03fb9357..e39103767 100644 --- a/documentation/manual/en/module_specs/Zend_Form-QuickStart.xml +++ b/documentation/manual/en/module_specs/Zend_Form-QuickStart.xml @@ -45,7 +45,7 @@ $form->setAction('/resource/process') - You can set additional HTML attributes for the + You can set additional HTML attributes for the <form> tag by using the setAttrib() or setAttribs() methods. For instance, if you wish to set the id, set the "id" attribute: diff --git a/documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml b/documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml index 80acb7de9..dfa87b0c4 100644 --- a/documentation/manual/en/module_specs/Zend_Form-StandardDecorators.xml +++ b/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 getLegend() 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 HTML 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 HTML attributes. @@ -172,11 +172,11 @@ class Util Zend_Form_Decorator_Form - Zend_Form 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 + Zend_Form 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 Zend_Form object's action and method, and any - attributes as HTML attributes. + attributes as HTML attributes. @@ -288,9 +288,9 @@ class Util Zend_Form_Decorator_HtmlTag - The HtmlTag decorator allows you to utilize HTML tags to + The HtmlTag decorator allows you to utilize HTML 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 HTML 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 Zend_Form_Decorator_Image - The Image decorator allows you to create an HTML image input + The Image decorator allows you to create an HTML image input (<input type="image" ... />), and optionally - render it within another HTML tag. + render it within another HTML tag. @@ -316,7 +316,7 @@ class Util - To specify an HTML tag with which to wrap the element, either pass a + To specify an HTML tag with which to wrap the element, either pass a 'tag' option to the decorator, or explicitly call setTag(). diff --git a/documentation/manual/en/module_specs/Zend_Form-StandardElements.xml b/documentation/manual/en/module_specs/Zend_Form-StandardElements.xml index 3878e5aa9..78dad6afd 100644 --- a/documentation/manual/en/module_specs/Zend_Form-StandardElements.xml +++ b/documentation/manual/en/module_specs/Zend_Form-StandardElements.xml @@ -4,7 +4,7 @@ Standard Form Elements Shipped With Zend Framework - Zend Framework ships with concrete element classes covering most HTML + Zend Framework ships with concrete element classes covering most HTML 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 @@ Zend_Form_Element_Button - Used for creating HTML button elements, + Used for creating HTML button elements, Zend_Form_Element_Button extends Zend_Form_Element_Submit, specifying some custom functionality. It specifies the 'formButton' @@ -134,7 +134,7 @@ $element = new Zend_Form_Element_Captcha('foo', array( Zend_Form_Element_Checkbox - HTML checkboxes allow you return a specific value, but basically + HTML 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, Zend_Form_Element_Checkbox enforces this state. diff --git a/documentation/manual/en/module_specs/Zend_Gdata_YouTube.xml b/documentation/manual/en/module_specs/Zend_Gdata_YouTube.xml index de2c38dd1..1f3a8efbf 100644 --- a/documentation/manual/en/module_specs/Zend_Gdata_YouTube.xml +++ b/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 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 HTML form. @@ -570,7 +570,8 @@ try { object to the Zend_Gdata_YouTube_VideoEntry 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 HTML upload + form. @@ -596,8 +597,8 @@ $postUrl = $tokenArray['url']; 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, + 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, 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 diff --git a/documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml b/documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml index fa24ca3dd..6efb45a10 100644 --- a/documentation/manual/en/module_specs/Zend_Http_Client-Advanced.xml +++ b/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 HTML form. A fourth optional parameter provides the file's content-type. If not specified, and Zend_Http_Client reads the file from the disk, the mime_content_type function will be used to guess the file's diff --git a/documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml b/documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml index 41881563e..559b096c5 100644 --- a/documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml +++ b/documentation/manual/en/module_specs/Zend_InfoCard-Basics.xml @@ -24,8 +24,8 @@ either as part of the larger Zend_Auth component via the Zend_InfoCard 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 HTML block in your + HTML login form: - When the above HTML is activated by a user (clicks on it), the + When the above HTML 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 diff --git a/documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml b/documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml index 7c98ed5dc..920b65533 100644 --- a/documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml +++ b/documentation/manual/en/module_specs/Zend_Log-Writers-Mail.xml @@ -63,10 +63,11 @@ $log->error('unable to connect to database'); Zend_Layout Usage - A Zend_Layout instance may be used to generate the HTML - portion of a multipart email. If a Zend_Layout instance - is in use, Zend_Log_Writer_Mail assumes that it is - being used to render HTML and sets the body HTML for the message as + A Zend_Layout instance may be used to generate the + HTML portion of a multipart email. If a + Zend_Layout instance is in use, + Zend_Log_Writer_Mail assumes that it is being used to render + HTML and sets the body HTML for the message as the Zend_Layout-rendered value. diff --git a/documentation/manual/en/module_specs/Zend_Mail-Encoding.xml b/documentation/manual/en/module_specs/Zend_Mail-Encoding.xml index e5f363a44..a79d0ed77 100644 --- a/documentation/manual/en/module_specs/Zend_Mail-Encoding.xml +++ b/documentation/manual/en/module_specs/Zend_Mail-Encoding.xml @@ -4,13 +4,13 @@ Encoding - 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 setHeaderEncoding(). 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 addAttachment() - call or assigned to the MIME part object later. 7Bit and 8Bit encoding - currently only pass on the binary content data. + 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 setHeaderEncoding(). 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 + addAttachment() call or assigned to the MIME + part object later. 7Bit and 8Bit encoding currently only pass on the binary content data. diff --git a/documentation/manual/en/module_specs/Zend_Mail-HtmlMails.xml b/documentation/manual/en/module_specs/Zend_Mail-HtmlMails.xml index d489d8c82..8d9049bd0 100644 --- a/documentation/manual/en/module_specs/Zend_Mail-HtmlMails.xml +++ b/documentation/manual/en/module_specs/Zend_Mail-HtmlMails.xml @@ -4,11 +4,11 @@ HTML E-Mail - To send an e-mail in HTML format, set the body using the method + To send an e-mail in HTML format, set the body using the method setBodyHTML() instead of setBodyText(). The MIME content type will automatically be set to text/html - then. If you use both HTML and Text bodies, a multipart/alternative MIME - message will automatically be generated: + then. If you use both HTML and Text bodies, a multipart/alternative + MIME message will automatically be generated: diff --git a/documentation/manual/en/module_specs/Zend_Mail-Introduction.xml b/documentation/manual/en/module_specs/Zend_Mail-Introduction.xml index 8f41a9e42..4bbaa1f77 100644 --- a/documentation/manual/en/module_specs/Zend_Mail-Introduction.xml +++ b/documentation/manual/en/module_specs/Zend_Mail-Introduction.xml @@ -39,7 +39,7 @@ $mail->send(); In order to send an e-mail with Zend_Mail you have to specify at least one recipient, a sender (e.g., with setFrom()), - and a message body (text and/or HTML). + and a message body (text and/or HTML). diff --git a/documentation/manual/en/module_specs/Zend_Markup-Renderers.xml b/documentation/manual/en/module_specs/Zend_Markup-Renderers.xml index d93b909f7..3b99b036c 100644 --- a/documentation/manual/en/module_specs/Zend_Markup-Renderers.xml +++ b/documentation/manual/en/module_specs/Zend_Markup-Renderers.xml @@ -49,7 +49,7 @@ echo $bbcode->render('my [foo]markup[/foo]'); - Some renderers (like the HTML renderer) also have support for a + Some renderers (like the HTML 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. diff --git a/documentation/manual/en/module_specs/Zend_Markup.xml b/documentation/manual/en/module_specs/Zend_Markup.xml index 8fa584bbf..4578212b1 100644 --- a/documentation/manual/en/module_specs/Zend_Markup.xml +++ b/documentation/manual/en/module_specs/Zend_Markup.xml @@ -15,7 +15,7 @@ Zend_Markup_Renderer_Abstract. 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, HTML by default. Thirdly an array with options to use for the renderer can be specified. diff --git a/documentation/manual/en/module_specs/Zend_Mime_Part.xml b/documentation/manual/en/module_specs/Zend_Mime_Part.xml index 2ed2f86f6..fe85cac2f 100644 --- a/documentation/manual/en/module_specs/Zend_Mime_Part.xml +++ b/documentation/manual/en/module_specs/Zend_Mime_Part.xml @@ -62,13 +62,13 @@ public $language; $charset 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 HTML). - $id - may be set to identify a content-id for inline images in a HTML mail. + $id may be set to identify a content-id for inline images + in a HTML mail. diff --git a/documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml b/documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml index 5a12d0f72..2dd91033e 100644 --- a/documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml +++ b/documentation/manual/en/module_specs/Zend_Pdf-Drawing.xml @@ -47,8 +47,8 @@ $color3 = new Zend_Pdf_Color_Cmyk($c, $m, $y, $k); ]]> - HTML style colors are also provided with Zend_Pdf_Color_Html - class: + HTML style colors are also provided with + Zend_Pdf_Color_Html class: 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 + HTML. 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 iframe or object tag. While the process is @@ -88,8 +88,8 @@ Basic example for the client-side stuff - This example illustrates a basic setup of HTML, CSS and JavaScript - for the JsPush adapter + This example illustrates a basic setup of HTML, + CSS and JavaScript for the JsPush adapter HTML form, etc. @@ -286,8 +286,9 @@ $doc->addField(Zend_Search_Lucene_Field::UnStored('contents', $contents)); HTML documents - Zend_Search_Lucene offers a HTML parsing feature. Documents can - be created directly from a HTML file or string: + Zend_Search_Lucene offers a HTML parsing + feature. Documents can be created directly from a HTML file or + string: addDocument($doc); Zend_Search_Lucene_Document_Html class uses the DOMDocument::loadHTML() and - DOMDocument::loadHTMLFile() methods to parse the source HTML, - so it doesn't need HTML to be well formed or to be XHTML. On the - other hand, it's sensitive to the encoding specified by the "meta http-equiv" header - tag. + DOMDocument::loadHTMLFile() methods to parse the source + HTML, so it doesn't need HTML to be well formed or + to be XHTML. On the other hand, it's sensitive to the encoding + specified by the "meta http-equiv" header tag. @@ -318,8 +319,8 @@ $index->addDocument($doc); - 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 HTML file or + string. It doesn't include scripts, comments or attributes. @@ -332,9 +333,9 @@ $index->addDocument($doc); The third parameter of loadHTML() and - loadHTMLFile() methods optionally specifies source HTML - document encoding. It's used if encoding is not specified using Content-type HTTP-EQUIV - meta tag. + loadHTMLFile() methods optionally specifies source + HTML document encoding. It's used if encoding is not specified using + Content-type HTTP-EQUIV meta tag. diff --git a/documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml b/documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml index f70b17049..6e4fa5d2e 100644 --- a/documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml +++ b/documentation/manual/en/module_specs/Zend_Search_Lucene-Searching.xml @@ -410,8 +410,9 @@ public function highlightExtended($words, $callback, $params = array()) - 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 HTML fragment for highlighting and others are + callback behavior dependent. Returned value is a highlighted + HTML fragment. , or extend Zend_Search_Lucene_Document_Html class and redefine @@ -420,8 +421,8 @@ public function highlightExtended($words, $callback, $params = array()) - In both cases returned HTML is automatically transformed into valid - XHTML. + In both cases returned HTML is automatically transformed into + valid XHTML. @@ -476,8 +477,8 @@ $highlightedHTML = $query->highlightMatches($sourceHTML); - 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 HTML document encoding. It's + used if encoding is not specified using Content-type HTTP-EQUIV meta tag. @@ -512,7 +513,7 @@ interface Zend_Search_Lucene_Search_Highlighter_Interface ]]> Where Zend_Search_Lucene_Document_Html object is an object - constructed from the source HTML provided to the + constructed from the source HTML provided to the Zend_Search_Lucene_Search_Query->highlightMatches() method. @@ -534,9 +535,9 @@ interface Zend_Search_Lucene_Search_Highlighter_Interface Zend_Search_Lucene_Search_Query->htmlFragmentHighlightMatches() has similar - behavior. The only difference is that it takes as an input and returns HTML fragment - without <>HTML>, <HEAD>, <BODY> tags. Nevertheless, fragment is automatically - transformed to valid XHTML. + behavior. The only difference is that it takes as an input and returns + HTML fragment without <>HTML>, <HEAD>, <BODY> tags. + Nevertheless, fragment is automatically transformed to valid XHTML. diff --git a/documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml b/documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml index 8ae8e94f1..b19225300 100644 --- a/documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml +++ b/documentation/manual/en/module_specs/Zend_Service_StrikeIron-AdvancedUses.xml @@ -46,7 +46,8 @@ echo $result->listingName; Jan Schneider from the Horde project has written a small PHP - routine that will format a WSDL file into more readable HTML. + routine that will format a WSDL file into more readable + HTML. diff --git a/documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml b/documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml index 28d75d453..2ac2c7b62 100644 --- a/documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml +++ b/documentation/manual/en/module_specs/Zend_Session-AdvancedUsage.xml @@ -47,8 +47,8 @@ Zend_Session::start(); session.auto_start setting. 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 php.ini, then - add the following to your .htaccess file (usually in your HTML - document root directory): + add the following to your .htaccess file (usually in your + HTML document root directory): diff --git a/documentation/manual/en/module_specs/Zend_Tag_Cloud.xml b/documentation/manual/en/module_specs/Zend_Tag_Cloud.xml index 3af2c5f0e..adde92549 100644 --- a/documentation/manual/en/module_specs/Zend_Tag_Cloud.xml +++ b/documentation/manual/en/module_specs/Zend_Tag_Cloud.xml @@ -5,7 +5,7 @@ Zend_Tag_Cloud is the rendering part of - Zend_Tag. By default it comes with a set of HTML + Zend_Tag. By default it comes with a set of HTML 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 PDF 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. Zend_Tag_Cloud ships a default decorator set for - formatting a tag cloud in HTML. This set will by default create a + formatting a tag cloud in HTML. 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. @@ -124,7 +124,7 @@ echo $cloud; HTML Tag decorator - The HTML tag decorator will by default render every tag in an + The HTML 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. @@ -133,7 +133,7 @@ echo $cloud; URL parameter - As the HTML tag decorator always surounds the tag title with + As the HTML tag decorator always surounds the tag title with an anchor, you should define an URL parameter for every tag used in it. @@ -179,7 +179,7 @@ echo $cloud; - htmlTags: an array of HTML tags surounding + htmlTags: an array of HTML 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; HTML Cloud decorator - 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 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 additionally define a separator. The available options are: @@ -210,7 +210,7 @@ echo $cloud; - htmlTags: an array of HTML tags surounding + htmlTags: an array of HTML 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 diff --git a/documentation/manual/en/module_specs/Zend_Translate-Adapters.xml b/documentation/manual/en/module_specs/Zend_Translate-Adapters.xml index c6df72b6f..3d4fa21f5 100644 --- a/documentation/manual/en/module_specs/Zend_Translate-Adapters.xml +++ b/documentation/manual/en/module_specs/Zend_Translate-Adapters.xml @@ -329,7 +329,7 @@ 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 HTML source to be included in the translation source, so the translation is coupled with the layout. XLIFF is a XML file based format, which is related to XLIFF but its not as simple to read. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml index 1fea8214e..3313d8229 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml @@ -4,7 +4,7 @@ Doctype Helper - Valid HTML and XHTML documents should include a + Valid HTML and XHTML documents should include a DOCTYPE declaration. Besides being difficult to remember, these can also affect how certain elements in your document should be rendered (for instance, CDATA escaping in <script> and diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml index 82ed5ff7e..dc6dc89c5 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml @@ -4,8 +4,8 @@ HeadLink Helper - The HTML <link> element is increasingly used for - linking a variety of resources for your site: stylesheets, feeds, + The HTML <link> element is increasingly used + for linking a variety of resources for your site: stylesheets, feeds, favicons, trackbacks, and more. The HeadLink helper provides a simple interface for creating and aggregating these elements for later retrieval and output in your layout script. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml index 551674dba..7f74b592a 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml @@ -4,8 +4,8 @@ HeadMeta Helper - The HTML <meta> element is used to provide meta - information about your HTML document -- typically keywords, document + The HTML <meta> element is used to provide + meta information about your HTML 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', ]]> - If you are serving an HTML5 document, you should provide the character set like this: + If you are serving an HTML5 document, you should provide the + character set like this: HeadScript Helper - The HTML <script> element is used to either provide - inline client-side scripting elements or link to a remote resource + The HTML <script> element is used to either + provide inline client-side scripting elements or link to a remote resource containing client-side scripting code. The HeadScript helper allows you to manage both. @@ -138,7 +138,7 @@ $this->headScript()->appendFile( HeadScript's sibling helper, InlineScript, - 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 HTML body. 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. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml index 1eaab9d99..b1b435511 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadStyle.xml @@ -4,9 +4,9 @@ HeadStyle Helper - The HTML <style> element is used to include - CSS stylesheets inline in the HTML <head> - element. + The HTML <style> element is used to include + CSS stylesheets inline in the HTML + <head> element. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadTitle.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadTitle.xml index cc204fcf7..d3ec91d2a 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-HeadTitle.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-HeadTitle.xml @@ -4,10 +4,9 @@ HeadTitle Helper - The HTML <title> element is used to provide a title - for an HTML document. The HeadTitle helper allows you to - programmatically create and store the title for later retrieval and - output. + The HTML <title> element is used to provide a + title for an HTML document. The HeadTitle helper + allows you to programmatically create and store the title for later retrieval and output. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-HtmlObject.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-HtmlObject.xml index c02137704..15b14dc8c 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-HtmlObject.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-HtmlObject.xml @@ -4,7 +4,7 @@ HTML Object Helpers - The HTML HTML ]]> 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 @@ ]]> - This outputs the following HTML: + This outputs the following HTML: InlineScript Helper - The HTML <script> element is used to either provide - inline client-side scripting elements or link to a remote resource + The HTML <script> element is used to either + provide inline client-side scripting elements or link to a remote resource containing client-side scripting code. The InlineScript helper allows you to manage both. It is derived from HeadScript, @@ -19,15 +19,15 @@ InlineScript, should be used when you wish to include - scripts inline in the HTML body. Placing scripts at the - end of your document is a good practice for speeding up delivery of + scripts inline in the HTML body. 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. - Some JS libraries need to be included in the HTML head; - use HeadScript - for those scripts. + Some JS libraries need to be included in the HTML + head; use HeadScript for those scripts. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml b/documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml index 03a660c3e..3c857b14d 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml @@ -186,8 +186,9 @@ - htmlify() renders an 'a' HTML - element from a Zend_Navigation_Page instance. + htmlify() renders an 'a' + HTML element from a Zend_Navigation_Page + instance. @@ -779,14 +780,14 @@ Products, Foo Server, FAQ Links Helper - The links helper is used for rendering HTML LINK + The links helper is used for rendering HTML LINK elements. Links are used for describing document relationships of the currently active page. Read more about links and link types at Document relationships: the LINK element (HTML4 W3C Rec.) and Link types (HTML4 W3C - Rec.) in the HTML4 W3C Recommendation. + Rec.) in the HTML4 W3C Recommendation. @@ -1040,7 +1041,7 @@ Products, Foo Server, FAQ The constants from RENDER_ALTERNATE to - RENDER_BOOKMARK denote standard HTML link types. + RENDER_BOOKMARK denote standard HTML link types. RENDER_CUSTOM denotes non-standard relations that specified in pages. RENDER_ALL denotes standard and non-standard relations. @@ -1230,7 +1231,7 @@ Output: The Menu helper is used for rendering menus from navigation containers. By default, the menu will be rendered using - HTML UL and LI tags, but the helper also + HTML UL and LI tags, but the helper also allows using a partial view script. @@ -1294,7 +1295,7 @@ Output: renderMenu($container = null, $options = array()) is the default render method, and will render a container as - a HTML UL list. + a HTML UL list. diff --git a/documentation/manual/en/module_specs/Zend_View-Helpers.xml b/documentation/manual/en/module_specs/Zend_View-Helpers.xml index f592e9e68..9f522b3ad 100644 --- a/documentation/manual/en/module_specs/Zend_View-Helpers.xml +++ b/documentation/manual/en/module_specs/Zend_View-Helpers.xml @@ -60,8 +60,8 @@ Zend_View 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 URLs and HTML lists, as well as - declaring variables. The currently shipped helpers include: + are helpers for creating route-based URLs and HTML + lists, as well as declaring variables. The currently shipped helpers include: @@ -255,9 +255,9 @@ echo $this->formCheckbox('foo', $options should be an associative array, and may be arbitrarily deep. $value may be a single value or an array of selected values that match the keys in the - $options array. $listsep is an HTML - break ("<br />") by default. By default, this element is - treated as an array; all checkboxes share the same name, and are + $options array. $listsep is an + HTML break ("<br />") by default. By default, this + element is treated as an array; all checkboxes share the same name, and are submitted as an array. diff --git a/documentation/manual/en/module_specs/Zend_View-Introduction.xml b/documentation/manual/en/module_specs/Zend_View-Introduction.xml index 840910446..c05913c0d 100644 --- a/documentation/manual/en/module_specs/Zend_View-Introduction.xml +++ b/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. 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 HTML. diff --git a/documentation/manual/en/ref/migration-110.xml b/documentation/manual/en/ref/migration-110.xml index 7befd1a3d..033e5aed3 100644 --- a/documentation/manual/en/ref/migration-110.xml +++ b/documentation/manual/en/ref/migration-110.xml @@ -212,13 +212,15 @@ $authors = $feed->getAuthors()->getValues(); Zend_Filter_StripTags contains a flag, commentsAllowed, 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 XSS attacks, particularly in Internet - Explorer (which allows specifying conditional functionality via HTML comments). Starting + optionally whitelist HTML comments in HTML text + filtered by the class. However, this opens code enabling the flag to + XSS 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 - commentsAllowed 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. + commentsAllowed 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. diff --git a/documentation/manual/en/ref/migration-19.xml b/documentation/manual/en/ref/migration-19.xml index 56bc1ba28..53094af90 100644 --- a/documentation/manual/en/ref/migration-19.xml +++ b/documentation/manual/en/ref/migration-19.xml @@ -424,13 +424,15 @@ $container = new Zend_Navigation(array( Zend_Filter_StripTags contains a flag, commentsAllowed, 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 XSS 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 commentsAllowed 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 HTML comments in HTML + text filtered by the class. However, this opens code enabling the flag to + XSS 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 + commentsAllowed 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. diff --git a/documentation/manual/en/tutorials/form-decorators-individual.xml b/documentation/manual/en/tutorials/form-decorators-individual.xml index eb7e25285..cda598801 100644 --- a/documentation/manual/en/tutorials/form-decorators-individual.xml +++ b/documentation/manual/en/tutorials/form-decorators-individual.xml @@ -226,8 +226,8 @@ foreach ($form->getElements() as $element) { ]]> - 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 + HTML (approximate, as the HTML below is formatted): addValidator('NotEmpty') For example, let's consider Zend_View_Helper_FormButton (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 HTML + markup for a form input element. - 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 HTML button 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 diff --git a/documentation/manual/en/tutorials/quickstart-create-layout.xml b/documentation/manual/en/tutorials/quickstart-create-layout.xml index 361734972..250b21777 100644 --- a/documentation/manual/en/tutorials/quickstart-create-layout.xml +++ b/documentation/manual/en/tutorials/quickstart-create-layout.xml @@ -4,15 +4,15 @@ Create A Layout - 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 + 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. - 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 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. @@ -213,9 +213,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap Note also the use of the headLink() placeholder. This is an easy - way to generate the HTML for <link> 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 HTML for <link> 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. -- 2.11.4.GIT