httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1564960 [2/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/env.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/env.html.ko.euc-kr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/env.html.ko.euc-kr [euc-kr] Wed Feb  5 22:28:30 2014
@@ -312,8 +312,7 @@
 
         <p>클라이언트들의 이미 알려진 문제를 해결하기위해
         httpd.conf에 다음 내용을 포함하길 바란다.</p>
-<div class="example"><pre>
-#
+<div class="example"><pre>#
 # 다음 지시어들은 일반적인 HTTP 응답을 변경한다.
 # 첫번째 지시어는 Netscape 2.x와 이를 가장한 브라우저에게
 # keepalive를 사용하지 않는다. 이들 브라우저 구현에 문제가 있다.
@@ -339,8 +338,7 @@ BrowserMatch "JDK/1\.0" force-response-1
         <p>이 예제는 이미지에 대한 요청을 접근 로그에 기록하지
         않는다. 특정 디렉토리에 대한 혹은 특정 호스트에서 온
         요청을 로그하지 않도록 쉽게 수정할 수 있다.</p>
-    <div class="example"><pre>
-SetEnvIf Request_URI \.gif image-request
+    <div class="example"><pre>SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
 CustomLog logs/access_log common env=!image-request</pre></div>
@@ -354,8 +352,7 @@ CustomLog logs/access_log common env=!im
         설정을 권장하지는 않으며, 제한된 경우에만 동작한다.
         우리는 모든 이미지가 /web/images 디렉토리 안에 있다고
         가정한다.</p>
-    <div class="example"><pre>
-SetEnvIf Referer "^http://www.example.com/" local_referal
+    <div class="example"><pre>SetEnvIf Referer "^http://www.example.com/" local_referal
 # Referer 정보를 보내지 않는 브라우저를 허용한다
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;

Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Wed Feb  5 22:28:30 2014
@@ -58,9 +58,7 @@
       that evaluate to a string value. For those, the starting point in
       the BNF is <code>string</code>.
       </p>
-<blockquote>
-<pre>
-expr        ::= "<strong>true</strong>" | "<strong>false</strong>"
+<pre>expr        ::= "<strong>true</strong>" | "<strong>false</strong>"
               | "<strong>!</strong>" expr
               | expr "<strong>&amp;&amp;</strong>" expr
               | expr "<strong>||</strong>" expr
@@ -119,9 +117,7 @@ rebackref   ::= "<strong>$</strong>" [0-
 
 function     ::= funcname "<strong>(</strong>" word "<strong>)</strong>"
 
-listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
-</pre>
-</blockquote>
+listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -500,8 +496,7 @@ listfunction ::= listfuncname "<strong>(
     evaluate requests:</p>
 
 	
-	<pre class="prettyprint lang-config">
-# Compare the host name to example.com and redirect to www.example.com if it matches
+	<pre class="prettyprint lang-config"># Compare the host name to example.com and redirect to www.example.com if it matches
 &lt;If "%{HTTP_HOST} == 'example.com'"&gt;
     Redirect permanent / http://www.example.com/
 &lt;/If&gt;
@@ -514,8 +509,7 @@ listfunction ::= listfuncname "<strong>(
 # Only allow access to this content during business hours
 &lt;Directory "/foo/bar/business"&gt;
     Require expr "%{TIME_HOUR} -gt 9 &amp;&amp; %{TIME_HOUR} -lt 17"
-&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>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/expr.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.fr Wed Feb  5 22:28:30 2014
@@ -24,6 +24,8 @@
 <p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/expr.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
     <p>Historiquement, il existe de nombreuses variantes dans la syntaxe
     des expressions permettant d'exprimer une condition dans les
@@ -64,8 +66,7 @@
       <code>string</code>.
       </p>
 <blockquote>
-<pre>
-expr        ::= "<strong>true</strong>" | "<strong>false</strong>"
+<pre>expr        ::= "<strong>true</strong>" | "<strong>false</strong>"
               | "<strong>!</strong>" expr
               | expr "<strong>&amp;&amp;</strong>" expr
               | expr "<strong>||</strong>" expr
@@ -124,8 +125,7 @@ rebackref   ::= "<strong>$</strong>" [0-
 
 function     ::= funcname "<strong>(</strong>" word "<strong>)</strong>"
 
-listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
-</pre>
+listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pre>
 </blockquote>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -516,8 +516,7 @@ listfunction ::= listfuncname "<strong>(
 	<p>Les exemples suivants montent comment utiliser les
 	expressions pour évaluer les requêtes :</p>
 	
-	<pre class="prettyprint lang-config">
-# Comparer le nom d'hôte avec example.com et rediriger vers
+	<pre class="prettyprint lang-config"># Comparer le nom d'hôte avec example.com et rediriger vers
 # www.example.com si le nom d'hôte correspond
 &lt;If "%{HTTP_HOST} == 'example.com'"&gt;
     Redirect permanent / http://www.example.com/
@@ -533,8 +532,7 @@ listfunction ::= listfuncname "<strong>(
 # travail
 &lt;Directory "/foo/bar/business"&gt;
      Require expr "%{TIME_HOUR} -gt 9 &amp;&amp; %{TIME_HOUR} -lt 17"
-&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>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/expr.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml.fr Wed Feb  5 22:28:30 2014
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision : 1560918 -->
+<!-- English Revision: 1560918:1564957 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/trunk/docs/manual/expr.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml.meta?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml.meta Wed Feb  5 22:28:30 2014
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/handler.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/handler.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/handler.html.en (original)
+++ httpd/httpd/trunk/docs/manual/handler.html.en Wed Feb  5 22:28:30 2014
@@ -97,10 +97,8 @@
       the <code>html</code> extension to trigger the launch of the
       <code>footer.pl</code> CGI script.</p>
 
-      <pre class="prettyprint lang-config">
-Action add-footer /cgi-bin/footer.pl
-AddHandler add-footer .html
-      </pre>
+      <pre class="prettyprint lang-config">Action add-footer /cgi-bin/footer.pl
+AddHandler add-footer .html</pre>
 
 
       <p>Then the CGI script is responsible for sending the
@@ -119,11 +117,9 @@ AddHandler add-footer .html
       the <code>send-as-is</code> handler, regardless of their
       filename extensions.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /web/htdocs/asis&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /web/htdocs/asis&gt;
     SetHandler send-as-is
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
     
@@ -137,9 +133,7 @@ AddHandler add-footer .html
     you may wish to make use of. Specifically, a new record has
     been added to the <code>request_rec</code> structure:</p>
 
-    <pre class="prettyprint lang-c">
-      char *handler
-    </pre>
+    <pre class="prettyprint lang-c">      char *handler</pre>
 
 
     <p>If you wish to have your module engage a handler, you need

Modified: httpd/httpd/trunk/docs/manual/handler.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/handler.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/handler.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/handler.html.fr Wed Feb  5 22:28:30 2014
@@ -99,10 +99,8 @@
       des fichiers possédant une extension <code>html</code> déclenchent
       l'exécution du script CGI <code>footer.pl</code>.</p>
 
-      <pre class="prettyprint lang-config">
-Action add-footer /cgi-bin/footer.pl
-AddHandler add-footer .html
-      </pre>
+      <pre class="prettyprint lang-config">Action add-footer /cgi-bin/footer.pl
+AddHandler add-footer .html</pre>
 
 
       <p>À ce moment-là, le script CGI se charge d'envoyer le document
@@ -121,11 +119,9 @@ AddHandler add-footer .html
       <code>send-as-is</code>, sans tenir compte de l'extension
       de leur nom de fichier.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /web/htdocs/asis&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /web/htdocs/asis&gt;
     SetHandler send-as-is
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
     
@@ -141,9 +137,7 @@ AddHandler add-footer .html
     Plus précisément, un nouvel enregistrement a été ajouté à la structure
     <code>request_rec</code> :</p>
 
-    <pre class="prettyprint lang-c">
-      char *handler
-    </pre>
+    <pre class="prettyprint lang-c">      char *handler</pre>
 
 
     <p>Si vous voulez que votre module déclenche l'utilisation d'un

Modified: httpd/httpd/trunk/docs/manual/howto/access.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/access.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/access.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/access.html.en Wed Feb  5 22:28:30 2014
@@ -69,10 +69,8 @@
 
     <p>The usage of these directives is:</p>
 
-    <pre class="prettyprint lang-config">
-Require host address
-Require ip ip.address
-    </pre>
+    <pre class="prettyprint lang-config">Require host address
+Require ip ip.address</pre>
 
 
     <p>In the first form, <var>address</var> is a fully qualified
@@ -96,12 +94,10 @@ Require ip ip.address
     board, and you want to keep them out, you could do the
     following:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+    <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 10.252.46.165
-&lt;/RequireAll&gt;
-</pre>
+&lt;/RequireAll&gt;</pre>
 
 
     <p>Visitors coming from that address (<code>10.252.46.165</code>)
@@ -115,11 +111,9 @@ Require ip ip.address
     <p>And, if you'd like to block access from an entire domain,
     you can specify just part of an address or domain name:</p>
 
-    <pre class="prettyprint lang-config">
-Require not ip 192.168.205
+    <pre class="prettyprint lang-config">Require not ip 192.168.205
 Require not host phishers.example.com moreidiots.example
-Require not host gov
-    </pre>
+Require not host gov</pre>
 
 
     <p>Use of the <code class="directive"><a href="../mod/mod_authz_core.html#requireall">RequireAll</a></code>, <code class="directive"><a href="../mod/mod_authz_core.html#requireany">RequireAny</a></code>, and <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">RequireNone</a></code> directives may be
@@ -135,11 +129,9 @@ Require not host gov
     based on user-agent (the browser type) you might do the
     following:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
+    <pre class="prettyprint lang-config">&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
     Require All Denied
-&lt;/If&gt;
-    </pre>
+&lt;/If&gt;</pre>
 
 
     <div class="note"><h3>Warning:</h3>
@@ -163,12 +155,10 @@ Require not host gov
     <p>For example, if you wish to block access to a resource between 8pm
     and 6am, you can do this using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
-    <pre class="prettyprint lang-config">
-RewriteEngine On
+    <pre class="prettyprint lang-config">RewriteEngine On
 RewriteCond %{TIME_HOUR} &gt;=20 [OR]
 RewriteCond %{TIME_HOUR} &lt;07
-RewriteRule ^/fridge - [F]
-    </pre>
+RewriteRule ^/fridge - [F]</pre>
 
 
     <p>This will return a 403 Forbidden response for any request after 8pm

Modified: httpd/httpd/trunk/docs/manual/howto/access.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/access.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/access.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/access.html.fr Wed Feb  5 22:28:30 2014
@@ -74,10 +74,8 @@ client</a></h2>
 
     <p>Les directives Require s'utilisent comme suit :</p>
 
-    <pre class="prettyprint lang-config">
-Require host address
-Require ip ip.address
-    </pre>
+    <pre class="prettyprint lang-config">Require host address
+Require ip ip.address</pre>
 
 
     <p>Dans la première forme, <var>nom-hôte</var> est un nom de domaine
@@ -104,12 +102,10 @@ Require ip ip.address
     spamer votre forum, vous pouvez ajouter cette ligne pour lui refuser
     l'accès :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+    <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 10.252.46.165
-&lt;/RequireAll&gt;
-    </pre>
+&lt;/RequireAll&gt;</pre>
 
 
     <p>Les visiteurs possédant cette adresse (<code>10.252.46.165</code>) ne pourront pas voir le
@@ -124,11 +120,9 @@ Require ip ip.address
     vous pouvez spécifier des adresses IP partielles ou des noms de
     domaine, comme ceci :</p>
 
-    <pre class="prettyprint lang-config">
-Require not ip 192.168.205
+    <pre class="prettyprint lang-config">Require not ip 192.168.205
 Require not host phishers.example.com moreidiots.example
-Require not host gov
-    </pre>
+Require not host gov</pre>
 
 
     <p>Les directives <code class="directive"><a href="../mod/mod_authz_core.html#requireall">RequireAll</a></code>, <code class="directive"><a href="../mod/mod_authz_core.html#requireany">RequireAny</a></code>, et <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">RequireNone</a></code> ouvrent le champ à des
@@ -145,11 +139,9 @@ arbitraires</a></h2>
     fonction du user-agent (le type de navigateur), vous pouvez
     spécifier ceci :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
+    <pre class="prettyprint lang-config">&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
     Require All Denied
-&lt;/If&gt;
-    </pre>
+&lt;/If&gt;</pre>
 
 
     <div class="note"><h3>Avertissement :</h3>
@@ -174,12 +166,10 @@ d'accès</a></h2>
     <p>Par exemple, pour bloquer l'accès à une ressources entre 20h et
     6h du matin, vous pouvez utiliser <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> :</p>
 
-    <pre class="prettyprint lang-config">
-RewriteEngine On
+    <pre class="prettyprint lang-config">RewriteEngine On
 RewriteCond %{TIME_HOUR} &gt;=20 [OR]
 RewriteCond %{TIME_HOUR} &lt;07
-RewriteRule ^/fridge - [F]
-    </pre>
+RewriteRule ^/fridge - [F]</pre>
 
 
     <p>Toute requête arrivant après 20h ou avant 7h du matin provoquera

Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.en Wed Feb  5 22:28:30 2014
@@ -215,14 +215,12 @@ module from each group.</p>
     placed in <code>httpd.conf</code> inside a &lt;Directory
     /usr/local/apache/htdocs/secret&gt; section.</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "Restricted Files"
 # (Following line optional)
 AuthBasicProvider file
 AuthUserFile /usr/local/apache/passwd/passwords
-Require user rbowen
-    </pre>
+Require user rbowen</pre>
 
 
     <p>Let's examine each of those directives individually. The <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> directive selects
@@ -313,15 +311,13 @@ person in</a></h2>
     <p>Now, you need to modify your <code>.htaccess</code> file to
     look like the following:</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "By Invitation Only"
 # Optional line:
 AuthBasicProvider file
 AuthUserFile /usr/local/apache/passwd/passwords
 AuthGroupFile /usr/local/apache/passwd/groups
-Require group GroupName
-    </pre>
+Require group GroupName</pre>
 
 
     <p>Now, anyone that is listed in the group <code>GroupName</code>,
@@ -379,15 +375,13 @@ Require group GroupName
 
     <p>To select a dbm file rather than a text file, for example:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider dbm
     AuthDBMUserFile /www/passwords/passwd.dbm
     Require valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Other options are available. Consult the
@@ -403,16 +397,14 @@ Require group GroupName
     scheme that meets your needs. In the following example, both the
     file and LDAP based authentication providers are being used.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file ldap
     AuthUserFile /usr/local/apache/passwd/passwords
     AuthLDAPURL ldap://ldaphost/o=yourorg
     Require valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>In this example the file provider will attempt to authenticate
@@ -428,8 +420,7 @@ Require group GroupName
     authorization methods can also be used. In this example both file group
     authorization as well as LDAP group authorization is being used.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file
@@ -438,8 +429,7 @@ Require group GroupName
     AuthGroupFile /usr/local/apache/passwd/groups
     Require group GroupName
     Require ldap-group cn=mygroup,o=yourorg
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>To take authorization a little further, authorization container
@@ -533,37 +523,31 @@ Require group GroupName
         board, and you want to keep them out, you could do the
         following:</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 10.252.46.165
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>Visitors coming from that address will not be able to see
         the content covered by this directive. If, instead, you have a
         machine name, rather than an IP address, you can use that.</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not host host.example.com
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>And, if you'd like to block access from an entire domain,
         you can specify just part of an address or domain name:</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 192.168.205
     Require not host phishers.example.com moreidiots.example
     Require not host ke
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>Using <code class="directive"><a href="../mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>

Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.fr Wed Feb  5 22:28:30 2014
@@ -223,14 +223,12 @@ module de chaque groupe.</p>
     fichier <code>httpd.conf</code> à l'intérieur d'une section &lt;Directory
     /usr/local/apache/htdocs/secret&gt; :</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "Restricted Files"
 # (Following line optional)
 AuthBasicProvider file
 AuthUserFile /usr/local/apache/passwd/passwords
-Require user rbowen
-    </pre>
+Require user rbowen</pre>
 
 
     <p>Examinons ces directives une à une. La directive <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> définit la méthode
@@ -329,15 +327,13 @@ plusieurs personnes</a></h2>
     <p>Maintenant, vous devez modifier votre fichier
     <code>.htaccess</code> comme suit :</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "By Invitation Only"
 # Optional line:
 AuthBasicProvider file
 AuthUserFile /usr/local/apache/passwd/passwords
 AuthGroupFile /usr/local/apache/passwd/groups
-Require group GroupName
-    </pre>
+Require group GroupName</pre>
 
 
     <p>Maintenant, quiconque appartient au groupe
@@ -402,15 +398,13 @@ passe</a></h2>
     <p>Par exemple, pour sélectionner un fichier dbm à la place d'un
     fichier texte :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider dbm
     AuthDBMUserFile /www/passwords/passwd.dbm
     Require valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>D'autres options sont disponibles. Consultez la documentation de
@@ -429,16 +423,14 @@ d'authentification</a></h2>
     conjointement les fournisseurs d'authentification
     file et LDAP :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file ldap
     AuthUserFile /usr/local/apache/passwd/passwords
     AuthLDAPURL ldap://ldaphost/o=yourorg
     Require valid-user
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Dans cet exemple, le fournisseur file va tenter d'authentifier
@@ -457,8 +449,7 @@ d'authentification</a></h2>
     autorisation à base de fichier de groupes et une autorisation à base
     de groupes LDAP.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/docs/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/docs/private&gt;
     AuthName "Private"
     AuthType Basic
     AuthBasicProvider file
@@ -467,8 +458,7 @@ d'authentification</a></h2>
     AuthGroupFile /usr/local/apache/passwd/groups
     Require group GroupName
     Require ldap-group cn=mygroup,o=yourorg
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Pour un scénario d'autorisation un peu plus avancé, des
@@ -568,12 +558,10 @@ autorisation</a></h2>
         <p>Par exemple, si vous voulez rejeter les spams dont une
 	machine vous inonde, vous pouvez utiliser ceci :</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 10.252.46.165
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>Ainsi, les visiteurs en provenance de cette adresse ne
@@ -581,26 +569,22 @@ autorisation</a></h2>
 	par contre, vous connaissez le nom de la machine, vous pouvez
 	utiliser ceci :</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not host host.example.com
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>Et si vous voulez interdire l'accès à toutes les machines
 	d'un domaine, vous pouvez spécifier une partie seulement de
 	l'adresse ou du nom de domaine :</p>
 
-        <pre class="prettyprint lang-config">
-&lt;RequireAll&gt;
+        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
     Require all granted
     Require not ip 192.168.205
     Require not host phishers.example.com moreidiots.example
     Require not host ke
-&lt;/RequireAll&gt;
-        </pre>
+&lt;/RequireAll&gt;</pre>
 
 
         <p>L'utilisation de la directive <code class="directive"><a href="../mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>

Modified: httpd/httpd/trunk/docs/manual/howto/cgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/cgi.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/cgi.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/cgi.html.en Wed Feb  5 22:28:30 2014
@@ -65,9 +65,7 @@
     directive has not been commented out.  A correctly configured directive
     may look like this:
 
-    <pre class="prettyprint lang-config">
-      LoadModule cgi_module modules/mod_cgi.so
-    </pre>
+    <pre class="prettyprint lang-config">      LoadModule cgi_module modules/mod_cgi.so</pre>
 </div>
 
     <h3><a name="scriptalias" id="scriptalias">ScriptAlias</a></h3>
@@ -85,9 +83,7 @@
       <p>The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
       directive looks like:</p>
 
-      <pre class="prettyprint lang-config">
-        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-      </pre>
+      <pre class="prettyprint lang-config">        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/</pre>
 
 
       <p>The example shown is from your default <code>httpd.conf</code>
@@ -141,11 +137,9 @@
       file, to specify that CGI execution was permitted in a particular
       directory:</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
     Options +ExecCGI
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>The above directive tells Apache to permit the execution
@@ -154,9 +148,7 @@
       files with the <code>cgi</code> or <code>pl</code> extension as CGI
       programs:</p>
 
-      <pre class="prettyprint lang-config">
-        AddHandler cgi-script .cgi .pl
-      </pre>
+      <pre class="prettyprint lang-config">        AddHandler cgi-script .cgi .pl</pre>
 
     
 
@@ -175,24 +167,20 @@
       <code>.cgi</code> in users' directories, you can use the
       following configuration.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html&gt;
     Options +ExecCGI
     AddHandler cgi-script .cgi
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>If you wish designate a <code>cgi-bin</code> subdirectory of
       a user's directory where everything will be treated as a CGI
       program, you can use the following.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html/cgi-bin&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html/cgi-bin&gt;
     Options ExecCGI
     SetHandler cgi-script
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
     
@@ -231,11 +219,9 @@
       file called <code>first.pl</code>, and put it in your
       <code>cgi-bin</code> directory.</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl
 print "Content-type: text/html\n\n";
-print "Hello, World.";
-      </pre>
+print "Hello, World.";</pre>
 
 
       <p>Even if you are not familiar with Perl, you should be able
@@ -340,9 +326,7 @@ print "Hello, World.";
       interpreter (often <code>perl</code>) indicated in the first
       line of your CGI program, which will look something like:</p>
 
-      <pre class="prettyprint lang-perl">
-        #!/usr/bin/perl
-      </pre>
+      <pre class="prettyprint lang-perl">        #!/usr/bin/perl</pre>
 
 
       <p>Make sure that this is in fact the path to the
@@ -481,16 +465,14 @@ print "Hello, World.";
       <a href="../env.html">add your own environment variables</a>
       to the basic ones provided by default.</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl
 use strict;
 use warnings;
 
 print "Content-type: text/html\n\n";
 foreach my $key (keys %ENV) {
     print "$key --&gt; $ENV{$key}&lt;br&gt;";
-}
-      </pre>
+}</pre>
 
     
 

Modified: httpd/httpd/trunk/docs/manual/howto/cgi.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/cgi.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/cgi.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/cgi.html.fr Wed Feb  5 22:28:30 2014
@@ -65,9 +65,7 @@
     commentée dans votre <code>httpd.conf</code>. Une directive correcte
     doit ressembler à ceci :
 
-    <pre class="prettyprint lang-config">
-      LoadModule cgi_module modules/mod_cgi.so
-    </pre>
+    <pre class="prettyprint lang-config">      LoadModule cgi_module modules/mod_cgi.so</pre>
 </div>
 
     <h3><a name="scriptalias" id="scriptalias">ScriptAlias</a></h3>
@@ -82,9 +80,7 @@
       <p>La directive <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> se présente comme suit
       :</p>
 
-      <pre class="prettyprint lang-config">
-        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-      </pre>
+      <pre class="prettyprint lang-config">        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/</pre>
 
 
       <p>Cet exemple est tiré de votre fichier de configuration
@@ -149,11 +145,9 @@
       l'exécution des programmes CGI est permise depuis un répertoire
       particulier :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
     Options +ExecCGI
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>La directive ci-dessus indique à Apache qu'il doit permettre
@@ -163,9 +157,7 @@
       extension <code>cgi</code> ou <code>pl</code> en tant que
       programmes CGI :</p>
 
-      <pre class="prettyprint lang-config">
-        AddHandler cgi-script .cgi .pl
-      </pre>
+      <pre class="prettyprint lang-config">        AddHandler cgi-script .cgi .pl</pre>
 
     
 
@@ -186,24 +178,20 @@
       répertoire utilisateur, vous pouvez utiliser la configuration
       suivante :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html&gt;
     Options +ExecCGI
     AddHandler cgi-script .cgi
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>Pour indiquer un sous-répertoire <code>cgi-bin</code> d'un
       répertoire utilisateur où tout fichier sera traité en tant que
       programme CGI, vous pouvez utiliser ceci :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html/cgi-bin&gt;
+      <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html/cgi-bin&gt;
     Options ExecCGI
     SetHandler cgi-script
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
     
@@ -243,11 +231,9 @@
       <code>premier.pl</code>, et placez le dans votre répertoire
       <code>cgi-bin</code>.</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl
 print "Content-type: text/html\n\n";
-print "Hello, World.";
-      </pre>
+print "Hello, World.";</pre>
 
 
       <p>Même si Perl ne vous est pas familier, vous devriez être
@@ -362,9 +348,7 @@ print "Hello, World.";
       trouve à la première ligne de votre programme CGI et qui va
       ressembler à ceci :</p>
 
-      <pre class="prettyprint lang-perl">
-        #!/usr/bin/perl
-      </pre>
+      <pre class="prettyprint lang-perl">        #!/usr/bin/perl</pre>
 
 
       <p>Assurez-vous qu'il s'agit bien du chemin correct vers
@@ -518,16 +502,14 @@ print "Hello, World.";
       variables d'environnement</a> aux variables de base fournies par
       défaut.</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl
 use strict;
 use warnings;
 
 print "Content-type: text/html\n\n";
 foreach my $key (keys %ENV) {
     print "$key --&gt; $ENV{$key}&lt;br&gt;";
-}
-      </pre>
+}</pre>
 
     
 

Modified: httpd/httpd/trunk/docs/manual/howto/cgi.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/cgi.html.ja.utf8?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/cgi.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/cgi.html.ja.utf8 [utf-8] Wed Feb  5 22:28:30 2014
@@ -238,11 +238,9 @@
       というファイルに保存し、それを <code>cgi-bin</code>
       ディレクトリに置いてください。</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl<br />
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl<br />
 print "Content-type: text/html\n\n";<br />
-print "Hello, World.";
-      </pre>
+print "Hello, World.";</pre>
 
 
       <p>Perl に精通していなくても、
@@ -460,13 +458,11 @@ print "Hello, World.";
       <a href="../env.html">あなた自身の環境変数を加える</a>ための、
       多くの異なる方法を用意してします。</p>
 
-      <pre class="prettyprint lang-perl">
-#!/usr/bin/perl
+      <pre class="prettyprint lang-perl">#!/usr/bin/perl
 print "Content-type: text/html\n\n";
 foreach $key (keys %ENV) {
   print "$key --&gt; $ENV{$key}&lt;br&gt;";
-}
-      </pre>
+}</pre>
 
     
 

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.html.en Wed Feb  5 22:28:30 2014
@@ -197,11 +197,9 @@ changes on a per-directory basis.</p>
 </div>
 
     <div class="example"><h3>Section from your <code>httpd.conf</code>
-    file</h3><pre class="prettyprint lang-config">
-&lt;Directory /www/htdocs/example&gt;
+    file</h3><pre class="prettyprint lang-config">&lt;Directory /www/htdocs/example&gt;
     AddType text/example .exm
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 </div>
 
     <p>However, putting this configuration in your server configuration
@@ -266,15 +264,13 @@ changes on a per-directory basis.</p>
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/htdocs&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/htdocs&gt;
     AllowOverride All
 &lt;/Directory&gt;
 
 &lt;Location /&gt;
     Options +IncludesNoExec -ExecCGI<br />
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <div class="note">This example assumes that your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is <code>/www/htdocs</code>.</div>
@@ -301,13 +297,11 @@ changes on a per-directory basis.</p>
 
     <p><code>.htaccess</code> file contents:</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "Password Required"
 AuthUserFile /www/passwords/password.file
 AuthGroupFile /www/passwords/group.file
-Require Group admins
-    </pre>
+Require Group admins</pre>
 
 
     <p>Note that <code>AllowOverride AuthConfig</code> must be in effect
@@ -324,11 +318,9 @@ Require Group admins
     the following configuration directives, placed in a
     <code>.htaccess</code> file in the desired directory:</p>
 
-    <pre class="prettyprint lang-config">
-Options +Includes
+    <pre class="prettyprint lang-config">Options +Includes
 AddType text/html shtml
-AddHandler server-parsed shtml
-    </pre>
+AddHandler server-parsed shtml</pre>
 
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
@@ -345,20 +337,16 @@ AddHandler server-parsed shtml
     the execution of CGI programs in a particular directory. This may be
     implemented with the following configuration:</p>
 
-    <pre class="prettyprint lang-config">
-Options +ExecCGI
-AddHandler cgi-script cgi pl
-    </pre>
+    <pre class="prettyprint lang-config">Options +ExecCGI
+AddHandler cgi-script cgi pl</pre>
 
 
     <p>Alternately, if you wish to have all files in the given directory be
     considered to be CGI programs, this may be done with the following
     configuration:</p>
 
-    <pre class="prettyprint lang-config">
-Options +ExecCGI
-SetHandler cgi-script
-    </pre>
+    <pre class="prettyprint lang-config">Options +ExecCGI
+SetHandler cgi-script</pre>
 
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.html.fr Wed Feb  5 22:28:30 2014
@@ -76,9 +76,7 @@ Includes - SSI)</a></li>
       <code>.config</code>, vous pouvez mettre ceci dans le fichier de
       configuration de votre serveur :</p>
 
-      <pre class="prettyprint lang-config">
-        AccessFileName .config
-      </pre>
+      <pre class="prettyprint lang-config">        AccessFileName .config</pre>
 
     </div>
 
@@ -224,11 +222,9 @@ Includes - SSI)</a></li>
 </div>
 
     <div class="example"><h3>Section de votre fichier
-    <code>httpd.conf</code></h3><pre class="prettyprint lang-config">
-&lt;Directory /www/htdocs/example&gt;
+    <code>httpd.conf</code></h3><pre class="prettyprint lang-config">&lt;Directory /www/htdocs/example&gt;
     AddType text/example .exm
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 </div>
 
     <p>Cependant, la perte de performances sera moindre si vous
@@ -302,15 +298,13 @@ Includes - SSI)</a></li>
     définition de toute autre option dans les fichiers
     <code>.htaccess</code>, vous pouvez utiliser :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www/htdocs&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www/htdocs&gt;
     AllowOverride All
 &lt;/Directory&gt;
 
 &lt;Location /&gt;
     Options +IncludesNoExec -ExecCGI<br />
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <div class="note">Dans cet exemple, on considère que le chemin défini par la
@@ -340,13 +334,11 @@ Includes - SSI)</a></li>
 
     <p>Contenu du fichier <code>.htaccess</code> :</p>
 
-    <pre class="prettyprint lang-config">
-AuthType Basic
+    <pre class="prettyprint lang-config">AuthType Basic
 AuthName "Password Required"
 AuthUserFile /www/passwords/password.file
 AuthGroupFile /www/passwords/group.file
-Require Group admins
-    </pre>
+Require Group admins</pre>
 
 
     <p>Notez que <code>AllowOverride AuthConfig</code> doit être présent
@@ -366,11 +358,9 @@ Includes - SSI)</a></h2>
     placées dans un fichier <code>.htaccess</code> enregistré dans le
     répertoire considéré :</p>
 
-    <pre class="prettyprint lang-config">
-Options +Includes
+    <pre class="prettyprint lang-config">Options +Includes
 AddType text/html shtml
-AddHandler server-parsed shtml
-    </pre>
+AddHandler server-parsed shtml</pre>
 
 
     <p>Notez que <code>AllowOverride Options</code> et <code>AllowOverride
@@ -388,20 +378,16 @@ AddHandler server-parsed shtml
     dans un répertoire particulier. Pour y parvenir, vous pouvez
     utiliser la configuration suivante :</p>
 
-    <pre class="prettyprint lang-config">
-Options +ExecCGI
-AddHandler cgi-script cgi pl
-    </pre>
+    <pre class="prettyprint lang-config">Options +ExecCGI
+AddHandler cgi-script cgi pl</pre>
 
 
     <p>Alternativement, si vous souhaitez que tous les fichiers d'un
     répertoire donné soient considérés comme des programmes CGI, vous
     pouvez utiliser la configuration suivante :</p>
 
-    <pre class="prettyprint lang-config">
-Options +ExecCGI
-SetHandler cgi-script
-    </pre>
+    <pre class="prettyprint lang-config">Options +ExecCGI
+SetHandler cgi-script</pre>
 
 
     <p>Notez que <code>AllowOverride Options</code> et <code>AllowOverride

Modified: httpd/httpd/trunk/docs/manual/howto/public_html.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.html.en Wed Feb  5 22:28:30 2014
@@ -137,10 +137,8 @@
     You can, likewise, disable the feature for all but a few users by
     using a configuration like the following:</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir disabled<br />
-      UserDir enabled rbowen krietz
-    </pre>
+    <pre class="prettyprint lang-config">      UserDir disabled<br />
+      UserDir enabled rbowen krietz</pre>
 
 
     <p>See <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
@@ -156,12 +154,10 @@
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html/cgi-bin/&gt;
     Options ExecCGI
     SetHandler cgi-script
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Then, presuming that <code>UserDir</code> is set to

Modified: httpd/httpd/trunk/docs/manual/howto/public_html.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.html.fr Wed Feb  5 22:28:30 2014
@@ -150,10 +150,8 @@ avec le système de fichiers</a></li></u
     utilisateurs sauf certains d'entre eux en utilisant une
     configuration du style :</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir disabled<br />
-      UserDir enabled rbowen krietz
-    </pre>
+    <pre class="prettyprint lang-config">      UserDir disabled<br />
+      UserDir enabled rbowen krietz</pre>
 
 
     <p>Vous trouverez d'autres exemples dans la documentation de
@@ -168,12 +166,10 @@ avec le système de fichiers</a></li></u
    vous pouvez utiliser une section <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> pour activer CGI dans un
    sous-répertoire particulier d'un répertoire home utilisateur.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /home/*/public_html/cgi-bin/&gt;
     Options ExecCGI
     SetHandler cgi-script
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Avec la configuration ci-dessus, et en supposant que

Modified: httpd/httpd/trunk/docs/manual/howto/ssi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/ssi.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/ssi.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/ssi.html.en Wed Feb  5 22:28:30 2014
@@ -92,9 +92,7 @@ existing HTML documents.</p>
     <p>To permit SSI on your server, you must have the following
     directive either in your <code>httpd.conf</code> file, or in a
     <code>.htaccess</code> file:</p>
-<pre class="prettyprint lang-config">
-        Options +Includes
-</pre>
+<pre class="prettyprint lang-config">        Options +Includes</pre>
 
 
     <p>This tells Apache that you want to permit files to be parsed
@@ -109,10 +107,8 @@ existing HTML documents.</p>
     do this. You can tell Apache to parse any file with a
     particular file extension, such as <code>.shtml</code>, with
     the following directives:</p>
-<pre class="prettyprint lang-config">
-        AddType text/html .shtml<br />
-        AddOutputFilter INCLUDES .shtml
-</pre>
+<pre class="prettyprint lang-config">        AddType text/html .shtml<br />
+        AddOutputFilter INCLUDES .shtml</pre>
 
 
     <p>One disadvantage to this approach is that if you wanted to
@@ -122,9 +118,7 @@ existing HTML documents.</p>
     directives would be executed.</p>
 
     <p>The other method is to use the <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> directive:</p>
-<pre class="prettyprint lang-config">
-        XBitHack on
-</pre>
+<pre class="prettyprint lang-config">        XBitHack on</pre>
 
 
     <p><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
@@ -446,10 +440,8 @@ modified?</a></h3>
 
     <p>In your configuration file, you could put the following
     line:</p>
-<pre class="prettyprint lang-config">
-        BrowserMatchNoCase macintosh Mac<br />
-        BrowserMatchNoCase MSIE InternetExplorer
-</pre>
+<pre class="prettyprint lang-config">        BrowserMatchNoCase macintosh Mac<br />
+        BrowserMatchNoCase MSIE InternetExplorer</pre>
 
 
     <p>This will set environment variables ``Mac'' and

Modified: httpd/httpd/trunk/docs/manual/howto/ssi.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/ssi.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/ssi.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/ssi.html.fr Wed Feb  5 22:28:30 2014
@@ -99,9 +99,7 @@ HTML préexistants.</p>
     devez ajouter la directive suivante dans votre fichier
     <code>httpd.conf</code>, ou dans un fichier <code>.htaccess</code>
     :</p>
-<pre class="prettyprint lang-config">
-        Options +Includes
-</pre>
+<pre class="prettyprint lang-config">        Options +Includes</pre>
 
 
     <p>Cette directive indique à Apache que vous désirez permettre la
@@ -117,10 +115,8 @@ HTML préexistants.</p>
     directives SSI. Vous devez indiquer à Apache quels fichiers seront
     concernés. Vous pouvez y parvenir en indiquant une extension, comme
     <code>.shtml</code>, à l'aide des directives suivantes :</p>
-<pre class="prettyprint lang-config">
-        AddType text/html .shtml<br />
-        AddOutputFilter INCLUDES .shtml
-</pre>
+<pre class="prettyprint lang-config">        AddType text/html .shtml<br />
+        AddOutputFilter INCLUDES .shtml</pre>
 
 
     <p>Un des désavantages de cette approche réside dans le fait que si
@@ -131,9 +127,7 @@ HTML préexistants.</p>
     SSI qu'elle contient soient traitées.</p>
 
     <p>Une autre méthode consiste à utiliser la directive <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> :</p>
-<pre class="prettyprint lang-config">
-        XBitHack on
-</pre>
+<pre class="prettyprint lang-config">        XBitHack on</pre>
 
 
     <p>La directive <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
@@ -458,10 +452,8 @@ HTML préexistants.</p>
 
     <p>Vous pouvez ajouter les lignes suivantes dans votre fichier de
     configuration :</p>
-<pre class="prettyprint lang-config">
-        BrowserMatchNoCase macintosh Mac<br />
-        BrowserMatchNoCase MSIE InternetExplorer
-</pre>
+<pre class="prettyprint lang-config">        BrowserMatchNoCase macintosh Mac<br />
+        BrowserMatchNoCase MSIE InternetExplorer</pre>
 
 
     <p>Ces lignes définissent les variables d'environnement "Mac" et

Modified: httpd/httpd/trunk/docs/manual/logs.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/logs.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.html.en (original)
+++ httpd/httpd/trunk/docs/manual/logs.html.en Wed Feb  5 22:28:30 2014
@@ -164,9 +164,7 @@
     <p>Do this by specifying the name of the module in your
     <code class="directive">LogLevel</code> directive:</p>
 
-    <pre class="prettyprint lang-config">
-    LogLevel info rewrite:trace5
-    </pre>
+    <pre class="prettyprint lang-config">    LogLevel info rewrite:trace5</pre>
 
 
     <p>This sets the main <code class="directive">LogLevel</code> to info, but
@@ -219,10 +217,8 @@
       <p>A typical configuration for the access log might look as
       follows.</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
-CustomLog logs/access_log common
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+CustomLog logs/access_log common</pre>
 
 
       <p>This defines the <em>nickname</em> <code>common</code> and
@@ -362,10 +358,8 @@ CustomLog logs/access_log common
       <p>Another commonly used format string is called the Combined
       Log Format. It can be used as follows.</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
-CustomLog log/access_log combined
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
+CustomLog log/access_log combined</pre>
 
 
       <p>This format is exactly the same as the Common Log Format,
@@ -414,12 +408,10 @@ CustomLog log/access_log combined
       information. The last two <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> lines show how
       to mimic the effects of the <code>ReferLog</code> and <code>AgentLog</code> directives.</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
 CustomLog logs/access_log common
 CustomLog logs/referer_log "%{Referer}i -&gt; %U"
-CustomLog logs/agent_log "%{User-agent}i"
-      </pre>
+CustomLog logs/agent_log "%{User-agent}i"</pre>
 
 
       <p>This example also shows that it is not necessary to define a
@@ -440,36 +432,30 @@ CustomLog logs/agent_log "%{User-agent}i
       include or exclude requests where the environment variable is
       set. Some examples:</p>
 
-      <pre class="prettyprint lang-config">
-# Mark requests from the loop-back interface
+      <pre class="prettyprint lang-config"># Mark requests from the loop-back interface
 SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog
 # Mark requests for the robots.txt file
 SetEnvIf Request_URI "^/robots\.txt$" dontlog
 # Log what remains
-CustomLog logs/access_log common env=!dontlog
-      </pre>
+CustomLog logs/access_log common env=!dontlog</pre>
 
 
       <p>As another example, consider logging requests from
       english-speakers to one log file, and non-english speakers to a
       different log file.</p>
 
-      <pre class="prettyprint lang-config">
-        SetEnvIf Accept-Language "en" english<br />
+      <pre class="prettyprint lang-config">        SetEnvIf Accept-Language "en" english<br />
         CustomLog logs/english_log common env=english<br />
-        CustomLog logs/non_english_log common env=!english
-      </pre>
+        CustomLog logs/non_english_log common env=!english</pre>
 
 
       <p>In a caching scenario one would want to know about
       the efficiency of the cache. A very simple method to
       find this out would be:</p>
 
-      <pre class="prettyprint lang-config">
-SetEnv CACHE_MISS 1
+      <pre class="prettyprint lang-config">SetEnv CACHE_MISS 1
 LogFormat "%h %l %u %t "%r " %&gt;s %b %{CACHE_MISS}e" common-cache
-CustomLog logs/access_log common-cache
-      </pre>
+CustomLog logs/access_log common-cache</pre>
 
 
       <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> will run before
@@ -480,10 +466,8 @@ CustomLog logs/access_log common-cache
       <p>In addition to the <code>env=</code> syntax, <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> supports logging values
       conditional upon the HTTP response code:</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%400,501{User-agent}i" browserlog
-LogFormat "%!200,304,302{Referer}i" refererlog
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%400,501{User-agent}i" browserlog
+LogFormat "%!200,304,302{Referer}i" refererlog</pre>
 
 
       <p>In the first example, the <code>User-agent</code> will be
@@ -563,9 +547,7 @@ LogFormat "%!200,304,302{Referer}i" refe
     for this purpose. For example, to rotate the logs every 24 hours, you
     can use:</p>
 
-    <pre class="prettyprint lang-config">
-      CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common
-    </pre>
+    <pre class="prettyprint lang-config">      CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common</pre>
 
 
     <p>Notice that quotes are used to enclose the entire command
@@ -585,10 +567,8 @@ LogFormat "%!200,304,302{Referer}i" refe
     a shell. Use "<code>|$</code>" instead of "<code>|</code>"
     to spawn using a shell (usually with <code>/bin/sh -c</code>):</p>
 
-    <pre class="prettyprint lang-config">
-# Invoke "rotatelogs" using a shell
-CustomLog "|$/usr/local/apache/bin/rotatelogs   /var/log/access_log 86400" common
-    </pre>
+    <pre class="prettyprint lang-config"># Invoke "rotatelogs" using a shell
+CustomLog "|$/usr/local/apache/bin/rotatelogs   /var/log/access_log 86400" common</pre>
 
 
     <p>This was the default behaviour for Apache 2.2.
@@ -632,10 +612,8 @@ CustomLog "|$/usr/local/apache/bin/rotat
     later split the log into individual files. For example,
     consider the following directives.</p>
 
-    <pre class="prettyprint lang-config">
-LogFormat "%v %l %u %t \"%r\" %&gt;s %b" comonvhost
-CustomLog logs/access_log comonvhost
-    </pre>
+    <pre class="prettyprint lang-config">LogFormat "%v %l %u %t \"%r\" %&gt;s %b" comonvhost
+CustomLog logs/access_log comonvhost</pre>
 
 
     <p>The <code>%v</code> is used to log the name of the virtual

Modified: httpd/httpd/trunk/docs/manual/logs.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/logs.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/logs.html.fr Wed Feb  5 22:28:30 2014
@@ -177,9 +177,7 @@
     <p>Pour ce faire, vous devez spécifier le nom du module dans votre
     directive <code class="directive">LogLevel</code> :</p>
 
-    <pre class="prettyprint lang-config">
-    LogLevel info rewrite:trace5
-    </pre>
+    <pre class="prettyprint lang-config">    LogLevel info rewrite:trace5</pre>
 
 
     <p>Dans cet exemple, le niveau de journalisation général est défini
@@ -234,10 +232,8 @@
 
       <p>Voici une configuration typique pour le journal des accès :</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
-CustomLog logs/access_log common
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+CustomLog logs/access_log common</pre>
 
 
       <p>Ici est définie l'<em>identité</em> <code>common</code> qui est
@@ -386,10 +382,8 @@ CustomLog logs/access_log common
       "Combined Log Format" (Format de journalisation combiné). Il s'utilise
       comme suit :</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
-CustomLog log/access_log combined
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
+CustomLog log/access_log combined</pre>
 
 
       <p>Ce format est identique au Common Log Format, avec deux champs
@@ -439,12 +433,10 @@ CustomLog log/access_log combined
       comment simuler les effets des directives <code>ReferLog</code> et
       <code>AgentLog</code>.</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+      <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
 CustomLog logs/access_log common
 CustomLog logs/referer_log "%{Referer}i -&gt; %U"
-CustomLog logs/agent_log "%{User-agent}i"
-      </pre>
+CustomLog logs/agent_log "%{User-agent}i"</pre>
 
 
       <p>Cet exemple montre aussi qu'il n'est pas obligatoire d'associer
@@ -470,36 +462,30 @@ CustomLog logs/agent_log "%{User-agent}i
       la variable d'environnement est définie.
       Quelques exemples :</p>
 
-      <pre class="prettyprint lang-config">
-# Marque les requêtes en provenance de l'interface loop-back
+      <pre class="prettyprint lang-config"># Marque les requêtes en provenance de l'interface loop-back
 SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog
 # Marque les requêtes pour le fichier robots.txt
 SetEnvIf Request_URI "^/robots\.txt$" dontlog
 # Journalise toutes les autres requêtes
-CustomLog logs/access_log common env=!dontlog
-      </pre>
+CustomLog logs/access_log common env=!dontlog</pre>
 
 
       <p>Autre exemple, imaginons l'enregistrement des requêtes en provenance
       d'utilisateurs de langue anglaise dans un journal, et celles des autres
       utilisateurs dans un autre journal.</p>
 
-      <pre class="prettyprint lang-config">
-        SetEnvIf Accept-Language "en" english<br />
+      <pre class="prettyprint lang-config">        SetEnvIf Accept-Language "en" english<br />
         CustomLog logs/english_log common env=english<br />
-        CustomLog logs/non_english_log common env=!english
-      </pre>
+        CustomLog logs/non_english_log common env=!english</pre>
 
 
 	<p>Dans le contexte d'une mise en cache, il peut être
 	intéressant de connaître l'efficacité du cache. Pour y parvenir,
 	on pourrait utiliser cette méthode simple :</p>
 
-      <pre class="prettyprint lang-config">
-SetEnv CACHE_MISS 1
+      <pre class="prettyprint lang-config">SetEnv CACHE_MISS 1
 LogFormat "%h %l %u %t "%r " %&gt;s %b %{CACHE_MISS}e" common-cache
-CustomLog logs/access_log common-cache
-      </pre>
+CustomLog logs/access_log common-cache</pre>
 
 
       <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> va s'exécuter avant
@@ -513,10 +499,8 @@ CustomLog logs/access_log common-cache
       valeurs de journalisation conditionnelles basées sur le code de la
       réponse HTTP :</p>
 
-      <pre class="prettyprint lang-config">
-LogFormat "%400,501{User-agent}i" browserlog
-LogFormat "%!200,304,302{Referer}i" refererlog
-      </pre>
+      <pre class="prettyprint lang-config">LogFormat "%400,501{User-agent}i" browserlog
+LogFormat "%!200,304,302{Referer}i" refererlog</pre>
 
 
       <p>Dans le premier exemple, le <code>User-agent</code> sera
@@ -609,9 +593,7 @@ LogFormat "%!200,304,302{Referer}i" refe
     appelé <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code>. Par exemple, pour une rotation des
     journaux toutes les 24 heures, ajoutez ces lignes :</p>
 
-    <pre class="prettyprint lang-config">
-      CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common
-    </pre>
+    <pre class="prettyprint lang-config">      CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common</pre>
 
 
     <p>Notez que l'ensemble de la commande qui sera appelée par le tube de
@@ -633,10 +615,8 @@ LogFormat "%!200,304,302{Referer}i" refe
   au lieu de "<code>|</code>" (en général avec <code>/bin/sh -c</code>)
   :</p>
 
-    <pre class="prettyprint lang-config">
-# Invocation de "rotatelogs" en utilisant un shell
-CustomLog "|$/usr/local/apache/bin/rotatelogs   /var/log/access_log 86400" common
-    </pre>
+    <pre class="prettyprint lang-config"># Invocation de "rotatelogs" en utilisant un shell
+CustomLog "|$/usr/local/apache/bin/rotatelogs   /var/log/access_log 86400" common</pre>
 
 
 
@@ -679,10 +659,8 @@ CustomLog "|$/usr/local/apache/bin/rotat
     journal, puis de séparer ultérieurement le journal en plusieurs journaux
     individuels. Considérons par exemple les directives suivantes :</p>
 
-    <pre class="prettyprint lang-config">
-LogFormat "%v %l %u %t \"%r\" %&gt;s %b" comonvhost
-CustomLog logs/access_log comonvhost
-    </pre>
+    <pre class="prettyprint lang-config">LogFormat "%v %l %u %t \"%r\" %&gt;s %b" comonvhost
+CustomLog logs/access_log comonvhost</pre>
 
 
     <p>Le champ <code>%v</code> sert à enregistrer le nom de l'hôte virtuel qui

Modified: httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en Wed Feb  5 22:28:30 2014
@@ -116,8 +116,7 @@
                     Linux (Xen) system: 
                 </p>
                 
-                <div class="example"><pre>
-top - 23:10:58 up 71 days,  6:14,  4 users,  load average: 0.25, 0.53, 0.47
+                <div class="example"><pre>top - 23:10:58 up 71 days,  6:14,  4 users,  load average: 0.25, 0.53, 0.47
 Tasks: 163 total,   1 running, 162 sleeping,   0 stopped,   0 zombie
 Cpu(s): 11.6%us,  0.7%sy,  0.0%ni, 87.3%id,  0.4%wa,  0.0%hi,  0.0%si,  0.0%st
 Mem:   2621656k total,  2178684k used,   442972k free,   100500k buffers
@@ -173,13 +172,11 @@ Swap:  4194296k total,   860584k used,  
                     The output of free looks like this: 
                 </p>
                 
-                <div class="example"><pre>
-sctemme@brutus:~$ free
+                <div class="example"><pre>sctemme@brutus:~$ free
               total       used     free   shared    buffers    cached
 Mem:        4026028    3901892   124136         0    253144    841044
 -/+ buffers/cache:     2807704  1218324
-Swap:       3903784      12540  3891244
-                </pre></div>
+Swap:       3903784      12540  3891244</pre></div>
             
             
             <h4><a name="vmstat" id="vmstat">vmstat
@@ -203,27 +200,23 @@ Swap:       3903784      12540  3891244
                 </p>
                 
                 
-                <div class="example"><pre>
-[sctemme@GayDeceiver sctemme]$ vmstat 5 3
+                <div class="example"><pre>[sctemme@GayDeceiver sctemme]$ vmstat 5 3
    procs                      memory     swap         io    system        cpu
  r b w     swpd   free   buff cache si so       bi    bo in     cs us  sy id
  0 0 0        0 186252   6688 37516    0    0   12     5 47    311  0   1 99
  0 0 0        0 186244   6696 37516    0    0    0    16 41    314  0   0 100
- 0 0 0        0 186236   6704 37516    0    0    0     9 44    314  0   0 100
-                  </pre></div>
+ 0 0 0        0 186236   6704 37516    0    0    0     9 44    314  0   0 100</pre></div>
                 
                 <p>And this is output of a server that is under a load of one
                     hundred simultaneous connections fetching static content: 
                 </p>
                 
-                <div class="example"><pre>
-[sctemme@GayDeceiver sctemme]$ vmstat 5 3
+                <div class="example"><pre>[sctemme@GayDeceiver sctemme]$ vmstat 5 3
    procs                      memory     swap    io      system       cpu
  r b w     swpd   free   buff cache si so     bi bo   in     cs us sy  id
  1 0 1        0 162580   6848 40056    0    0 11  5 150     324  1  1  98
  6 0 1        0 163280   6856 40248    0    0  0 66 6384 1117   42 25  32
-11 0 0        0 162780   6864 40436    0    0  0 61 6309 1165   33 28  40
-                  </pre></div>
+11 0 0        0 162780   6864 40436    0    0  0 61 6309 1165   33 28  40</pre></div>
                 
                 <p>The first line gives averages since the last reboot. The
                     subsequent lines give information for five second
@@ -440,9 +433,7 @@ Swap:       3903784      12540  3891244
                     can be specified on a per module basis: 
                 </p>
                 
-                <pre class="prettyprint lang-config">
-                    LogLevel debug mod_ssl:warn
-                </pre>
+                <pre class="prettyprint lang-config">                    LogLevel debug mod_ssl:warn</pre>
 
                 
                 <p>
@@ -475,15 +466,13 @@ Swap:       3903784      12540  3891244
                 </p>
                 
                 
-                <div class="example"><pre>
-195.54.228.42 - - [24/Mar/2007:23:05:11 -0400] "GET /sander/feed/ HTTP/1.1" 200 9747
+                <div class="example"><pre>195.54.228.42 - - [24/Mar/2007:23:05:11 -0400] "GET /sander/feed/ HTTP/1.1" 200 9747
 64.34.165.214 - - [24/Mar/2007:23:10:11 -0400] "GET /sander/feed/atom HTTP/1.1" 200 9068
 60.28.164.72 - - [24/Mar/2007:23:11:41 -0400] "GET / HTTP/1.0" 200 618
 85.140.155.56 - - [24/Mar/2007:23:14:12 -0400] "GET /sander/2006/09/27/44/ HTTP/1.1" 200 14172
 85.140.155.56 - - [24/Mar/2007:23:14:15 -0400] "GET /sander/2006/09/21/gore-tax-pollution/ HTTP/1.1" 200 15147
 74.6.72.187 - - [24/Mar/2007:23:18:11 -0400] "GET /sander/2006/09/27/44/ HTTP/1.0" 200 14172
-74.6.72.229 - - [24/Mar/2007:23:24:22 -0400] "GET /sander/2006/11/21/os-java/ HTTP/1.0" 200 13457
-                </pre></div>
+74.6.72.229 - - [24/Mar/2007:23:24:22 -0400] "GET /sander/2006/11/21/os-java/ HTTP/1.0" 200 13457</pre></div>
                 
                 <table>
                     <tr>
@@ -1291,8 +1280,7 @@ Swap:       3903784      12540  3891244
                     pre-rendered blog pages: 
                 </p>
                 
-<pre class="prettyprint lang-config">
-Listen *:8001
+<pre class="prettyprint lang-config">Listen *:8001
   &lt;VirtualHost *:8001&gt;
       ServerName blog.sandla.org:8001
       ServerAdmin sander@temme.net
@@ -1316,8 +1304,7 @@ Listen *:8001
           Options +ExecCGI
           Require all granted
       &lt;/Directory&gt;
-  &lt;/VirtualHost&gt;
-</pre>
+  &lt;/VirtualHost&gt;</pre>
 
                 
                 <p>
@@ -1399,14 +1386,12 @@ Listen *:8001
                     <code>httpd.conf</code>:
                 </p>
                 
-<pre class="prettyprint lang-config">
-CacheRoot /raid1/cacheroot
+<pre class="prettyprint lang-config">CacheRoot /raid1/cacheroot
 CacheEnable disk /
 # A page modified 100 minutes ago will expire in 10 minutes
 CacheLastModifiedFactor .1
 # Always check again after 6 hours
-CacheMaxExpire 21600
-</pre>
+CacheMaxExpire 21600</pre>
 
                 
                 <p>This configuration will try to cache any and all content
@@ -1433,11 +1418,9 @@ CacheMaxExpire 21600
                     Unfortunately there does currently not exist a way to cache
                     these headers. 
                 </p>
-<pre class="prettyprint lang-config">
-&lt;FilesMatch \.(jpe?g|png|gif|js|css|x?html|xml)&gt;
+<pre class="prettyprint lang-config">&lt;FilesMatch \.(jpe?g|png|gif|js|css|x?html|xml)&gt;
     FileETag None
-&lt;/FilesMatch&gt;
-</pre>
+&lt;/FilesMatch&gt;</pre>
 
                 
                 <p>

Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en Wed Feb  5 22:28:30 2014
@@ -137,12 +137,10 @@
       matching the criteria. Here's an example which disables lookups
       except for <code>.html</code> and <code>.cgi</code> files:</p>
 
-      <pre class="prettyprint lang-config">
-HostnameLookups off
+      <pre class="prettyprint lang-config">HostnameLookups off
 &lt;Files ~ "\.(html|cgi)$"&gt;
   HostnameLookups on
-&lt;/Files&gt;
-      </pre>
+&lt;/Files&gt;</pre>
 
 
       <p>But even still, if you just need DNS names in some CGIs you
@@ -161,12 +159,10 @@ HostnameLookups off
       system calls to check up on symlinks. One extra call per
       filename component. For example, if you had:</p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   Options SymLinksIfOwnerMatch
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>and a request is made for the URI <code>/index.html</code>.
@@ -177,16 +173,14 @@ DocumentRoot /www/htdocs
       every single request. If you really desire the symlinks
       security checking you can do something like this:</p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   Options FollowSymLinks
 &lt;/Directory&gt;
 
 &lt;Directory /www/htdocs&gt;
   Options -FollowSymLinks +SymLinksIfOwnerMatch
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>This at least avoids the extra checks for the
@@ -209,12 +203,10 @@ DocumentRoot /www/htdocs
       <code>.htaccess</code> for each filename component. For
       example,</p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   AllowOverride all
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>and a request is made for the URI <code>/index.html</code>.
@@ -557,8 +549,7 @@ DocumentRoot /www/htdocs
       do not match the code, they're contrived for pedagogical
       purposes):</p>
 
-      <pre class="prettyprint lang-c">
-        for (;;) {
+      <pre class="prettyprint lang-c">        for (;;) {
           for (;;) {
             fd_set accept_fds;
 
@@ -578,8 +569,7 @@ DocumentRoot /www/htdocs
             if (new_connection != -1) break;
           }
           process_the(new_connection);
-        }
-      </pre>
+        }</pre>
 
 
       <p>But this naive implementation has a serious starvation problem.
@@ -618,8 +608,7 @@ DocumentRoot /www/htdocs
       entry into the inner loop. The loop looks like this
       (differences highlighted):</p>
 
-      <pre class="prettyprint lang-c">
-        for (;;) {
+      <pre class="prettyprint lang-c">        for (;;) {
           <strong>accept_mutex_on ();</strong>
           for (;;) {
             fd_set accept_fds;
@@ -641,8 +630,7 @@ DocumentRoot /www/htdocs
           }
           <strong>accept_mutex_off ();</strong>
           process the new_connection;
-        }
-      </pre>
+        }</pre>
 
 
       <p><a id="serialize" name="serialize">The functions</a>
@@ -751,8 +739,7 @@ DocumentRoot /www/htdocs
       <code>http_main.c</code>). The function looks roughly like
       this:</p>
 
-      <pre class="prettyprint lang-c">
-        void lingering_close (int s)
+      <pre class="prettyprint lang-c">        void lingering_close (int s)
         {
           char junk_buffer[2048];
           
@@ -774,8 +761,7 @@ DocumentRoot /www/htdocs
           }
           
           close (s);
-        }
-      </pre>
+        }</pre>
 
 
       <p>This naturally adds some expense at the end of a connection,

Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.fr Wed Feb  5 22:28:30 2014
@@ -151,12 +151,10 @@
       Voici un exemple qui désactive les recherches DNS sauf pour les fichiers
       <code>.html</code> et <code>.cgi</code> :</p>
 
-      <pre class="prettyprint lang-config">
-HostnameLookups off
+      <pre class="prettyprint lang-config">HostnameLookups off
 &lt;Files ~ "\.(html|cgi)$"&gt;
   HostnameLookups on
-&lt;/Files&gt;
-      </pre>
+&lt;/Files&gt;</pre>
 
 
       <p>Mais même dans ce cas, si vous n'avez besoin de noms DNS que dans
@@ -176,12 +174,10 @@ HostnameLookups off
       symboliques. Un appel supplémentaire par élément du chemin du fichier.
       Par exemple, si vous avez :</p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   Options SymLinksIfOwnerMatch
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>et si une requête demande l'URI <code>/index.html</code>, Apache
@@ -193,16 +189,14 @@ DocumentRoot /www/htdocs
       vérifier la sécurité des liens symboliques, vous pouvez utiliser une
       configuration du style :</p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   Options FollowSymLinks
 &lt;/Directory&gt;
 
 &lt;Directory /www/htdocs&gt;
   Options -FollowSymLinks +SymLinksIfOwnerMatch
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>Ceci évite au moins les vérifications supplémentaires pour le chemin
@@ -228,12 +222,10 @@ DocumentRoot /www/htdocs
       pour chaque élément du chemin du fichier demandé. Par exemple, si vous
       avez : </p>
 
-      <pre class="prettyprint lang-config">
-DocumentRoot /www/htdocs
+      <pre class="prettyprint lang-config">DocumentRoot /www/htdocs
 &lt;Directory /&gt;
   AllowOverride all
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
       <p>et qu'une requête demande l'URI <code>/index.html</code>, Apache
@@ -613,8 +605,7 @@ DocumentRoot /www/htdocs
       (ces exemples ne sont pas extraits du code d'Apache, ils ne sont
       proposés qu'à des fins pédagogiques) :</p>
 
-      <pre class="prettyprint lang-c">
-        for (;;) {
+      <pre class="prettyprint lang-c">        for (;;) {
           for (;;) {
             fd_set accept_fds;
 
@@ -634,8 +625,7 @@ DocumentRoot /www/htdocs
             if (new_connection != -1) break;
           }
           process_the(new_connection);
-        }
-      </pre>
+        }</pre>
 
 
       <p>Mais cette implémentation rudimentaire présente une sérieuse lacune.
@@ -675,8 +665,7 @@ DocumentRoot /www/htdocs
       entrées dans la boucle interne. La boucle ressemble à ceci (les
       différences sont mises en surbrillance) :</p>
 
-      <pre class="prettyprint lang-c">
-        for (;;) {
+      <pre class="prettyprint lang-c">        for (;;) {
           <strong>accept_mutex_on ();</strong>
           for (;;) {
             fd_set accept_fds;
@@ -698,8 +687,7 @@ DocumentRoot /www/htdocs
           }
           <strong>accept_mutex_off ();</strong>
           process the new_connection;
-        }
-      </pre>
+        }</pre>
 
 
       <p><a id="serialize" name="serialize">Les fonctions</a>
@@ -812,8 +800,7 @@ DocumentRoot /www/htdocs
       <code>http_main.c</code>). La fonction ressemble approximativement à
       ceci :</p>
 
-      <pre class="prettyprint lang-c">
-        void lingering_close (int s)
+      <pre class="prettyprint lang-c">        void lingering_close (int s)
         {
           char junk_buffer[2048];
           
@@ -835,8 +822,7 @@ DocumentRoot /www/htdocs
           }
           
           close (s);
-        }
-      </pre>
+        }</pre>
 
 
       <p>Ceci ajoute naturellement un peu de charge à la fin d'une connexion,

Modified: httpd/httpd/trunk/docs/manual/misc/security_tips.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/security_tips.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/security_tips.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/security_tips.html.en Wed Feb  5 22:28:30 2014
@@ -334,11 +334,9 @@
 
     <p>In the server configuration file, put</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /&gt;
     AllowOverride None
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>This prevents the use of <code>.htaccess</code> files in all
@@ -366,25 +364,21 @@
     work around this, add the following block to your server's
     configuration:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /&gt;
     Require all denied
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>This will forbid default access to filesystem locations. Add
     appropriate <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> blocks to
     allow access only in those areas you wish. For example,</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /usr/users/*/public_html&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /usr/users/*/public_html&gt;
     Require all granted
 &lt;/Directory&gt;
 &lt;Directory /usr/local/httpd&gt;
     Require all granted
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Pay particular attention to the interactions of <code class="directive"><a href="../mod/core.html#location">Location</a></code> and <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> directives; for instance, even
@@ -441,11 +435,9 @@
     you probably commented out the following in your server configuration
     file:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Files ".ht*"&gt;
+    <pre class="prettyprint lang-config">&lt;Files ".ht*"&gt;
     Require all denied
-&lt;/Files&gt;
-    </pre>
+&lt;/Files&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/misc/security_tips.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/security_tips.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/security_tips.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/misc/security_tips.html.fr Wed Feb  5 22:28:30 2014
@@ -343,11 +343,9 @@
 
     <p>Ajoutez dans le fichier de configuration du serveur</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /&gt;
     AllowOverride None
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Ceci interdit l'utilisation des fichiers <code>.htaccess</code> dans
@@ -377,11 +375,9 @@
     fichiers. Pour l'éviter, ajoutez le bloc suivant à la configuration
     de votre serveur :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /&gt;
     Require all denied
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>ceci va interdire l'accès par défaut à tous les fichiers du système de
@@ -389,14 +385,12 @@
     <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> appropriés correspondant
     aux répertoires auxquels vous voulez autorisez l'accès. Par exemple,</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /usr/users/*/public_html&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /usr/users/*/public_html&gt;
     Require all granted
 &lt;/Directory&gt;
 &lt;Directory /usr/local/httpd&gt;
     Require all granted
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>Portez une attention particulière aux interactions entre les directives
@@ -459,11 +453,9 @@
     qui signifie que vous avez probablement mis en commentaire ce qui suit dans
     le fichier de configuration de votre serveur :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Files ".ht*"&gt;
+    <pre class="prettyprint lang-config">&lt;Files ".ht*"&gt;
     Require all denied
-&lt;/Files&gt;
-    </pre>
+&lt;/Files&gt;</pre>
 
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>



Mime
View raw message