httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1564960 [7/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/mod/mod_ext_filter.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.en Wed Feb  5 22:28:30 2014
@@ -78,8 +78,7 @@ delivery to the client</td></tr>
 <h2><a name="examples" id="examples">Examples</a></h2>
 
     <h3>Generating HTML from some other type of response</h3>
-      <pre class="prettyprint lang-config">
-# mod_ext_filter directive to define a filter
+      <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
 # to HTML-ize text/c files using the external
 # program /usr/bin/enscript, with the type of
 # the result set to text/html
@@ -95,8 +94,7 @@ ExtFilterDefine c-to-html mode=output \
     # mod_mime directive to set the type of .c
     # files to text/c
     AddType text/c .c
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
     
 
@@ -105,8 +103,7 @@ ExtFilterDefine c-to-html mode=output \
       Please refer to <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> for a practical
       implementation.</p>
 
-      <pre class="prettyprint lang-config">
-# mod_ext_filter directive to define the external filter
+      <pre class="prettyprint lang-config"># mod_ext_filter directive to define the external filter
 ExtFilterDefine gzip mode=output cmd=/bin/gzip
 
 &lt;Location /gzipped&gt;
@@ -118,14 +115,12 @@ ExtFilterDefine gzip mode=output cmd=/bi
     # mod_headers directive to add
     # "Content-Encoding: gzip" header field
     Header set Content-Encoding gzip
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
     
 
     <h3>Slowing down the server</h3>
-      <pre class="prettyprint lang-config">
-# mod_ext_filter directive to define a filter
+      <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
 # which runs everything through cat; cat doesn't
 # modify anything; it just introduces extra pathlength
 # and consumes more resources
@@ -137,14 +132,12 @@ ExtFilterDefine slowdown mode=output cmd
     # be run several times on output
     #
     SetOutputFilter slowdown;slowdown;slowdown
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
     
 
     <h3>Using sed to replace text in the response</h3>
-      <pre class="prettyprint lang-config">
-# mod_ext_filter directive to define a filter which
+      <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter which
 # replaces text in the response
 #
 ExtFilterDefine fixtext mode=output intype=text/html \
@@ -154,14 +147,12 @@ ExtFilterDefine fixtext mode=output inty
     # core directive to cause the fixtext filter to
     # be run on output
     SetOutputFilter fixtext
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
     
 
     <h3>Tracing another filter</h3>
-      <pre class="prettyprint lang-config">
-# Trace the data read and written by mod_deflate
+      <pre class="prettyprint lang-config"># Trace the data read and written by mod_deflate
 # for a particular client (IP 192.168.1.31)
 # experiencing compression problems.
 # This filter will trace what goes into mod_deflate.
@@ -183,12 +174,10 @@ ExtFilterDefine traceafter \
 &lt;Directory /usr/local/docs&gt;
     SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
     SetOutputFilter tracebefore;deflate;traceafter
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
-      <div class="example"><h3>Here is the filter which traces the data:</h3><pre class="prettyprint lang-perl">
-#!/usr/local/bin/perl -w
+      <div class="example"><h3>Here is the filter which traces the data:</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
 use strict;
 
 open(SAVE, "&gt;$ARGV[0]")
@@ -199,8 +188,7 @@ while (&lt;STDIN&gt;) {
     print $_;
 }
 
-close(SAVE);
-        </pre>
+close(SAVE);</pre>
 </div>
     
 </div>
@@ -327,9 +315,7 @@ close(SAVE);
       filter is removed and the request continues without it.</dd>
     </dl>
 
-    <pre class="prettyprint lang-config">
-      ExtFilterOptions LogStderr
-    </pre>
+    <pre class="prettyprint lang-config">      ExtFilterOptions LogStderr</pre>
 
 
     <p>Messages written to the filter's standard error will be stored

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.fr Wed Feb  5 22:28:30 2014
@@ -81,8 +81,7 @@ externe avant de l'envoyer au client</td
     <h3>Générer du HTML à partir d'un autre type de
     contenu</h3>
 
-      <pre class="prettyprint lang-config">
-# la directive de mod_ext_filter définissant un filtre
+      <pre class="prettyprint lang-config"># la directive de mod_ext_filter définissant un filtre
 # permettant de mettre des fichiers text/c au format HTML en
 # utilisant le programme externe /usr/bin/enscript, le type du
 # fichier résultant étant défini à text/html
@@ -98,8 +97,7 @@ ExtFilterDefine c-to-html mode=output \
     # directive de mod_mime définissant le type des fichiers dont
     # le nom possède l'extension .c à text/c
     AddType text/c .c
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
     
 
@@ -110,8 +108,7 @@ ExtFilterDefine c-to-html mode=output \
       <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> pour un exemple d'implémentation plus
       pratique.</p>
 
-      <pre class="prettyprint lang-config">
-# la directive de mod_ext_filter qui définit le filtre externe
+      <pre class="prettyprint lang-config"># la directive de mod_ext_filter qui définit le filtre externe
 ExtFilterDefine gzip mode=output cmd=/bin/gzip
 
 &lt;Location /gzipped&gt;
@@ -123,15 +120,13 @@ ExtFilterDefine gzip mode=output cmd=/bi
     # la directive de mod_headers permettant d'ajouter le champ
   # d'en-tête "Content-Encoding: gzip"
     Header set Content-Encoding gzip
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
 
     
 
     <h3>Ralentissement du serveur</h3>
-      <pre class="prettyprint lang-config">
-# directive de mod_ext_filter définissant un filtre qui fait
+      <pre class="prettyprint lang-config"># directive de mod_ext_filter définissant un filtre qui fait
 # passer tous les flux en sortie par la commande cat ; cat ne
 # modifie rien ; elle ne fait que compliquer le cheminement des
 # flux et consommer des ressources supplémentaires
@@ -144,16 +139,14 @@ ExtFilterDefine slowdown mode=output cmd
     # sortie avec le filtre slowdown
     #
     SetOutputFilter slowdown;slowdown;slowdown
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
     
 
     <h3>Utilisation de sed pour remplacer du texte dans la
     réponse</h3>
 
-      <pre class="prettyprint lang-config">
-# directive de mod_ext_filter définissant un filtre qui
+      <pre class="prettyprint lang-config"># directive de mod_ext_filter définissant un filtre qui
 # remplace du texte dans la réponse
 #
 ExtFilterDefine fixtext mode=output intype=text/html \
@@ -163,15 +156,13 @@ ExtFilterDefine fixtext mode=output inty
     # directive de base permettant de traiter la sortie avec le
     # filtre fixtext
     SetOutputFilter fixtext
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
 
     
 
     <h3>Tracer un autre filtre</h3>
-      <pre class="prettyprint lang-config">
-# Trace les données lues et écrites par mod_deflate pour un
+      <pre class="prettyprint lang-config"># Trace les données lues et écrites par mod_deflate pour un
 # client particulier (IP 192.168.1.31) qui a des problèmes de
 # compression.
 # Ce premier filtre va tracer ce qui entre dans mod_deflate.
@@ -193,12 +184,10 @@ ExtFilterDefine traceafter \
 &lt;Directory /usr/local/docs&gt;
     SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
     SetOutputFilter tracebefore;deflate;traceafter
-&lt;/Directory&gt;
-      </pre>
+&lt;/Directory&gt;</pre>
 
 
-      <div class="example"><h3>Voici le filtre qui trace les données :</h3><pre class="prettyprint lang-perl">
-#!/usr/local/bin/perl -w
+      <div class="example"><h3>Voici le filtre qui trace les données :</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
 use strict;
 
 open(SAVE, "&gt;$ARGV[0]")
@@ -209,8 +198,7 @@ while (&lt;STDIN&gt;) {
     print $_;
 }
 
-close(SAVE);
-        </pre>
+close(SAVE);</pre>
 </div>
     
 </div>
@@ -347,9 +335,7 @@ close(SAVE);
       sans lui.</dd>
     </dl>
 
-    <pre class="prettyprint lang-config">
-      ExtFilterOptions LogStderr
-    </pre>
+    <pre class="prettyprint lang-config">      ExtFilterOptions LogStderr</pre>
 
 
     <p>Les messages envoyés vers la sortie d'erreurs standard du filtre

Modified: httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.en Wed Feb  5 22:28:30 2014
@@ -169,9 +169,7 @@
     with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      CacheFile /usr/local/apache/htdocs/index.html
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      CacheFile /usr/local/apache/htdocs/index.html</pre>
 </div>
 
 </div>
@@ -200,9 +198,7 @@
     with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      MMapFile /usr/local/apache/htdocs/index.html
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      MMapFile /usr/local/apache/htdocs/index.html</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.fr Wed Feb  5 22:28:30 2014
@@ -197,9 +197,7 @@ démarrage</td></tr>
     fichiers réécrits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      CacheFile /usr/local/apache/htdocs/index.html
-      </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      CacheFile /usr/local/apache/htdocs/index.html</pre>
 </div>
 
 </div>
@@ -232,9 +230,7 @@ mémoire</td></tr>
     fichiers réécrits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      MMapFile /usr/local/apache/htdocs/index.html
-      </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      MMapFile /usr/local/apache/htdocs/index.html</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en Wed Feb  5 22:28:30 2014
@@ -173,40 +173,33 @@
     <dl>
     <dt>Server side Includes (SSI)</dt>
     <dd>A simple case of replacing <code class="directive">AddOutputFilterByType</code>
-    <pre class="prettyprint lang-config">
-FilterDeclare SSI
+    <pre class="prettyprint lang-config">FilterDeclare SSI
 FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
-FilterChain SSI
-    </pre>
+FilterChain SSI</pre>
 
     </dd>
 
     <dt>Server side Includes (SSI)</dt>
     <dd>The same as the above but dispatching on handler (classic
     SSI behaviour; .shtml files get processed).
-    <pre class="prettyprint lang-config">
-FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
-FilterChain SSI
-    </pre>
+    <pre class="prettyprint lang-config">FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
+FilterChain SSI</pre>
 
     </dd>
 
     <dt>Emulating mod_gzip with mod_deflate</dt>
     <dd>Insert INFLATE filter only if "gzip" is NOT in the
     Accept-Encoding header.  This filter runs with ftype CONTENT_SET.
-    <pre class="prettyprint lang-config">
-FilterDeclare gzip CONTENT_SET
+    <pre class="prettyprint lang-config">FilterDeclare gzip CONTENT_SET
 FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
-FilterChain gzip
-    </pre>
+FilterChain gzip</pre>
 
     </dd>
 
     <dt>Image Downsampling</dt>
     <dd>Suppose we want to downsample all web images, and have filters
     for GIF, JPEG and PNG.
-    <pre class="prettyprint lang-config">
-FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
+    <pre class="prettyprint lang-config">FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
 FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
 FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
 
@@ -218,8 +211,7 @@ FilterProvider repack gif_pack "%{CONTEN
 FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
 &lt;Location /image-filter&gt;
     FilterChain unpack downsample repack
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
     </dd>
     </dl>
@@ -287,9 +279,7 @@ being moved to <code class="module"><a h
     <code>text/html</code> or <code>text/plain</code> before it is sent
     to the client.</p>
 
-    <pre class="prettyprint lang-config">
-      AddOutputFilterByType DEFLATE text/html text/plain
-    </pre>
+    <pre class="prettyprint lang-config">      AddOutputFilterByType DEFLATE text/html text/plain</pre>
 
 
     <p>If you want the content to be processed by more than one filter, their
@@ -302,12 +292,10 @@ being moved to <code class="module"><a h
     <code>INCLUDES</code> filter and then by the <code>DEFLATE</code>
     filter.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /cgi-bin/&gt;
+    <pre class="prettyprint lang-config">&lt;Location /cgi-bin/&gt;
     Options Includes
     AddOutputFilterByType INCLUDES;DEFLATE text/html
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_firehose.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_firehose.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_firehose.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_firehose.html.en Wed Feb  5 22:28:30 2014
@@ -123,8 +123,7 @@
 
     <p>The BNF for the fragment format is as follows:</p>
 
-    <pre>
- stream = 0*(fragment)
+    <pre> stream = 0*(fragment)
 
  fragment = header CRLF body CRLF
 
@@ -140,8 +139,7 @@
  body = &lt;the binary content of the fragment&gt;
 
  SPC = &lt;a single space&gt;
- CRLF = &lt;a carriage return, followed by a line feed&gt;
-    </pre>
+ CRLF = &lt;a carriage return, followed by a line feed&gt;</pre>
 
     <p>All fragments for a connection or a request will share the same
     UUID, depending on whether connections or requests are being recorded.
@@ -177,9 +175,7 @@ later.</td></tr>
     requests will be captured within the same connection if keepalive is
     present.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseConnectionInput connection-input.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseConnectionInput connection-input.firehose</pre>
 </div>
 
 </div>
@@ -199,9 +195,7 @@ later.</td></tr>
     Multiple requests will be captured within the same connection if
     keepalive is present.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseConnectionOutput connection-output.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseConnectionOutput connection-output.firehose</pre>
 </div>
 
 </div>
@@ -219,9 +213,7 @@ later.</td></tr>
 </table>
     <p>Capture traffic being received by mod_proxy.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseProxyConnectionInput proxy-input.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseProxyConnectionInput proxy-input.firehose</pre>
 </div>
 
 </div>
@@ -239,9 +231,7 @@ later.</td></tr>
 </table>
     <p>Capture traffic being sent out by mod_proxy.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseProxyConnectionOutput proxy-output.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseProxyConnectionOutput proxy-output.firehose</pre>
 </div>
 
 </div>
@@ -260,9 +250,7 @@ later.</td></tr>
     <p>Capture traffic coming into the server on each request. Requests
     will be captured separately, regardless of the presence of keepalive.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseRequestInput request-input.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseRequestInput request-input.firehose</pre>
 </div>
 
 </div>
@@ -281,9 +269,7 @@ later.</td></tr>
     <p>Capture traffic going out of the server on each request. Requests
     will be captured separately, regardless of the presence of keepalive.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      FirehoseRequestOutput request-output.firehose
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      FirehoseRequestOutput request-output.firehose</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_headers.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_headers.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_headers.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_headers.html.en Wed Feb  5 22:28:30 2014
@@ -63,10 +63,8 @@ headers</td></tr>
     order in the configuration file and by placement in <a href="../sections.html#mergin">configuration sections</a>. These
     two directives have a different effect if reversed:</p>
 
-    <pre class="prettyprint lang-config">
-RequestHeader append MirrorID "mirror 12"
-RequestHeader unset MirrorID
-    </pre>
+    <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
+RequestHeader unset MirrorID</pre>
 
 
     <p>This way round, the <code>MirrorID</code> header is not set. If
@@ -101,9 +99,7 @@ RequestHeader unset MirrorID
         Copy all request headers that begin with "TS" to the
         response headers:
 
-        <pre class="prettyprint lang-config">
-          Header echo ^TS
-        </pre>
+        <pre class="prettyprint lang-config">          Header echo ^TS</pre>
 
       </li>
 
@@ -114,9 +110,7 @@ RequestHeader unset MirrorID
         the client to intuit load on the server or in isolating
         bottlenecks between the client and the server.
 
-        <pre class="prettyprint lang-config">
-          Header set MyHeader "%D %t"
-        </pre>
+        <pre class="prettyprint lang-config">          Header set MyHeader "%D %t"</pre>
 
 
         <p>results in this header being added to the response:</p>
@@ -129,9 +123,7 @@ RequestHeader unset MirrorID
       <li>
         Say hello to Joe
 
-        <pre class="prettyprint lang-config">
-Header set MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."
-        </pre>
+        <pre class="prettyprint lang-config">Header set MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."</pre>
 
 
         <p>results in this header being added to the response:</p>
@@ -149,10 +141,8 @@ Header set MyHeader "Hello Joe. It took 
         stimulus. Note that this example requires the services of the
         <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> module.
 
-        <pre class="prettyprint lang-config">
-SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
-Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
-        </pre>
+        <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
+Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
 
 
         <p>If the header <code>MyRequestHeader: myvalue</code> is present on
@@ -169,9 +159,7 @@ Header set MyHeader "%D %t mytext" env=H
         description</a>) by replacing <var>https:</var> with
         <var>http:</var> in the <var>Destination</var> header:
 
-        <pre class="prettyprint lang-config">
-          RequestHeader edit Destination ^https: http: early
-        </pre>
+        <pre class="prettyprint lang-config">          RequestHeader edit Destination ^https: http: early</pre>
 
       </li>
 
@@ -183,11 +171,9 @@ Header set MyHeader "%D %t mytext" env=H
         <code>NO_STORE</code> environment variables all existed for the
         request):
 
-        <pre class="prettyprint lang-config">
-Header merge Cache-Control no-cache env=CGI
+        <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
 Header merge Cache-Control no-cache env=NO_CACHE
-Header merge Cache-Control no-store env=NO_STORE
-        </pre>
+Header merge Cache-Control no-store env=NO_STORE</pre>
 
 
         <p>then the response would contain the following header:</p>
@@ -205,9 +191,7 @@ Header merge Cache-Control no-store env=
       </li>
       <li>
         Set a test cookie if and only if the client didn't send us a cookie
-        <pre class="prettyprint lang-config">
-          Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"
-        </pre>
+        <pre class="prettyprint lang-config">          Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
 
       </li>
     </ol>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_headers.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_headers.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_headers.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_headers.html.fr Wed Feb  5 22:28:30 2014
@@ -66,10 +66,8 @@ tardif</a></li>
     ces deux directives ont un effet différent si leur ordre est inversé
     :</p>
 
-    <pre class="prettyprint lang-config">
-RequestHeader append MirrorID "mirror 12"
-RequestHeader unset MirrorID
-    </pre>
+    <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
+RequestHeader unset MirrorID</pre>
 
 
     <p>Dans cet ordre, l'en-tête <code>MirrorID</code> n'est pas défini.
@@ -111,9 +109,7 @@ tardif</a></h2>
         Copie tous les en-têtes de requête qui commencent par "TS" vers
 	les en-têtes de la réponse :
 
-        <pre class="prettyprint lang-config">
-          Header echo ^TS
-        </pre>
+        <pre class="prettyprint lang-config">          Header echo ^TS</pre>
 
       </li>
 
@@ -126,9 +122,7 @@ tardif</a></h2>
 	isoler les goulets d'étranglement entre le client et le
 	serveur.
 
-        <pre class="prettyprint lang-config">
-          Header set mon-en-tête "%D %t"
-        </pre>
+        <pre class="prettyprint lang-config">          Header set mon-en-tête "%D %t"</pre>
 
 
         <p>le résultat est l'ajout à la réponse d'un en-tête du type :</p>
@@ -148,10 +142,8 @@ tardif</a></h2>
 
         <p>le résultat est l'ajout à la réponse d'un en-tête du type :</p>
 
-        <pre class="prettyprint lang-config">
-	Header set MyHeader "Bonjour Joe. Il a fallu D=3775428 microsecondes à Apache
-          pour servir cette requête."
-        </pre>
+        <pre class="prettyprint lang-config">	Header set MyHeader "Bonjour Joe. Il a fallu D=3775428 microsecondes à Apache
+          pour servir cette requête."</pre>
 
       </li>
 
@@ -163,10 +155,8 @@ tardif</a></h2>
 	exemple nécessite les services du module
 	<code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>.
 
-        <pre class="prettyprint lang-config">
-SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
-Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
-        </pre>
+        <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
+Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
 
 
         <p>Si l'en-tête <code>mon-en-tête-requête: mavaleur</code> est
@@ -183,9 +173,7 @@ Header set MyHeader "%D %t mytext" env=H
 	du problème</a>) en remplaçant <var>https:</var> par
 	<var>http:</var> dans l'en-tête <var>Destination</var> :
 
-        <pre class="prettyprint lang-config">
-          RequestHeader edit Destination ^https: http: early
-        </pre>
+        <pre class="prettyprint lang-config">          RequestHeader edit Destination ^https: http: early</pre>
 
       </li>
 
@@ -198,11 +186,9 @@ Header set MyHeader "%D %t mytext" env=H
 	<code>NO_CACHE</code> et <code>NO_STORE</code> existent pour la
 	requête) :
 
-        <pre class="prettyprint lang-config">
-Header merge Cache-Control no-cache env=CGI
+        <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
 Header merge Cache-Control no-cache env=NO_CACHE
-Header merge Cache-Control no-store env=NO_STORE
-        </pre>
+Header merge Cache-Control no-store env=NO_STORE</pre>
 
 
         <p>alors, la réponse contiendra l'en-tête suivant :</p>
@@ -222,9 +208,7 @@ Header merge Cache-Control no-store env=
       <li>
         Définit un cookie de test si et seulement si le client n'envoie
 	pas de cookie
-        <pre class="prettyprint lang-config">
-          Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"
-        </pre>
+        <pre class="prettyprint lang-config">          Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
 
       </li>
     </ol>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_heartbeat.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_heartbeat.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_heartbeat.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_heartbeat.html.en Wed Feb  5 22:28:30 2014
@@ -95,9 +95,7 @@ multicast address to which <code class="
 status information. This address will usually correspond to a configured
  <code class="directive"><a href="../mod/mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></code> on a
 frontend proxy system.</p>
-<pre class="prettyprint lang-config">
-HeartbeatAddress 239.0.0.1:27999
-</pre>
+<pre class="prettyprint lang-config">HeartbeatAddress 239.0.0.1:27999</pre>
     
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_heartmonitor.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_heartmonitor.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_heartmonitor.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_heartmonitor.html.en Wed Feb  5 22:28:30 2014
@@ -77,9 +77,7 @@ use <code class="module"><a href="../mod
     address will usually correspond to a configured  <code class="directive"><a href="../mod/mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></code> on an origin server.
     </p>
     
-    <pre class="prettyprint lang-config">
-    HeartbeatListen 239.0.0.1:27999
-    </pre>
+    <pre class="prettyprint lang-config">    HeartbeatListen 239.0.0.1:27999</pre>
 
 
     <p> This module is inactive until this directive is used.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_include.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_include.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_include.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_include.html.en Wed Feb  5 22:28:30 2014
@@ -80,10 +80,8 @@
     parse them and assign the resulting document the mime type of
     <code>text/html</code>:</p>
 
-    <pre class="prettyprint lang-config">
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
-    </pre>
+    <pre class="prettyprint lang-config">AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml</pre>
 
 
     <p>The following directive must be given for the directories
@@ -93,9 +91,7 @@ AddOutputFilter INCLUDES .shtml
     <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> <code>Options</code>
     is set):</p>
 
-    <pre class="prettyprint lang-config">
-      Options +Includes
-    </pre>
+    <pre class="prettyprint lang-config">      Options +Includes</pre>
 
 
     <p>For backwards compatibility, the <code>server-parsed</code>
@@ -819,9 +815,7 @@ AddOutputFilter INCLUDES .shtml
     <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
     looks for to mark the end of an include element.</p>
 
-    <pre class="prettyprint lang-config">
-      SSIEndTag "%&gt;"
-    </pre>
+    <pre class="prettyprint lang-config">      SSIEndTag "%&gt;"</pre>
 
 
 
@@ -852,9 +846,7 @@ directive]"</code></td></tr>
     <p>This directive has the same effect as the <code>&lt;!--#config
     errmsg=<var>message</var> --&gt;</code> element.</p>
 
-    <pre class="prettyprint lang-config">
-      SSIErrorMsg "&lt;!-- Error --&gt;"
-    </pre>
+    <pre class="prettyprint lang-config">      SSIErrorMsg "&lt;!-- Error --&gt;"</pre>
 
 
 </div>
@@ -974,10 +966,8 @@ server.</td></tr>
     output of a file each processing different commands (possibly at
     different times).</p>
 
-    <pre class="prettyprint lang-config">
-      SSIStartTag "&lt;%"<br />
-      SSIEndTag   "%&gt;"
-    </pre>
+    <pre class="prettyprint lang-config">      SSIStartTag "&lt;%"<br />
+      SSIEndTag   "%&gt;"</pre>
 
 
     <p>The example given above, which also specifies a matching
@@ -1014,9 +1004,7 @@ displayed</td></tr>
     <p>This directive has the same effect as the <code>&lt;!--#config
     timefmt=<var>formatstring</var> --&gt;</code> element.</p>
 
-    <pre class="prettyprint lang-config">
-      SSITimeFormat "%R, %B %d, %Y"
-    </pre>
+    <pre class="prettyprint lang-config">      SSITimeFormat "%R, %B %d, %Y"</pre>
 
 
     <p>The above directive would cause times to be displayed in the
@@ -1037,9 +1025,7 @@ displayed</td></tr>
     <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
     displays when a variable is not set and "echoed".</p>
 
-    <pre class="prettyprint lang-config">
-      SSIUndefinedEcho "&lt;!-- undef --&gt;"
-    </pre>
+    <pre class="prettyprint lang-config">      SSIUndefinedEcho "&lt;!-- undef --&gt;"</pre>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_info.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.html.en Wed Feb  5 22:28:30 2014
@@ -39,11 +39,9 @@ configuration</td></tr>
     <p>To configure <code class="module"><a href="../mod/mod_info.html">mod_info</a></code>, add the following to your
     <code>httpd.conf</code> file.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>You may wish to use <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> inside the
@@ -51,12 +49,10 @@ configuration</td></tr>
     directive to limit access to your server configuration
     information:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
     Require host example.com
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>Once configured, the server information is obtained by
@@ -91,16 +87,14 @@ configuration</td></tr>
     <p>You will probably want to use <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>
     to limit access to your server configuration information.</p>
 
-    <div class="example"><h3>Access control</h3><pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <div class="example"><h3>Access control</h3><pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
     Order allow,deny
     # Allow access from server itself
     Allow from 127.0.0.1
     # Additionally, allow access from local workstation
     Allow from 192.168.1.17
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 </div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -188,11 +182,9 @@ information displayed by the server-info
     HTML interpreted, <strong>Additional Information</strong> for
     the module <var>module-name</var>. Example:</p>
 
-    <pre class="prettyprint lang-config">
-AddModuleInfo mod_deflate.c 'See &lt;a \
+    <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
     href="http://httpd.apache.org/docs/trunk/mod/mod_deflate.html"&gt;\
-    http://httpd.apache.org/docs/trunk/mod/mod_deflate.html&lt;/a&gt;'
-    </pre>
+    http://httpd.apache.org/docs/trunk/mod/mod_deflate.html&lt;/a&gt;'</pre>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_info.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.html.fr Wed Feb  5 22:28:30 2014
@@ -39,23 +39,19 @@ serveur</td></tr>
     <p>Pour activer <code class="module"><a href="../mod/mod_info.html">mod_info</a></code>, ajoutez les lignes
     suivantes à votre fichier <code>httpd.conf</code>.</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>Il est recommandé d'utiliser <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> à
     l'intérieur de la section <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> afin de restreindre l'accès aux
     informations de configuration de votre serveur :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
     Require host example.com
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>Une fois cette configuration effectuée, les informations du
@@ -94,8 +90,7 @@ serveur</td></tr>
     restreindre l'accès aux informations de configuration de votre
     serveur.</p>
 
-    <div class="example"><h3>Contrôle d'accès</h3><pre class="prettyprint lang-config">
-&lt;Location /server-info&gt;
+    <div class="example"><h3>Contrôle d'accès</h3><pre class="prettyprint lang-config">&lt;Location /server-info&gt;
     SetHandler server-info
     Order allow,deny
     # Autorisation d'accès depuis le serveur lui-même
@@ -103,8 +98,7 @@ serveur</td></tr>
     # Autorisation d'accès depuis une station de travail du réseau
 # local
     Allow from 192.168.1.17
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 </div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -196,11 +190,9 @@ module affichées par le gestionnaire se
     en tant qu'<strong>Information supplémentaire</strong> interprétée
     en HTML pour le module <var>nom-module</var>. Exemple :</p>
 
-    <pre class="prettyprint lang-config">
-AddModuleInfo mod_deflate.c 'See &lt;a \
+    <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
     href="http://httpd.apache.org/docs/trunk/mod/mod_deflate.html"&gt;\
-    http://httpd.apache.org/docs/trunk/mod/mod_deflate.html&lt;/a&gt;'
-    </pre>
+    http://httpd.apache.org/docs/trunk/mod/mod_deflate.html&lt;/a&gt;'</pre>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_isapi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_isapi.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_isapi.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_isapi.html.en Wed Feb  5 22:28:30 2014
@@ -71,9 +71,7 @@
     it to them with their file extensions. To enable any .dll file to be
     processed as an ISAPI extension, edit the httpd.conf file and add the
     following line:</p>
-    <pre class="prettyprint lang-config">
-        AddHandler isapi-handler .dll
-    </pre>
+    <pre class="prettyprint lang-config">        AddHandler isapi-handler .dll</pre>
 
 
     <div class="note">In older versions of the Apache server,
@@ -87,9 +85,7 @@
     requested module loaded. However, you may preload and keep a
     specific module loaded by using the following syntax in your
     httpd.conf:</p>
-    <pre class="prettyprint lang-config">
-        ISAPICacheFile c:/WebWork/Scripts/ISAPI/mytest.dll
-    </pre>
+    <pre class="prettyprint lang-config">        ISAPICacheFile c:/WebWork/Scripts/ISAPI/mytest.dll</pre>
 
 
     <p>Whether or not you have preloaded an ISAPI extension, all

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Wed Feb  5 22:28:30 2014
@@ -91,8 +91,7 @@ by other LDAP modules</td></tr>
     <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> to increase the performance of HTTP Basic
     authentication provided by <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
 
-    <pre class="prettyprint lang-config">
-# Enable the LDAP connection pool and shared
+    <pre class="prettyprint lang-config"># Enable the LDAP connection pool and shared
 # memory cache. Enable the LDAP cache status
 # handler. Requires that mod_ldap and mod_authnz_ldap
 # be loaded. Change the "yourdomain.example.com" to
@@ -115,8 +114,7 @@ LDAPOpCacheTTL 600
     AuthBasicProvider ldap
     AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&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">
@@ -211,11 +209,9 @@ LDAPOpCacheTTL 600
       following directives could be used to access the
       <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache information:</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Location /server/cache-info&gt;
+      <pre class="prettyprint lang-config">&lt;Location /server/cache-info&gt;
     SetHandler ldap-status
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
 
       <p>By fetching the URL <code>http://servername/cache-info</code>,
@@ -239,8 +235,7 @@ LDAPOpCacheTTL 600
     as well as the type of encryption to be used on the connection (none, SSL or 
     TLS/STARTTLS).</p>
 
-    <pre class="prettyprint lang-config">
-# Establish an SSL LDAP connection on port 636. Requires that 
+    <pre class="prettyprint lang-config"># Establish an SSL LDAP connection on port 636. Requires that 
 # mod_ldap and mod_authnz_ldap be loaded. Change the 
 # "yourdomain.example.com" to match your domain.
 
@@ -257,12 +252,10 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
     AuthBasicProvider ldap
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-# Establish a TLS LDAP connection on port 389. Requires that 
+    <pre class="prettyprint lang-config"># Establish a TLS LDAP connection on port 389. Requires that 
 # mod_ldap and mod_authnz_ldap be loaded. Change the 
 # "yourdomain.example.com" to match your domain.
 
@@ -279,8 +272,7 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
     AuthBasicProvider ldap
     AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS
     Require valid-user
-&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>
@@ -314,8 +306,7 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
         an error when an attempt is made to contact the LDAP server at
         runtime.</p>
 
-        <pre class="prettyprint lang-config">
-# Specify a Netscape CA certificate file
+        <pre class="prettyprint lang-config"># Specify a Netscape CA certificate file
 LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db
 # Specify an optional key3.db file for client certificate support
 LDAPTrustedGlobalCert CERT_KEY3_DB /certs/key3.db
@@ -333,8 +324,7 @@ LDAPTrustedGlobalCert CA_SECMOD /certs/s
     LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-        </pre>
+&lt;/Location&gt;</pre>
 
 
     
@@ -355,16 +345,14 @@ LDAPTrustedGlobalCert CA_SECMOD /certs/s
         LDAPTrustedMode parameter. If an ldaps:// URL is specified,
         SSL mode is forced, override this directive.</p>
 
-        <pre class="prettyprint lang-config">
-# Specify two CA certificate files
+        <pre class="prettyprint lang-config"># Specify two CA certificate files
 LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
 LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
 # Specify a client certificate file and key
 LDAPTrustedGlobalCert CERT_BASE64 /certs/cert1.pem
 LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]
 # Do not use this directive, as it will throw an error
-#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
-        </pre>
+#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem</pre>
 
 
     
@@ -388,8 +376,7 @@ LDAPTrustedGlobalCert KEY_BASE64 /certs/
         (ldaps://) support has been deprecated to be replaced with TLS,
         although the SSL functionality still works.</p>
 
-        <pre class="prettyprint lang-config">
-# Specify two CA certificate files
+        <pre class="prettyprint lang-config"># Specify two CA certificate files
 LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
 LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
 &lt;Location /ldap-status&gt;
@@ -408,8 +395,7 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/c
     AuthBasicProvider ldap
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-        </pre>
+&lt;/Location&gt;</pre>
 
 
     

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr Wed Feb  5 22:28:30 2014
@@ -91,8 +91,7 @@ cache du résultat à destination des au
     l'authentification HTTP de base fournie par
     <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
 
-    <pre class="prettyprint lang-config">
-# Active la conservation des connexions LDAP et le cache partagé en
+    <pre class="prettyprint lang-config"># Active la conservation des connexions LDAP et le cache partagé en
 # mémoire. Active le gestionnaire de statut du cache LDAP.
 # Nécessite le chargement de mod_ldap et de mod_authnz_ldap.
 # Remplacez "votre-domaine.example.com" par le nom de votre
@@ -115,8 +114,7 @@ LDAPOpCacheTTL 600
     AuthBasicProvider ldap
     AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&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">
@@ -220,11 +218,9 @@ LDAPOpCacheTTL 600
       suivantes pour accéder aux informations du cache de
       <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Location /server/cache-info&gt;
+      <pre class="prettyprint lang-config">&lt;Location /server/cache-info&gt;
     SetHandler ldap-status
-&lt;/Location&gt;
-      </pre>
+&lt;/Location&gt;</pre>
 
 
       <p>En se connectant à l'URL
@@ -250,8 +246,7 @@ LDAPOpCacheTTL 600
     ainsi que le type de chiffrement à utiliser pour la connexion (none,
     SSL ou TLS/STARTTLS).</p>
 
-    <pre class="prettyprint lang-config">
-# Etablissement d'une connexion SSL LDAP sur le port 636.
+    <pre class="prettyprint lang-config"># Etablissement d'une connexion SSL LDAP sur le port 636.
 # Nécessite le chargement de mod_ldap et mod_authnz_ldap.
 # Remplacez "votre-domaine.example.com" par le nom de votre
 # domaine.
@@ -269,12 +264,10 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
     AuthBasicProvider ldap
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-# Etablissement d'une connexion TLS LDAP sur le port 389.
+    <pre class="prettyprint lang-config"># Etablissement d'une connexion TLS LDAP sur le port 389.
 # Nécessite le chargement de mod_ldap et mod_authnz_ldap.
 # Remplacez "votre-domaine.example.com" par le nom de votre
 # domaine.
@@ -292,8 +285,7 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
     AuthBasicProvider ldap
     AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS
     Require valid-user
-&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>
@@ -330,8 +322,7 @@ LDAPTrustedGlobalCert CA_DER /certs/cert
 	de STARTTLS engendrera une erreur lors des tentatives de
 	contacter le serveur LDAP pendant l'exécution.</p>
 
-        <pre class="prettyprint lang-config">
-# Spécifie un fichier de certificats de CA Netscape
+        <pre class="prettyprint lang-config"># Spécifie un fichier de certificats de CA Netscape
 LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db
 # Spécifie un fichier key3db optionnel pour le support des
 # certificats clients
@@ -350,8 +341,7 @@ LDAPTrustedGlobalCert CA_SECMOD /certs/s
     LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-        </pre>
+&lt;/Location&gt;</pre>
 
 
     
@@ -375,8 +365,7 @@ LDAPTrustedGlobalCert CA_SECMOD /certs/s
 	ldaps:// est spécifiée, le mode SSL est forcé, et l'emporte sur
 	cette directive.</p>
 
-        <pre class="prettyprint lang-config">
-# Spécifie deux fichiers contenant des certificats de CA
+        <pre class="prettyprint lang-config"># Spécifie deux fichiers contenant des certificats de CA
 LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
 LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
 # Spécifie un fichier contenant des certificats clients
@@ -385,8 +374,7 @@ LDAPTrustedGlobalCert CERT_BASE64 /certs
 LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]
 # N'utilisez pas cette directive, sous peine de provoquer
 # une erreur
-#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
-        </pre>
+#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem</pre>
 
 
     
@@ -410,8 +398,7 @@ LDAPTrustedGlobalCert KEY_BASE64 /certs/
 	OpenLDAP indique que le support SSL (ldaps://) tend à être
 	remplacé par TLS, bien que le mode SSL fonctionne toujours.</p>
 
-        <pre class="prettyprint lang-config">
-# Spécifie deux fichiers contenant des certificats de CA
+        <pre class="prettyprint lang-config"># Spécifie deux fichiers contenant des certificats de CA
 LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
 LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
 &lt;Location /ldap-status&gt;
@@ -430,8 +417,7 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/c
     AuthBasicProvider ldap
     AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
     Require valid-user
-&lt;/Location&gt;
-        </pre>
+&lt;/Location&gt;</pre>
 
 
     

Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en Wed Feb  5 22:28:30 2014
@@ -416,14 +416,12 @@ expr=<var>expression</var>]</code></td><
     <p>For example, the following two sets of directives have
     exactly the same effect:</p>
 
-    <pre class="prettyprint lang-config">
-# CustomLog with format nickname
+    <pre class="prettyprint lang-config"># CustomLog with format nickname
 LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
 CustomLog logs/access_log common
 
 # CustomLog with explicit format string
-CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
-    </pre>
+CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"</pre>
 
 
     <p>The third argument is optional and controls whether or
@@ -442,20 +440,16 @@ CustomLog logs/access_log "%h %l %u %t \
     images on your server in a separate logfile but not in your main
     log, you can use:</p>
 
-    <pre class="prettyprint lang-config">
-SetEnvIf Request_URI \.gif$ gif-image
+    <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
 CustomLog gif-requests.log common env=gif-image
-CustomLog nongif-requests.log common env=!gif-image
-    </pre>
+CustomLog nongif-requests.log common env=!gif-image</pre>
 
 
     <p>Or, to reproduce the behavior of the old RefererIgnore
     directive, you might use the following:</p>
 
-    <pre class="prettyprint lang-config">
-SetEnvIf Referer example\.com localreferer
-CustomLog referer.log referer env=!localreferer
-    </pre>
+    <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
+CustomLog referer.log referer env=!localreferer</pre>
 
 
 </div>
@@ -499,9 +493,7 @@ CustomLog referer.log referer env=!local
     to define another nickname. Note that the nickname should not contain
     percent signs (<code>%</code>).</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common</pre>
 </div>
     
 
@@ -524,10 +516,8 @@ CustomLog referer.log referer env=!local
     which does not define a nickname. Common Log Format is used if no
     other format has been specified.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
-TransferLog logs/access_log
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
+TransferLog logs/access_log</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_debug.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_debug.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_debug.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_debug.html.en Wed Feb  5 22:28:30 2014
@@ -48,21 +48,17 @@
       <li>
         Log message after request to /foo/* is processed:
 
-        <pre class="prettyprint lang-config">
-&lt;Location /foo/&gt;
-&nbsp;&nbsp;LogMessage "/foo/ has been requested"
-&lt;/Location&gt;
-        </pre>
+        <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
+  LogMessage "/foo/ has been requested"
+&lt;/Location&gt;</pre>
 
       </li>
 
       <li>
         Log message if request to /foo/* is processed in a sub-request:
-        <pre class="prettyprint lang-config">
-&lt;Location /foo/&gt;
-&nbsp;&nbsp;LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
-&lt;/Location&gt;
-        </pre>
+        <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
+  LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
+&lt;/Location&gt;</pre>
 
 
         The default log_transaction hook is not executed for sub-requests,
@@ -72,9 +68,7 @@
 
       <li>
         Log message if an IPv6 client causes a request timeout:
-        <pre class="prettyprint lang-config">
-            LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"
-        </pre>
+        <pre class="prettyprint lang-config">            LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"</pre>
 
         Note the placing of the double quotes for the <code>expr=</code> argument.
       </li>
@@ -82,11 +76,9 @@
       <li>
         Log the value of the "X-Foo" request environment variable in each
         stage of the request:
-        <pre class="prettyprint lang-config">
-&lt;Location /&gt;
-&nbsp;&nbsp;LogMessage "%{reqenv:X-Foo}" hook=all
-&lt;/Location&gt;
-        </pre>
+        <pre class="prettyprint lang-config">&lt;Location /&gt;
+  LogMessage "%{reqenv:X-Foo}" hook=all
+&lt;/Location&gt;</pre>
 
         Together with microsecond time stamps in the error log,
         <code>hook=all</code> also lets you determine the times spent



Mime
View raw message