[DOCUMENTATION] English:

- manual fixes

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

documentation/manual/en/module_specs/Zend_Auth_Adapter_Ldap.xml

@@ -308,15 +308,16 @@ Array
                         <entry><emphasis><property>useStartTls</property></emphasis></entry>
                         <entry>
                             Whether or not the <acronym>LDAP</acronym> client should use
-                            <acronym>TLS</acronym> (aka <acronym>SSL</acronym>v2) encrypted transport. A value of
-                            <constant>TRUE</constant> is strongly favored in production
-                            environments to prevent passwords from be transmitted in clear text.
-                            The default value is <constant>FALSE</constant>, as servers frequently
-                            require that a certificate be installed separately after installation.
-                            The <property>useSsl</property> and <property>useStartTls</property>
-                            options are mutually exclusive. The <property>useStartTls</property>
-                            option should be favored over <property>useSsl</property> but not all
-                            servers support this newer mechanism.
+                            <acronym>TLS</acronym> (aka <acronym>SSL</acronym>v2) encrypted
+                            transport. A value of <constant>TRUE</constant> is strongly favored in
+                            production environments to prevent passwords from be transmitted in
+                            clear text. The default value is <constant>FALSE</constant>, as servers
+                            frequently require that a certificate be installed separately after
+                            installation. The <property>useSsl</property> and
+                            <property>useStartTls</property> options are mutually exclusive. The
+                            <property>useStartTls</property> option should be favored over
+                            <property>useSsl</property> but not all servers support this newer
+                            mechanism.
                         </entry>
                     </row>
                     <row>
@@ -485,14 +486,14 @@ Array
         <note>
             <para>
                 If you enable <emphasis>useStartTls = <constant>TRUE</constant></emphasis> or
-                <emphasis>useSsl = <constant>TRUE</constant></emphasis> you may find that the <acronym>LDAP</acronym>
-                client generates an error claiming that it cannot validate the server's
-                certificate. Assuming the <acronym>PHP</acronym> <acronym>LDAP</acronym> extension
-                is ultimately linked to the OpenLDAP client libraries, to resolve this issue you
-                can set "<command>TLS_REQCERT never</command>" in the OpenLDAP client
-                <filename>ldap.conf</filename> (and restart the web server) to indicate to the
-                OpenLDAP client library that you trust the server. Alternatively, if you are
-                concerned that the server could be spoofed, you can export the
+                <emphasis>useSsl = <constant>TRUE</constant></emphasis> you may find that the
+                <acronym>LDAP</acronym> client generates an error claiming that it cannot validate
+                the server's certificate. Assuming the <acronym>PHP</acronym>
+                <acronym>LDAP</acronym> extension is ultimately linked to the OpenLDAP client
+                libraries, to resolve this issue you can set "<command>TLS_REQCERT never</command>"
+                in the OpenLDAP client <filename>ldap.conf</filename> (and restart the web server)
+                to indicate to the OpenLDAP client library that you trust the server. Alternatively,
+                if you are concerned that the server could be spoofed, you can export the
                 <acronym>LDAP</acronym> server's root certificate and put it on the web server so
                 that the OpenLDAP client can validate the server's identity.
             </para>

documentation/manual/en/module_specs/Zend_Cache-Backends.xml

@@ -171,8 +171,8 @@
             This (extended) backends stores cache records into a memcached server. <ulink
                 url="http://www.danga.com/memcached/">memcached</ulink> is a high-performance,
             distributed memory object caching system. To use this backend, you need a memcached
-            daemon and <ulink url="http://pecl.php.net/package/memcache">the memcache <acronym>PECL</acronym>
-                extension</ulink>.
+            daemon and <ulink url="http://pecl.php.net/package/memcache">the memcache
+                <acronym>PECL</acronym> extension</ulink>.
         </para>
         <para>
             Be careful : with this backend, "tags" are not supported for the moment as

documentation/manual/en/module_specs/Zend_Controller-Exceptions.xml

@@ -64,8 +64,8 @@
                 <para><methodname>Zend_Controller_Front::throwExceptions()</methodname></para>
 
                 <para>
-                    By passing a boolean <constant>TRUE</constant> value to this method, you can tell
-                    the front controller that instead of aggregating exceptions
+                    By passing a boolean <constant>TRUE</constant> value to this method, you can
+                    tell the front controller that instead of aggregating exceptions
                     in the response object or using the error handler plugin,
                     you'd rather handle them yourself. As an example:
                 </para>
@@ -92,8 +92,8 @@ try {
                 </para>
 
                 <para>
-                    By passing a boolean <constant>TRUE</constant> value to this method, you tell the
-                    response object that it should render an exception message
+                    By passing a boolean <constant>TRUE</constant> value to this method, you tell
+                    the response object that it should render an exception message
                     and backtrace when rendering itself. In this scenario, any
                     exception raised by your application will be displayed. This
                     is only recommended for non-production environments.