[MANUAL] English:

- manual fixes

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

documentation/manual/en/tutorials/view-placeholders-basics.xml

@@ -7,7 +7,7 @@
         Zend Framework defines a generic <methodname>placeholder()</methodname> view helper that you
         may use for as many custom placeholders you need. It also provides a variety of specific
         placeholder implementations for often-needed functionality, such as specifying the
-        <acronym>DocType</acronym> declaration, document title, and more.
+        <emphasis>DocType</emphasis> declaration, document title, and more.
     </para>
 
     <para>
@@ -80,9 +80,10 @@
 <div class="sidebar">
     <div class="block">
         <p>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus consectetur aliquet
-            odio ac consectetur. Nulla quis eleifend tortor. Pellentesque varius, odio quis bibendum
-            consequat, diam lectus porttitor quam, et aliquet mauris orci eu augue.
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
+            consectetur aliquet odio ac consectetur. Nulla quis eleifend
+            tortor. Pellentesque varius, odio quis bibendum consequat, diam
+            lectus porttitor quam, et aliquet mauris orci eu augue.
         </p>
     </div>
     <div class="block">
@@ -110,11 +111,11 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view = $this->getResource('View');
 
         $view->placeholder('sidebar')
-             // "prefix" -> markup to emit once, before all items in collection
+             // "prefix" -> markup to emit once before all items in collection
              ->setPrefix("<div class=\"sidebar\">\n    <div class=\"block\">\n")
              // "separator" -> markup to emit between items in a collection
              ->setSeparator("</div>\n    <div class=\"block\">\n")
-             // "postfix" -> markup to emit once, after all items in a collection
+             // "postfix" -> markup to emit once after all items in a collection
              ->setPostfix("</div>\n</div>");
     }
 
@@ -138,7 +139,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     </para>
 
     <para>
-        We'll name the view script "user/_sidebar.phtml", and populate it as follows:
+        We'll name the view script "<filename>user/_sidebar.phtml</filename>", and populate it as
+        follows:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -156,8 +158,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     <para>
         The above example makes use of the content capturing feature of placeholders. By default,
         content is appended as a new item in the container, allowing us to aggregate content. This
-        example makes use of view helpers and static HTML in order to generate markup, and the
-        content is then captured and appended into the placeholder itself.
+        example makes use of view helpers and static <acronym>HTML</acronym> in order to generate
+        markup, and the content is then captured and appended into the placeholder itself.
     </para>
 
     <para>
@@ -190,8 +192,8 @@ class UserController extends Zend_Controller_Action
 
     <para>
         Now, let's assume our "view" action in that same controller needs to present some
-        information. Within the "user/view.phtml" view script, we might have the following snippet
-        of content:
+        information. Within the "<filename>user/view.phtml</filename>" view script, we might have
+        the following snippet of content:
     </para>
 
     <programlisting language="php"><![CDATA[
@@ -226,8 +228,9 @@ $this->placeholder('sidebar')
         For controllers and actions that do not populate the "sidebar" placeholder, no content will
         be rendered; for those that do, however, echoing the placeholder will render the content
         according to the rules we created in our bootstrap, and the content we aggregated throughout
-        the application. In the case of the "/user/view" action, and assuming a username of
-        "matthew", we would get content for the sidebar as follows (formatted for readability):
+        the application. In the case of the "<filename>/user/view</filename>" action, and assuming a
+        username of "matthew", we would get content for the sidebar as follows (formatted for
+        readability):
     </para>
 
     <programlisting language="html"><![CDATA[

documentation/manual/en/tutorials/view-placeholders-standard.xml

@@ -151,7 +151,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         <title>Specifying the Page Title</title>
 
         <para>
-            Often, a site will include the site or business name as  part of the page title, and
+            Often, a site will include the site or business name as part of the page title, and
             then add additional information based on the location within the site. As an example,
             the zend.com website includes the string "Zend.com" on all pages, and the prepends
             information based on the page: "Zend Server - Zend.com". Within Zend Framework, the
@@ -231,11 +231,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         <title>Specifying Stylesheets with HeadLink</title>
 
         <para>
-            Good CSS developers will often create a general stylesheet for sitewide styles, and
-            individual stylesheets for specific sections or pages of the website, and load these
-            latter conditionally so as to decrease the amount of data needing to be transferred on
-            each request. The <methodname>headLink()</methodname> placeholder makes such conditional
-            aggregation of stylesheets trivial within your application.
+            Good <acronym>CSS</acronym> developers will often create a general stylesheet for
+            sitewide styles, and individual stylesheets for specific sections or pages of the
+            website, and load these latter conditionally so as to decrease the amount of data
+            needing to be transferred on each request. The <methodname>headLink()</methodname>
+            placeholder makes such conditional aggregation of stylesheets trivial within your
+            application.
         </para>
 
         <para>
@@ -244,18 +245,18 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             with are <methodname>appendStylesheet()</methodname> and
             <methodname>prependStylesheet()</methodname>. Each takes up to four arguments,
             <varname>$href</varname> (the relative path to the stylesheet),
-            <varname>$media</varname> (the MIME type, which defaults to "text/css"),
-            <varname>$conditionalStylesheet</varname> (which can be used to specify a "condition"
-            under which the stylesheet will be evaluated), and <varname>$extras</varname> (an
-            associative array of key/value pairs, commonly used to specify a key for "media"). In
-            most cases, you will only need to specify the first argument, the relative path to the
-            stylesheet.
+            <varname>$media</varname> (the <acronym>MIME</acronym> type, which defaults to
+            "text/css"), <varname>$conditionalStylesheet</varname> (which can be used to specify a
+            "condition" under which the stylesheet will be evaluated), and
+            <varname>$extras</varname> (an associative array of key and value pairs, commonly used
+            to specify a key for "media"). In most cases, you will only need to specify the first
+            argument, the relative path to the stylesheet.
         </para>
 
         <para>
             In our example, we'll assume that all pages need to load the stylesheet located in
-            "/styles/site.css" (relative to the document root); we'll specify this in our
-            <methodname>_initPlaceholders()</methodname> bootstrap method.
+            "<filename>/styles/site.css</filename>" (relative to the document root); we'll specify
+            this in our <methodname>_initPlaceholders()</methodname> bootstrap method.
         </para>
 
         <programlisting language="php"><![CDATA[
@@ -333,20 +334,20 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         </para>
 
         <para>
-            Also like <methodname>headLink()</methodname>, <methodname>headScript</methodname>
+            Also like <methodname>headLink()</methodname>, <methodname>headScript()</methodname>
             provides "virtual" methods via overloading as a convenience when specifying items to
             aggregate; common methods include <methodname>prependFile()</methodname>,
             <methodname>appendFile()</methodname>, <methodname>prependScript()</methodname>, and
             <methodname>appendScript()</methodname>. The first two allow you to specify files that
-            will be referenced in a <code>&lt;script&gt;</code> tag's <varname>src</varname>
+            will be referenced in a <code>&lt;script&gt;</code> tag's <varname>$src</varname>
             attribute; the latter two will take the content provided and render it as literal
             JavaScript within a <code>&lt;script&gt;</code> tag.
         </para>
 
         <para>
-            In this example, we'll specify that a script, "/js/site.js" needs to be loaded on every
-            page; we'll update our <methodname>_initPlaceholders()</methodname> bootstrap method to
-            do this.
+            In this example, we'll specify that a script, "<filename>/js/site.js</filename>" needs
+            to be loaded on every page; we'll update our
+            <methodname>_initPlaceholders()</methodname> bootstrap method to do this.
         </para>
 
         <programlisting language="php"><![CDATA[