[DOCUMENTATION] French:

 - sync manual

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

documentation/manual/fr/manual.xml.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 17215 -->
+<!-- EN-Revision: 17272 -->
 <!-- Reviewed: no -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "@DOCBOOK_DTD@"
@@ -1647,6 +1647,11 @@
                 <xi:include href="../en/module_specs/Zend_Tool_Framework-SystemProviders.xml" />
             </xi:fallback>
         </xi:include>
+        <xi:include href="module_specs/Zend_Tool_Framework-Extending.xml">
+            <xi:fallback>
+                <xi:include href="../en/module_specs/Zend_Tool_Framework-Extending.xml" />
+            </xi:fallback>
+        </xi:include>
     </chapter>
 
     <chapter id="zend.tool.project">

documentation/manual/fr/module_specs/Zend_Application-CoreFunctionality-Bootstrap_BootstrapAbstract.xml

@@ -54,7 +54,7 @@
                     <para>
                         Toute option possédant un setter l'invoquera, sinon l'option sera stockée
                         pour une utilisation ultérieure. Par exemple, si votre classe fille définit
-                        une méthode <methodname>setFoo()</methodname>, l'option 'foo' passera sa 
+                        une méthode <methodname>setFoo()</methodname>, l'option 'foo' passera sa
                         valeur à cette méthode.
                     </para>
                     <para>
@@ -213,7 +213,7 @@
                         Lorsqu'une ressource est demandée (retournée par une méthode ou un plugin),
                         elle est stockée dans un objet conteneur (voyez
                         <methodname>getContainer()</methodname> et
-                        <methodname>setContainer()</methodname>.) Cette méthode récupère une 
+                        <methodname>setContainer()</methodname>.) Cette méthode récupère une
                         ressource depuis le conteneur.
                     </para></entry>
                 </row>
@@ -235,7 +235,7 @@
                     </para>
 
                     <para>
-                        Cette méthode peut être utilisée pour déclencher le chargement d'une 
+                        Cette méthode peut être utilisée pour déclencher le chargement d'une
                         ressource, définit sous forme de méthode ou de plugin (c'est égal).
                         Attention si vous spécifiez à la fois une méthode et un plugin pour une
                         même ressource, alors la méthode sera préférée comme bootstrap, le plugin

documentation/manual/fr/module_specs/Zend_Application-Introduction.xml

@@ -6,7 +6,7 @@
 
     <para>
         <classname>Zend_Application</classname> propose une interface de lancement (bootstrap)
-        pour vos applications, permettant la réutilisabilité des ressources utilisées, 
+        pour vos applications, permettant la réutilisabilité des ressources utilisées,
         la vérification de dépendances et des classes de bootstrap basées sur des modules <acronym>MVC</acronym>.
         Ce composant s'occupe aussi de configurer l'environnement <acronym>PHP</acronym>
         et propose l'autoload par défaut.

documentation/manual/fr/module_specs/Zend_Controller-Router-Route-Chain.xml

@@ -7,7 +7,7 @@
     <para>
         <classname>Zend_Controller_Router_Route_Chain</classname> est une route permettant le chainage
         d'autres routes. Ceci permet de chainer des routes hostnames à des routes de chemin, ou de multiples
-        routes de chemin entre elles, par exemple. Le chainage se configure via des méthodes ou un fichier 
+        routes de chemin entre elles, par exemple. Le chainage se configure via des méthodes ou un fichier
         de configuration.
     </para>
 
@@ -23,7 +23,7 @@
 
     <para>
         En réalisant le chainage via les méthodes, il existe 2 manières de procéder. La première
-        est de créer un objet <classname>Zend_Controller_Router_Route_Chain</classname> puis 
+        est de créer un objet <classname>Zend_Controller_Router_Route_Chain</classname> puis
         d'appeler la méthode <methodname>chain()</methodname> plusieurs fois en lui passant les routes à chainer.
         La deuxième méthode consiste à créer la première route, par exemple une route hostname, puis
         d'appeler sa méthode <methodname>chain()</methodname> en passant comme paramètre la route qui devrait

documentation/manual/fr/module_specs/Zend_Controller-Router-Route-Rest.xml

@@ -7,7 +7,7 @@
     <para>
         Le composant <classname>Zend_Rest</classname> contient une route RESTful pour
         <classname>Zend_Controller_Router_Rewrite</classname>. Cette route permet un
-        schéma de routage fonction de la méthode <acronym>HTTP</acronym> et de 
+        schéma de routage fonction de la méthode <acronym>HTTP</acronym> et de
         l'<acronym>URI</acronym> afin d'y faire correspondre un module, contrôleur,
         et action. Le tableau suivant vous donne un aperçu du schéma de routage.
     </para>

documentation/manual/fr/module_specs/Zend_Db_Adapter.xml

@@ -1655,7 +1655,7 @@ $db->closeConnection();
                 <code>persistent</code> quand il est à une valeur true dans la configuration
                 (pas celle du driver) d'un adaptateur de <classname>Zend_Db</classname>.
             </para>
-            
+
             <example id="zend.db.adapter.connecting.persistence.example">
                 <title>Utiliser l'option de persistance avec l'adaptateur Oracle</title>
                 <programlisting language="php"><![CDATA[

documentation/manual/fr/module_specs/Zend_Db_Table.xml

@@ -966,7 +966,7 @@ $rows = $table->fetchAll($select);
 $table = new Bugs();
 
 // Récupération avec la partie from déjà spécifié, important lors des jointures
-$select = $table->select(Zend_Db_Table::SELECT_WITH_FROM_PART); 
+$select = $table->select(Zend_Db_Table::SELECT_WITH_FROM_PART);
 $select->setIntegrityCheck(false)
        ->where('bug_status = ?', 'NEW')
        ->join('accounts', 'accounts.account_name = bugs.reported_by')

documentation/manual/fr/module_specs/Zend_Filter-Callback.xml

@@ -21,7 +21,7 @@ print $filter->filter('Hello!');
 ]]></programlisting>
 
     <para>
-        C'est très simple de passer une fonction à appliquer comme filtre. Dans le cas de méthodes de classes, 
+        C'est très simple de passer une fonction à appliquer comme filtre. Dans le cas de méthodes de classes,
         passez un tableau comme callback.
     </para>
 

documentation/manual/fr/module_specs/Zend_Filter-Decryption.xml

@@ -10,7 +10,7 @@
     </para>
 
     <para>
-        Pour plus de détails sur l'encryptage de contenu, voyez le filtre <code>Encrypt</code>. La 
+        Pour plus de détails sur l'encryptage de contenu, voyez le filtre <code>Encrypt</code>. La
         documentation de celui-ci couvre les bases en matière de cryptage, nous n'aborderons ici que
         les méthodes utilisées pour le décryptage.
     </para>
@@ -60,7 +60,7 @@ print $decrypted;
     <sect3 id="zend.filter.set.decrypt.openssl">
         <title>Decryptage avec OpenSSL</title>
         <para>
-            Le décryptage avec <code>OpenSSL</code> est aussi simple que l'encryptage. Mais vous aurez besoin de toutes 
+            Le décryptage avec <code>OpenSSL</code> est aussi simple que l'encryptage. Mais vous aurez besoin de toutes
             les données concernant la personne ayant crypté la donnée de référence.
         </para>
 

documentation/manual/fr/module_specs/Zend_Filter-RealPath.xml

@@ -13,8 +13,8 @@
 
     <para>
         <classname>Zend_Filter_RealPath</classname> retourne <constant>FALSE</constant> en cas d'echec
-        par exemple si le fichier n'existe pas. Sur les systems BSD, 
-        <classname>Zend_Filter_RealPath</classname> n'échoue pas si seule la dernière partie du chemin 
+        par exemple si le fichier n'existe pas. Sur les systems BSD,
+        <classname>Zend_Filter_RealPath</classname> n'échoue pas si seule la dernière partie du chemin
         n'existe pas, les autres systèmes retourneront <constant>FALSE</constant>.
     </para>
 

documentation/manual/fr/module_specs/Zend_Http_Client-Adapters.xml

@@ -169,17 +169,17 @@ $response = $client->request();
         </para>
 
         <para><methodname>fsockopen('tls://www.example.com', 443)</methodname></para>
-        
+
         <sect3 id="zend.http.client.adapters.socket.streamcontext">
             <title>Customizing and accessing the Socket adapter stream context</title>
             <para>
-                Starting from Zend Framework 1.9, <classname>Zend_Http_Client_Adapter_Socket</classname> 
+                Starting from Zend Framework 1.9, <classname>Zend_Http_Client_Adapter_Socket</classname>
                 provides direct access to the underlying <ulink url="http://php.net/manual/en/stream.contexts.php">stream context</ulink>
-                used to connect to the remote server. This allows the user to pass 
+                used to connect to the remote server. This allows the user to pass
                 specific options and parameters to the <acronym>TCP</acronym> stream, and to the <acronym>SSL</acronym> wrapper in
                 case of <acronym>HTTP</acronym>S connections.
             </para>
-                        
+
             <para>
                 You can access the stream context using the following methods of <classname>Zend_Http_Client_Adapter_Socket</classname>:
                 <itemizedlist>
@@ -187,38 +187,38 @@ $response = $client->request();
                         <para>
                             <firstterm><methodname>setStreamContext($context)</methodname></firstterm>
                             Sets the stream context to be used by the adapter. Can accept either
-                            a stream context resource created using the 
+                            a stream context resource created using the
                             <ulink url="http://php.net/manual/en/function.stream-context-create.php"><methodname>stream_context_create()</methodname></ulink>
-                            <acronym>PHP</acronym> function, or an array of stream context options, in the same format provided to this function. 
+                            <acronym>PHP</acronym> function, or an array of stream context options, in the same format provided to this function.
                             Providing an array will create a new stream context using these options, and set it.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
                             <firstterm><methodname>getStreamContext()</methodname></firstterm>
-                            Get the stream context of the adapter. If no stream context was set, 
+                            Get the stream context of the adapter. If no stream context was set,
                             will create a default stream context and return it. You can then set
                             or get the value of different context options using regular <acronym>PHP</acronym> stream
                             context functions.
                         </para>
                     </listitem>
-                </itemizedlist>    
+                </itemizedlist>
             </para>
             <example id="zend.http.client.adapters.socket.streamcontext.example-1">
             <title>Setting stream context options for the Socket adapter</title>
             <programlisting language="php"><![CDATA[
 // Array of options
 $options = array(
-    'socket' => array(  
+    'socket' => array(
         // Bind local socket side to a specific interface
         'bindto' => '10.1.2.3:50505'
     ),
     'ssl' => array(
-        // Verify server side certificate, 
+        // Verify server side certificate,
         // do not accept invalid or self-signed SSL certificates
         'verify_peer' => true,
         'allow_self_signed' => false,
-        
+
         // Capture the peer's certificate
         'capture_peer_cert' => true
     )
@@ -243,7 +243,7 @@ stream_context_set_option($context, $options);
 // Now, preform the request
 $response = $client->request();
 
-// If everything went well, you can now access the context again 
+// If everything went well, you can now access the context again
 $opts = stream_context_get_options($adapter->getStreamContext());
 echo $opts['ssl']['peer_certificate'];
 ]]></programlisting>
@@ -254,7 +254,7 @@ echo $opts['ssl']['peer_certificate'];
                 Note that you must set any stream context options before using the adapter
                 to preform actual requests. If no context is set before preforming <acronym>HTTP</acronym> requests
                 with the Socket adapter, a default stream context will be created. This context
-                resource could be accessed after preforming any requests using the 
+                resource could be accessed after preforming any requests using the
                 <methodname>getStreamContext()</methodname> method.
             </para>
         </note>
@@ -370,7 +370,7 @@ $client = new Zend_Http_Client('http://www.example.com', $config);
             alors le client utilisera l'adaptateur Socket par défaut. Ceci est utile si le proxy est
             utilisé optionnellement, ou par intermittence.
         </para>
-        
+
         <note>
             <para>
                 Since the proxy adapter inherits from <classname>Zend_Http_Client_Adapter_Socket</classname>,

documentation/manual/fr/module_specs/Zend_Http_Client-Migration.xml

@@ -7,9 +7,9 @@
     <para>
         Alors que l'API externe de <classname>Zend_Http_Client</classname> n'a pas changé sur la branche
         1.x de Zend Framework, des changements ont été opérés dans la structure interne de
-        <classname>Zend_Http_Client</classname>. 
+        <classname>Zend_Http_Client</classname>.
     </para>
-    
+
     <para>
         Ces changements ne devraient pas avoir de conséquence si vous utilisiez directement
         <classname>Zend_Http_Client</classname>, mais des boulversements peuvent apparaitre dans le cas
@@ -24,9 +24,9 @@
             <para>
                 Dans la version 1.9 de Zend Framework, il y a eu un changement dans la manière dont
                 <classname>Zend_Http_Client</classname> stocke en interne les informations concernant les
-                fichiers ayant été uploadés, affectés grâce à <methodname>Zend_Http_Client::setFileUpload()</methodname> 
+                fichiers ayant été uploadés, affectés grâce à <methodname>Zend_Http_Client::setFileUpload()</methodname>
             </para>
-            
+
             <para>
                 Ce changement a été mis en place de manière à permettre l'envoi de plusieurs fichiers
                 avec le même nom dans le formulaire, en tant que tableau de fichiers. Plus d'informations à
@@ -36,7 +36,7 @@
 
             <example id="zend.http.client.migration.tozf19.fileuploadsarray.example">
                 <title>Stockage interne des informations sur les fichiers uploadés</title>
-                
+
                 <programlisting language="php"><![CDATA[
 // Uploade 2 fichiers avec le même nom d'élément de formulaire, en tant que tableau
 $client = new Zend_Http_Client();
@@ -65,10 +65,10 @@ $client->setFileUpload('file2.txt', 'userfile[]', 'some other data', 'applicatio
 // );
 ]]></programlisting>
             </example>
-            
+
             <para>
                 Comme vous le voyez, ce changement permet l'utilisation du même élément de formulaire avec plusieurs
-                fichiers. Cependant ceci introduit un changement subtile dans l'API interne, il est donc signalé ici. 
+                fichiers. Cependant ceci introduit un changement subtile dans l'API interne, il est donc signalé ici.
             </para>
         </sect3>
     </sect2>

documentation/manual/fr/module_specs/Zend_Locale-Migration.xml

@@ -72,7 +72,7 @@
             </table>
         </sect3>
     </sect2>
-    
+
     <sect2 id="zend.locale.migration.fromonesixtooneseven">
         <title>Migrer de la version 1.6 vers 1.7 ou plus récent</title>
 

documentation/manual/fr/module_specs/Zend_Paginator-Usage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 16319 -->
+<!-- EN-Revision: 17274 -->
 <!-- Reviewed: no -->
 <sect1 id="zend.paginator.usage">
     <title>Utilisation</title>
@@ -181,29 +181,29 @@ $this->view->paginator = $paginator;
                 faster than fetching an entire result set and using count(). Especially with
                 large collections of data.
             </para>
-            
+
             <para>
                 The database adapters will try and build the most efficient query that will execute
                 on pretty much all modern databases. However, depending on your database or even your
                 own schema setup, there might be more efficient ways to get a rowcount. For this scenario
                 the database adapters allow you to set a custom COUNT query. For example,
                 if you keep track of the count of blog posts in a separate table, you could achieve a
-                faster count query with the following setup:  
+                faster count query with the following setup:
             </para>
-            
+
             <programlisting language="php"><![CDATA[
 $adapter = new Zend_Paginator_Adapter_DbSelect($db->select()->from('posts'));
 $adapter->setRowCount(
-    $db->select()->from('item_counts', array(Zend_Paginator_Adapter_DbSelect::ROW_COUNT_COLUMN => 'post_count')) 
+    $db->select()->from('item_counts', array(Zend_Paginator_Adapter_DbSelect::ROW_COUNT_COLUMN => 'post_count'))
 )
- 
+
 $paginator = new Zend_Paginator($adapter);
 ]]></programlisting>
-    
+
             <para>
                 This approach will probably not give you a huge performance gain on
                 small collections and/or simple select queries. However, with complex
-                queries and large collections, a similar approach could give you a 
+                queries and large collections, a similar approach could give you a
                 significant performance boost.
             </para>
         </sect2>
@@ -366,7 +366,7 @@ $smarty->assign('pages', $paginator->getPages());
 
             <para>
                 <programlisting language="php"><![CDATA[
-{$pages.pageCount}
+{$pages->pageCount}
 ]]></programlisting></para>
             </note>
 

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

@@ -212,12 +212,12 @@
                 <title>Regression in PHP 5.3</title>
 
                 <para>
-                    Prior to <acronym>PHP</acronym> 5.3, <function>parse_ini_file()</function> and 
-                    <function>parse_ini_string()</function> handled non-ASCII characters 
+                    Prior to <acronym>PHP</acronym> 5.3, <function>parse_ini_file()</function> and
+                    <function>parse_ini_string()</function> handled non-ASCII characters
                     within <acronym>INI</acronym> option keys worked without an issue. However, starting with <acronym>PHP</acronym> 5.3,
-                    any such keys will now be silently dropped in the returned array from either 
-                    function. If you had keys utilizing UTF-8 or Latin-1 characters, you may find 
-                    your translations no longer work when using the <acronym>INI</acronym> adapter. If this is the 
+                    any such keys will now be silently dropped in the returned array from either
+                    function. If you had keys utilizing UTF-8 or Latin-1 characters, you may find
+                    your translations no longer work when using the <acronym>INI</acronym> adapter. If this is the
                     case, we recommend utilizing a different adapter.
                 </para>
             </warning>

documentation/manual/fr/ref/coding_standard.xml

@@ -163,20 +163,20 @@
             <title>Abstract Classes</title>
 
             <para>
-                In general, abstract classes follow the same conventions as <link 
+                In general, abstract classes follow the same conventions as <link
                     linkend="coding-standard.naming-conventions.classes">classes</link>,
-                with one additional rule: abstract class names must end in the term, "Abstract", 
+                with one additional rule: abstract class names must end in the term, "Abstract",
                 and that term must not be preceded by an underscore. As an example,
-                <classname>Zend_Controller_Plugin_Abstract</classname> is considered an 
+                <classname>Zend_Controller_Plugin_Abstract</classname> is considered an
                 invalid name, but <classname>Zend_Controller_PluginAbstract</classname> or
-                <classname>Zend_Controller_Plugin_PluginAbstract</classname> would be valid 
+                <classname>Zend_Controller_Plugin_PluginAbstract</classname> would be valid
                 names.
             </para>
 
             <note>
                 <para>
-                    This naming convention is new with version 1.9.0 of Zend Framework. Classes 
-                    that pre-date that version may not follow this rule, but will be renamed in 
+                    This naming convention is new with version 1.9.0 of Zend Framework. Classes
+                    that pre-date that version may not follow this rule, but will be renamed in
                     the future in order to comply.
                 </para>
             </note>
@@ -186,26 +186,26 @@
             <title>Interfaces</title>
 
             <para>
-                In general, interfaces follow the same conventions as <link 
+                In general, interfaces follow the same conventions as <link
                     linkend="coding-standard.naming-conventions.classes">classes</link>,
-                with one additional rule: interface names may optionally end in the term, 
+                with one additional rule: interface names may optionally end in the term,
                 "Interface", but that term must not be preceded by an underscore. As an example,
-                <classname>Zend_Controller_Plugin_Interface</classname> is considered an 
+                <classname>Zend_Controller_Plugin_Interface</classname> is considered an
                 invalid name, but <classname>Zend_Controller_PluginInterface</classname> or
-                <classname>Zend_Controller_Plugin_PluginInterface</classname> would be valid 
+                <classname>Zend_Controller_Plugin_PluginInterface</classname> would be valid
                 names.
             </para>
 
             <para>
-                While this rule is not required, it is strongly recommended, as it provides a 
-                good visual cue to developers as to which files contain interfaces rather than 
+                While this rule is not required, it is strongly recommended, as it provides a
+                good visual cue to developers as to which files contain interfaces rather than
                 classes.
             </para>
 
             <note>
                 <para>
-                    This naming convention is new with version 1.9.0 of Zend Framework. Classes 
-                    that pre-date that version may not follow this rule, but will be renamed in 
+                    This naming convention is new with version 1.9.0 of Zend Framework. Classes
+                    that pre-date that version may not follow this rule, but will be renamed in
                     the future in order to comply.
                 </para>
             </note>
@@ -478,10 +478,10 @@ $sampleArray = array(1, 2, 3, 'Zend', 'Studio',
                 </para>
 
                 <para>
-                    Alternately, the initial array item may begin on the following line. If so, 
-                    it should be padded at one indentation level greater than the line containing 
+                    Alternately, the initial array item may begin on the following line. If so,
+                    it should be padded at one indentation level greater than the line containing
                     the array declaration, and all successive lines should have the same
-                    indentation; the closing paren should be on a line by itself at the same 
+                    indentation; the closing paren should be on a line by itself at the same
                     indentation level as the line containing the array declaration:
                 </para>
 
@@ -494,9 +494,9 @@ $sampleArray = array(
 ]]></programlisting>
 
                 <para>
-                    When using this latter declaration, we encourage using a trailing comma for 
-                    the last item in the array; this minimizes the impact of adding new items on 
-                    successive lines, and helps to ensure no parse errors occur due to a missing 
+                    When using this latter declaration, we encourage using a trailing comma for
+                    the last item in the array; this minimizes the impact of adding new items on
+                    successive lines, and helps to ensure no parse errors occur due to a missing
                     comma.
                 </para>
             </sect3>
@@ -516,12 +516,12 @@ $sampleArray = array('firstKey'  => 'firstValue',
                 </para>
 
                 <para>
-                    Alternately, the initial array item may begin on the following line. If so, 
-                    it should be padded at one indentation level greater than the line containing 
+                    Alternately, the initial array item may begin on the following line. If so,
+                    it should be padded at one indentation level greater than the line containing
                     the array declaration, and all successive lines should have the same
-                    indentation; the closing paren should be on a line by itself at the same 
-                    indentation level as the line containing the array declaration. For 
-                    readability, the various "=>" assignment operators should be padded such that 
+                    indentation; the closing paren should be on a line by itself at the same
+                    indentation level as the line containing the array declaration. For
+                    readability, the various "=>" assignment operators should be padded such that
                     they align.
                 </para>
 
@@ -533,9 +533,9 @@ $sampleArray = array(
 ]]></programlisting>
 
                 <para>
-                    When using this latter declaration, we encourage using a trailing comma for 
-                    the last item in the array; this minimizes the impact of adding new items on 
-                    successive lines, and helps to ensure no parse errors occur due to a missing 
+                    When using this latter declaration, we encourage using a trailing comma for
+                    the last item in the array; this minimizes the impact of adding new items on
+                    successive lines, and helps to ensure no parse errors occur due to a missing
                     comma.
                 </para>
             </sect3>
@@ -587,7 +587,7 @@ class SampleClass
                 </para>
 
                 <para>
-                    Classes that extend other classes or which implement interfaces should 
+                    Classes that extend other classes or which implement interfaces should
                     declare their dependencies on the same line when possible.
                 </para>
 
@@ -599,13 +599,13 @@ class SampleClass extends FooAbstract implements BarInterface
 
                 <para>
                     If as a result of such declarations, the line length exceeds the <link
-                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line 
-                        length</link>, break the line before the "extends" and/or "implements" 
+                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line
+                        length</link>, break the line before the "extends" and/or "implements"
                     keywords, and pad those lines by one indentation level.
                 </para>
 
                 <programlisting language="php"><![CDATA[
-class SampleClass 
+class SampleClass
     extends FooAbstract
     implements BarInterface
 {
@@ -613,13 +613,13 @@ class SampleClass
 ]]></programlisting>
 
                 <para>
-                    If the class implements multiple interfaces and the declaration exceeds the 
-                    maximum line length, break after each comma separating the interfaces, and 
+                    If the class implements multiple interfaces and the declaration exceeds the
+                    maximum line length, break after each comma separating the interfaces, and
                     indent the interface names such that they align.
                 </para>
 
                 <programlisting language="php"><![CDATA[
-class SampleClass 
+class SampleClass
     implements BarInterface,
                BazInterface
 {
@@ -697,14 +697,14 @@ class Foo
                 </para>
 
                 <para>
-                    In cases where the argument list exceeds the <link 
-                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line 
-                        length</link>, you may introduce line breaks. Additional arguments to the 
-                    function or method must be indented one additional level beyond the function 
-                    or method declaration.  A line break should then occur before the closing 
-                    argument paren, which should then be placed on the same line as the opening 
-                    brace of the function or method with one space separating the two, and at the 
-                    same indentation level as the function or method declaration. The following is 
+                    In cases where the argument list exceeds the <link
+                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line
+                        length</link>, you may introduce line breaks. Additional arguments to the
+                    function or method must be indented one additional level beyond the function
+                    or method declaration.  A line break should then occur before the closing
+                    argument paren, which should then be placed on the same line as the opening
+                    brace of the function or method with one space separating the two, and at the
+                    same indentation level as the function or method declaration. The following is
                     an example of one such situation:
 
                     <programlisting language="php"><![CDATA[
@@ -844,26 +844,26 @@ if ($a != 2) {
 
                 <para>
                     If the conditional statement causes the line length to exceed the <link
-                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line 
-                        length</link> and has several clauses, you may break the conditional into 
-                    multiple lines. In such a case, break the line prior to a logic operator, and 
-                    pad the line such that it aligns under the first character of the conditional 
-                    clause. The closing paren in the conditional will then be placed on a line with 
-                    the opening brace, with one space separating the two, at an indentation level 
+                        linkend="coding-standard.php-file-formatting.max-line-length">maximum line
+                        length</link> and has several clauses, you may break the conditional into
+                    multiple lines. In such a case, break the line prior to a logic operator, and
+                    pad the line such that it aligns under the first character of the conditional
+                    clause. The closing paren in the conditional will then be placed on a line with
+                    the opening brace, with one space separating the two, at an indentation level
                     equivalent to the opening control statement.
                 </para>
 
                 <programlisting language="php"><![CDATA[
-if (($a == $b) 
+if (($a == $b)
     && ($b == $c)
     || (Foo::CONST == $d)
 ) {
     $a = $d;
 }
 ]]></programlisting>
-                
+
                 <para>
-                    The intention of this latter declaration format is to prevent issues when 
+                    The intention of this latter declaration format is to prevent issues when
                     adding or removing clauses from the conditional during later revisions.
                 </para>
 
@@ -886,7 +886,7 @@ if ($a != 2) {
     $a = 7;
 }
 
-if (($a == $b) 
+if (($a == $b)
     && ($b == $c)
     || (Foo::CONST == $d)
 ) {