httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1564960 [9/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_mime.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en Wed Feb  5 22:28:30 2014
@@ -156,11 +156,9 @@
     script, but not the file <code>bar.cgi.html</code>, then instead
     of using <code>AddHandler cgi-script .cgi</code>, use</p>
 
-    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">
-&lt;FilesMatch \.cgi$&gt;
+    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.cgi$&gt;
   SetHandler cgi-script
-&lt;/FilesMatch&gt;
-    </pre>
+&lt;/FilesMatch&gt;</pre>
 </div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -268,12 +266,10 @@ charset</td></tr>
     overriding any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddLanguage ja .ja
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddLanguage ja .ja
 AddCharset EUC-JP .euc
 AddCharset ISO-2022-JP .jis
-AddCharset SHIFT_JIS .sjis
-      </pre>
+AddCharset SHIFT_JIS .sjis</pre>
 </div>
 
     <p>Then the document <code>xxxx.ja.jis</code> will be treated
@@ -317,10 +313,8 @@ type</td></tr>
     overriding any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddEncoding x-gzip .gz
-AddEncoding x-compress .Z
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddEncoding x-gzip .gz
+AddEncoding x-compress .Z</pre>
 </div>
 
     <p>This will cause filenames containing the <code>.gz</code> extension
@@ -367,9 +361,7 @@ handler</td></tr>
     activate CGI scripts with the file extension <code>.cgi</code>, you
     might use:</p>
 
-    <pre class="prettyprint lang-config">
-      AddHandler cgi-script .cgi
-    </pre>
+    <pre class="prettyprint lang-config">      AddHandler cgi-script .cgi</pre>
 
 
     <p>Once that has been put into your httpd.conf file, any file containing
@@ -441,11 +433,9 @@ language</td></tr>
     This directive overrides any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddEncoding x-compress .Z
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddEncoding x-compress .Z
 AddLanguage en .en
-AddLanguage fr .fr
-      </pre>
+AddLanguage fr .fr</pre>
 </div>
 
     <p>Then the document <code>xxxx.en.Z</code> will be treated as
@@ -461,11 +451,9 @@ AddLanguage fr .fr
     extension, the last one encountered is the one that is used.
     That is, for the case of:</p>
 
-    <pre class="prettyprint lang-config">
-AddLanguage en .en
+    <pre class="prettyprint lang-config">AddLanguage en .en
 AddLanguage en-gb .en
-AddLanguage en-us .en
-    </pre>
+AddLanguage en-us .en</pre>
 
 
     <p>documents with the extension <code>.en</code> would be treated as
@@ -504,9 +492,7 @@ responses from the server</td></tr>
     <code>.shtml</code> files for server-side includes and will then
     compress the output using <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.</p>
 
-    <pre class="prettyprint lang-config">
-      AddOutputFilter INCLUDES;DEFLATE shtml
-    </pre>
+    <pre class="prettyprint lang-config">      AddOutputFilter INCLUDES;DEFLATE shtml</pre>
 
 
     <p>If more than one filter is specified, they must be separated
@@ -524,8 +510,7 @@ responses from the server</td></tr>
     the <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code>
     directive.</p>
 
-    <pre class="prettyprint lang-config">
-# Effective filter "DEFLATE"
+    <pre class="prettyprint lang-config"># Effective filter "DEFLATE"
 AddOutputFilter DEFLATE shtml
 &lt;Location /foo&gt;
   # Effective filter "INCLUDES", replacing "DEFLATE"
@@ -542,8 +527,7 @@ AddOutputFilter DEFLATE shtml
 &lt;Location /bar/baz/buz&gt;
   # No effective filter, replacing "BUFFER"
   RemoveOutputFilter shtml
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 <h3>See also</h3>
@@ -578,16 +562,12 @@ type</td></tr>
       <code class="directive"><a href="#typesconfig">TypesConfig</a></code> file.
     </div>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType image/gif .gif
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      AddType image/gif .gif</pre>
 </div>
 
     <p>Or, to specify multiple file extensions in one directive:</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType image/jpeg jpeg jpg jpe
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      AddType image/jpeg jpeg jpg jpe</pre>
 </div>
 
     <p>The <var>extension</var> argument is case-insensitive and can
@@ -600,9 +580,7 @@ type</td></tr>
     can be achieved by qualifying a <var>media-type</var> with
     <code>qs</code>:</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType application/rss+xml;qs=0.8 .xml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      AddType application/rss+xml;qs=0.8 .xml</pre>
 </div>
 
     <p>This is useful in situations, <em>e.g.</em> when a client
@@ -649,9 +627,7 @@ assigned a language-tag by some other me
     by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>, then no
     Content-Language header field will be generated.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      DefaultLanguage en
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      DefaultLanguage en</pre>
 </div>
 
 <h3>See also</h3>
@@ -678,9 +654,7 @@ components as part of the filename</td><
 
     <p>This directive is recommended when you have a virtual filesystem.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ModMimeUsePathInfo On
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      ModMimeUsePathInfo On</pre>
 </div>
 
     <p>If you have a request for <code>/index.php/foo.shtml</code>
@@ -744,9 +718,7 @@ a matching file with MultiViews</td></tr
     and filters to participate in Multviews, but will exclude unknown
     files:</p>
 
-    <pre class="prettyprint lang-config">
-      MultiviewsMatch Handlers Filters
-    </pre>
+    <pre class="prettyprint lang-config">      MultiviewsMatch Handlers Filters</pre>
 
 
     <p><code class="directive">MultiviewsMatch</code> is not allowed in a
@@ -780,9 +752,7 @@ extensions</td></tr>
     <p>The <var>extension</var> argument is case-insensitive and can
     be specified with or without a leading dot.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      RemoveCharset .html .shtml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      RemoveCharset .html .shtml</pre>
 </div>
 
 </div>
@@ -804,13 +774,11 @@ extensions</td></tr>
     any associations inherited from parent directories or the
     server config files. An example of its use might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-AddEncoding x-gzip .gz
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">AddEncoding x-gzip .gz
 AddType text/plain .asc
 &lt;Files *.gz.asc&gt;
     RemoveEncoding .gz
-&lt;/Files&gt;
-      </pre>
+&lt;/Files&gt;</pre>
 </div>
 
     <p>This will cause <code>foo.gz</code> to be marked as being
@@ -846,14 +814,10 @@ extensions</td></tr>
     associations inherited from parent directories or the server
     config files. An example of its use might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-      AddHandler server-parsed .html
-      </pre>
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">      AddHandler server-parsed .html</pre>
 </div>
 
-    <div class="example"><h3>/foo/bar/.htaccess:</h3><pre class="prettyprint lang-config">
-      RemoveHandler .html
-      </pre>
+    <div class="example"><h3>/foo/bar/.htaccess:</h3><pre class="prettyprint lang-config">      RemoveHandler .html</pre>
 </div>
 
     <p>This has the effect of returning <code>.html</code> files in
@@ -936,9 +900,7 @@ extensions</td></tr>
     <p>The <var>extension</var> argument is case-insensitive and can
     be specified with or without a leading dot.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      RemoveOutputFilter shtml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      RemoveOutputFilter shtml</pre>
 </div>
 
 <h3>See also</h3>
@@ -965,9 +927,7 @@ extensions</td></tr>
     directories or the server config files. An example of its use
     might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-      RemoveType .cgi
-      </pre>
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">      RemoveType .cgi</pre>
 </div>
 
     <p>This will remove any special handling of <code>.cgi</code>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_mime_magic.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime_magic.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime_magic.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime_magic.html.en Wed Feb  5 22:28:30 2014
@@ -264,9 +264,7 @@ using the specified magic file</td></tr>
     used, in which case the more specific setting overrides the main
     server's file.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      MimeMagicFile conf/magic
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      MimeMagicFile conf/magic</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en Wed Feb  5 22:28:30 2014
@@ -192,9 +192,7 @@ Negotiation</a></li>
     and the <code>.var</code> file should be associated with the
     <code>type-map</code> handler with an <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive:</p>
 
-    <pre class="prettyprint lang-config">
-    AddHandler type-map .var
-    </pre>
+    <pre class="prettyprint lang-config">    AddHandler type-map .var</pre>
 
 
     <p>A request for <code>document.html.var</code> in this directory will
@@ -278,10 +276,8 @@ found</td></tr>
     (equally acceptable) then the first matching variant, <code>en</code>,
     will be served.</p>
 
-    <pre class="prettyprint lang-config">
-LanguagePriority en fr de
-ForceLanguagePriority Prefer
-    </pre>
+    <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Prefer</pre>
 
 
     <p><code>ForceLanguagePriority Fallback</code> uses
@@ -292,10 +288,8 @@ ForceLanguagePriority Prefer
     language response, but such a variant isn't found, then the first
     variant from the <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> list below will be served.</p>
 
-    <pre class="prettyprint lang-config">
-LanguagePriority en fr de
-ForceLanguagePriority Fallback
-    </pre>
+    <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Fallback</pre>
 
 
     <p>Both options, <code>Prefer</code> and <code>Fallback</code>, may be
@@ -326,9 +320,7 @@ the client does not express a preference
     express a preference, when handling a Multiviews request. The list
     of <var>MIME-lang</var> are in order of decreasing preference.</p>
 
-    <pre class="prettyprint lang-config">
-      LanguagePriority en fr de
-    </pre>
+    <pre class="prettyprint lang-config">      LanguagePriority en fr de</pre>
 
 
     <p>For a request for <code>foo.html</code>, where

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.fr Wed Feb  5 22:28:30 2014
@@ -197,9 +197,7 @@ contenu</a></li>
     et le fichier <code>.var</code> doit être associé au gestionnaire
     <code>type-map</code> via une directive <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> :</p>
 
-    <pre class="prettyprint lang-config">
-    AddHandler type-map .var
-    </pre>
+    <pre class="prettyprint lang-config">    AddHandler type-map .var</pre>
 
 
     <p>A l'arrivée d'une requête pour la ressource
@@ -288,10 +286,8 @@ n'est pas trouvé</td></tr>
     première variante acceptable de langue <code>en</code> qui sera
     servie.</p>
 
-    <pre class="prettyprint lang-config">
-LanguagePriority en fr de
-ForceLanguagePriority Prefer
-    </pre>
+    <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Prefer</pre>
 
 
     <p><code>ForceLanguagePriority Fallback</code> utilise la directive
@@ -303,10 +299,8 @@ ForceLanguagePriority Prefer
     dans cette langue n'est trouvée, c'est la première variante de la
     liste définie par la directive <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> qui sera servie.</p>
 
-    <pre class="prettyprint lang-config">
-LanguagePriority en fr de
-ForceLanguagePriority Fallback
-    </pre>
+    <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Fallback</pre>
 
 
     <p>Les deux options, <code>Prefer</code> et <code>Fallback</code>,
@@ -341,9 +335,7 @@ cas où le client n'a pas formulé de pr
     <var>langages-MIME</var> dans un ordre de préférences
     décroissantes.</p>
 
-    <pre class="prettyprint lang-config">
-      LanguagePriority en fr de
-    </pre>
+    <pre class="prettyprint lang-config">      LanguagePriority en fr de</pre>
 
 
     <p>Dans le cas d'une requête pour <code>foo.html</code>, si

Modified: httpd/httpd/trunk/docs/manual/mod/mod_policy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_policy.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_policy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_policy.html.en Wed Feb  5 22:28:30 2014
@@ -228,8 +228,7 @@
     <p>A typical configuration protecting a server serving static content
     might be as follows:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /&gt;
+    <pre class="prettyprint lang-config">&lt;Location /&gt;
   SetOutputFilter POLICY_TYPE;POLICY_LENGTH;POLICY_KEEPALIVE;POLICY_VARY;POLICY_VALIDATION; \
     POLICY_CONDITIONAL;POLICY_NOCACHE;POLICY_MAXAGE;POLICY_VERSION
   
@@ -264,8 +263,7 @@
 # suppress policy protection for server-status
 &lt;Location /server-status&gt;
   PolicyFilter off
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 </div>
@@ -284,10 +282,8 @@ later.</td></tr>
     <p>When logged or enforced, a response that should have been conditional
     but wasn't will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# non-functional conditional responses should be rejected
-PolicyConditional enforce
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># non-functional conditional responses should be rejected
+PolicyConditional enforce</pre>
 </div>
 
 </div>
@@ -325,10 +321,8 @@ later.</td></tr>
     variable is present and equal to the ignore-value, all policies will
     be ignored.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# downgrade if POLICY_CONTROL was present
-PolicyEnvironment POLICY_CONTROL log ignore
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># downgrade if POLICY_CONTROL was present
+PolicyEnvironment POLICY_CONTROL log ignore</pre>
 </div>
 
 </div>
@@ -346,8 +340,7 @@ later.</td></tr>
 </table>
     <p>Master switch to enable or disable policies for a given URL space.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# enabled by default
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># enabled by default
 &lt;Location /&gt;
   PolicyFilter on
 &lt;/Location&gt;
@@ -355,8 +348,7 @@ later.</td></tr>
 # suppress policy protection for server-status
 &lt;Location /server-status&gt;
   PolicyFilter off
-&lt;/Location&gt;
-</pre>
+&lt;/Location&gt;</pre>
 </div>
 
 </div>
@@ -376,10 +368,8 @@ later.</td></tr>
     <code>Content-Length</code> header and a <code>Transfer-Encoding</code>
     of <code>chunked</code> will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# missing Content-Length or Transfer-Encoding should be rejected
-PolicyKeepalive enforce
-</pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># missing Content-Length or Transfer-Encoding should be rejected
+PolicyKeepalive enforce</pre>
 </div>
 
 </div>
@@ -414,10 +404,8 @@ later.</td></tr>
     <p>When logged or enforced, a response that lacks an explicit
     <code>Content-Length</code> header will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# missing Content-Length header should be rejected
-PolicyLength enforce
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># missing Content-Length header should be rejected
+PolicyLength enforce</pre>
 </div>
 
 </div>
@@ -454,10 +442,8 @@ later.</td></tr>
     <code>Expires</code> header, or where the explicit freshness lifetime is
     smaller than the given value, will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# reject responses with a freshness lifetime shorter than a day
-PolicyMaxage enforce 86400
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># reject responses with a freshness lifetime shorter than a day
+PolicyMaxage enforce 86400</pre>
 </div>
 
 
@@ -494,10 +480,8 @@ later.</td></tr>
     using the <code>Cache-Control</code> or <code>Pragma</code> headers will
     be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# Cache-Control: no-cache will be rejected
-PolicyNocache enforce
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># Cache-Control: no-cache will be rejected
+PolicyNocache enforce</pre>
 </div>
 
 
@@ -534,16 +518,12 @@ later.</td></tr>
     header, where the <code>Content-Type</code> header is malformed, or where the
     header does not match the given pattern or patterns will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# enforce json or XML
-PolicyType enforce application/json text/xml
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># enforce json or XML
+PolicyType enforce application/json text/xml</pre>
 </div>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# malformed content type should be rejected
-PolicyType enforce */*
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># malformed content type should be rejected
+PolicyType enforce */*</pre>
 </div>
 
 
@@ -580,10 +560,8 @@ later.</td></tr>
     <code>ETag</code> header or a <code>Last-Modified</code> header, or where
     either header is syntactically incorrect, will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# no ETag or Last-Modified will be rejected
-PolicyValidation enforce
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># no ETag or Last-Modified will be rejected
+PolicyValidation enforce</pre>
 </div>
 
 
@@ -620,10 +598,8 @@ later.</td></tr>
     header which in turn contains one of the headers listed, will be
     rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# reject reponses with "User-Agent" listed in the Vary header
-PolicyVary enforce User-Agent
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># reject reponses with "User-Agent" listed in the Vary header
+PolicyVary enforce User-Agent</pre>
 </div>
 
 
@@ -659,10 +635,8 @@ later.</td></tr>
     <p>When logged or enforced, a request with a version lower than specified
     will be rejected.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-# reject requests with an HTTP version older than HTTP/1.1
-PolicyVersion enforce HTTP/1.1
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># reject requests with an HTTP version older than HTTP/1.1
+PolicyVersion enforce HTTP/1.1</pre>
 </div>
 
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Wed Feb  5 22:28:30 2014
@@ -201,20 +201,16 @@
     <p>In addition, if you wish to have caching enabled, consult
     the documentation from <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
 
-    <div class="example"><h3>Reverse Proxy</h3><pre class="prettyprint lang-config">
-ProxyPass /foo http://foo.example.com/bar
-ProxyPassReverse /foo http://foo.example.com/bar
-    </pre>
+    <div class="example"><h3>Reverse Proxy</h3><pre class="prettyprint lang-config">ProxyPass /foo http://foo.example.com/bar
+ProxyPassReverse /foo http://foo.example.com/bar</pre>
 </div>
 
-    <div class="example"><h3>Forward Proxy</h3><pre class="prettyprint lang-config">
-ProxyRequests On
+    <div class="example"><h3>Forward Proxy</h3><pre class="prettyprint lang-config">ProxyRequests On
 ProxyVia On
 
 &lt;Proxy *&gt;
   Require host internal.example.com
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 </div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -237,9 +233,7 @@ ProxyVia On
       <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> when used
       for a reverse proxy:</p>
 
-      <pre class="prettyprint lang-config">
-          ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30
-      </pre>
+      <pre class="prettyprint lang-config">          ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30</pre>
 
 
       <p>This will create a worker associated with the origin server URL
@@ -247,19 +241,15 @@ ProxyVia On
       values. When used in a forward proxy, workers are usually defined
       via the <code class="directive"><a href="#proxyset">ProxySet</a></code> directive:</p>
 
-      <pre class="prettyprint lang-config">
-          ProxySet http://backend.example.com connectiontimeout=5 timeout=30
-      </pre>
+      <pre class="prettyprint lang-config">          ProxySet http://backend.example.com connectiontimeout=5 timeout=30</pre>
 
 
       <p>or alternatively using <code class="directive"><a href="#proxy">Proxy</a></code>
       and <code class="directive"><a href="#proxyset">ProxySet</a></code>:</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Proxy http://backend.example.com&gt;
+      <pre class="prettyprint lang-config">&lt;Proxy http://backend.example.com&gt;
   ProxySet connectiontimeout=5 timeout=30
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 
 
       <p>Using explicitly configured workers in the forward mode is
@@ -276,10 +266,8 @@ ProxyVia On
       <p>The URL identifying a direct worker is the URL of its
       origin server including any path components given:</p>
 
-     <pre class="prettyprint lang-config">
-ProxyPass /examples http://backend.example.com/examples
-ProxyPass /docs http://backend.example.com/docs
-      </pre>
+     <pre class="prettyprint lang-config">ProxyPass /examples http://backend.example.com/examples
+ProxyPass /docs http://backend.example.com/docs</pre>
 
 
       <p>This example defines two different workers, each using a separate
@@ -290,10 +278,8 @@ ProxyPass /docs http://backend.example.c
         the URL of some worker is a leading substring of the URL of another
         worker defined later in the configuration file. In the following example</p>
 
-        <pre class="prettyprint lang-config">
-ProxyPass /apps http://backend.example.com/ timeout=60
-ProxyPass /examples http://backend.example.com/examples timeout=10
-        </pre>
+        <pre class="prettyprint lang-config">ProxyPass /apps http://backend.example.com/ timeout=60
+ProxyPass /examples http://backend.example.com/examples timeout=10</pre>
 
 
         <p>the second worker isn't actually created. Instead the first
@@ -340,11 +326,9 @@ ProxyPass /examples http://backend.examp
       <p>You can control who can access your proxy via the <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> control block as in
       the following example:</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Proxy *&gt;
+      <pre class="prettyprint lang-config">&lt;Proxy *&gt;
   Require ip 192.168.0
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 
 
       <p>For more information on access control directives, see
@@ -402,13 +386,11 @@ ProxyPass /examples http://backend.examp
       <p>These are the <code>force-proxy-request-1.0</code> and
       <code>proxy-nokeepalive</code> notes.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Location /buggyappserver/&gt;
+      <pre class="prettyprint lang-config">&lt;Location /buggyappserver/&gt;
   ProxyPass http://buggyappserver:7001/foo/
   SetEnv force-proxy-request-1.0 1
   SetEnv proxy-nokeepalive 1
-&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>
@@ -573,10 +555,8 @@ directly</td></tr>
     always served directly, without forwarding to the configured
     <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> proxy server(s).</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-ProxyRemote  *  http://firewall.example.com:81
-NoProxy         .example.com 192.168.112.0/21
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ProxyRemote  *  http://firewall.example.com:81
+NoProxy         .example.com 192.168.112.0/21</pre>
 </div>
 
     <p>The <var>host</var> arguments to the <code class="directive">NoProxy</code>
@@ -699,22 +679,18 @@ NoProxy         .example.com 192.168.112
     <code>yournetwork.example.com</code> to access content via your proxy
     server:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Proxy *&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy *&gt;
   Require host yournetwork.example.com
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>The following example will process all files in the <code>foo</code>
     directory of <code>example.com</code> through the <code>INCLUDES</code>
     filter when they are sent through the proxy server:</p>
 
-   <pre class="prettyprint lang-config">    
-&lt;Proxy http://example.com/foo/*&gt;
+   <pre class="prettyprint lang-config">&lt;Proxy http://example.com/foo/*&gt;
   SetOutputFilter INCLUDES
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <div class="note"><h3>Differences from the Location configuration section</h3>
@@ -823,9 +799,7 @@ response</td></tr>
     <p>Note that the DNS lookups may slow down the startup time of the
     server.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ProxyBlock news.example.com auctions.example.com friends.example.com
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      ProxyBlock news.example.com auctions.example.com friends.example.com</pre>
 </div>
 
     <p>Note that <code>example</code> would also be sufficient to match any
@@ -835,9 +809,7 @@ response</td></tr>
 
     <p>Note also that</p>
 
-    <pre class="prettyprint lang-config">
-      ProxyBlock *
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyBlock *</pre>
 
 
     <p>blocks connections to all sites.</p>
@@ -859,11 +831,9 @@ response</td></tr>
     response to the same host with the configured <var>Domain</var> appended
     will be generated.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ProxyRemote  *  http://firewall.example.com:81<br />
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      ProxyRemote  *  http://firewall.example.com:81<br />
       NoProxy         .example.com 192.168.112.0/21<br />
-      ProxyDomain     .example.com
-      </pre>
+      ProxyDomain     .example.com</pre>
 </div>
 
 </div>
@@ -939,11 +909,9 @@ proxied resources</td></tr>
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. In order to prevent confusion, numbered
     (unnamed) backreferences are ignored. Use named groups instead.</p>
 
-<pre class="prettyprint lang-config">
-&lt;ProxyMatch ^http://(?&lt;sitename&gt;[^/]+)&gt;
+<pre class="prettyprint lang-config">&lt;ProxyMatch ^http://(?&lt;sitename&gt;[^/]+)&gt;
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
-&lt;/ProxyMatch&gt;
-</pre>
+&lt;/ProxyMatch&gt;</pre>
 
 
 <h3>See also</h3>
@@ -967,9 +935,7 @@ through</td></tr>
     <code>Max-Forwards</code> header supplied with the request. This may
     be set to prevent infinite proxy loops, or a DoS attack.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ProxyMaxForwards 15
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      ProxyMaxForwards 15</pre>
 </div>
 
     <p>Note that setting <code class="directive">ProxyMaxForwards</code> is a
@@ -1024,11 +990,9 @@ through</td></tr>
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /mirror/foo/&gt;
+    <pre class="prettyprint lang-config">&lt;Location /mirror/foo/&gt;
     ProxyPass http://backend.example.com/
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>will cause a local request for
@@ -1040,9 +1004,7 @@ through</td></tr>
     the below syntax is that it allows for dynamic control via the
     <a href="mod_proxy_balancer.html#balancer_manager">Balancer Manager</a> interface:</p>
 
-    <pre class="prettyprint lang-config">
-        ProxyPass /mirror/foo/ http://backend.example.com/
-    </pre>
+    <pre class="prettyprint lang-config">        ProxyPass /mirror/foo/ http://backend.example.com/</pre>
 
 
     <div class="warning">
@@ -1056,20 +1018,16 @@ through</td></tr>
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory, <em>e.g.</em></p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /mirror/foo/&gt;
+    <pre class="prettyprint lang-config">&lt;Location /mirror/foo/&gt;
     ProxyPass http://backend.example.com/
 &lt;/Location&gt;
 &lt;Location /mirror/foo/i&gt;
     ProxyPass !
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-ProxyPass /mirror/foo/i !
-ProxyPass /mirror/foo http://backend.example.com
-    </pre>
+    <pre class="prettyprint lang-config">ProxyPass /mirror/foo/i !
+ProxyPass /mirror/foo http://backend.example.com</pre>
 
 
     <p>will proxy all requests to <code>/mirror/foo</code> to
@@ -1116,9 +1074,7 @@ ProxyPass /mirror/foo http://backend.exa
     among all child processes, except when only one child process is allowed
     by configuration or MPM design.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-        ProxyPass /example http://backend.example.com max=20 ttl=120 retry=300
-        </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">        ProxyPass /example http://backend.example.com max=20 ttl=120 retry=300</pre>
 </div>
 
     <table class="bordered"><tr><th>BalancerMember parameters</th></tr></table>
@@ -1397,30 +1353,26 @@ ProxyPass /mirror/foo http://backend.exa
 
     </table>
     <p>A sample balancer setup</p>
-    <pre class="prettyprint lang-config">
-ProxyPass /special-area http://special.example.com smax=5 max=10
+    <pre class="prettyprint lang-config">ProxyPass /special-area http://special.example.com smax=5 max=10
 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
 &lt;Proxy balancer://mycluster&gt;
     BalancerMember ajp://1.2.3.4:8009
     BalancerMember ajp://1.2.3.5:8009 loadfactor=20
     # Less powerful server, don't send as many requests there,
     BalancerMember ajp://1.2.3.6:8009 loadfactor=5
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>Setting up a hot-standby, that will only be used if no other
      members are available</p>
-    <pre class="prettyprint lang-config">
-ProxyPass / balancer://hotcluster/
+    <pre class="prettyprint lang-config">ProxyPass / balancer://hotcluster/
 &lt;Proxy balancer://hotcluster&gt;
     BalancerMember ajp://1.2.3.4:8009 loadfactor=1
     BalancerMember ajp://1.2.3.5:8009 loadfactor=2
     # The server below is on hot standby
     BalancerMember ajp://1.2.3.6:8009 status=+H
     ProxySet lbmethod=bytraffic
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>Normally, mod_proxy will canonicalise ProxyPassed URLs.
@@ -1460,8 +1412,7 @@ ProxyPass / balancer://hotcluster/
     scheme can be accomplished with <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> as in the
     following example.</p>
 
-    <pre class="prettyprint lang-config">
-RewriteEngine On
+    <pre class="prettyprint lang-config">RewriteEngine On
 
 RewriteCond %{HTTPS} =off
 RewriteRule . - [E=protocol:http]
@@ -1470,8 +1421,7 @@ RewriteRule . - [E=protocol:https]
 
 RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
-ProxyPassReverse  /mirror/foo/ https://backend.example.com/
-    </pre>
+ProxyPassReverse  /mirror/foo/ https://backend.example.com/</pre>
 
 
 </div>
@@ -1545,9 +1495,7 @@ ProxyPassReverse  /mirror/foo/ https://b
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
 
-    <pre class="prettyprint lang-config">
-      ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com$1
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com$1</pre>
 
 
     <p>will cause a local request for
@@ -1557,16 +1505,12 @@ ProxyPassReverse  /mirror/foo/ https://b
       <p>The URL argument must be parsable as a URL <em>before</em> regexp
       substitutions (as well as after).  This limits the matches you can use.
       For instance, if we had used</p>
-      <pre class="prettyprint lang-config">
-        ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1
-      </pre>
+      <pre class="prettyprint lang-config">        ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1</pre>
 
       <p>in our previous example, it would fail with a syntax error
       at server startup.  This is a bug (PR 46665 in the ASF bugzilla),
       and the workaround is to reformulate the match:</p>
-      <pre class="prettyprint lang-config">
-        ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1
-      </pre>
+      <pre class="prettyprint lang-config">        ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1</pre>
 
     </div>
     <p>The <code>!</code> directive is useful in situations where you don't want
@@ -1622,12 +1566,10 @@ proxied server</td></tr>
     <p>For example, suppose the local server has address
     <code>http://example.com/</code>; then</p>
 
-    <pre class="prettyprint lang-config">
-ProxyPass         /mirror/foo/ http://backend.example.com/
+    <pre class="prettyprint lang-config">ProxyPass         /mirror/foo/ http://backend.example.com/
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
 ProxyPassReverseCookieDomain  backend.example.com  public.example.com
-ProxyPassReverseCookiePath  /  /mirror/foo/
-    </pre>
+ProxyPassReverseCookiePath  /  /mirror/foo/</pre>
 
 
     <p>will not only cause a local request for the
@@ -1702,9 +1644,7 @@ reverse proxy. This directive rewrites t
 In the example given with 
 <code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code>, the directive:
 </p>
-    <pre class="prettyprint lang-config">
-      ProxyPassReverseCookiePath  /  /mirror/foo/
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyPassReverseCookiePath  /  /mirror/foo/</pre>
 
 <p>
 will rewrite a cookie with backend path <code>/</code> (or
@@ -1752,9 +1692,7 @@ connections</td></tr>
     to <code>0</code> to indicate that the system's default buffer size should
     be used.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ProxyReceiveBufferSize 2048
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">      ProxyReceiveBufferSize 2048</pre>
 </div>
 
 </div>
@@ -1783,11 +1721,9 @@ connections</td></tr>
     are supported by this module. When using <code>https</code>, the requests
     are forwarded through the remote proxy using the HTTP CONNECT method.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
 ProxyRemote * http://cleverproxy.localdomain
-ProxyRemote ftp http://ftpproxy.mydomain:8080
-    </pre>
+ProxyRemote ftp http://ftpproxy.mydomain:8080</pre>
 </div>
 
     <p>In the last example, the proxy will forward FTP requests, encapsulated
@@ -1869,30 +1805,22 @@ expressions</td></tr>
     <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> instead of a
     <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.</p>
 
-    <div class="example"><pre class="prettyprint lang-config">
-&lt;Proxy balancer://hotcluster&gt;
+    <div class="example"><pre class="prettyprint lang-config">&lt;Proxy balancer://hotcluster&gt;
     BalancerMember http://www2.example.com:8080 loadfactor=1
     BalancerMember http://www3.example.com:8080 loadfactor=2
     ProxySet lbmethod=bytraffic
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 </div>
 
-    <pre class="prettyprint lang-config">
-&lt;Proxy http://backend&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy http://backend&gt;
     ProxySet keepalive=On
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-        ProxySet balancer://foo lbmethod=bytraffic timeout=15
-    </pre>
+    <pre class="prettyprint lang-config">        ProxySet balancer://foo lbmethod=bytraffic timeout=15</pre>
 
 
-    <pre class="prettyprint lang-config">
-        ProxySet ajp://backend:7001 timeout=15
-    </pre>
+    <pre class="prettyprint lang-config">        ProxySet ajp://backend:7001 timeout=15</pre>
 
 
    <div class="warning"><h3>Warning</h3>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr Wed Feb  5 22:28:30 2014
@@ -219,20 +219,16 @@
     <p>Si en outre, vous désirez activer la mise en cache, consultez la
     documentation de <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
 
-    <div class="example"><h3>Mandataire inverse</h3><pre class="prettyprint lang-config">
-ProxyPass /foo http://foo.example.com/bar
-ProxyPassReverse /foo http://foo.example.com/bar
-    </pre>
+    <div class="example"><h3>Mandataire inverse</h3><pre class="prettyprint lang-config">ProxyPass /foo http://foo.example.com/bar
+ProxyPassReverse /foo http://foo.example.com/bar</pre>
 </div>
 
-    <div class="example"><h3>Mandataire direct</h3><pre class="prettyprint lang-config">
-ProxyRequests On
+    <div class="example"><h3>Mandataire direct</h3><pre class="prettyprint lang-config">ProxyRequests On
 ProxyVia On
 
 &lt;Proxy *&gt;
   Require host internal.example.com
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 </div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -256,9 +252,7 @@ ProxyVia On
       Ils sont en général définis via les directives <code class="directive"><a href="#proxypass">ProxyPass</a></code> ou <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> lorsqu'on les
       utilise dans le cadre d'un mandataire inverse :</p>
 
-      <div class="example"><pre class="prettyprint lang-config">
-          ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30
-	  </pre>
+      <div class="example"><pre class="prettyprint lang-config">          ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30</pre>
 </div>
       
 
@@ -268,19 +262,15 @@ ProxyVia On
       d'un mandataire direct, les workers sont en général définis via la
       directive <code class="directive"><a href="#proxyset">ProxySet</a></code>,</p>
 
-      <div class="example"><pre class="prettyprint lang-config">
-          ProxySet http://backend.example.com connectiontimeout=5 timeout=30
-	  </pre>
+      <div class="example"><pre class="prettyprint lang-config">          ProxySet http://backend.example.com connectiontimeout=5 timeout=30</pre>
 </div>
       
 
       <p>ou encore via les directives <code class="directive"><a href="#proxy">Proxy</a></code> et <code class="directive"><a href="#proxyset">ProxySet</a></code> :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Proxy http://backend.example.com&gt;
+      <pre class="prettyprint lang-config">&lt;Proxy http://backend.example.com&gt;
   ProxySet connectiontimeout=5 timeout=30
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 
 
       <p>L'utilisation de workers définis explicitement dans le mode
@@ -299,10 +289,8 @@ ProxyVia On
       <p>L'URL qui identifie un worker correspond à l'URL de son serveur
       original, y compris un éventuel chemin donné :</p>
 
-      <pre class="prettyprint lang-config">
-ProxyPass /examples http://backend.example.com/examples
-ProxyPass /docs http://backend.example.com/docs
-      </pre>
+      <pre class="prettyprint lang-config">ProxyPass /examples http://backend.example.com/examples
+ProxyPass /docs http://backend.example.com/docs</pre>
 
 
       <p>Dans cet exemple, deux workers différents sont définis, chacun
@@ -315,10 +303,8 @@ ProxyPass /docs http://backend.example.c
 	correspond au début de l'URL d'un autre worker défini plus loin
 	dans le fichier de configuration. Dans l'exemple suivant,</p>
 
-        <pre class="prettyprint lang-config">
-ProxyPass /apps http://backend.example.com/ timeout=60
-ProxyPass /examples http://backend.example.com/examples timeout=10
-        </pre>
+        <pre class="prettyprint lang-config">ProxyPass /apps http://backend.example.com/ timeout=60
+ProxyPass /examples http://backend.example.com/examples timeout=10</pre>
 
 
         <p>le second worker n'est pas vraiment créé. C'est le premier
@@ -372,11 +358,9 @@ ProxyPass /examples http://backend.examp
       de contrôle <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> comme dans
       l'exemple suivant :</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Proxy *&gt;
+      <pre class="prettyprint lang-config">&lt;Proxy *&gt;
   Require ip 192.168.0
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 
 
       <p>Pour plus de détails sur les directives de contrôle d'accès,
@@ -447,13 +431,11 @@ ProxyPass /examples http://backend.examp
       <p>Il s'agit des variables <code>force-proxy-request-1.0</code> et
       <code>proxy-nokeepalive</code>.</p>
 
-      <pre class="prettyprint lang-config">
-&lt;Location /buggyappserver/&gt;
+      <pre class="prettyprint lang-config">&lt;Location /buggyappserver/&gt;
   ProxyPass http://buggyappserver:7001/foo/
   SetEnv force-proxy-request-1.0 1
   SetEnv proxy-nokeepalive 1
-&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>
@@ -641,10 +623,8 @@ directement</td></tr>
     sans être redirigée vers le(s) serveur(s) mandataire(s) défini(s) par
     la directive <code class="directive"><a href="#proxyremote">ProxyRemote</a></code>.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-ProxyRemote  *  http://firewall.example.com:81
-NoProxy         .example.com 192.168.112.0/21
-    </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">ProxyRemote  *  http://firewall.example.com:81
+NoProxy         .example.com 192.168.112.0/21</pre>
 </div>
 
     <p>Le type des arguments <var>serveur</var> de la directive
@@ -784,11 +764,9 @@ mandatées</td></tr>
     contenu via votre serveur mandataire que les hôtes appartenant à
     <code>votre-reseau.example.com</code> :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Proxy *&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy *&gt;
   Require host votre-reseau.example.com
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>Dans l'exemple suivant, tous les fichiers du répertoire
@@ -796,11 +774,9 @@ mandatées</td></tr>
     filtre <code>INCLUDES</code> lorsqu'ils seront envoyés par
     l'intermédiaire du serveur mandataire :</p>
 
-    <pre class="prettyprint lang-config">    
-&lt;Proxy http://example.com/foo/*&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy http://example.com/foo/*&gt;
   SetOutputFilter INCLUDES
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <div class="note"><h3>Différences avec la section de configuration Location</h3>
@@ -921,9 +897,7 @@ incorrectes d'une réponse</td></tr>
     <p>Notez que les recherches DNS peuvent ralentir le processus de
     démarrage du serveur.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      ProxyBlock news.example.com auctions.example.com friends.example.com
-      </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      ProxyBlock news.example.com auctions.example.com friends.example.com</pre>
 </div>
 
     <p>Notez qu'<code>example</code> suffirait aussi pour atteindre
@@ -933,9 +907,7 @@ incorrectes d'une réponse</td></tr>
 
     <p>Notez aussi que</p>
 
-    <pre class="prettyprint lang-config">
-      ProxyBlock *
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyBlock *</pre>
 
 
     <p>bloque les connexions vers tous les sites.</p>
@@ -959,11 +931,9 @@ mandatées</td></tr>
     générer une réponse de redirection vers le même hôte suffixé par le
     <var>Domaine</var> spécifié.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      ProxyRemote  *  http://firewall.example.com:81<br />
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      ProxyRemote  *  http://firewall.example.com:81<br />
       NoProxy         .example.com 192.168.112.0/21<br />
-      ProxyDomain     .example.com
-      </pre>
+      ProxyDomain     .example.com</pre>
 </div>
 
 </div>
@@ -1049,11 +1019,9 @@ mandatées correspondant à une expressi
     nommées) sont ignorées. Vous devez utiliser à la place des groupes
     nommés.</p>
 
-<pre class="prettyprint lang-config">
-&lt;ProxyMatch ^http://(?&lt;sitename&gt;[^/]+)&gt;
+<pre class="prettyprint lang-config">&lt;ProxyMatch ^http://(?&lt;sitename&gt;[^/]+)&gt;
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
-&lt;/ProxyMatch&gt;
-</pre>
+&lt;/ProxyMatch&gt;</pre>
 
 
 <h3>Voir aussi</h3>
@@ -1079,9 +1047,7 @@ requête peut être redirigée</td></tr>
     contre les boucles infinies de mandataires ou contre les attaques de
     type déni de service.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      ProxyMaxForwards 15
-      </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      ProxyMaxForwards 15</pre>
 </div>
 
     <p>Notez que la définition de la directive
@@ -1143,11 +1109,9 @@ l'espace d'URLs du serveur local</td></t
     <p>Supposons que le serveur local a pour adresse
     <code>http://example.com/</code> ; alors la ligne</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /mirror/foo/&gt;
+    <pre class="prettyprint lang-config">&lt;Location /mirror/foo/&gt;
     ProxyPass http://backend.example.com/
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
     <p>va convertir en interne toute requête pour
@@ -1159,9 +1123,7 @@ l'espace d'URLs du serveur local</td></t
     présente en très grand nombre. Elle possède l'avantage de
     permettre un contrôle dynamique via l'interface <a href="mod_proxy_balancer.html#balancer_manager">Balancer Manager</a> :</p>
 
-    <pre class="prettyprint lang-config">
-        ProxyPass /miroir/foo/ http://backend.example.com/
-    </pre>
+    <pre class="prettyprint lang-config">        ProxyPass /miroir/foo/ http://backend.example.com/</pre>
 
 
     <div class="warning">
@@ -1176,20 +1138,16 @@ l'espace d'URLs du serveur local</td></t
     <p>Le drapeau <code>!</code> permet de soustraire un sous-répertoire
     du mandat inverse, comme dans l'exemple suivant :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Location /mirror/foo/&gt;
+    <pre class="prettyprint lang-config">&lt;Location /mirror/foo/&gt;
     ProxyPass http://backend.example.com/
 &lt;/Location&gt;
 &lt;Location /mirror/foo/i&gt;
     ProxyPass !
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-ProxyPass /mirror/foo/i !
-ProxyPass /mirror/foo http://backend.example.com
-    </pre>
+    <pre class="prettyprint lang-config">ProxyPass /mirror/foo/i !
+ProxyPass /mirror/foo http://backend.example.com</pre>
 
 
     <p>va mandater toutes les requêtes pour <code>/miroir/foo</code>
@@ -1242,9 +1200,7 @@ ProxyPass /mirror/foo http://backend.exa
     enfants, sauf si un seul processus enfant est autorisé par la
     configuration ou la conception du module multi-processus (MPM).</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-        ProxyPass /example http://backend.example.com max=20 ttl=120 retry=300
-	</pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">        ProxyPass /example http://backend.example.com max=20 ttl=120 retry=300</pre>
 </div>
 
     <table class="bordered"><tr><th>Paramètres de BalancerMember</th></tr></table>
@@ -1578,30 +1534,26 @@ ProxyPass /mirror/foo http://backend.exa
 
     </table>
     <p>Exemple de configuration d'un répartiteur de charge</p>
-    <pre class="prettyprint lang-config">
-ProxyPass /special-area http://special.example.com smax=5 max=10
+    <pre class="prettyprint lang-config">ProxyPass /special-area http://special.example.com smax=5 max=10
 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
 &lt;Proxy balancer://mycluster&gt;
     BalancerMember ajp://1.2.3.4:8009
     BalancerMember ajp://1.2.3.5:8009 loadfactor=20
     # Less powerful server, don't send as many requests there,
     BalancerMember ajp://1.2.3.6:8009 loadfactor=5
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>Configuration d'un serveur cible de réserve qui ne sera utilisé que si
     aucun autre serveur cible n'est disponible</p>
-    <pre class="prettyprint lang-config">
-ProxyPass / balancer://hotcluster/ 
+    <pre class="prettyprint lang-config">ProxyPass / balancer://hotcluster/ 
 &lt;Proxy balancer://hotcluster&gt;
     BalancerMember ajp://1.2.3.4:8009 loadfactor=1
     BalancerMember ajp://1.2.3.5:8009 loadfactor=2
     # The server below is on hot standby
     BalancerMember ajp://1.2.3.6:8009 status=+H
     ProxySet lbmethod=bytraffic
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
     <p>Normalement, mod_proxy va mettre sous leur forme canonique les
@@ -1649,8 +1601,7 @@ ProxyPass / balancer://hotcluster/ 
     protocole peut être effectuée à l'aide de
     <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> comme dans l'exemple suivant :</p>
 
-    <pre class="prettyprint lang-config">
-RewriteEngine On
+    <pre class="prettyprint lang-config">RewriteEngine On
 
 RewriteCond %{HTTPS} =off
 RewriteRule . - [E=protocol:http]
@@ -1659,8 +1610,7 @@ RewriteRule . - [E=protocol:https]
 
 RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
-ProxyPassReverse  /mirror/foo/ https://backend.example.com/
-    </pre>
+ProxyPassReverse  /mirror/foo/ https://backend.example.com/</pre>
 
 
 
@@ -1746,9 +1696,7 @@ du serveur local en utilisant des expres
     <p>Supposons que le serveur local a pour adresse
     <code>http://example.com/</code> ; alors</p>
 
-    <pre class="prettyprint lang-config">
-      ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com$1
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com$1</pre>
 
 
     <p>va provoquer la conversion interne de la requête locale
@@ -1760,17 +1708,13 @@ du serveur local en utilisant des expres
       <em>avant</em> les substitutions d'expressions rationnelles (et
       doit aussi l'être après). Ceci limite les correspondances que vous
       pouvez utiliser. Par exemple, si l'on avait utilisé</p>
-      <pre class="prettyprint lang-config">
-        ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1
-      </pre>
+      <pre class="prettyprint lang-config">        ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1</pre>
 
       <p>dans l'exemple précédent, nous aurions provoqué une erreur de
       syntaxe au démarrage du serveur. C'est une bogue (PR 46665 dans
       ASF bugzilla), et il est possible de la contourner en reformulant
       la correspondance :</p>
-      <pre class="prettyprint lang-config">
-        ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1
-      </pre>
+      <pre class="prettyprint lang-config">        ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1</pre>
 
     </div>
 
@@ -1833,12 +1777,10 @@ par un serveur mandaté en inverse</td><
     <p>Supposons par exemple que le serveur local a pour adresse
     <code>http://example.com/</code> ; alors</p>
 
-    <pre class="prettyprint lang-config">
-ProxyPass         /mirror/foo/ http://backend.example.com/
+    <pre class="prettyprint lang-config">ProxyPass         /mirror/foo/ http://backend.example.com/
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
 ProxyPassReverseCookieDomain  backend.example.com  public.example.com
-ProxyPassReverseCookiePath  /  /mirror/foo/
-    </pre>
+ProxyPassReverseCookiePath  /  /mirror/foo/</pre>
 
 
     <p>ne va pas seulement provoquer la conversion interne d'une requête
@@ -1924,9 +1866,7 @@ réécrire la chaîne <code>path</code> 
 </p><p>
 Dans l'exemple fourni avec la directive <code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code>, la directive :
 </p>
-    <pre class="prettyprint lang-config">
-      ProxyPassReverseCookiePath  /  /mirror/foo/
-    </pre>
+    <pre class="prettyprint lang-config">      ProxyPassReverseCookiePath  /  /mirror/foo/</pre>
 
 <p>
 va réécrire un cookie possédant un chemin d'arrière-plan <code>/</code>
@@ -1977,9 +1917,7 @@ et FTP</td></tr>
     <code>0</code> pour indiquer que la taille de tampon par défaut du
     système doit être utilisée.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-      ProxyReceiveBufferSize 2048
-      </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">      ProxyReceiveBufferSize 2048</pre>
 </div>
 
 </div>
@@ -2012,11 +1950,9 @@ requêtes</td></tr>
     <code>https</code>, les requêtes sont redirigées par le mandataire
     distant en utilisant la méthode HTTP CONNECT.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
 ProxyRemote * http://cleverproxy.localdomain
-ProxyRemote ftp http://ftpproxy.mydomain:8080
-    </pre>
+ProxyRemote ftp http://ftpproxy.mydomain:8080</pre>
 </div>
 
     <p>Dans la dernière ligne de l'exemple, le mandataire va faire
@@ -2108,30 +2044,22 @@ charge</td></tr>
     est créé. Ceci peut s'avérer utile pour la mise en oeuvre d'un
     mandataire inverse via une directive <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> au lieu de <code class="directive"><a href="#proxypass">ProxyPass</a></code>.</p>
 
-    <div class="example"><pre class="prettyprint lang-config">
-&lt;Proxy balancer://hotcluster&gt;
+    <div class="example"><pre class="prettyprint lang-config">&lt;Proxy balancer://hotcluster&gt;
     BalancerMember http://www2.example.com:8080 loadfactor=1
     BalancerMember http://www3.example.com:8080 loadfactor=2
     ProxySet lbmethod=bytraffic
-&lt;/Proxy&gt;
-      </pre>
+&lt;/Proxy&gt;</pre>
 </div>
 
-    <pre class="prettyprint lang-config">
-&lt;Proxy http://backend&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy http://backend&gt;
     ProxySet keepalive=On
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
 
-    <pre class="prettyprint lang-config">
-        ProxySet balancer://foo lbmethod=bytraffic timeout=15
-    </pre>
+    <pre class="prettyprint lang-config">        ProxySet balancer://foo lbmethod=bytraffic timeout=15</pre>
 
 
-    <pre class="prettyprint lang-config">
-        ProxySet ajp://backend:7001 timeout=15
-    </pre>
+    <pre class="prettyprint lang-config">        ProxySet ajp://backend:7001 timeout=15</pre>
 
 
    <div class="warning"><h3>Avertissement</h3>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en Wed Feb  5 22:28:30 2014
@@ -71,20 +71,16 @@
     (e.g. Apache Tomcat) using the AJP13 protocol. The usage is similar to
     an HTTP reverse proxy, but uses the <code>ajp://</code> prefix:</p>
 
-    <div class="example"><h3>Simple Reverse Proxy</h3><pre class="prettyprint lang-config">
-    ProxyPass /app ajp://backend.example.com:8009/app
-    </pre>
+    <div class="example"><h3>Simple Reverse Proxy</h3><pre class="prettyprint lang-config">    ProxyPass /app ajp://backend.example.com:8009/app</pre>
 </div>
 
     <p>Balancers may also be used:</p>
-    <div class="example"><h3>Balancer Reverse Proxy</h3><pre class="prettyprint lang-config">
-&lt;Proxy balancer://cluster&gt;
+    <div class="example"><h3>Balancer Reverse Proxy</h3><pre class="prettyprint lang-config">&lt;Proxy balancer://cluster&gt;
     BalancerMember ajp://app1.example.com:8009 loadfactor=1
     BalancerMember ajp://app2.example.com:8009 loadfactor=2
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
-ProxyPass /app balancer://cluster/app
-      </pre>
+ProxyPass /app balancer://cluster/app</pre>
 </div>
 
     <p>Note that usually no
@@ -99,10 +95,8 @@ ProxyPass /app balancer://cluster/app
     backend. In this case, a redirect header can be rewritten relative to the
     original host URL (not the backend <code>ajp://</code> URL), for
     example:</p>
-    <div class="example"><h3>Rewriting Proxied Path</h3><pre class="prettyprint lang-config">
-ProxyPass /apps/foo ajp://backend.example.com:8009/foo
-ProxyPassReverse /apps/foo http://www.example.com/foo
-    </pre>
+    <div class="example"><h3>Rewriting Proxied Path</h3><pre class="prettyprint lang-config">ProxyPass /apps/foo ajp://backend.example.com:8009/foo
+ProxyPassReverse /apps/foo http://www.example.com/foo</pre>
 </div>
     <p>However, it is usually better to deploy the application on the backend
     server at the same path as the proxy rather than to take this approach.
@@ -341,8 +335,7 @@ ProxyPassReverse /apps/foo http://www.ex
 <h2><a name="rpacetstruct" id="rpacetstruct">Request Packet Structure</a></h2>
     <p>For messages from the server to the container of type
     <em>Forward Request</em>:</p>
-    <div class="example"><pre>
-AJP13_FORWARD_REQUEST :=
+    <div class="example"><pre>AJP13_FORWARD_REQUEST :=
     prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
     method           (byte)
     protocol         (string)
@@ -355,25 +348,19 @@ AJP13_FORWARD_REQUEST :=
     num_headers      (integer)
     request_headers *(req_header_name req_header_value)
     attributes      *(attribut_name attribute_value)
-    request_terminator (byte) OxFF
-    </pre></div>
+    request_terminator (byte) OxFF</pre></div>
     <p>The <code>request_headers</code> have the following structure:
-    </p><div class="example"><pre>
-req_header_name :=
+    </p><div class="example"><pre>req_header_name :=
     sc_req_header_name | (string)  [see below for how this is parsed]
 
 sc_req_header_name := 0xA0xx (integer)
 
-req_header_value := (string)
-</pre></div>
+req_header_value := (string)</pre></div>
     <p>The <code>attributes</code> are optional and have the following
     structure:</p>
-    <div class="example"><pre>
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+    <div class="example"><pre>attribute_name := sc_a_name | (sc_a_req_attribute string)
 
-attribute_value := (string)
-
-    </pre></div>
+attribute_value := (string)</pre></div>
     <p>Not that the all-important header is <code>content-length</code>,
     because it determines whether or not the container looks for another
     packet immediately.</p>
@@ -526,8 +513,7 @@ attribute_value := (string)
 <div class="section">
 <h2><a name="resppacketstruct" id="resppacketstruct">Response Packet Structure</a></h2>
     <p>for messages which the container can send back to the server.</p>
-    <div class="example"><pre>
-AJP13_SEND_BODY_CHUNK :=
+    <div class="example"><pre>AJP13_SEND_BODY_CHUNK :=
   prefix_code   3
   chunk_length  (integer)
   chunk        *(byte)
@@ -555,8 +541,7 @@ AJP13_END_RESPONSE :=
 
 AJP13_GET_BODY_CHUNK :=
   prefix_code       6
-  requested_length  (integer)
-    </pre></div>
+  requested_length  (integer)</pre></div>
   <h3>Details:</h3>
   <h3>Send Body Chunk</h3>
     <p>The chunk is basically binary data, and is sent directly back to the

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.ja.utf8?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.ja.utf8 [utf-8] Wed Feb  5 22:28:30 2014
@@ -284,8 +284,7 @@
 <h2><a name="rpacetstruct" id="rpacetstruct">リクエストパケット構造</a></h2>
     <p>サーバからコンテナへ送られるメッセージが
     <em>Forward Request</em> 型の場合 :</p>
-    <div class="example"><pre>
-AJP13_FORWARD_REQUEST :=
+    <div class="example"><pre>AJP13_FORWARD_REQUEST :=
     prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
     method           (byte)
     protocol         (string)
@@ -298,24 +297,18 @@ AJP13_FORWARD_REQUEST :=
     num_headers      (integer)
     request_headers *(req_header_name req_header_value)
     attributes      *(attribut_name attribute_value)
-    request_terminator (byte) OxFF
-    </pre></div>
+    request_terminator (byte) OxFF</pre></div>
     <p><code>request_headers</code> は次のような構造になっています :
-    </p><div class="example"><pre>
-req_header_name := 
+    </p><div class="example"><pre>req_header_name := 
     sc_req_header_name | (string)  [see below for how this is parsed]
 
 sc_req_header_name := 0xA0xx (integer)
 
-req_header_value := (string)
-</pre></div>
+req_header_value := (string)</pre></div>
     <p><code>属性</code> はオプションで、次のような構造をしています :</p>
-    <div class="example"><pre>
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+    <div class="example"><pre>attribute_name := sc_a_name | (sc_a_req_attribute string)
 
-attribute_value := (string)
-
-    </pre></div>
+attribute_value := (string)</pre></div>
     <p>もっとも重要なヘッダは <code>content-length</code> だということに
     注意してください。コンテナは次のパケットを探すかどうかを、
     それを見て決めるからです。</p>
@@ -463,8 +456,7 @@ attribute_value := (string)
 <div class="section">
 <h2><a name="resppacketstruct" id="resppacketstruct">レスポンスパケット構造</a></h2>
     <p>コンテナがサーバに送り返すことのできるメッセージ:</p>
-    <div class="example"><pre>
-AJP13_SEND_BODY_CHUNK :=
+    <div class="example"><pre>AJP13_SEND_BODY_CHUNK :=
   prefix_code   3
   chunk_length  (integer)
   chunk        *(byte)
@@ -491,8 +483,7 @@ AJP13_END_RESPONSE :=
 
 AJP13_GET_BODY_CHUNK :=
   prefix_code       6
-  requested_length  (integer)
-    </pre></div>
+  requested_length  (integer)</pre></div>
   <h3>詳細 :</h3>
   <h3>Send Body Chunk</h3>
     <p>チャンクは基本的にはバイナリデータで、ブラウザに直接送られます。</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en Wed Feb  5 22:28:30 2014
@@ -108,14 +108,12 @@
     load balancing between two back-end servers:
     </p>
 
-    <pre class="prettyprint lang-config">
-&lt;Proxy balancer://mycluster&gt;
+    <pre class="prettyprint lang-config">&lt;Proxy balancer://mycluster&gt;
     BalancerMember http://192.168.1.50:80
     BalancerMember http://192.168.1.51:80
 &lt;/Proxy&gt;
 ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
-    </pre>
+ProxyPassReverse /test balancer://mycluster</pre>
 
 
     <p>Another example of how to provide load balancing with stickyness
@@ -123,16 +121,14 @@ ProxyPassReverse /test balancer://myclus
     not set a suitable session cookie:
     </p>
 
-    <pre class="prettyprint lang-config">
-Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
+    <pre class="prettyprint lang-config">Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
 &lt;Proxy balancer://mycluster&gt;
     BalancerMember http://192.168.1.50:80 route=1
     BalancerMember http://192.168.1.51:80 route=2
     ProxySet stickysession=ROUTEID
 &lt;/Proxy&gt;
 ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
-    </pre>
+ProxyPassReverse /test balancer://mycluster</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -206,12 +202,10 @@ ProxyPassReverse /test balancer://myclus
     <p>To enable load balancer management for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
-<pre class="prettyprint lang-config">
-&lt;Location /balancer-manager&gt;
+<pre class="prettyprint lang-config">&lt;Location /balancer-manager&gt;
     SetHandler balancer-manager
     Require host example.com
-&lt;/Location&gt;
-</pre>
+&lt;/Location&gt;</pre>
 
 
     <p>You can now access load balancer manager by using a Web browser
@@ -268,13 +262,11 @@ ProxyPassReverse /test balancer://myclus
     <p>Finally you can support cookies and URL encoding at the same time, by
     configuring the name of the cookie and the name of the URL parameter
     separated by a vertical bar (<code>|</code>) as in the following example:</p>
-    <pre class="prettyprint lang-config">
-ProxyPass /test balancer://mycluster stickysession=JSESSIONID|jsessionid scolonpathdelim=On
+    <pre class="prettyprint lang-config">ProxyPass /test balancer://mycluster stickysession=JSESSIONID|jsessionid scolonpathdelim=On
 &lt;Proxy balancer://mycluster&gt;
     BalancerMember http://192.168.1.50:80 route=node1
     BalancerMember http://192.168.1.51:80 route=node2
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 
     <p>If the cookie and the request parameter both provide routing information
     for the same request, the information from the request parameter is used.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_fcgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_fcgi.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_fcgi.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_fcgi.html.en Wed Feb  5 22:28:30 2014
@@ -73,9 +73,7 @@
     <p>Remember, in order to make the following examples work, you have to
     enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code>.</p>
 
-    <div class="example"><h3>Single application instance</h3><pre class="prettyprint lang-config">
-      ProxyPass /myapp/ fcgi://localhost:4000/
-      </pre>
+    <div class="example"><h3>Single application instance</h3><pre class="prettyprint lang-config">      ProxyPass /myapp/ fcgi://localhost:4000/</pre>
 </div>
 
     <p>This application should be able to handle multiple concurrent
@@ -89,9 +87,7 @@
     reuse on the <code class="directive">ProxyPass</code> directive, as shown in
     the following example:</p>
 
-    <div class="example"><h3>Single application instance, no connection reuse</h3><pre class="prettyprint lang-config">
-      ProxyPass /myapp/ fcgi://localhost:4000/ disablereuse=on
-      </pre>
+    <div class="example"><h3>Single application instance, no connection reuse</h3><pre class="prettyprint lang-config">      ProxyPass /myapp/ fcgi://localhost:4000/ disablereuse=on</pre>
 </div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
@@ -100,13 +96,11 @@
     modules listed above.  <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
     default, and will be used for this example configuration.</p>
 
-    <div class="example"><h3>Balanced gateway to multiple application instances</h3><pre class="prettyprint lang-config">
-ProxyPass /myapp/ balancer://myappcluster/
+    <div class="example"><h3>Balanced gateway to multiple application instances</h3><pre class="prettyprint lang-config">ProxyPass /myapp/ balancer://myappcluster/
 &lt;Proxy balancer://myappcluster/&gt;
     BalancerMember fcgi://localhost:4000
     BalancerMember fcgi://localhost:4001
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 </div>
 </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/mod/mod_proxy_scgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.html.en Wed Feb  5 22:28:30 2014
@@ -66,9 +66,7 @@
     <p>Remember, in order to make the following examples work, you have to
     enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
 
-    <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">
-      ProxyPass /scgi-bin/ scgi://localhost:4000/
-      </pre>
+    <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">      ProxyPass /scgi-bin/ scgi://localhost:4000/</pre>
 </div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
@@ -77,13 +75,11 @@
     modules listed above.  <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
     default, and will be used for this example configuration.</p>
 
-    <div class="example"><h3>Balanced gateway</h3><pre class="prettyprint lang-config">
-ProxyPass /scgi-bin/ balancer://somecluster/
+    <div class="example"><h3>Balanced gateway</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ balancer://somecluster/
 &lt;Proxy balancer://somecluster&gt;
     BalancerMember scgi://localhost:4000
     BalancerMember scgi://localhost:4001
-&lt;/Proxy&gt;
-    </pre>
+&lt;/Proxy&gt;</pre>
 </div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -125,9 +121,7 @@ backend</td></tr>
     <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> in this regard, except that you can turn off the
     feature.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-    ProxySCGIInternalRedirect Off
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">    ProxySCGIInternalRedirect Off</pre>
 </div>
 
 </div>
@@ -164,13 +158,11 @@ header</td></tr>
     the argument is applied as header name.</dd>
     </dl>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-    # Use the default header (X-Sendfile)
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">    # Use the default header (X-Sendfile)
     ProxySCGISendfile On
     
     # Use a different header
-    ProxySCGISendfile X-Send-Static
-    </pre>
+    ProxySCGISendfile X-Send-Static</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en Wed Feb  5 22:28:30 2014
@@ -38,17 +38,13 @@
     socket connections to a backend websockets server. The connection
     is automagically upgraded to a websocket connection:</p>
 
-    <pre class="prettyprint lang-config">
-Upgrade: WebSocket
-Connection: Upgrade
-    </pre>
+    <pre class="prettyprint lang-config">Upgrade: WebSocket
+Connection: Upgrade</pre>
 
 
 
-    <div class="example"><h3>Proxying requests to websockets server</h3><pre class="prettyprint lang-config">
-ProxyPass /ws2/  ws://echo.websocket.org/
-ProxyPass /wss2/ wss://echo.websocket.org/
-    </pre>
+    <div class="example"><h3>Proxying requests to websockets server</h3><pre class="prettyprint lang-config">ProxyPass /ws2/  ws://echo.websocket.org/
+ProxyPass /wss2/ wss://echo.websocket.org/</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en Wed Feb  5 22:28:30 2014
@@ -37,12 +37,10 @@
 The connection speed to be simulated is specified, in KiB/s, using the environment
 variable <code>rate-limit</code>.</p>
 
-<div class="example"><h3>Example Configuration</h3><pre class="prettyprint lang-config">
-&lt;Location /downloads&gt;
+<div class="example"><h3>Example Configuration</h3><pre class="prettyprint lang-config">&lt;Location /downloads&gt;
     SetOutputFilter RATE_LIMIT
     SetEnv rate-limit 400 
-&lt;/Location&gt;
-</pre>
+&lt;/Location&gt;</pre>
 </div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_reflector.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_reflector.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_reflector.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_reflector.html.en Wed Feb  5 22:28:30 2014
@@ -55,24 +55,20 @@
     <dd>Pass the request body through the DEFLATE filter to compress the
     body. This request requires a Content-Encoding request header containing
     "gzip" for the filter to return compressed data.
-    <pre class="prettyprint lang-config">
-&lt;Location /compress&gt;
+    <pre class="prettyprint lang-config">&lt;Location /compress&gt;
     SetHandler reflector
     SetOutputFilter DEFLATE
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
     </dd>
 
     <dt>Image downsampling service</dt>
     <dd>Pass the request body through an image downsampling filter, and reflect
     the results to the caller.
-    <pre class="prettyprint lang-config">
-&lt;Location /downsample&gt;
+    <pre class="prettyprint lang-config">&lt;Location /downsample&gt;
     SetHandler reflector
     SetOutputFilter DOWNSAMPLE
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
     </dd>
     </dl>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en Wed Feb  5 22:28:30 2014
@@ -136,14 +136,10 @@ via the request headers.
     other directives are used, <code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> will trust all
     hosts presenting a <code class="directive">RemoteIPHeader</code> IP value.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
-        RemoteIPHeader X-Client-IP
-        </pre>
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">        RemoteIPHeader X-Client-IP</pre>
 </div>
 
-    <div class="example"><h3>Proxy Example</h3><pre class="prettyprint lang-config">
-        RemoteIPHeader X-Forwarded-For
-        </pre>
+    <div class="example"><h3>Proxy Example</h3><pre class="prettyprint lang-config">        RemoteIPHeader X-Forwarded-For</pre>
 </div>
 
 </div>
@@ -163,11 +159,9 @@ via the request headers.
     presented in this header, including private intranet addresses, are
     trusted when passed from these proxies.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
-RemoteIPHeader X-Client-IP
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Client-IP
 RemoteIPInternalProxy 10.0.2.0/24
-RemoteIPInternalProxy gateway.localdomain
-        </pre>
+RemoteIPInternalProxy gateway.localdomain</pre>
 </div>
 
 </div>
@@ -188,17 +182,13 @@ RemoteIPInternalProxy gateway.localdomai
     each whitespace or newline separated entry is processed identically to
     the <code class="directive">RemoteIPInternalProxy</code> directive.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
-RemoteIPHeader X-Client-IP
-RemoteIPInternalProxyList conf/trusted-proxies.lst
-        </pre>
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Client-IP
+RemoteIPInternalProxyList conf/trusted-proxies.lst</pre>
 </div>
 
-    <div class="example"><h3>conf/trusted-proxies.lst contents</h3><pre>
-# Our internally trusted proxies;
+    <div class="example"><h3>conf/trusted-proxies.lst contents</h3><pre># Our internally trusted proxies;
 10.0.2.0/24         #Everyone in the testing group
-gateway.localdomain #The front end balancer
-</pre></div>
+gateway.localdomain #The front end balancer</pre></div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -218,10 +208,8 @@ gateway.localdomain #The front end balan
     this header, while any intermediate
     <code class="directive">RemoteIPInternalProxy</code> addresses are discarded.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-RemoteIPHeader X-Forwarded-For
-RemoteIPProxiesHeader X-Forwarded-By
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Forwarded-For
+RemoteIPProxiesHeader X-Forwarded-By</pre>
 </div>
 
 </div>
@@ -243,11 +231,9 @@ RemoteIPProxiesHeader X-Forwarded-By
     2000::/3 block) are not trusted as the useragent IP, and are left in the
     <code class="directive">RemoteIPHeader</code> header's value.</p>
 
-    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">
-RemoteIPHeader X-Forwarded-For
+    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Forwarded-For
 RemoteIPTrustedProxy 10.0.2.16/28
-RemoteIPTrustedProxy proxy.example.com
-        </pre>
+RemoteIPTrustedProxy proxy.example.com</pre>
 </div>
 
 </div>
@@ -268,10 +254,8 @@ RemoteIPTrustedProxy proxy.example.com
     each whitespace or newline separated entry is processed identically to
     the <code class="directive">RemoteIPTrustedProxy</code> directive.</p>
 
-    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">
-RemoteIPHeader X-Forwarded-For
-RemoteIPTrustedProxyList conf/trusted-proxies.lst
-        </pre>
+    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/trusted-proxies.lst</pre>
 </div>
 
     <div class="example"><h3>conf/trusted-proxies.lst contents</h3><p><code>



Mime
View raw message