httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1564960 [12/12] - in /httpd/httpd/trunk/docs/manual: ./ developer/ howto/ misc/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Date Wed, 05 Feb 2014 22:28:36 GMT
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en Wed Feb  5 22:28:30 2014
@@ -176,11 +176,9 @@ relative hyperlinks?</a></li>
     fully-qualified hyperlinks (because you have to change the URL
     scheme).  Using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> however, you can
     manipulate relative hyperlinks, to achieve the same effect.</p>
-    <pre class="prettyprint lang-config">
-RewriteEngine on
+    <pre class="prettyprint lang-config">RewriteEngine on
 RewriteRule   ^/(.*)_SSL$   https://%{SERVER_NAME}/$1 [R,L]
-RewriteRule   ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1  [R,L]
-    </pre>
+RewriteRule   ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1  [R,L]</pre>
 
 
     <p>This rewrite ruleset lets you use hyperlinks of the form
@@ -257,10 +255,8 @@ Certificate for testing purposes?</a></h
                         -keyout server.key</strong></code><br />
         These can be used as follows in your <code>httpd.conf</code>
         file:
-        <pre class="prettyprint lang-config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
-        </pre>
+        <pre class="prettyprint lang-config">SSLCertificateFile    /path/to/this/server.crt
+SSLCertificateKeyFile /path/to/this/server.key</pre>
 
     </li>
     <li>It is important that you are aware that this
@@ -338,10 +334,8 @@ SSLCertificateKeyFile /path/to/this/serv
     <li>You should now have two files: <code>server.key</code> and
     <code>server.crt</code>. These can be used as follows in your
     <code>httpd.conf</code> file:
-       <pre class="prettyprint lang-config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
-       </pre>
+       <pre class="prettyprint lang-config">SSLCertificateFile    /path/to/this/server.crt
+SSLCertificateKeyFile /path/to/this/server.key</pre>
 
        The <code>server.csr</code> file is no longer needed.
     </li>
@@ -656,9 +650,7 @@ Virtual Hosting to identify different SS
     you must make sure to put the non-SSL port number on the NameVirtualHost
     directive, e.g.</p>
 
-    <pre class="prettyprint lang-config">
-      NameVirtualHost 192.168.1.1:80
-    </pre>
+    <pre class="prettyprint lang-config">      NameVirtualHost 192.168.1.1:80</pre>
 
 
     <p>Other workaround solutions include: </p>
@@ -709,11 +701,9 @@ Explorer (MSIE)?</a></h3>
     keep-alive connections or send the SSL close notify messages to MSIE clients.
     This can be done by using the following directive in your SSL-aware
     virtual host section:</p>
-    <pre class="prettyprint lang-config">
-SetEnvIf User-Agent "MSIE [2-5]" \
+    <pre class="prettyprint lang-config">SetEnvIf User-Agent "MSIE [2-5]" \
          nokeepalive ssl-unclean-shutdown \
-         downgrade-1.0 force-response-1.0
-    </pre>
+         downgrade-1.0 force-response-1.0</pre>
 
     <p>Further, some MSIE versions have problems with particular ciphers.
     Unfortunately, it is not possible to implement a MSIE-specific

Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.fr Wed Feb  5 22:28:30 2014
@@ -189,11 +189,9 @@ HTTPS dans les hyperliens relatifs ?</a>
 hyperliens pleinement qualifiés (car vous devez modifier le schéma de l'URL).
 Cependant, à l'aide du module <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>, vous pouvez
 manipuler des hyperliens relatifs, pour obtenir le même effet.</p>
-    <pre class="prettyprint lang-config">
-RewriteEngine on
+    <pre class="prettyprint lang-config">RewriteEngine on
 RewriteRule   ^/(.*)_SSL$   https://%{SERVER_NAME}/$1 [R,L]
-RewriteRule   ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1  [R,L]
-    </pre>
+RewriteRule   ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1  [R,L]</pre>
 
 
     <p>Ce jeu de règles rewrite vous permet d'utiliser des hyperliens de la
@@ -273,10 +271,8 @@ fins de test ?</a></h3>
 			-keyout server.key</strong></code><br />
 	Ces fichiers seront utilisés comme suit dans votre
 	<code>httpd.conf</code> :
-        <pre class="prettyprint lang-config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
-        </pre>
+        <pre class="prettyprint lang-config">SSLCertificateFile    /path/to/this/server.crt
+SSLCertificateKeyFile /path/to/this/server.key</pre>
 
     </li>
     <li>Il est important de savoir que le fichier <code>server.key</code> n'a
@@ -357,10 +353,8 @@ SSLCertificateKeyFile /path/to/this/serv
     <li>Vous devez maintenant disposer de deux fichiers :
     <code>server.key</code> et <code>server.crt</code>. Ils sont précisés dans
     votre fichier <code>httpd.conf</code> comme suit :
-       <pre class="prettyprint lang-config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
-       </pre>
+       <pre class="prettyprint lang-config">SSLCertificateFile    /path/to/this/server.crt
+SSLCertificateKeyFile /path/to/this/server.key</pre>
 
        Le fichier <code>server.csr</code> n'est plus nécessaire.
     </li>
@@ -713,9 +707,7 @@ pour différencier plusieurs hôtes virt
     (sur le port 443). Mais dans ce cas, vous devez définir le numéro de port
     non-SSL à l'aide de la directive NameVirtualHost dans ce style :</p>
 
-    <pre class="prettyprint lang-config">
-      NameVirtualHost 192.168.1.1:80
-    </pre>
+    <pre class="prettyprint lang-config">      NameVirtualHost 192.168.1.1:80</pre>
 
 
     <p>il existe d'autres solutions alternatives comme :</p>
@@ -773,11 +765,9 @@ versions de MSIE. Vous pouvez contourner
 ou l'envoi de messages de notification de fermeture de session SSL aux
 clients MSIE. Pour cela, vous pouvez utiliser la directive suivante
 dans votre section d'hôte virtuel avec support SSL :</p>
-    <pre class="prettyprint lang-config">
-SetEnvIf User-Agent "MSIE [2-5]" \
+    <pre class="prettyprint lang-config">SetEnvIf User-Agent "MSIE [2-5]" \
          nokeepalive ssl-unclean-shutdown \
-         downgrade-1.0 force-response-1.0
-    </pre>
+         downgrade-1.0 force-response-1.0</pre>
 
     <p>En outre, certaines versions de MSIE ont des problèmes avec des
     algorithmes de chiffrement particuliers. Hélas, il n'est pas

Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.en (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.en Wed Feb  5 22:28:30 2014
@@ -44,15 +44,13 @@ before progressing to the advanced techn
 <p>Your SSL configuration will need to contain, at minimum, the
 following directives.</p>
 
-<pre class="prettyprint lang-config">
-Listen 443
+<pre class="prettyprint lang-config">Listen 443
 &lt;VirtualHost *:443&gt;
     ServerName www.example.com
     SSLEngine on
     SSLCertificateFile /path/to/www.example.com.cert
     SSLCertificateKeyFile /path/to/www.example.com.key
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -69,19 +67,15 @@ requires a strong cipher for access to a
 only?</a></h3>
 
     <p>The following enables only the strongest ciphers:</p>
-    <pre class="prettyprint lang-config">
-      SSLCipherSuite HIGH:!aNULL:!MD5
-    </pre>
+    <pre class="prettyprint lang-config">      SSLCipherSuite HIGH:!aNULL:!MD5</pre>
 
 
     <p>While with the following configuration you specify a preference
     for specific speed-optimized ciphers (which will be selected by
     mod_ssl, provided that they are supported by the client):</p>
 
-    <pre class="prettyprint lang-config">
-SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
-SSLHonorCipherOrder on
-    </pre>
+    <pre class="prettyprint lang-config">SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on</pre>
 
 
 
@@ -95,16 +89,14 @@ URL?</a></h3>
     blocks, to give a per-directory solution, and can automatically force
     a renegotiation of the SSL parameters to meet the new configuration.
     This can be done as follows:</p>
-    <pre class="prettyprint lang-config">
-# be liberal in general
+    <pre class="prettyprint lang-config"># be liberal in general
 SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
 
 &lt;Location /strong/area&gt;
 # but https://hostname/strong/area/ and below
 # requires strong ciphers
 SSLCipherSuite HIGH:!aNULL:!MD5
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -130,13 +122,11 @@ Intranet website, for clients coming fro
     need to do is to create client certificates signed by your own CA
     certificate (<code>ca.crt</code>) and then verify the clients against this
     certificate.</p>
-    <pre class="prettyprint lang-config">
-# require a client certificate which has to be directly
+    <pre class="prettyprint lang-config"># require a client certificate which has to be directly
 # signed by our CA certificate in ca.crt
 SSLVerifyClient require
 SSLVerifyDepth 1
-SSLCACertificateFile conf/ssl.crt/ca.crt
-    </pre>
+SSLCACertificateFile conf/ssl.crt/ca.crt</pre>
 
 
 
@@ -148,15 +138,13 @@ SSLCACertificateFile conf/ssl.crt/ca.crt
     you can use the per-directory reconfiguration features of
     <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>:</p>
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient none
+    <pre class="prettyprint lang-config">SSLVerifyClient none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 
 &lt;Location /secure/area&gt;
 SSLVerifyClient require
 SSLVerifyDepth 1
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 
@@ -176,8 +164,7 @@ SSLVerifyDepth 1
     you should establish a password database containing <em>all</em>
     clients allowed, as follows:</p>
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient      none
+    <pre class="prettyprint lang-config">SSLVerifyClient      none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 
@@ -191,16 +178,14 @@ SSLCACertificatePath conf/ssl.crt
     AuthBasicProvider    file
     AuthUserFile         /usr/local/apache2/conf/httpd.passwd
     Require              valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>The password used in this example is the DES encrypted string "password".
     See the <code class="directive"><a href="../mod/mod_ssl.html#ssloptions">SSLOptions</a></code> docs for more
     information.</p>
 
-    <div class="example"><h3>httpd.passwd</h3><pre>
-/C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
+    <div class="example"><h3>httpd.passwd</h3><pre>/C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA
 /C=US/L=L.A./O=Snake Oil, Ltd./OU=Dev/CN=Quux:xxj31ZMTZzkVA</pre></div>
 
@@ -208,8 +193,7 @@ SSLCACertificatePath conf/ssl.crt
     into the DN, you can match them more easily using <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code>, as follows:</p>
 
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient      none
+    <pre class="prettyprint lang-config">SSLVerifyClient      none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 
@@ -220,8 +204,7 @@ SSLCACertificatePath conf/ssl.crt
   SSLRequireSSL
   SSLRequire       %{SSL_CLIENT_S_DN_O}  eq "Snake Oil, Ltd." \
                and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
 
@@ -237,8 +220,7 @@ plain HTTP access for clients on the Int
    This configuration should remain outside of your HTTPS virtual host, so
    that it applies to both HTTPS and HTTP.</p>
 
-    <pre class="prettyprint lang-config">
-SSLCACertificateFile conf/ssl.crt/company-ca.crt
+    <pre class="prettyprint lang-config">SSLCACertificateFile conf/ssl.crt/company-ca.crt
 
 &lt;Directory /usr/local/apache2/htdocs&gt;
     #   Outside the subarea only Intranet access is granted
@@ -275,8 +257,7 @@ SSLCACertificateFile conf/ssl.crt/compan
     AuthBasicProvider    file
     AuthUserFile         conf/protected.passwd
     Require              valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.fr Wed Feb  5 22:28:30 2014
@@ -49,15 +49,13 @@ accéder à une URL particulière ?</a><
 <p>Votre configuration SSL doit comporter au moins les directives
 suivantes :</p>
 
-<pre class="prettyprint lang-config">
-Listen 443
+<pre class="prettyprint lang-config">Listen 443
 &lt;VirtualHost *:443&gt;
     ServerName www.example.com
     SSLEngine on
     SSLCertificateFile /path/to/www.example.com.cert
     SSLCertificateKeyFile /path/to/www.example.com.key
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -79,9 +77,7 @@ que le chiffrement fort ?</a></h3>
 
     <p>Les directives suivantes ne permettent que les
     chiffrements de plus haut niveau :</p>
-    <pre class="prettyprint lang-config">
-      SSLCipherSuite HIGH:!aNULL:!MD5
-    </pre>
+    <pre class="prettyprint lang-config">      SSLCipherSuite HIGH:!aNULL:!MD5</pre>
 
 
 
@@ -91,10 +87,8 @@ que le chiffrement fort ?</a></h3>
  rapidité (le choix final sera opéré par mod_ssl, dans la mesure ou le
  client les supporte) :</p>
 
-    <pre class="prettyprint lang-config">
-SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
-SSLHonorCipherOrder on
-    </pre>
+    <pre class="prettyprint lang-config">SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -110,16 +104,14 @@ accéder à une URL particulière ?</a><
     <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> peut alors forcer automatiquement une
     renégociation des paramètres SSL pour parvenir au but recherché.
     Cette configuration peut se présenter comme suit :</p>
-    <pre class="prettyprint lang-config">
-# soyons très tolérant a priori
+    <pre class="prettyprint lang-config"># soyons très tolérant a priori
 SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
 
 &lt;Location /strong/area&gt;
 # sauf pour https://hostname/strong/area/ et ses sous-répertoires
 # qui exigent des chiffrements forts
 SSLCipherSuite HIGH:!aNULL:!MD5
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -153,13 +145,11 @@ provenance de l'Internet ?</a></li>
     le certificat de votre propre autorité de certification
     (<code>ca.crt</code>), et d'authentifier les clients à l'aide de ces
     certificats.</p>
-    <pre class="prettyprint lang-config">
-# exige un certificat client signé par le certificat de votre CA
+    <pre class="prettyprint lang-config"># exige un certificat client signé par le certificat de votre CA
 # contenu dans ca.crt
 SSLVerifyClient require
 SSLVerifyDepth 1
-SSLCACertificateFile conf/ssl.crt/ca.crt
-    </pre>
+SSLCACertificateFile conf/ssl.crt/ca.crt</pre>
 
 
 
@@ -173,15 +163,13 @@ mais autoriser quand-même tout client a
 URL particulière, vous pouvez utiliser les fonctionnalités de reconfiguration
 de <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> en fonction du répertoire :</p>
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient none
+    <pre class="prettyprint lang-config">SSLVerifyClient none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 
 &lt;Location /secure/area&gt;
 SSLVerifyClient require
 SSLVerifyDepth 1
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 
@@ -204,8 +192,7 @@ l'accès au reste du serveur à tous les
     de données de mots de passe contenant <em>tous</em> les clients
     autorisés, comme suit :</p>
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient      none
+    <pre class="prettyprint lang-config">SSLVerifyClient      none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 
@@ -219,8 +206,7 @@ SSLVerifyClient      require
     AuthBasicProvider    file
     AuthUserFile         /usr/local/apache2/conf/httpd.passwd
     Require              valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
     
 
@@ -229,8 +215,7 @@ SSLVerifyClient      require
     directive <code class="directive"><a href="../mod/mod_ssl.html#ssloptions">SSLOptions</a></code> pour
     plus de détails.</p>
 
-    <div class="example"><h3>httpd.passwd</h3><pre>
-/C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
+    <div class="example"><h3>httpd.passwd</h3><pre>/C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA
 /C=US/L=L.A./O=Snake Oil, Ltd./OU=Dev/CN=Quux:xxj31ZMTZzkVA</pre></div>
 
@@ -239,8 +224,7 @@ SSLVerifyClient      require
     utilisant la directive <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code>, comme suit :</p>
 
 
-    <pre class="prettyprint lang-config">
-SSLVerifyClient      none
+    <pre class="prettyprint lang-config">SSLVerifyClient      none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 
@@ -251,8 +235,7 @@ SSLCACertificatePath conf/ssl.crt
   SSLRequireSSL
   SSLRequire       %{SSL_CLIENT_S_DN_O}  eq "Snake Oil, Ltd." \
                and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
 
@@ -270,8 +253,7 @@ aux clients de l'intranet.</a></h3>
    doivent se trouver en dehors de votre hôte virtuel HTTPS, afin qu'elles
    s'appliquent à la fois à HTTP et HTTPS.</p>
 
-    <pre class="prettyprint lang-config">
-SSLCACertificateFile conf/ssl.crt/company-ca.crt
+    <pre class="prettyprint lang-config">SSLCACertificateFile conf/ssl.crt/company-ca.crt
 
 &lt;Directory /usr/local/apache2/htdocs&gt;
 #   En dehors de subarea, seul l'accès depuis l'intranet est
@@ -310,8 +292,7 @@ SSLCACertificateFile conf/ssl.crt/compan
     AuthBasicProvider    file
     AuthUserFile         conf/protected.passwd
     Require              valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/suexec.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/suexec.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.html.en (original)
+++ httpd/httpd/trunk/docs/manual/suexec.html.en Wed Feb  5 22:28:30 2014
@@ -497,10 +497,8 @@
 
       <p>If for example, your web server is configured to run as:</p>
 
-      <pre class="prettyprint lang-config">
-User www
-Group webgroup
-      </pre>
+      <pre class="prettyprint lang-config">User www
+Group webgroup</pre>
 
 
       <p>and <code class="program"><a href="./programs/suexec.html">suexec</a></code> is installed at

Modified: httpd/httpd/trunk/docs/manual/suexec.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/suexec.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/suexec.html.fr Wed Feb  5 22:28:30 2014
@@ -531,10 +531,8 @@ de suEXEC</a></li>
     <p>Si, par exemple, votre serveur web est configuré pour
     s'exécuter en tant que :</p>
 
-<pre class="prettyprint lang-config">
-User www
-Group webgroup
-      </pre>
+<pre class="prettyprint lang-config">User www
+Group webgroup</pre>
 
 
     <p>et <code class="program"><a href="./programs/suexec.html">suexec</a></code> se trouve à

Modified: httpd/httpd/trunk/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.en Wed Feb  5 22:28:30 2014
@@ -140,39 +140,27 @@
       access control.</p>
 
       <p>In this example, all requests are denied.</p>
-      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
-Order deny,allow
-Deny from all
-        </pre>
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">Order deny,allow
+Deny from all</pre>
 </div>
-      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
-        Require all denied
-        </pre>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">        Require all denied</pre>
 </div>
 
       <p>In this example, all requests are allowed.</p>
-      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
-Order allow,deny
-Allow from all
-        </pre>
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">Order allow,deny
+Allow from all</pre>
 </div>
-      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
-        Require all granted
-        </pre>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">        Require all granted</pre>
 </div>
 
       <p>In the following example, all hosts in the example.org domain
       are allowed access; all other hosts are denied access.</p>
 
-      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
-Order Deny,Allow
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">Order Deny,Allow
 Deny from all
-Allow from example.org
-        </pre>
+Allow from example.org</pre>
 </div>
-      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
-        Require host example.org
-        </pre>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">        Require host example.org</pre>
 </div>
     
 

Modified: httpd/httpd/trunk/docs/manual/upgrading.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.fr Wed Feb  5 22:28:30 2014
@@ -149,39 +149,27 @@ nécessiter une mise à jour des fichier
       la nouvelle méthode :</p>
 
       <p>Dans cet exemple, toutes les requêtes sont rejetées :</p>
-      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">
-Order deny,allow
-Deny from all
-        </pre>
+      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">Order deny,allow
+Deny from all</pre>
 </div>
-      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">
-        Require all denied
-	</pre>
+      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">        Require all denied</pre>
 </div>
 
       <p>Dans cet exemple, toutes les requêtes sont acceptées :</p>
-      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">
-Order allow,deny
-Allow from all
-        </pre>
+      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">Order allow,deny
+Allow from all</pre>
 </div>
-      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">
-        Require all granted
-	</pre>
+      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">        Require all granted</pre>
 </div>
 
       <p>Dans l'exemple suivant, tous les hôtes du domaine example.org
       ont l'autorisation d'accès, tous les autres sont rejetés :</p>
 
-      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">
-Order Deny,Allow
+      <div class="example"><h3>version 2.2 :</h3><pre class="prettyprint lang-config">Order Deny,Allow
 Deny from all
-Allow from example.org
-        </pre>
+Allow from example.org</pre>
 </div>
-      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">
-        Require host example.org
-	</pre>
+      <div class="example"><h3>version 2.4 :</h3><pre class="prettyprint lang-config">        Require host example.org</pre>
 </div>
     
 

Modified: httpd/httpd/trunk/docs/manual/urlmapping.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.html.en Wed Feb  5 22:28:30 2014
@@ -129,9 +129,7 @@
     expression</a> based matching and substitution. For
     example,</p>
 
-    <pre class="prettyprint lang-config">
-    ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)   /home/$1/cgi-bin/$2
-    </pre>
+    <pre class="prettyprint lang-config">    ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)   /home/$1/cgi-bin/$2</pre>
 
 
     <p>will map a request to
@@ -178,9 +176,7 @@
     <code>/home/user/public_html/file.html</code>, use the following
     <code>AliasMatch</code> directive:</p>
 
-    <pre class="prettyprint lang-config">
-    AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$   /home/$1/public_html/$3
-    </pre>
+    <pre class="prettyprint lang-config">    AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$   /home/$1/public_html/$3</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -198,9 +194,7 @@
     to the new directory <code>/bar/</code>, you can instruct clients
     to request the content at the new location as follows:</p>
 
-    <pre class="prettyprint lang-config">
-    Redirect permanent /foo/   http://www.example.com/bar/
-    </pre>
+    <pre class="prettyprint lang-config">    Redirect permanent /foo/   http://www.example.com/bar/</pre>
 
 
     <p>This will redirect any URL-Path starting in
@@ -214,17 +208,13 @@
     for the site home page to a different site, but leave all other
     requests alone, use the following configuration:</p>
 
-    <pre class="prettyprint lang-config">
-    RedirectMatch permanent ^/$    http://www.example.com/startpage.html
-    </pre>
+    <pre class="prettyprint lang-config">    RedirectMatch permanent ^/$    http://www.example.com/startpage.html</pre>
 
 
     <p>Alternatively, to temporarily redirect all pages on one site
     to a particular page on another site, use the following:</p>
 
-    <pre class="prettyprint lang-config">
-    RedirectMatch temp .*  http://othersite.example.com/startpage.html
-    </pre>
+    <pre class="prettyprint lang-config">    RedirectMatch temp .*  http://othersite.example.com/startpage.html</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -243,12 +233,10 @@ the <code>/bar/</code> directory on <cod
 and returns them to the client as if they were from the local
 server.</p>
 
-<pre class="prettyprint lang-config">
-ProxyPass /foo/ http://internal.example.com/bar/<br />
+<pre class="prettyprint lang-config">ProxyPass /foo/ http://internal.example.com/bar/<br />
 ProxyPassReverse /foo/ http://internal.example.com/bar/<br />
 ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
-ProxyPassReverseCookiePath /foo/ /bar/
-</pre>
+ProxyPassReverseCookiePath /foo/ /bar/</pre>
 
 
 <p>The <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> configures
@@ -268,9 +256,7 @@ breaking out of the proxy server and req
 content) in a page as it is being served to the client using
 <code class="module"><a href="./mod/mod_substitute.html">mod_substitute</a></code>.</p>
 
-<pre class="prettyprint lang-config">
-Substitute s/internal\.example\.com/www.example.com/i
-</pre>
+<pre class="prettyprint lang-config">Substitute s/internal\.example\.com/www.example.com/i</pre>
 
 
 <p>For more sophisticated rewriting of links in HTML and XHTML, the 

Modified: httpd/httpd/trunk/docs/manual/urlmapping.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.html.fr Wed Feb  5 22:28:30 2014
@@ -141,9 +141,7 @@ l'arborescence DocumentRoot</a></h2>
     sur les <a class="glossarylink" href="./glossary.html#regex" title="voir glossaire">expressions rationnelles</a>.
     Par exemple,</p>
 
-<pre class="prettyprint lang-config">
-    ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)   /home/$1/cgi-bin/$2
-    </pre>
+<pre class="prettyprint lang-config">    ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)   /home/$1/cgi-bin/$2</pre>
 
 
     <p>fera correspondre une requête du style
@@ -192,9 +190,7 @@ l'arborescence DocumentRoot</a></h2>
     <code>/home/user/public_html/file.html</code>, utilisez la directive
     <code>AliasMatch</code> suivante :</p>
 
-<pre class="prettyprint lang-config">
-    AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$   /home/$1/public_html/$3
-    </pre>
+<pre class="prettyprint lang-config">    AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$   /home/$1/public_html/$3</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -214,9 +210,7 @@ l'arborescence DocumentRoot</a></h2>
     nouveau répertoire <code>/bar/</code>, vous pouvez demander aux clients
     de le requérir à sa nouvelle localisation comme suit :</p>
 
-<pre class="prettyprint lang-config">
-    Redirect permanent /foo/   http://www.example.com/bar/
-    </pre>
+<pre class="prettyprint lang-config">    Redirect permanent /foo/   http://www.example.com/bar/</pre>
 
 
     <p>Ceci aura pour effet de rediriger tout chemin d'URL commençant par
@@ -231,17 +225,13 @@ l'arborescence DocumentRoot</a></h2>
     laisser toutes les autres requêtes inchangées, utilisez la
     configuration suivante :</p>
 
-<pre class="prettyprint lang-config">
-   RedirectMatch permanent ^/$    http://www.example.com/startpage.html
-    </pre>
+<pre class="prettyprint lang-config">   RedirectMatch permanent ^/$    http://www.example.com/startpage.html</pre>
 
 
     <p>De même, pour rediriger temporairement toutes les pages d'un site
     vers une page particulière d'un autre site, utilisez ce qui suit :</p>
 
-<pre class="prettyprint lang-config">
-    RedirectMatch temp .*  http://othersite.example.com/startpage.html
-    </pre>
+<pre class="prettyprint lang-config">    RedirectMatch temp .*  http://othersite.example.com/startpage.html</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -261,12 +251,10 @@ dans le répertoire
 <code>/bar/</code> sur <code>internal.example.com</code>
 et les renvoie au client comme s'ils appartenaient au serveur local.</p>
 
-<pre class="prettyprint lang-config">
-ProxyPass /foo/ http://internal.example.com/bar/<br />
+<pre class="prettyprint lang-config">ProxyPass /foo/ http://internal.example.com/bar/<br />
 ProxyPassReverse /foo/ http://internal.example.com/bar/<br />
 ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
-ProxyPassReverseCookiePath /foo/ /bar/
-</pre>
+ProxyPassReverseCookiePath /foo/ /bar/</pre>
 
 
 <p>La directive <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> configure
@@ -286,9 +274,7 @@ du serveur mandataire et effectuer sa re
 d'utres contenus) situés dans la page au moment où elle est envoyée au
 client en utilisant le module <code class="module"><a href="./mod/mod_substitute.html">mod_substitute</a></code>.</p>
 
-<pre class="prettyprint lang-config">
-Substitute s/internal\.example\.com/www.example.com/i
-</pre>
+<pre class="prettyprint lang-config">Substitute s/internal\.example\.com/www.example.com/i</pre>
 
 
 <p>Le module <code class="module"><a href="./mod/mod_proxy_html.html">mod_proxy_html</a></code> rend possible une réécriture plus

Modified: httpd/httpd/trunk/docs/manual/vhosts/examples.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/examples.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/examples.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/examples.html.en Wed Feb  5 22:28:30 2014
@@ -78,8 +78,7 @@
           <code>hosts</code> entries.</p>
     </div>
 
-    <pre class="prettyprint lang-config">
-# Ensure that Apache listens on port 80
+    <pre class="prettyprint lang-config"># Ensure that Apache listens on port 80
 Listen 80
 &lt;VirtualHost *:80&gt;
     DocumentRoot /www/example1
@@ -93,8 +92,7 @@ Listen 80
     ServerName www.example.org
 
     # Other directives here
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>The asterisks match all addresses, so the main server serves no
@@ -142,8 +140,7 @@ Listen 80
     will serve the "main" server, <code>server.example.com</code> and on the
     other (<code>172.20.30.50</code>), we will serve two or more virtual hosts.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 
 # This is the "main" server running on 172.20.30.40
 ServerName server.example.com
@@ -161,8 +158,7 @@ DocumentRoot /www/mainserver
     ServerName www.example.org
     
     # Other directives here ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Any request to an address other than <code>172.20.30.50</code> will be
@@ -188,13 +184,11 @@ DocumentRoot /www/mainserver
     with the same content, with just one <code>VirtualHost</code>
     section.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
     DocumentRoot /www/server1
     ServerName server.example.com
     ServerAlias server
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Now requests from both networks will be served from the same
@@ -221,8 +215,7 @@ DocumentRoot /www/mainserver
     takes place after the best matching IP address and port combination
     is determined.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 Listen 8080
 
 &lt;VirtualHost 172.20.30.40:80&gt;
@@ -243,8 +236,7 @@ Listen 8080
 &lt;VirtualHost 172.20.30.40:8080&gt;
     ServerName www.example.org
     DocumentRoot /www/otherdomain-8080
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -256,8 +248,7 @@ Listen 8080
     <code>www.example.com</code> and <code>www.example.org</code>
     respectively.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 
 &lt;VirtualHost 172.20.30.40&gt;
     DocumentRoot /www/example1
@@ -267,8 +258,7 @@ Listen 80
 &lt;VirtualHost 172.20.30.50&gt;
     DocumentRoot /www/example2
     ServerName www.example.org
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Requests for any address not specified in one of the
@@ -287,8 +277,7 @@ Listen 80
     respectively. In each case, we want to run hosts on ports 80 and
     8080.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 172.20.30.40:80
+    <pre class="prettyprint lang-config">Listen 172.20.30.40:80
 Listen 172.20.30.40:8080
 Listen 172.20.30.50:80
 Listen 172.20.30.50:8080
@@ -311,8 +300,7 @@ Listen 172.20.30.50:8080
 &lt;VirtualHost 172.20.30.50:8080&gt;
     DocumentRoot /www/example2-8080
     ServerName www.example.org
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -323,8 +311,7 @@ Listen 172.20.30.50:8080
     <p>Any address mentioned in the argument to a virtualhost that never
     appears in another virtual host is a strictly IP-based virtual host.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 &lt;VirtualHost 172.20.30.40&gt;
     DocumentRoot /www/example1
     ServerName www.example.com
@@ -349,8 +336,7 @@ Listen 80
 &lt;VirtualHost 172.20.30.60&gt;
     DocumentRoot /www/example5
     ServerName www.example.gov
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -366,14 +352,12 @@ Listen 80
     passed through, in case we are proxying multiple hostnames to a
     single machine.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost *:*&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost *:*&gt;
     ProxyPreserveHost On
     ProxyPass / http://192.168.111.2/
     ProxyPassReverse / http://192.168.111.2/
     ServerName hostname.example.com
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -388,11 +372,9 @@ Listen 80
     port, <em>i.e.</em>, an address/port combination that is not used for
     any other virtual host.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:*&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:*&gt;
     DocumentRoot /www/default
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Using such a default vhost with a wildcard port effectively prevents
@@ -415,8 +397,7 @@ Listen 80
     <p>Same as setup 1, but the server listens on several ports and we want
     to use a second <code>_default_</code> vhost for port 80.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:80&gt;
     DocumentRoot /www/default80
     # ...
 &lt;/VirtualHost&gt;
@@ -424,8 +405,7 @@ Listen 80
 &lt;VirtualHost _default_:*&gt;
     DocumentRoot /www/default
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>The default vhost for port 80 (which <em>must</em> appear before any
@@ -440,12 +420,10 @@ Listen 80
     <p>We want to have a default vhost for port 80, but no other default
     vhosts.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:80&gt;
 DocumentRoot /www/default
 ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>A request to an unspecified address on port 80 is served from the
@@ -473,8 +451,7 @@ DocumentRoot /www/default
     (<code>172.20.30.50</code>) to the <code>VirtualHost</code>
     directive.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 ServerName www.example.com
 DocumentRoot /www/example1
 
@@ -489,8 +466,7 @@ DocumentRoot /www/example1
     ServerName www.example.net
     ServerAlias *.example.net
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>The vhost can now be accessed through the new address (as an
@@ -511,8 +487,7 @@ DocumentRoot /www/example1
     containing links with an URL prefix to the name-based virtual
     hosts.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 172.20.30.40&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 172.20.30.40&gt;
     # primary vhost
     DocumentRoot /www/subdomain
     RewriteEngine On
@@ -536,8 +511,7 @@ DocumentRoot /www/subdomain/sub1
     RewriteEngine On
     RewriteRule ^(/sub2/.*) /www/subdomain$1
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Due to the <code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code>

Modified: httpd/httpd/trunk/docs/manual/vhosts/examples.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/examples.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/examples.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/examples.html.fr Wed Feb  5 22:28:30 2014
@@ -82,8 +82,7 @@
     que sur la machine possédant ces entrées.</p>
     </div>
 
-    <pre class="prettyprint lang-config">
-# Apache doit écouter sur le port 80
+    <pre class="prettyprint lang-config"># Apache doit écouter sur le port 80
 Listen 80
 &lt;VirtualHost *:80&gt;
     DocumentRoot /www/example1
@@ -97,8 +96,7 @@ Listen 80
     ServerName www.example.org
 
     # Autres directives ici
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
    
 
@@ -152,8 +150,7 @@ Listen 80
     (<code>172.20.30.50</code>), deux serveurs virtuels (ou plus) 
     répondront.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 
 # Serveur "principal" sur 172.20.30.40
 ServerName server.example.com
@@ -171,8 +168,7 @@ DocumentRoot /www/mainserver
     ServerName www.example.org
     
     # D'autres directives ici ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Toute requête arrivant sur une autre adresse que 
@@ -199,13 +195,11 @@ DocumentRoot /www/mainserver
     aux requêtes internes et externes, au moyen d'une seule section 
     <code>VirtualHost</code>.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
     DocumentRoot /www/server1
     ServerName server.example.com
     ServerAlias server
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Ainsi, les requêtes en provenance de chacun des deux réseaux 
@@ -233,8 +227,7 @@ DocumentRoot /www/mainserver
     la sélection de la meilleure correspondance du point de vue adresse
     IP/port.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 Listen 8080
 
 &lt;VirtualHost 172.20.30.40:80&gt;
@@ -255,8 +248,7 @@ Listen 8080
 &lt;VirtualHost 172.20.30.40:8080&gt;
     ServerName www.example.org
     DocumentRoot /www/otherdomain-8080
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 	</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -267,8 +259,7 @@ Listen 8080
     et <code>172.20.30.50</code>) correspondant respectivement aux noms 
     <code>www.example.com</code> et <code>www.example.org</code>.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 
 &lt;VirtualHost 172.20.30.40&gt;
     DocumentRoot /www/example1
@@ -278,8 +269,7 @@ Listen 80
 &lt;VirtualHost 172.20.30.50&gt;
     DocumentRoot /www/example2
     ServerName www.example.org
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Les requêtes provenant d'adresses non spécifiées dans l'une des 
@@ -298,8 +288,7 @@ Listen 80
     Pour chacun d'eux, nous voulons un hébergement sur les ports 80 
     et 8080.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 172.20.30.40:80
+    <pre class="prettyprint lang-config">Listen 172.20.30.40:80
 Listen 172.20.30.40:8080
 Listen 172.20.30.50:80
 Listen 172.20.30.50:8080
@@ -322,8 +311,7 @@ Listen 172.20.30.50:8080
 &lt;VirtualHost 172.20.30.50:8080&gt;
     DocumentRoot /www/example2-8080
     ServerName www.example.org
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 	</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -336,8 +324,7 @@ Listen 172.20.30.50:8080
     section un serveur virtuel sélectionnable uniquement en fonction de
     son adresse IP.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 &lt;VirtualHost 172.20.30.40&gt;
     DocumentRoot /www/example1
     ServerName www.example.com
@@ -362,8 +349,7 @@ Listen 80
 &lt;VirtualHost 172.20.30.60&gt;
     DocumentRoot /www/example5
     ServerName www.example.gov
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 	</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -380,14 +366,12 @@ Listen 80
     transfert, au cas où plusieurs noms de domaines cohabitent sur 
     une même machine.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost *:*&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost *:*&gt;
     ProxyPreserveHost On
     ProxyPass / http://192.168.111.2/
     ProxyPassReverse / http://192.168.111.2/
     ServerName hostname.example.com
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -402,11 +386,9 @@ Listen 80
     d'adresses IP ou de ports non connus, <em>c'est-à-dire</em>, d'un 
     couple adresse/port non traité par aucun autre serveur virtuel.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:*&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:*&gt;
     DocumentRoot /www/default
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>L'utilisation d'un tel serveur virtuel avec un joker pour le 
@@ -435,8 +417,7 @@ Listen 80
     le serveur écoute sur plusieurs ports et un second serveur virtuel 
     <code>_default_</code> pour le port 80 est ajouté.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:80&gt;
     DocumentRoot /www/default80
     # ...
 &lt;/VirtualHost&gt;
@@ -444,8 +425,7 @@ Listen 80
 &lt;VirtualHost _default_:*&gt;
     DocumentRoot /www/default
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Le serveur virtuel par défaut défini pour le port 80 (il doit 
@@ -461,12 +441,10 @@ Listen 80
     <p>Nous voulons créer un serveur virtuel par défaut seulement 
     pour le port 80.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost _default_:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost _default_:80&gt;
 DocumentRoot /www/default
 ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Une requête vers une adresse non spécifiée sur le port 80 
@@ -494,8 +472,7 @@ DocumentRoot /www/default
     adresse IP (<code>172.20.30.50</code>) dans la directive 
     <code>VirtualHost</code>.</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
+    <pre class="prettyprint lang-config">Listen 80
 ServerName www.example.com
 DocumentRoot /www/example1
 
@@ -510,8 +487,7 @@ DocumentRoot /www/example1
     ServerName www.example.net
     ServerAlias *.example.net
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Le serveur virtuel peut maintenant être joint par la nouvelle 
@@ -534,8 +510,7 @@ DocumentRoot /www/example1
     des liens dont les URLs auront un préfixe identifiant les serveurs 
     virtuels par nom.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 172.20.30.40&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 172.20.30.40&gt;
     # serveur virtuel primaire
     DocumentRoot /www/subdomain
     RewriteEngine On
@@ -559,8 +534,7 @@ DocumentRoot /www/subdomain/sub1
     RewriteEngine On
     RewriteRule ^(/sub2/.*) /www/subdomain$1
     # ...
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>À cause de la directive 

Modified: httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en Wed Feb  5 22:28:30 2014
@@ -94,10 +94,8 @@ LogFormat</a></code>
 directive, and the <code>%v</code> variable. Add this to the beginning
 of your log format string:</p>
 
-<pre class="prettyprint lang-config">
-LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost
-CustomLog logs/multiple_vhost_log vhost
-</pre>
+<pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost
+CustomLog logs/multiple_vhost_log vhost</pre>
 
 
 <p>This will create a log file in the common log format, but with the

Modified: httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.fr Wed Feb  5 22:28:30 2014
@@ -105,10 +105,8 @@ entrée du journal. Ceci se paramètre a
 variable <code>%v</code>. Ajoutez cette variable au début de la chaîne
 de définition du format de journalisations&nbsp;:</p>
 
-<pre class="prettyprint lang-config">
-LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost
-CustomLog logs/multiple_vhost_log vhost
-</pre>
+<pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost
+CustomLog logs/multiple_vhost_log vhost</pre>
 
 
 <p>Cette configuration va provoquer la création d'un fichier de

Modified: httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.en Wed Feb  5 22:28:30 2014
@@ -113,9 +113,7 @@ Virtual Hosts</a> to help you decide.  <
     configuration file to select which IP address (or virtual host)
     that daemon services. e.g.</p>
 
-    <pre class="prettyprint lang-config">
-    Listen 192.0.2.100:80
-    </pre>
+    <pre class="prettyprint lang-config">    Listen 192.0.2.100:80</pre>
 
 
     <p>It is recommended that you use an IP address instead of a
@@ -133,8 +131,7 @@ Virtual Hosts</a> to help you decide.  <
     configuration directives to different values for each virtual
     host. e.g.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 172.20.30.40:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 172.20.30.40:80&gt;
     ServerAdmin webmaster@www1.example.com
     DocumentRoot /www/vhosts/www1
     ServerName www1.example.com
@@ -148,8 +145,7 @@ Virtual Hosts</a> to help you decide.  <
     ServerName www2.example.org
     ErrorLog /www/logs/www2/error_log
     CustomLog /www/logs/www2/access_log combined
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>It is recommended that you use an IP address instead of a

Modified: httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.fr Wed Feb  5 22:28:30 2014
@@ -110,9 +110,7 @@ résident pour des serveurs virtuels</a>
     de configuration pour définir l'adresse IP (ou serveur virtuel)
     que le processus résident doit gérer. Par exemple&nbsp;:</p>
 
-    <pre class="prettyprint lang-config">
-    Listen 192.0.2.100:80
-    </pre>
+    <pre class="prettyprint lang-config">    Listen 192.0.2.100:80</pre>
 
 
     <p>Il est recommandé d'utiliser une adresse IP plutôt qu'un nom
@@ -137,8 +135,7 @@ résident pour des serveurs virtuels</a>
     <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> avec des
     valeurs différentes pour chaque serveur virtuel. Par exemple&nbsp;:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 172.20.30.40:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 172.20.30.40:80&gt;
     ServerAdmin webmaster@www1.example.com
     DocumentRoot /www/vhosts/www1
     ServerName www1.example.com
@@ -152,8 +149,7 @@ résident pour des serveurs virtuels</a>
     ServerName www2.example.org
     ErrorLog /www/logs/www2/error_log
     CustomLog /www/logs/www2/access_log combined
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Il est recommandé d'utiliser une adresse IP plutôt qu'un nom

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.en Wed Feb  5 22:28:30 2014
@@ -56,8 +56,7 @@ mod_rewrite</a></li>
     <code>&lt;VirtualHost&gt;</code> sections that are
     substantially the same, for example:</p>
 
-<pre class="prettyprint lang-config">
-&lt;VirtualHost 111.22.33.44&gt;
+<pre class="prettyprint lang-config">&lt;VirtualHost 111.22.33.44&gt;
     ServerName                 customer-1.example.com
     DocumentRoot        /www/hosts/customer-1.example.com/docs
     ScriptAlias  /cgi-bin/  /www/hosts/customer-1.example.com/cgi-bin
@@ -73,8 +72,7 @@ mod_rewrite</a></li>
     ServerName                 customer-N.example.com
     DocumentRoot        /www/hosts/customer-N.example.com/docs
     ScriptAlias  /cgi-bin/  /www/hosts/customer-N.example.com/cgi-bin
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>We wish to replace these multiple
@@ -159,8 +157,7 @@ mod_vhost_alias</a></h2>
     virtual host arrangement outlined in the <a href="#motivation">Motivation</a> section above
     using <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code>.</p>
 
-<pre class="prettyprint lang-config">
-# get the server name from the Host: header
+<pre class="prettyprint lang-config"># get the server name from the Host: header
 UseCanonicalName Off
 
 # this log format can be split per-virtual-host based on the first field
@@ -170,8 +167,7 @@ CustomLog logs/access_log vcommon
 
 # include the server name in the filenames used to satisfy requests
 VirtualDocumentRoot /www/hosts/%0/docs
-VirtualScriptAlias  /www/hosts/%0/cgi-bin
-</pre>
+VirtualScriptAlias  /www/hosts/%0/cgi-bin</pre>
 
 
     <p>This configuration can be changed into an IP-based virtual
@@ -197,8 +193,7 @@ examples.</p>
     <code>/home/user/www</code>. It uses a single <code>cgi-bin</code>
     directory instead of one per virtual host.</p>
 
-<pre class="prettyprint lang-config">
-UseCanonicalName Off
+<pre class="prettyprint lang-config">UseCanonicalName Off
 
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
 CustomLog logs/access_log vcommon
@@ -207,8 +202,7 @@ CustomLog logs/access_log vcommon
 VirtualDocumentRoot /home/%2/www
 
 # single cgi-bin directory
-ScriptAlias  /cgi-bin/  /www/std-cgi/
-</pre>
+ScriptAlias  /cgi-bin/  /www/std-cgi/</pre>
 
 
     <p>There are examples of more complicated
@@ -229,8 +223,7 @@ ScriptAlias  /cgi-bin/  /www/std-cgi/
     <code>&lt;VirtualHost&gt;</code> configuration sections, as shown
     below.</p>
 
-<pre class="prettyprint lang-config">
-UseCanonicalName Off
+<pre class="prettyprint lang-config">UseCanonicalName Off
 
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
 
@@ -260,8 +253,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" 
     
     VirtualDocumentRoot /www/homepages/%0/docs
     ScriptAlias         /cgi-bin/ /www/std-cgi/
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 <div class="note">
@@ -287,8 +279,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" 
     negating the need for a DNS lookup. Logging will also have to be adjusted
     to fit this system.</p>
 
-<pre class="prettyprint lang-config">
-# get the server name from the reverse DNS of the IP address
+<pre class="prettyprint lang-config"># get the server name from the reverse DNS of the IP address
 UseCanonicalName DNS
 
 # include the IP address in the logs so they may be split
@@ -297,8 +288,7 @@ CustomLog logs/access_log vcommon
 
 # include the IP address in the filenames
 VirtualDocumentRootIP /www/hosts/%0/docs
-VirtualScriptAliasIP  /www/hosts/%0/cgi-bin
-</pre>
+VirtualScriptAliasIP  /www/hosts/%0/cgi-bin</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.fr Wed Feb  5 22:28:30 2014
@@ -58,8 +58,7 @@ mod_rewrite</a></li>
     <code>&lt;VirtualHost&gt;</code> très semblables,
     dans le style :</p>
 
-<pre class="prettyprint lang-config">
-&lt;VirtualHost 111.22.33.44&gt;
+<pre class="prettyprint lang-config">&lt;VirtualHost 111.22.33.44&gt;
     ServerName                 customer-1.example.com
     DocumentRoot        /www/hosts/customer-1.example.com/docs
     ScriptAlias  /cgi-bin/  /www/hosts/customer-1.example.com/cgi-bin
@@ -75,8 +74,7 @@ mod_rewrite</a></li>
     ServerName                 customer-N.example.com
     DocumentRoot        /www/hosts/customer-N.example.com/docs
     ScriptAlias  /cgi-bin/  /www/hosts/customer-N.example.com/cgi-bin
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Nous voulons remplacer toutes les configurations
@@ -166,8 +164,7 @@ dynamique avec mod_vhost_alias</a></h2>
     l'hébergement virtuel décrit dans la section <a href="#motivation">À qui ce document est-il destiné ?</a> ci-dessus
     en utilisant <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code>.</p>
 
-<pre class="prettyprint lang-config">
-# extrait le nom du serveur de l'en-tête Host:
+<pre class="prettyprint lang-config"># extrait le nom du serveur de l'en-tête Host:
 UseCanonicalName Off
 
 # ce format de journal peut être éclaté en journaux par serveur virtuel
@@ -178,8 +175,7 @@ CustomLog logs/access_log vcommon
 # inclut le nom du serveur dans les noms de fichiers ressources
 # nécessaires aux traitements des requêtes
 VirtualDocumentRoot /www/hosts/%0/docs
-VirtualScriptAlias  /www/hosts/%0/cgi-bin
-</pre>
+VirtualScriptAlias  /www/hosts/%0/cgi-bin</pre>
 
 
     <p>Pour changer cette configuration en solution de serveur virtuel
@@ -207,8 +203,7 @@ simplifié</a></h2>
     <code>cgi-bin</code> suffit pour l'ensemble des
     serveurs virtuels.</p>
 
-<pre class="prettyprint lang-config">
-UseCanonicalName Off
+<pre class="prettyprint lang-config">UseCanonicalName Off
 
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
 CustomLog logs/access_log vcommon
@@ -217,8 +212,7 @@ CustomLog logs/access_log vcommon
 VirtualDocumentRoot /home/%2/www
 
 # répertoire cgi-bin unique
-ScriptAlias  /cgi-bin/  /www/std-cgi/
-</pre>
+ScriptAlias  /cgi-bin/  /www/std-cgi/</pre>
 
 
     <p>Vous trouverez des exemples plus élaborés d'utilisation de la
@@ -240,8 +234,7 @@ d'hébergement virtuel sur le même serv
     <code>&lt;VirtualHost&gt;</code> conventionnelles, comme indiqué
     plus loin.</p>
 
-<pre class="prettyprint lang-config">
-UseCanonicalName Off
+<pre class="prettyprint lang-config">UseCanonicalName Off
 
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
 
@@ -271,8 +264,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" 
     
     VirtualDocumentRoot /www/homepages/%0/docs
     ScriptAlias         /cgi-bin/ /www/std-cgi/
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
 
 <div class="note">
@@ -299,8 +291,7 @@ efficace</a></h2>
     la-même la nécessité d'une recherche DNS. La journalisation doit
     aussi être adaptée pour fonctionner sur un tel système.</p>
 
-<pre class="prettyprint lang-config">
-# obtention du nom du serveur par recherche DNS inverse
+<pre class="prettyprint lang-config"># obtention du nom du serveur par recherche DNS inverse
 # sur l'adresse IP
 UseCanonicalName DNS
 
@@ -311,8 +302,7 @@ CustomLog logs/access_log vcommon
 
 # insertion de l'adresse IP dans les noms de fichiers
 VirtualDocumentRootIP /www/hosts/%0/docs
-VirtualScriptAliasIP  /www/hosts/%0/cgi-bin
-</pre>
+VirtualScriptAliasIP  /www/hosts/%0/cgi-bin</pre>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8 [utf-8] Wed Feb  5 22:28:30 2014
@@ -54,8 +54,7 @@
       <code>&lt;VirtualHost&gt;</code> bölümü içereceği zaman yapılacaklar ile
       ilgilidir.</p>
 
-<pre>
-&lt;VirtualHost 111.22.33.44&gt;
+<pre>&lt;VirtualHost 111.22.33.44&gt;
     ServerName                 musteri-1.example.com
     DocumentRoot        /siteler/musteri-1/belgeler
     ScriptAlias  /cgi-bin/  /siteler/musteri-1/cgi-bin
@@ -71,8 +70,7 @@
     ServerName                 musteri-N.example.com
     DocumentRoot        /siteler/musteri-N/belgeler
     ScriptAlias  /cgi-bin/  /siteler/musteri-N/cgi-bin
-&lt;/VirtualHost&gt;
-</pre>
+&lt;/VirtualHost&gt;</pre>
 
     <p>İsteğimiz çok sayıda <code>&lt;VirtualHost&gt;</code> bölümünü devingen
       olarak çalışan tek bir <code>&lt;VirtualHost&gt;</code> bölümüyle

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en Wed Feb  5 22:28:30 2014
@@ -128,8 +128,7 @@
     <code>other.example.com</code>, which points at the same IP address.
     Then you simply add the following to <code>httpd.conf</code>:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost *:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost *:80&gt;
     # This first-listed virtual host is also the default for *:80
     ServerName www.example.com
     ServerAlias example.com 
@@ -139,8 +138,7 @@
 &lt;VirtualHost *:80&gt;
     ServerName other.example.com
     DocumentRoot /www/otherdomain
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>You can alternatively specify an explicit IP address in place of the
@@ -155,9 +153,7 @@
     the listed names are other names which people can use to see that same
     web site:</p>
 
-    <pre class="prettyprint lang-config">
-        ServerAlias example.com *.example.com
-    </pre>
+    <pre class="prettyprint lang-config">        ServerAlias example.com *.example.com</pre>
 
 
     <p>then requests for all hosts in the <code>example.com</code> domain will

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr Wed Feb  5 22:28:30 2014
@@ -155,8 +155,7 @@ virtuel basé sur le nom approprié</a><
     la même adresse IP. Il vous suffit d'ajouter la configuration 
     suivante à <code>httpd.conf</code>&nbsp;:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost *:80&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost *:80&gt;
     # Le premier serveur virtuel de la liste est aussi le
     # serveur par défaut pour *:80
     ServerName www.example.com
@@ -167,8 +166,7 @@ virtuel basé sur le nom approprié</a><
 &lt;VirtualHost *:80&gt;
     ServerName other.example.com
     DocumentRoot /www/otherdomain
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Autrement, vous pouvez spécifiez une adresse IP explicite 
@@ -189,9 +187,7 @@ virtuel basé sur le nom approprié</a><
     indique aux utilisateurs les autres noms permis pour accéder au 
     même site Web&nbsp;:</p>
 
-    <pre class="prettyprint lang-config">
-        ServerAlias example.com *.example.com
-    </pre>
+    <pre class="prettyprint lang-config">        ServerAlias example.com *.example.com</pre>
 
 
     <p>ainsi, toutes les requêtes portant sur un domaine 



Mime
View raw message