Просмотр исходного кода

[MANUAL] English:

- linelength fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19425 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 лет назад
Родитель
Сommit
bdf9d6fb63

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

@@ -47,8 +47,8 @@
         <para>
             <code>HeadStyle</code> allows you to wrap the style tag in conditional comments,
             which allows you to hide it from specific browsers. To add the conditional
-            tags, pass the conditional value as part of the <varname>$attributes</varname> parameter in
-            the method calls.
+            tags, pass the conditional value as part of the <varname>$attributes</varname> parameter
+            in the method calls.
         </para>
 
         <example id="zend.view.helpers.initial.headstyle.conditional">
@@ -76,9 +76,9 @@ $this->headStyle()->appendStyle($styles, array('conditional' => 'lt IE 7'));
 
     <para>
         <code>HeadStyle</code> overrides each of <methodname>append()</methodname>,
-        <methodname>offsetSet()</methodname>, <methodname>prepend()</methodname>, and <methodname>set()</methodname>
-        to enforce usage of the special methods as listed above. Internally, it
-        stores each item as a <code>stdClass</code> token, which it later
+        <methodname>offsetSet()</methodname>, <methodname>prepend()</methodname>, and
+        <methodname>set()</methodname> to enforce usage of the special methods as listed above.
+        Internally, it stores each item as a <code>stdClass</code> token, which it later
         serializes using the <methodname>itemToString()</methodname> method. This allows you
         to perform checks on the items in the stack, and optionally modify these
         items by simply modifying the object returned.

+ 3 - 3
documentation/manual/en/module_specs/Zend_View-Helpers-Json.xml

@@ -57,9 +57,9 @@ echo $this->json($this->data, array('keepLayouts' => true));
 ]]></programlisting>
 
         <para>
-            <classname>Zend_Json::encode</classname> allows the encoding of native <acronym>JSON</acronym>
-            expressions using <classname>Zend_Json_Expr</classname> objects. This option
-            is disabled by default. To enable this option, pass a boolean
+            <classname>Zend_Json::encode</classname> allows the encoding of native
+            <acronym>JSON</acronym> expressions using <classname>Zend_Json_Expr</classname> objects.
+            This option is disabled by default. To enable this option, pass a boolean
             <constant>TRUE</constant> to the <code>enableJsonExprFinder</code> key of
             the options array:
         </para>

+ 14 - 13
documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -37,8 +37,9 @@
         <listitem>
             <para>
                 <link linkend="zend.view.helpers.initial.navigation.sitemap">Sitemap</link>,
-                used for rendering sitemaps conforming to the
-                <ulink url="http://www.sitemaps.org/protocol.php">Sitemaps <acronym>XML</acronym> format</ulink>.
+                used for rendering sitemaps conforming to the <ulink
+                    url="http://www.sitemaps.org/protocol.php">Sitemaps <acronym>XML</acronym>
+                    format</ulink>.
             </para>
         </listitem>
         <listitem>
@@ -88,8 +89,8 @@
                 filtering out pages when rendering, and
                 <code>{get|set}UseAcl()</code> controls whether <acronym>ACL</acronym> should
                 be enabled. The methods <methodname>hasAcl()</methodname> and
-                <methodname>hasRole()</methodname> checks if the helper has an <acronym>ACL</acronym>
-                instance or a role registered.
+                <methodname>hasRole()</methodname> checks if the helper has an
+                <acronym>ACL</acronym> instance or a role registered.
             </para>
         </listitem>
         <listitem>
@@ -1765,9 +1766,9 @@ foreach ($this->container as $page) {
         <para>
             The Sitemap helper is used for generating <acronym>XML</acronym> sitemaps, as
             defined by the <ulink
-                url="http://www.sitemaps.org/protocol.php">Sitemaps <acronym>XML</acronym> format</ulink>.
-            Read more about <ulink url="http://en.wikipedia.org/wiki/Sitemaps">Sitemaps
-            on Wikpedia</ulink>.
+                url="http://www.sitemaps.org/protocol.php">Sitemaps <acronym>XML</acronym>
+                format</ulink>. Read more about <ulink
+                url="http://en.wikipedia.org/wiki/Sitemaps">Sitemaps on Wikpedia</ulink>.
         </para>
 
         <para>
@@ -1806,8 +1807,8 @@ foreach ($this->container as $page) {
                     <row>
                         <entry><code>loc</code></entry>
                         <entry>
-                            Absolute <acronym>URL</acronym> to page. An absolute <acronym>URL</acronym> will
-                            be generated by the helper.
+                            Absolute <acronym>URL</acronym> to page. An absolute
+                            <acronym>URL</acronym> will be generated by the helper.
                         </entry>
                     </row>
                     <row>
@@ -1922,14 +1923,14 @@ foreach ($this->container as $page) {
                 <para>
                     <code>{get|set}ServerUrl()</code> gets/sets server <acronym>URL</acronym>
                     that will be prepended to non-absolute <acronym>URL</acronym>s in the
-                    <methodname>url()</methodname> method. If no server <acronym>URL</acronym> is specified,
-                    it will be determined by the helper.
+                    <methodname>url()</methodname> method. If no server <acronym>URL</acronym> is
+                    specified, it will be determined by the helper.
                 </para>
            </listitem>
            <listitem>
                 <para>
-                    <methodname>url()</methodname> is used to generate absolute <acronym>URL</acronym>s to
-                    pages.
+                    <methodname>url()</methodname> is used to generate absolute
+                    <acronym>URL</acronym>s to pages.
                 </para>
            </listitem>
            <listitem>

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

@@ -77,8 +77,8 @@
 
             <listitem><para>
                 <code>fieldset($name, $content, $attribs):</code> Creates an
-                <acronym>XHTML</acronym> fieldset. If <varname>$attribs</varname> contains a 'legend'
-                key, that value will be used for the fieldset legend. The
+                <acronym>XHTML</acronym> fieldset. If <varname>$attribs</varname> contains a
+                'legend' key, that value will be used for the fieldset legend. The
                 fieldset will surround the <varname>$content</varname> as provided to
                 the helper.
             </para></listitem>
@@ -86,8 +86,8 @@
             <listitem><para>
                 <code>form($name, $attribs, $content):</code> Generates an <acronym>XHTML</acronym>
                 form. All <varname>$attribs</varname> are escaped and rendered as
-                <acronym>XHTML</acronym> attributes of the form tag. If <varname>$content</varname> is
-                present and not a boolean false, then that content is rendered
+                <acronym>XHTML</acronym> attributes of the form tag. If <varname>$content</varname>
+                is present and not a boolean false, then that content is rendered
                 within the start and close form tags; if <varname>$content</varname>
                 is a boolean false (the default), only the opening form tag is
                 generated.
@@ -179,8 +179,8 @@ echo $this->formCheckbox('foo',
             <listitem>
                 <para>
                     <code>formErrors($errors, $options):</code> Generates an
-                    <acronym>XHTML</acronym> unordered list to show errors. <varname>$errors</varname>
-                    should be a string or an array of strings;
+                    <acronym>XHTML</acronym> unordered list to show errors.
+                    <varname>$errors</varname> should be a string or an array of strings;
                     <varname>$options</varname> should be any attributes you want
                     placed in the opening list tag.
                 </para>

+ 5 - 4
documentation/manual/en/module_specs/Zend_View-Introduction.xml

@@ -12,8 +12,8 @@
     </para>
 
     <para>
-        <classname>Zend_View</classname> is template system agnostic; you may use <acronym>PHP</acronym> as
-        your template language, or create instances of other
+        <classname>Zend_View</classname> is template system agnostic; you may use
+        <acronym>PHP</acronym> as your template language, or create instances of other
         template systems and manipulate them within your view
         script.
     </para>
@@ -155,8 +155,9 @@ base/path/
 
             <listitem><para>
                 <code>escape</code>: indicate a callback to be used by
-                <methodname>escape()</methodname>. May be set via <methodname>setEscape()</methodname>
-                or the <code>escape</code> option to the constructor.
+                <methodname>escape()</methodname>. May be set via
+                <methodname>setEscape()</methodname> or the <code>escape</code> option to the
+                constructor.
             </para></listitem>
 
             <listitem><para>

+ 8 - 8
documentation/manual/en/module_specs/Zend_XmlRpc_Client.xml

@@ -105,8 +105,8 @@ $result = $client->call('test.sayHello', array($arg1, $arg2));
         <sect3 id="zend.xmlrpc.value.parameters.php-native">
             <title>PHP Native Types as Parameters</title>
             <para>
-                Parameters may be passed to <methodname>call()</methodname> as native <acronym>PHP</acronym>
-                variables, meaning as a <type>String</type>,
+                Parameters may be passed to <methodname>call()</methodname> as native
+                <acronym>PHP</acronym> variables, meaning as a <type>String</type>,
                 <code>integer</code>, <code>float</code>,
                 <type>Boolean</type>, <type>Array</type>, or an
                 <code>object</code>. In this case, each <acronym>PHP</acronym> native type will
@@ -590,15 +590,15 @@ $client->doRequest($request);
             The <acronym>HTTP</acronym> client can be retrieved at any time with the
             <methodname>getHttpClient()</methodname> method. For most cases, the default
             <acronym>HTTP</acronym> client will be sufficient. However, the
-            <methodname>setHttpClient()</methodname> method allows for a different <acronym>HTTP</acronym>
-            client instance to be injected.
+            <methodname>setHttpClient()</methodname> method allows for a different
+            <acronym>HTTP</acronym> client instance to be injected.
         </para>
 
         <para>
-            The <methodname>setHttpClient()</methodname> is particularly useful for unit testing. When combined
-            with the <classname>Zend_Http_Client_Adapter_Test</classname>, remote services can be
-            mocked out for testing. See the unit tests for <classname>Zend_XmlRpc_Client</classname>
-            for examples of how to do this.
+            The <methodname>setHttpClient()</methodname> is particularly useful for unit testing.
+            When combined with the <classname>Zend_Http_Client_Adapter_Test</classname>, remote
+            services can be mocked out for testing. See the unit tests for
+            <classname>Zend_XmlRpc_Client</classname> for examples of how to do this.
         </para>
     </sect2>
 

+ 14 - 10
documentation/manual/en/ref/migration-19.xml

@@ -74,14 +74,15 @@ $valid->enableHeaderCheck();
             <para>
                 In version 1.9 of Zend Framework, there has been a change in the way
                 <classname>Zend_Http_Client</classname> internally stores information about
-                files to be uploaded, set using the <methodname>Zend_Http_Client::setFileUpload()</methodname>
-                method.
+                files to be uploaded, set using the
+                <methodname>Zend_Http_Client::setFileUpload()</methodname> method.
             </para>
 
             <para>
                 This change was introduced in order to allow multiple files to be uploaded
                 with the same form name, as an array of files. More information about this issue
-                can be found in <ulink url="http://framework.zend.com/issues/browse/ZF-5744">this bug report</ulink>.
+                can be found in <ulink
+                    url="http://framework.zend.com/issues/browse/ZF-5744">this bug report</ulink>.
             </para>
 
             <example id="migration.19.zend.http.client.fileuploadsarray.example">
@@ -136,20 +137,23 @@ $client->setFileUpload('file2.txt',
             <title>Deprecation of Zend_Http_Client::_getParametersRecursive()</title>
 
             <para>
-                Starting from version 1.9, the protected method <methodname>_getParametersRecursive()</methodname>
-                is no longer used by <classname>Zend_Http_Client</classname> and is deprecated.
-                Using it will cause an E_NOTICE message to be emitted by <acronym>PHP</acronym>.
+                Starting from version 1.9, the protected method
+                <methodname>_getParametersRecursive()</methodname> is no longer used by
+                <classname>Zend_Http_Client</classname> and is deprecated. Using it will cause an
+                E_NOTICE message to be emitted by <acronym>PHP</acronym>.
             </para>
 
             <para>
                 If you subclass <classname>Zend_Http_Client</classname> and call this method, you
-                should look into using the <methodname>Zend_Http_Client::_flattenParametersArray()</methodname>
-                static method instead.
+                should look into using the
+                <methodname>Zend_Http_Client::_flattenParametersArray()</methodname> static method
+                instead.
             </para>
 
             <para>
-                Again, since this <classname>_getParametersRecursive</classname> is a protected method,
-                this change will only affect users who subclass <classname>Zend_Http_Client</classname>.
+                Again, since this <classname>_getParametersRecursive</classname> is a protected
+                method, this change will only affect users who subclass
+                <classname>Zend_Http_Client</classname>.
             </para>
         </sect3>
     </sect2>