httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1331546 [2/2] - in /httpd/httpd/trunk/docs/manual: ./ developer/ howto/ mod/ platform/ rewrite/
Date Fri, 27 Apr 2012 19:07:00 GMT
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=1331546&r1=1331545&r2=1331546&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 Fri Apr 27 19:06:57 2012
@@ -67,12 +67,10 @@
     <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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">
       ProxyPass /scgi-bin/ scgi://localhost:4000/
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
     at least one load balancer algorithm module, such as
@@ -80,16 +78,14 @@
     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><p><code>
-    <pre class="prettyprint lang-config">
+    <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>
-
-    </code></p></div>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="env" id="env">Environment Variables</a></h2>
@@ -130,12 +126,10 @@ 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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
     ProxySCGIInternalRedirect Off
     </pre>
-
-    </code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -171,16 +165,14 @@ header</td></tr>
     the argument is applied as header name.</dd>
     </dl>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <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>
-
-    </code></p></div>
+</div>
 
 </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=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en Fri Apr 27 19:06:57 2012
@@ -37,15 +37,13 @@
 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><p><code>
-<pre class="prettyprint lang-config">
+<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>
-
-</code></p></div>
+</div>
 
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>

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=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en Fri Apr 27 19:06:57 2012
@@ -136,19 +136,15 @@ 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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
         RemoteIPHeader X-Client-IP
         </pre>
+</div>
 
-    </code></p></div>
-
-    <div class="example"><h3>Proxy Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Proxy Example</h3><pre class="prettyprint lang-config">
         RemoteIPHeader X-Forwarded-For
         </pre>
-
-    </code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -167,14 +163,12 @@ 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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
 RemoteIPHeader X-Client-IP
 RemoteIPTrustedProxy 10.0.2.0/24
 RemoteIPTrustedProxy gateway.localdomain
         </pre>
-
-    </code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -223,13 +217,11 @@ 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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 RemoteIPHeader X-Forwarded-For
 RemoteIPProxiesHeader X-Forwarded-By
     </pre>
-
-    </code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -250,14 +242,12 @@ 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><p><code>
-        <pre class="prettyprint lang-config">
+    <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>
-
-    </code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -277,13 +267,11 @@ 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><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">
 RemoteIPHeader X-Forwarded-For
 RemoteIPTrustedProxyList conf/trusted-proxies.lst
         </pre>
-
-    </code></p></div>
+</div>
 
     <div class="example"><h3>conf/trusted-proxies.lst contents</h3><p><code>
        # Identified external proxies;<br />

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Fri Apr 27 19:06:57 2012
@@ -84,12 +84,10 @@ URLs on the fly</td></tr>
       level higher than <code>trace2</code> only for debugging!
     </div>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       LogLevel alert rewrite:trace3
       </pre>
-
-    </code></p></div>
+</div>
 
     <div class="note"><h3>RewriteLog</h3>
       <p>Those familiar with earlier versions of

Modified: httpd/httpd/trunk/docs/manual/mod/mod_sed.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_sed.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_sed.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_sed.html.en Fri Apr 27 19:06:57 2012
@@ -75,8 +75,7 @@ the author's blog</a>.</p>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
-    <div class="example"><h3>Adding an output filter </h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Adding an output filter </h3><pre class="prettyprint lang-config">
 # In the following example, the sed filter will change the string
 # "monday" to "MON" and the string "sunday" to SUN in html documents
 # before sending to the client.
@@ -86,11 +85,9 @@ the author's blog</a>.</p>
     OutputSed "s/sunday/SUN/g" 
 &lt;/Directory&gt; 
     </pre>
+</div>
 
-    </code></p></div>
-
-    <div class="example"><h3>Adding an input filter </h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Adding an input filter </h3><pre class="prettyprint lang-config">
 # In the following example, the sed filter will change the string
 # "monday" to "MON" and the string "sunday" to SUN in the POST data
 # sent to PHP.
@@ -100,8 +97,7 @@ the author's blog</a>.</p>
     InputSed "s/sunday/SUN/g" 
 &lt;/Directory&gt; 
         </pre>
-
-    </code></p></div>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sed_commands" id="sed_commands">Sed Commands</a></h2>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_session.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_session.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_session.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_session.html.en Fri Apr 27 19:06:57 2012
@@ -159,57 +159,49 @@
       where the session will be stored. In this example, the session will be
       stored on the browser, in a cookie called <code>session</code>.</p>
 
-      <div class="example"><h3>Browser based session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName session path=/
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>The session is not useful unless it can be written to or read from. The
       following example shows how values can be injected into the session through
       the use of a predetermined HTTP response header called
       <code>X-Replace-Session</code>.</p>
 
-      <div class="example"><h3>Writing to a session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Writing to a session</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName session path=/
 SessionHeader X-Replace-Session
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>The header should contain name value pairs expressed in the same format
       as a query string in a URL, as in the example below. Setting a key to the
       empty string has the effect of removing that key from the session.</p>
 
-      <div class="example"><h3>CGI to write to a session</h3><p><code>
-      <pre class="prettyprint lang-sh">
+      <div class="example"><h3>CGI to write to a session</h3><pre class="prettyprint lang-sh">
 #!/bin/bash
 echo "Content-Type: text/plain"
 echo "X-Replace-Session: key1=foo&amp;key2=&amp;key3=bar"
 echo
 env
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>If configured, the session can be read back from the HTTP_SESSION
       environment variable. By default, the session is kept private, so this
       has to be explicitly turned on with the
       <code class="directive"><a href="#sessionenv">SessionEnv</a></code> directive.</p>
 
-      <div class="example"><h3>Read from a session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Read from a session</h3><pre class="prettyprint lang-config">
 Session On
 SessionEnv On
 SessionCookieName session path=/
 SessionHeader X-Replace-Session
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>Once read, the CGI variable <code>HTTP_SESSION</code> should contain
       the value <code>key1=foo&amp;key3=bar</code>.</p>
@@ -228,14 +220,12 @@ SessionHeader X-Replace-Session
       placed on the browser using the <code class="module"><a href="../mod/mod_session_crypto.html">mod_session_crypto</a></code>
       module.</p>
 
-      <div class="example"><h3>Browser based encrypted session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">
 Session On
 SessionCryptoPassphrase secret
 SessionCookieName session path=/
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>The session will be automatically decrypted on load, and encrypted on
       save by Apache, the underlying application using the session need have
@@ -268,14 +258,12 @@ SessionCookieName session path=/
       <p>Standard cookie parameters can be specified after the name of the cookie,
       as in the example below.</p>
 
-      <div class="example"><h3>Setting cookie parameters</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Setting cookie parameters</h3><pre class="prettyprint lang-config">
 Session On
 SessionCryptoPassphrase secret
 SessionCookieName session path=/private;domain=example.com;httponly;secure;
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>In cases where the Apache server forms the frontend for backend origin servers,
       it is possible to have the session cookies removed from the incoming HTTP headers using
@@ -293,8 +281,7 @@ SessionCookieName session path=/private;
       <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> saves the user's login name and password within
       the session.</p>
 
-      <div class="example"><h3>Form based authentication</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Form based authentication</h3><pre class="prettyprint lang-config">
 Session On
 SessionCryptoPassphrase secret
 SessionCookieName session path=/
@@ -304,8 +291,7 @@ AuthType form
 AuthName realm
 #...
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>See the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module for documentation and complete
       examples.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_session_cookie.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_session_cookie.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_session_cookie.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_session_cookie.html.en Fri Apr 27 19:06:57 2012
@@ -79,13 +79,11 @@
       <p>To create a simple session and store it in a cookie called
       <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>Browser based session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName session path=/
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>For more examples on how the session can be configured to be read
       from and written to by a CGI application, see the
@@ -115,13 +113,11 @@ SessionCookieName session path=/
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie with attributes</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Cookie with attributes</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName session path=/private;domain=example.com;httponly;secure;version=1;
       </pre>
-
-    </code></p></div>
+</div>
 
 
 </div>
@@ -145,13 +141,11 @@ SessionCookieName session path=/private;
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie2 with attributes</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Cookie2 with attributes</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName2 session path=/private;domain=example.com;httponly;secure;version=1;
     </pre>
-
-    </code></p></div>
+</div>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en Fri Apr 27 19:06:57 2012
@@ -76,14 +76,12 @@
       <p>To create a simple encrypted session and store it in a cookie called
       <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>Browser based encrypted session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">
 Session On
 SessionCookieName session path=/
 SessionCryptoPassphrase secret
     </pre>
-
-      </code></p></div>
+</div>
 
       <p>The session will be encrypted with the given key. Different servers can
       be configured to share sessions by ensuring the same encryption key is used
@@ -135,33 +133,25 @@ SessionCryptoPassphrase secret
     <p>The <var>NSS</var> crypto driver requires some parameters for configuration,
     which are specified as parameters with optional values after the driver name.</p>
 
-    <div class="example"><h3>NSS without a certificate database</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>NSS without a certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss
       </pre>
+</div>
 
-    </code></p></div>
-
-    <div class="example"><h3>NSS with certificate database</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss dir=certs
       </pre>
+</div>
 
-    </code></p></div>
-
-    <div class="example"><h3>NSS with certificate database and parameters</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>NSS with certificate database and parameters</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss dir=certs key3=key3.db cert7=cert7.db secmod=secmod
       </pre>
+</div>
 
-    </code></p></div>
-
-    <div class="example"><h3>NSS with paths containing spaces</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>NSS with paths containing spaces</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss "dir=My Certs" key3=key3.db cert7=cert7.db secmod=secmod
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>The <var>NSS</var> crypto driver might have already been configured by another
     part of the server, for example from <code class="module"><a href="../mod/mod_nss.html">mod_nss</a></code> or
@@ -169,12 +159,10 @@ SessionCryptoPassphrase secret
     a warning will be logged, and the existing configuration will have taken affect.
     To avoid this warning, use the noinit parameter as follows.</p>
 
-    <div class="example"><h3>NSS with certificate database</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss noinit
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>To prevent confusion, ensure that all modules requiring NSS are configured with
     identical parameters.</p>
@@ -182,12 +170,10 @@ SessionCryptoPassphrase secret
     <p>The <var>openssl</var> crypto driver supports an optional parameter to specify
     the engine to be used for encryption.</p>
 
-    <div class="example"><h3>OpenSSL with engine support</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>OpenSSL with engine support</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver openssl engine=name
       </pre>
-
-    </code></p></div>
+</div>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_session_dbd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_session_dbd.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_session_dbd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_session_dbd.html.en Fri Apr 27 19:06:57 2012
@@ -96,8 +96,7 @@
       to update an existing session, to insert a new session, and to delete an expired or empty
       session. These queries are configured as per the example below.</p>
 
-      <div class="example"><h3>Sample DBD configuration</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>Sample DBD configuration</h3><pre class="prettyprint lang-config">
 DBDriver pgsql
 DBDParams "dbname=apachesession user=apache password=xxxxx host=localhost"
 DBDPrepareSQL "delete from session where key = %s" deletesession
@@ -106,8 +105,7 @@ DBDPrepareSQL "insert into session (valu
 DBDPrepareSQL "select value from session where key = %s and (expiry = 0 or expiry &gt; %lld)" selectsession
 DBDPrepareSQL "delete from session where expiry != 0 and expiry &lt; %lld" cleansession
     </pre>
-
-      </code></p></div>
+</div>
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -121,13 +119,11 @@ DBDPrepareSQL "delete from session where
       table called <var>apachesession</var>, and save the session ID in a cookie
       called <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>SQL based anonymous session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>SQL based anonymous session</h3><pre class="prettyprint lang-config">
 Session On
 SessionDBDCookieName session path=/
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>For more examples on how the session can be configured to be read
       from and written to by a CGI application, see the
@@ -155,13 +151,11 @@ SessionDBDCookieName session path=/
       table called <var>apachesession</var>, and with the session keyed to the
       userid, configure the session as follows:</p>
 
-      <div class="example"><h3>SQL based per user session</h3><p><code>
-      <pre class="prettyprint lang-config">
+      <div class="example"><h3>SQL based per user session</h3><pre class="prettyprint lang-config">
 Session On
 SessionDBDPerUser On
         </pre>
-
-      </code></p></div>
+</div>
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -196,13 +190,11 @@ SessionDBDPerUser On
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie with attributes</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Cookie with attributes</h3><pre class="prettyprint lang-config">
 Session On
 SessionDBDCookieName session path=/private;domain=example.com;httponly;secure;version=1;
       </pre>
-
-    </code></p></div>
+</div>
 
 
 </div>
@@ -226,13 +218,11 @@ SessionDBDCookieName session path=/priva
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie2 with attributes</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Cookie2 with attributes</h3><pre class="prettyprint lang-config">
 Session On
 SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;version=1;
       </pre>
-
-    </code></p></div>
+</div>
 
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en Fri Apr 27 19:06:57 2012
@@ -239,12 +239,10 @@ you find in the above table.</p>
 For backward compatibility there is additionally a special
 ``<code>%{</code><em>name</em><code>}c</code>'' cryptography format function
 provided. Information about this function is provided in the <a href="../ssl/ssl_compat.html">Compatibility</a> chapter.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 </pre>
-
-</code></p></div>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="notes" id="notes">Request Notes</a></h2>
@@ -329,12 +327,10 @@ with. These are used for Client Authenti
 concatenation of the various PEM-encoded Certificate files, in order of
 preference. This can be used alternatively and/or additionally to
 <code class="directive"><a href="#sslcacertificatepath">SSLCACertificatePath</a></code>.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-client.crt
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -357,12 +353,10 @@ hash filenames. So usually you can't jus
 there: you also have to create symbolic links named
 <em>hash-value</em><code>.N</code>. And you should always make sure this directory
 contains the appropriate symbolic links.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCACertificatePath /usr/local/apache2/conf/ssl.crt/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -399,12 +393,10 @@ directives.</p>
 specify an <em>all-in-one</em> file containing a concatenation of
 PEM-encoded CA certificates.</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCADNRequestFile /usr/local/apache2/conf/ca-names.crt
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -428,12 +420,10 @@ through hash filenames. So usually you c
 Certificate files there: you also have to create symbolic links named
 <em>hash-value</em><code>.N</code>. And you should always make sure
 this directory contains the appropriate symbolic links.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCADNRequestPath /usr/local/apache2/conf/ca-names.crt/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -468,12 +458,10 @@ to succeed - otherwise it will fail with
 <code>"unable to get certificate CRL"</code> error.
 </p>
 </div>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCARevocationCheck chain
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -493,12 +481,10 @@ Authorities (CA) whose <em>clients</em> 
 for Client Authentication.  Such a file is simply the concatenation of
 the various PEM-encoded CRL files, in order of preference. This can be
 used alternatively and/or additionally to <code class="directive"><a href="#sslcarevocationpath">SSLCARevocationPath</a></code>.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-client.crl
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -521,12 +507,10 @@ hash filenames. So usually you have not 
 Additionally you have to create symbolic links named
 <em>hash-value</em><code>.rN</code>. And you should always make sure this directory
 contains the appropriate symbolic links.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCARevocationPath /usr/local/apache2/conf/ssl.crl/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -561,12 +545,10 @@ But be careful: Providing the certificat
 using a coupled RSA+DSA certificate pair, this will work only if actually both
 certificates use the <em>same</em> certificate chain. Else the browsers will be
 confused in this situation.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/ca.crt
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -585,12 +567,10 @@ optionally also to the corresponding RSA
 Pass Phrase dialog is forced at startup time. This directive can be used up to
 two times (referencing different filenames) when both a RSA and a DSA based
 server certificate is used in parallel.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -615,12 +595,10 @@ contained Private Key is encrypted, the 
 at startup time. This directive can be used up to two times
 (referencing different filenames) when both a RSA and a DSA based
 private key is used in parallel.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/server.key
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -743,12 +721,10 @@ PSK-RC4-SHA             SSLv3 Kx=PSK    
 KRB5-RC4-SHA            SSLv3 Kx=KRB5     Au=KRB5 Enc=RC4(128)  Mac=SHA1
 </pre></div>
 <p>The complete list of particular RSA &amp; DH ciphers for SSL is given in <a href="#table2">Table 2</a>.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLCipherSuite RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW
 </pre>
-
-</code></p></div>
+</div>
 <table class="bordered">
 
 <tr><th><a name="table2">Cipher-Tag</a></th> <th>Protocol</th> <th>Key Ex.</th> <th>Auth.</th> <th>Enc.</th> <th>MAC</th> <th>Type</th> </tr>
@@ -806,13 +782,11 @@ separate "-engine" releases of OpenSSL 0
 <p>To discover which engine names are supported, run the command
 "<code>openssl engine</code>".</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 # For a Broadcom accelerator:
 SSLCryptoDevice ubsec
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -830,15 +804,13 @@ This directive toggles the usage of the 
 is should be used inside a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for a
 that virtual host. By default the SSL/TLS Protocol Engine is
 disabled for both the main server and all configured virtual hosts.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 &lt;VirtualHost _default_:443&gt;
 SSLEngine on
 #...
 &lt;/VirtualHost&gt;
 </pre>
-
-</code></p></div>
+</div>
 <p>In Apache 2.1 and later, <code class="directive">SSLEngine</code> can be set to
 <code>optional</code>. This enables support for
 <a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, Upgrading to TLS
@@ -886,12 +858,10 @@ by the applicable Security Policy.
 <p>When choosing a cipher during an SSLv3 or TLSv1 handshake, normally
 the client's preference is used.  If this directive is enabled, the
 server's preference will be used instead.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLHonorCipherOrder on
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -926,12 +896,10 @@ the Man-in-the-Middle prefix attack as d
 in <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2009-3555">CVE-2009-3555</a>.</p>
 </div>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLInsecureRenegotiation on
 </pre>
-
-</code></p></div>
+</div>
 
 <p>The <code>SSL_SECURE_RENEG</code> environment variable can be used
 from an SSI or CGI script to determine whether secure renegotiation is
@@ -975,15 +943,13 @@ itself, or derived by configuration; see
 <code class="directive"><a href="#sslocspoverrideresponder">SSLOCSPOverrideResponder</a></code>
 directives.</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLVerifyClient on
 SSLOCSPEnable on
 SSLOCSPDefaultResponder http://responder.example.com:8888/responder
 SSLOCSPOverrideResponder on
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1147,15 +1113,13 @@ The available <em>option</em>s are:</p>
     </p>
 </li>
 </ul>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLOptions +FakeBasicAuth -StrictRequire
 &lt;Files ~ "\.(cgi|shtml)$"&gt;
     SSLOptions +StdEnvVars -ExportCertData
 &lt;Files&gt;
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1231,12 +1195,10 @@ query can be done in two ways which can 
     The reuse-algorithm above is used here, too. In other words: The external
     program is called only once per unique Pass Phrase.</p></li>
 </ul>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLPassPhraseDialog exec:/usr/local/apache/sbin/pp-filter
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1284,12 +1246,10 @@ The available (case-insensitive) <em>pro
     - when using OpenSSL 1.0.1 and later -
     ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>, respectively.</p></li>
 </ul>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProtocol TLSv1
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1309,12 +1269,10 @@ with. These are used for Remote Server A
 concatenation of the various PEM-encoded Certificate files, in order of
 preference. This can be used alternatively and/or additionally to
 <code class="directive"><a href="#sslproxycacertificatepath">SSLProxyCACertificatePath</a></code>.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-remote-server.crt
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1337,12 +1295,10 @@ hash filenames. So usually you can't jus
 there: you also have to create symbolic links named
 <em>hash-value</em><code>.N</code>. And you should always make sure this directory
 contains the appropriate symbolic links.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCACertificatePath /usr/local/apache2/conf/ssl.crt/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1378,12 +1334,10 @@ to succeed - otherwise it will fail with
 <code>"unable to get certificate CRL"</code> error.
 </p>
 </div>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCARevocationCheck chain
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1403,12 +1357,10 @@ Authorities (CA) whose <em>remote server
 for Remote Server Authentication.  Such a file is simply the concatenation of
 the various PEM-encoded CRL files, in order of preference. This can be
 used alternatively and/or additionally to <code class="directive"><a href="#sslproxycarevocationpath">SSLProxyCARevocationPath</a></code>.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-remote-server.crl
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1431,12 +1383,10 @@ hash filenames. So usually you have not 
 Additionally you have to create symbolic links named
 <em>hash-value</em><code>.rN</code>. And you should always make sure this directory
 contains the appropriate symbolic links.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCARevocationPath /usr/local/apache2/conf/ssl.crl/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1455,12 +1405,10 @@ This directive sets whether the remote s
 compared against the hostname of the request URL. If both are not equal
 a 502 status code (Bad Gateway) is sent.
 </p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCheckPeerCN on
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1479,12 +1427,10 @@ This directive sets whether it is checke
 is expired or not. If the check fails a 502 status code (Bad Gateway) is
 sent.
 </p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyCheckPeerExpire on
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1519,15 +1465,13 @@ This directive toggles the usage of the 
 is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for proxy
 usage in a particular virtual host. By default the SSL/TLS Protocol Engine is
 disabled for proxy image both for the main server and all configured virtual hosts.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 &lt;VirtualHost _default_:443&gt;
     SSLProxyEngine on
     #...
 &lt;/VirtualHost&gt;
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1556,12 +1500,10 @@ be examined and a chain of trust will be
 trusted as if they were also in <code class="directive"><a href="#&#10;sslproxycacertificatefile">
 SSLProxyCACertificateFile</a></code>.</p>
 </div>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyMachineCertificateChainFile /usr/local/apache2/conf/ssl.crt/proxyCA.pem
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1586,12 +1528,10 @@ or additionally to <code>SSLProxyMachine
 <div class="warning">
 <p>Currently there is no support for encrypted private keys</p>
 </div>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyMachineCertificateFile /usr/local/apache2/conf/ssl.crt/proxy.pem
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1615,12 +1555,10 @@ directory contains the appropriate symbo
 <div class="warning">
 <p>Currently there is no support for encrypted private keys</p>
 </div>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyMachineCertificatePath /usr/local/apache2/conf/proxy.crt/
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1676,12 +1614,10 @@ The following levels are available for <
 <strong>optional</strong> doesn't work with all servers and level
 <strong>optional_no_ca</strong> is actually against the idea of
 authentication (but can be used to establish SSL test pages, etc.)</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyVerify require
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1706,12 +1642,10 @@ remote server certificates are accepted 
 the remote server certificate can be self-signed or has to be signed by a CA
 which is directly known to the server (i.e. the CA's certificate is under
 <code class="directive"><a href="#sslproxycacertificatepath">SSLProxyCACertificatePath</a></code>), etc.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLProxyVerifyDepth 10
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1789,8 +1723,7 @@ The following <em>source</em> variants a
     /crypto/</a>) to seed the PRNG. Use this if no random device exists
     on your platform.</p></li>
 </ul>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLRandomSeed startup builtin
 SSLRandomSeed startup file:/dev/random
 SSLRandomSeed startup file:/dev/urandom 1024
@@ -1799,8 +1732,7 @@ SSLRandomSeed connect builtin
 SSLRandomSeed connect file:/dev/random
 SSLRandomSeed connect file:/dev/urandom 1024
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1828,12 +1760,10 @@ will be untrusted so a denial of service
 memory must be considered when changing this configuration setting.
 </p></div>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLRenegBufferSize 262144
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1921,8 +1851,7 @@ during request processing.  In .htaccess
 both parsed and executed each time the .htaccess file is encountered during 
 request processing.</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/                \
             and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd."        \
             and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}  \
@@ -1930,8 +1859,7 @@ SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP
             and %{TIME_HOUR} &gt;= 8 and %{TIME_HOUR} &lt;= 20       ) \
            or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
 </pre>
-
-</code></p></div>
+</div>
 
 <p>The <code>PeerExtList(<em>object-ID</em>)</code> function expects
 to find zero or more instances of the X.509 certificate extension
@@ -1941,12 +1869,10 @@ exactly against the value of an extensio
 (If multiple extensions with the same OID are present, at least one
 extension must match).</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLRequire "foobar" in PeerExtList("1.2.3.4.5.6")
 </pre>
-
-</code></p></div>
+</div>
 
 <div class="note"><h3>Notes on the PeerExtList function</h3>
 
@@ -1995,12 +1921,10 @@ the current connection. This is very han
 host or directories for defending against configuration errors that expose
 stuff that should be protected. When this directive is present all requests
 are denied which are not using SSL.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLRequireSSL
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2069,13 +1993,11 @@ The following five storage <em>type</em>
 
 </ul>
 
-<div class="example"><h3>Examples</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">
 SSLSessionCache dbm:/usr/local/apache/logs/ssl_gcache_data
 SSLSessionCache shmcb:/usr/local/apache/logs/ssl_gcache_data(512000)
 </pre>
-
-</code></p></div>
+</div>
 
 <p>The <code>ssl-cache</code> mutex is used to serialize access to
 the session cache to prevent corruption.  This mutex can be configured
@@ -2098,12 +2020,10 @@ This directive sets the timeout in secon
 global/inter-process SSL Session Cache and the OpenSSL internal memory cache.
 It can be set as low as 15 for testing, but should be set to higher
 values like 300 in real life.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLSessionCacheTimeout 600
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2324,12 +2244,10 @@ This option is only available if httpd w
 version of OpenSSL.
 </p></div>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLStrictSNIVHostCheck on
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2353,12 +2271,10 @@ any of the <a href="#envvars">SSL enviro
 <p>Note that this directive has no effect if the
 <code>FakeBasicAuth</code> option is used (see <a href="#ssloptions">SSLOptions</a>).</p>
 
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLUserName SSL_CLIENT_S_DN_CN
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2427,12 +2343,10 @@ The following levels are available for <
 <strong>optional</strong> doesn't work with all browsers and level
 <strong>optional_no_ca</strong> is actually against the idea of
 authentication (but can be used to establish SSL test pages, etc.)</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLVerifyClient require
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -2463,12 +2377,10 @@ certificates are accepted only, the defa
 certificate can be self-signed or has to be signed by a CA which is directly
 known to the server (i.e. the CA's certificate is under
 <code class="directive"><a href="#sslcacertificatepath">SSLCACertificatePath</a></code>), etc.</p>
-<div class="example"><h3>Example</h3><p><code>
-<pre class="prettyprint lang-config">
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 SSLVerifyDepth 10
 </pre>
-
-</code></p></div>
+</div>
 
 </div>
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en Fri Apr 27 19:06:57 2012
@@ -79,41 +79,35 @@
         or regex of a subsequent one.</dd>
     </dl>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 &lt;Location /&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     Substitute s/foo/bar/ni
 &lt;/Location&gt;
         </pre>
-
-    </code></p></div>
+</div>
 
     <p>If either the pattern or the substitution contain a slash
     character then an alternative delimiter should be used:</p>
 
-    <div class="example"><h3>Example of using an alternate delimiter</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example of using an alternate delimiter</h3><pre class="prettyprint lang-config">
 &lt;Location /&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     Substitute "s|&lt;BR */?&gt;|&lt;br /&gt;|i"
 &lt;/Location&gt;
         </pre>
-
-    </code></p></div>
+</div>
 
     <p>Backreferences can be used in the comparison and in the substitution,
     when regular expressions are used, as illustrated in the following example: </p>
-    <div class="example"><h3>Example of using backreferences and captures</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example of using backreferences and captures</h3><pre class="prettyprint lang-config">
 &lt;Location /&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     # "foo=k,bar=k" -&gt; "foo/bar=k" 
     Substitute "s|foo=(\w+),bar=\1|foo/bar=$1"
 &lt;/Location&gt;
     </pre>
-
-    </code></p></div>
+</div>
 
     <p>A common use scenario for <code>mod_substitute</code> is the
     situation in which a front-end server proxies requests to a back-end
@@ -124,15 +118,13 @@
     <p>In this case, <code>mod_substutite</code> can be used to rewrite
     those URLs into something that will work from the front end:</p>
 
-    <div class="example"><h3>Rewriting URLs embedded in proxied content</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Rewriting URLs embedded in proxied content</h3><pre class="prettyprint lang-config">
 ProxyPass /blog/ http://internal.blog.example.com
 ProxyPassReverse /blog/ http://internal.blog.example.com/
 
 Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"
     </pre>
-
-    </code></p></div>
+</div>
 
     <p><code class="directive"><a href="../mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code>
     modifies any <code>Location</code> (redirect) headers that are sent

Modified: httpd/httpd/trunk/docs/manual/mod/mod_suexec.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_suexec.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_suexec.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_suexec.html.en Fri Apr 27 19:06:57 2012
@@ -64,13 +64,10 @@ later.</td></tr>
     to specify a user and group for CGI programs to run as. Non-CGI
     requests are still processed with the user specified in the <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> directive.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-    
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
     SuexecUserGroup nobody nogroup
     </pre>
-
-    </code></p></div>
+</div>
 
     <p>In Apache httpd 2.3.9 and later, startup will fail if this
     directive is specified but the suEXEC feature is disabled.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_unixd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_unixd.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_unixd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_unixd.html.en Fri Apr 27 19:06:57 2012
@@ -91,12 +91,10 @@ requests</td></tr>
       <dd>Refers to a group by its number.</dd>
     </dl>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       Group www-group
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>It is recommended that you set up a new group specifically for
     running the server. Some admins use user <code>nobody</code>,

Modified: httpd/httpd/trunk/docs/manual/mod/mod_version.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_version.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_version.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_version.html.en Fri Apr 27 19:06:57 2012
@@ -41,8 +41,7 @@
     allows a flexible version checking including numeric comparisons and
     regular expressions.</p>
 
-    <div class="example"><h3>Examples</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">
 &lt;IfVersion 2.4.2&gt;
     # current httpd version is exactly 2.4.2
 &lt;/IfVersion&gt;
@@ -51,8 +50,7 @@
     # use really new features :-)
 &lt;/IfVersion&gt;
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>See below for further possibilities.</p>
 </div>
@@ -97,15 +95,13 @@
         <td>httpd version is less or equal</td></tr>
 </table>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 &lt;IfVersion &gt;= 2.3&gt;
     # this happens only in versions greater or
     # equal 2.3.0.
 &lt;/IfVersion&gt;
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>Besides the numerical comparison it is possible to match a
     <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
@@ -120,14 +116,12 @@
             <code><var>regex</var></code></td></tr>
 </table>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
 &lt;IfVersion = /^2.4.[01234]$/&gt;
     # e.g. workaround for buggy versions
 &lt;/IfVersion&gt;
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>In order to reverse the meaning, all operators can be preceded by an
     exclamation mark (<code>!</code>):</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en Fri Apr 27 19:06:57 2012
@@ -440,12 +440,10 @@ of the daemon</td></tr>
     filename is not absolute then it is assumed to be relative to the
     <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       PidFile /var/run/apache.pid
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>It is often useful to be able to send the server a signal,
     so that it closes and then re-opens its <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> and <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>, and
@@ -498,12 +496,10 @@ the child processes</td></tr>
     disk (using file-based shared memory). Specifying this directive causes
     Apache httpd to always create the file on the disk.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-    <pre class="prettyprint lang-config">
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       ScoreBoardFile /var/run/apache_status
       </pre>
-
-    </code></p></div>
+</div>
 
     <p>File-based shared memory is useful for third-party applications
     that require direct access to the scoreboard.</p>

Modified: httpd/httpd/trunk/docs/manual/platform/windows.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/windows.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/windows.html.en (original)
+++ httpd/httpd/trunk/docs/manual/platform/windows.html.en Fri Apr 27 19:06:57 2012
@@ -791,30 +791,24 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
   (Arcane and error prone procedures may work around the restriction
   on mapped drive letters, but this is not recommended.)</p>
 
-  <div class="example"><h3>Example DocumentRoot with UNC path</h3><p><code>
-  <pre class="prettyprint lang-config">
+  <div class="example"><h3>Example DocumentRoot with UNC path</h3><pre class="prettyprint lang-config">
   DocumentRoot //dochost/www/html/
   </pre>
+</div>
 
-  </code></p></div>
-
-  <div class="example"><h3>Example DocumentRoot with IP address in UNC path</h3><p><code>
-  <pre class="prettyprint lang-config">
+  <div class="example"><h3>Example DocumentRoot with IP address in UNC path</h3><pre class="prettyprint lang-config">
   DocumentRoot //192.168.1.50/docs/
   </pre>
+</div>
 
-  </code></p></div>
-
-  <div class="example"><h3>Example Alias and corresponding Directory with UNC path</h3><p><code>
-  <pre class="prettyprint lang-config">
+  <div class="example"><h3>Example Alias and corresponding Directory with UNC path</h3><pre class="prettyprint lang-config">
 Alias /images/ //imagehost/www/images/
 
 &lt;Directory //imagehost/www/images/&gt;
 #...
 &lt;Directory&gt;
   </pre>
-
-  </code></p></div>
+</div>
 
   <p>When running Apache httpd as a service, you must create a
   separate account in order to access network resources, as described

Modified: httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en Fri Apr 27 19:06:57 2012
@@ -124,10 +124,8 @@ is possible to perform this mapping with
 <code>Alias</code> is the preferred method, for reasons of simplicity
 and performance.</p>
 
-<div class="example"><h3>Using Alias</h3><p><code>
-<pre class="prettyprint lang-config">Alias /cats /var/www/virtualhosts/felines/htdocs</pre>
-
-</code></p></div>
+<div class="example"><h3>Using Alias</h3><pre class="prettyprint lang-config">Alias /cats /var/www/virtualhosts/felines/htdocs</pre>
+</div>
 
 <p>
 The use of <code>mod_rewrite</code> to perform this mapping may be

Modified: httpd/httpd/trunk/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.en?rev=1331546&r1=1331545&r2=1331546&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.en Fri Apr 27 19:06:57 2012
@@ -127,58 +127,40 @@
       access control.</p>
 
       <p>In this example, all requests are denied.</p>
-      <div class="example"><h3>2.2 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
 Order deny,allow
 Deny from all
         </pre>
-
-      </code></p></div>
-      <div class="example"><h3>2.4 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+</div>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
         Require all denied
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>In this example, all requests are allowed.</p>
-      <div class="example"><h3>2.2 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
 Order allow,deny
 Allow from all
         </pre>
-
-      </code></p></div>
-      <div class="example"><h3>2.4 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+</div>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
         Require all granted
         </pre>
-
-      </code></p></div>
+</div>
 
       <p>In the following example, all hosts in the example.org domain
       are allowed access; all other hosts are denied access.</p>
 
-      <div class="example"><h3>2.2 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+      <div class="example"><h3>2.2 configuration:</h3><pre class="prettyprint lang-config">
 Order Deny,Allow
 Deny from all
 Allow from example.org
         </pre>
-
-      </code></p></div>
-      <div class="example"><h3>2.4 configuration:</h3><p><code>
-        
-        <pre class="prettyprint lang-config">
+</div>
+      <div class="example"><h3>2.4 configuration:</h3><pre class="prettyprint lang-config">
         Require host example.org
         </pre>
-
-      </code></p></div>
+</div>
     
 
     



Mime
View raw message