httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1564960 [1/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
Author: nd
Date: Wed Feb  5 22:28:30 2014
New Revision: 1564960

URL: http://svn.apache.org/r1564960
Log:
update transformation

Modified:
    httpd/httpd/trunk/docs/manual/bind.html.en
    httpd/httpd/trunk/docs/manual/bind.html.fr
    httpd/httpd/trunk/docs/manual/caching.html.en
    httpd/httpd/trunk/docs/manual/caching.html.fr
    httpd/httpd/trunk/docs/manual/content-negotiation.html.en
    httpd/httpd/trunk/docs/manual/content-negotiation.html.fr
    httpd/httpd/trunk/docs/manual/custom-error.html.en
    httpd/httpd/trunk/docs/manual/custom-error.html.fr
    httpd/httpd/trunk/docs/manual/developer/API.html.en
    httpd/httpd/trunk/docs/manual/developer/filters.html.en
    httpd/httpd/trunk/docs/manual/developer/hooks.html.en
    httpd/httpd/trunk/docs/manual/developer/lua.html.en
    httpd/httpd/trunk/docs/manual/developer/modguide.html.en
    httpd/httpd/trunk/docs/manual/developer/modules.html.en
    httpd/httpd/trunk/docs/manual/developer/modules.html.ja.utf8
    httpd/httpd/trunk/docs/manual/developer/output-filters.html.en
    httpd/httpd/trunk/docs/manual/developer/request.html.en
    httpd/httpd/trunk/docs/manual/dns-caveats.html.en
    httpd/httpd/trunk/docs/manual/dns-caveats.html.fr
    httpd/httpd/trunk/docs/manual/env.html.en
    httpd/httpd/trunk/docs/manual/env.html.fr
    httpd/httpd/trunk/docs/manual/env.html.ja.utf8
    httpd/httpd/trunk/docs/manual/env.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/expr.html.en
    httpd/httpd/trunk/docs/manual/expr.html.fr
    httpd/httpd/trunk/docs/manual/expr.xml.fr
    httpd/httpd/trunk/docs/manual/expr.xml.meta
    httpd/httpd/trunk/docs/manual/handler.html.en
    httpd/httpd/trunk/docs/manual/handler.html.fr
    httpd/httpd/trunk/docs/manual/howto/access.html.en
    httpd/httpd/trunk/docs/manual/howto/access.html.fr
    httpd/httpd/trunk/docs/manual/howto/auth.html.en
    httpd/httpd/trunk/docs/manual/howto/auth.html.fr
    httpd/httpd/trunk/docs/manual/howto/cgi.html.en
    httpd/httpd/trunk/docs/manual/howto/cgi.html.fr
    httpd/httpd/trunk/docs/manual/howto/cgi.html.ja.utf8
    httpd/httpd/trunk/docs/manual/howto/htaccess.html.en
    httpd/httpd/trunk/docs/manual/howto/htaccess.html.fr
    httpd/httpd/trunk/docs/manual/howto/public_html.html.en
    httpd/httpd/trunk/docs/manual/howto/public_html.html.fr
    httpd/httpd/trunk/docs/manual/howto/ssi.html.en
    httpd/httpd/trunk/docs/manual/howto/ssi.html.fr
    httpd/httpd/trunk/docs/manual/logs.html.en
    httpd/httpd/trunk/docs/manual/logs.html.fr
    httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en
    httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en
    httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.fr
    httpd/httpd/trunk/docs/manual/misc/security_tips.html.en
    httpd/httpd/trunk/docs/manual/misc/security_tips.html.fr
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_actions.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_actions.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_alias.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_alias.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_allowhandlers.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_allowmethods.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_allowmethods.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_auth_basic.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_auth_basic.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_auth_form.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_auth_form.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authn_core.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authn_core.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authn_dbd.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authn_socache.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authnz_fcgi.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_dbd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_dbd.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_host.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_host.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/mod_buffer.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_buffer.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cache.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cgi.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cgi.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_cgid.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cgid.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_charset_lite.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_data.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_data.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dav.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dav.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dav_fs.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dav_fs.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dav_lock.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dav_lock.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_deflate.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_deflate.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dialup.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dialup.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dir.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_dumpio.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_echo.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_echo.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_env.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_env.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_example.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_example.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_expires.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_expires.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ext_filter.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_file_cache.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_firehose.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_headers.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_headers.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_heartbeat.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_heartmonitor.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_include.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_info.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_info.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_isapi.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_log_debug.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_macro.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_mime_magic.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_policy.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_fcgi.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_reflector.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_sed.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_sed.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_session.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_session_cookie.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_session_dbd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_so.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_so.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_status.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_status.html.fr
    httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_suexec.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_unixd.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_usertrack.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_version.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en
    httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
    httpd/httpd/trunk/docs/manual/mod/worker.html.en
    httpd/httpd/trunk/docs/manual/platform/perf-hp.html.en
    httpd/httpd/trunk/docs/manual/platform/perf-hp.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/platform/win_compiling.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/platform/windows.html.en
    httpd/httpd/trunk/docs/manual/programs/log_server_status.html.en
    httpd/httpd/trunk/docs/manual/programs/split-logfile.html.en
    httpd/httpd/trunk/docs/manual/rewrite/access.html.en
    httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en
    httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en
    httpd/httpd/trunk/docs/manual/rewrite/flags.html.en
    httpd/httpd/trunk/docs/manual/rewrite/flags.html.fr
    httpd/httpd/trunk/docs/manual/rewrite/intro.html.en
    httpd/httpd/trunk/docs/manual/rewrite/intro.html.fr
    httpd/httpd/trunk/docs/manual/rewrite/proxy.html.en
    httpd/httpd/trunk/docs/manual/rewrite/remapping.html.en
    httpd/httpd/trunk/docs/manual/rewrite/rewritemap.html.en
    httpd/httpd/trunk/docs/manual/rewrite/vhosts.html.en
    httpd/httpd/trunk/docs/manual/sections.html.en
    httpd/httpd/trunk/docs/manual/sections.html.fr
    httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en
    httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.fr
    httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.en
    httpd/httpd/trunk/docs/manual/ssl/ssl_howto.html.fr
    httpd/httpd/trunk/docs/manual/suexec.html.en
    httpd/httpd/trunk/docs/manual/suexec.html.fr
    httpd/httpd/trunk/docs/manual/upgrading.html.en
    httpd/httpd/trunk/docs/manual/upgrading.html.fr
    httpd/httpd/trunk/docs/manual/urlmapping.html.en
    httpd/httpd/trunk/docs/manual/urlmapping.html.fr
    httpd/httpd/trunk/docs/manual/vhosts/examples.html.en
    httpd/httpd/trunk/docs/manual/vhosts/examples.html.fr
    httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en
    httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.fr
    httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.en
    httpd/httpd/trunk/docs/manual/vhosts/ip-based.html.fr
    httpd/httpd/trunk/docs/manual/vhosts/mass.html.en
    httpd/httpd/trunk/docs/manual/vhosts/mass.html.fr
    httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8
    httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en
    httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr

Modified: httpd/httpd/trunk/docs/manual/bind.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.html.en (original)
+++ httpd/httpd/trunk/docs/manual/bind.html.en Wed Feb  5 22:28:30 2014
@@ -68,27 +68,21 @@
     <p>For example, to make the server accept connections on both
     port 80 and port 8000, on all interfaces, use:</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
-Listen 8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 80
+Listen 8000</pre>
 
 
     <p>To make the server accept connections on port 80 for one interface,
        and port 8000 on another, use</p>
 
-    <pre class="prettyprint lang-config">
-Listen 192.0.2.1:80
-Listen 192.0.2.5:8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 192.0.2.1:80
+Listen 192.0.2.5:8000</pre>
 
 
     <p>IPv6 addresses must be enclosed in square brackets, as in the
     following example:</p>
 
-    <pre class="prettyprint lang-config">
-      Listen [2001:db8::a00:20ff:fea7:ccea]:80
-    </pre>
+    <pre class="prettyprint lang-config">      Listen [2001:db8::a00:20ff:fea7:ccea]:80</pre>
 
 
     <div class="warning"><p>Overlapping <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directives will result in a
@@ -138,10 +132,8 @@ Listen 192.0.2.5:8000
     <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directives, as in the
     following examples:</p>
 
-    <pre class="prettyprint lang-config">
-Listen 0.0.0.0:80
-Listen 192.0.2.1:80
-    </pre>
+    <pre class="prettyprint lang-config">Listen 0.0.0.0:80
+Listen 192.0.2.1:80</pre>
 
 
     <p>If your platform supports it and you want httpd to handle IPv4 and
@@ -164,9 +156,7 @@ Listen 192.0.2.1:80
     <p>You only need to set the protocol if you are running on non-standard
        ports.  For example, running an <code>https</code> site on port 8443:</p>
 
-    <pre class="prettyprint lang-config">
-      Listen 192.170.2.1:8443 https
-    </pre>
+    <pre class="prettyprint lang-config">      Listen 192.170.2.1:8443 https</pre>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/bind.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/bind.html.fr Wed Feb  5 22:28:30 2014
@@ -72,28 +72,22 @@
     <p>Par exemple, pour faire en sorte que le serveur accepte des connexions
     sur les ports 80 et 8000, sur toutes les interfaces, utilisez :</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
-Listen 8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 80
+Listen 8000</pre>
 
 
     <p>Pour faire en sorte que le serveur accepte des connexions sur le port 80
     pour une interface, et sur le port 8000 pour une
     autre interface, utilisez :</p>
 
-    <pre class="prettyprint lang-config">
-Listen 192.0.2.1:80
-Listen 192.0.2.5:8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 192.0.2.1:80
+Listen 192.0.2.5:8000</pre>
 
 
     <p>Les adresses IPv6 doivent être mises entre crochets, comme dans
     l'exemple suivant :</p>
 
-    <pre class="prettyprint lang-config">
-      Listen [2001:db8::a00:20ff:fea7:ccea]:80
-    </pre>
+    <pre class="prettyprint lang-config">      Listen [2001:db8::a00:20ff:fea7:ccea]:80</pre>
 
 
     <div class="warning"><p>Des directives <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
@@ -148,10 +142,8 @@ Listen 192.0.2.5:8000
     <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>, comme dans l'exemple
     suivant :</p>
 
-    <pre class="prettyprint lang-config">
-Listen 0.0.0.0:80
-Listen 192.0.2.1:80
-    </pre>
+    <pre class="prettyprint lang-config">Listen 0.0.0.0:80
+Listen 192.0.2.1:80</pre>
 
 
     <p>Si votre plateforme le supporte et si vous souhaitez que httpd gère
@@ -176,9 +168,7 @@ Listen 192.0.2.1:80
     des ports non standards. Par exemple, pour travailler en
     <code>https</code> sur le port 8443 :</p>
 
-    <pre class="prettyprint lang-config">
-      Listen 192.170.2.1:8443 https
-    </pre>
+    <pre class="prettyprint lang-config">      Listen 192.170.2.1:8443 https</pre>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/caching.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/caching.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/caching.html.en (original)
+++ httpd/httpd/trunk/docs/manual/caching.html.en Wed Feb  5 22:28:30 2014
@@ -425,12 +425,10 @@ Vary: negotiate,accept-language,accept-c
 
       <p>Typically the module will be configured as so;</p>
 
-      <pre class="prettyprint lang-config">
-CacheRoot   "/var/cache/apache/"
+      <pre class="prettyprint lang-config">CacheRoot   "/var/cache/apache/"
 CacheEnable disk /
 CacheDirLevels 2
-CacheDirLength 1
-      </pre>
+CacheDirLength 1</pre>
 
 
       <p>Importantly, as the cached files are locally stored, operating system
@@ -618,9 +616,7 @@ CacheDirLength 1
         instructs httpd to open the file when it is started and to re-use
         this file-handle for all subsequent access to this file.</p>
 
-        <pre class="prettyprint lang-config">
-        CacheFile /usr/local/apache2/htdocs/index.html
-        </pre>
+        <pre class="prettyprint lang-config">        CacheFile /usr/local/apache2/htdocs/index.html</pre>
 
 
         <p>If you intend to cache a large number of files in this manner, you
@@ -672,8 +668,7 @@ CacheDirLength 1
         the difference in the time it takes to read a file for the first time
         and the second time;</p>
 
-        <div class="example"><pre>
-colm@coroebus:~$ time cat testfile &gt; /dev/null
+        <div class="example"><pre>colm@coroebus:~$ time cat testfile &gt; /dev/null
 real    0m0.065s
 user    0m0.000s
 sys     0m0.001s
@@ -710,9 +705,7 @@ sys     0m0.000s</pre></div>
         start time (using the mmap system call). httpd will use the in-memory
         contents for all subsequent accesses to this file.</p>
 
-        <pre class="prettyprint lang-config">
-        MMapFile /usr/local/apache2/htdocs/index.html
-        </pre>
+        <pre class="prettyprint lang-config">        MMapFile /usr/local/apache2/htdocs/index.html</pre>
 
 
         <p>As with the

Modified: httpd/httpd/trunk/docs/manual/caching.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/caching.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/caching.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/caching.html.fr Wed Feb  5 22:28:30 2014
@@ -465,12 +465,10 @@ Vary: negotiate,accept-language,accept-c
 
       <p>En général, le module se configure comme suit :</p>
 
-      <pre class="prettyprint lang-config">
-CacheRoot   "/var/cache/apache/"
+      <pre class="prettyprint lang-config">CacheRoot   "/var/cache/apache/"
 CacheEnable disk /
 CacheDirLevels 2
-CacheDirLength 1
-    </pre>
+CacheDirLength 1</pre>
 
 
     <p>Il est important de savoir que, les fichiers mis en cache étant stockés
@@ -676,9 +674,7 @@ CacheDirLength 1
 	réutiliser le descripteur de fichier mis en cache pour tous les
 	accès futurs à ce fichier.</p>
 
-        <pre class="prettyprint lang-config">
-        CacheFile /usr/local/apache2/htdocs/index.html
-        </pre>
+        <pre class="prettyprint lang-config">        CacheFile /usr/local/apache2/htdocs/index.html</pre>
 
 
         <p>Si vous désirez mettre en cache un grand nombre de fichiers
@@ -738,8 +734,7 @@ CacheDirLength 1
       temps nécessaire à la première lecture d'un fichier et le temps
       nécessaire à sa deuxième lecture;</p>
 
-        <div class="example"><pre>
-colm@coroebus:~$ time cat testfile &gt; /dev/null
+        <div class="example"><pre>colm@coroebus:~$ time cat testfile &gt; /dev/null
 real    0m0.065s
 user    0m0.000s
 sys     0m0.001s
@@ -783,9 +778,7 @@ sys     0m0.000s</pre></div>
       utilisera le contenu chargé en mémoire pour satisfaire ultérieurement
       toutes les demandes d'accès à ce fichier.</p>
 
-        <pre class="prettyprint lang-config">
-        MMapFile /usr/local/apache2/htdocs/index.html
-        </pre>
+        <pre class="prettyprint lang-config">        MMapFile /usr/local/apache2/htdocs/index.html</pre>
 
 
       <p>Comme dans le cas de la directive

Modified: httpd/httpd/trunk/docs/manual/content-negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.html.en (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.html.en Wed Feb  5 22:28:30 2014
@@ -518,10 +518,8 @@ Negotiation</a></li>
     try to select a matching variant. If there's no such variant,
     the normal negotiation process applies.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-SetEnvIf Cookie "language=(.+)" prefer-language=$1
-Header append Vary cookie
-    </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SetEnvIf Cookie "language=(.+)" prefer-language=$1
+Header append Vary cookie</pre>
 </div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/content-negotiation.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.html.fr Wed Feb  5 22:28:30 2014
@@ -541,10 +541,8 @@ langage</a></h3>
     de sélectionner une variante correspondante. S'il n'existe pas de telle
     variante, le processus normal de négociation sera lancé.</p>
 
-    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
-SetEnvIf Cookie "language=(.+)" prefer-language=$1
-Header append Vary cookie
-    </pre>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">SetEnvIf Cookie "language=(.+)" prefer-language=$1
+Header append Vary cookie</pre>
 </div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/custom-error.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/custom-error.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/custom-error.html.en (original)
+++ httpd/httpd/trunk/docs/manual/custom-error.html.en Wed Feb  5 22:28:30 2014
@@ -64,20 +64,16 @@
     if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is set to
     FileInfo.</p>
 
-    <pre class="prettyprint lang-config">
-ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br />
+    <pre class="prettyprint lang-config">ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br />
 ErrorDocument 500 /cgi-bin/crash-recover<br />
 ErrorDocument 500 http://error.example.com/server_error.html<br />
 ErrorDocument 404 /errors/not_found.html <br />
-ErrorDocument 401 /subscription/how_to_subscribe.html
-    </pre>
+ErrorDocument 401 /subscription/how_to_subscribe.html</pre>
 
 
     <p>The syntax of the <code>ErrorDocument</code> directive is:</p>
 
-    <pre class="prettyprint lang-config">
-      ErrorDocument &lt;3-digit-code&gt; &lt;action&gt;
-    </pre>
+    <pre class="prettyprint lang-config">      ErrorDocument &lt;3-digit-code&gt; &lt;action&gt;</pre>
 
 
     <p>where the action will be treated as:</p>
@@ -156,12 +152,10 @@ ErrorDocument 401 /subscription/how_to_s
       caused it to be invoked. For instance, a Perl ErrorDocument
       script might include the following:</p>
 
-       <pre class="prettyprint lang-perl">
-...
+       <pre class="prettyprint lang-perl">...
 print  "Content-type: text/html\n"; <br />
 printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
-...
-      </pre>
+...</pre>
 
 
       <p>If the script is dedicated to handling a particular error
@@ -186,10 +180,8 @@ printf "Status: %s Condition Intercepted
 
     <p>In your server configuration file, you'll see a line such as:</p>
 
-    <pre class="prettyprint lang-config">
-    # Multi-language error messages<br />
-    #Include conf/extra/httpd-multilang-errordoc.conf
-    </pre>
+    <pre class="prettyprint lang-config">    # Multi-language error messages<br />
+    #Include conf/extra/httpd-multilang-errordoc.conf</pre>
 
 
     <p>Uncommenting this <code>Include</code> line will enable this

Modified: httpd/httpd/trunk/docs/manual/custom-error.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/custom-error.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/custom-error.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/custom-error.html.fr Wed Feb  5 22:28:30 2014
@@ -67,20 +67,16 @@
     .htaccess si <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> est
     définie à FileInfo.</p>
 
-    <pre class="prettyprint lang-config">
-ErrorDocument 500 "Désolé, notre script s'est
+    <pre class="prettyprint lang-config">ErrorDocument 500 "Désolé, notre script s'est
 crashé ; comme c'est dommage !"<br />
 ErrorDocument 500 /cgi-bin/crash-recover<br />
 ErrorDocument 500 http://error.example.com/server_error.html<br />
 ErrorDocument 404 /errors/not_found.html <br />
-ErrorDocument 401 /subscription/how_to_subscribe.html
-    </pre>
+ErrorDocument 401 /subscription/how_to_subscribe.html</pre>
 
 
 <p>La syntaxe de la directive <code>ErrorDocument</code> est :</p>
-      <pre class="prettyprint lang-config">
-      ErrorDocument &lt;code_3_chiffres&gt; &lt;action&gt;
-    </pre>
+      <pre class="prettyprint lang-config">      ErrorDocument &lt;code_3_chiffres&gt; &lt;action&gt;</pre>
 
       <p>où action peut être traitée comme :</p>
         <ol>
@@ -166,12 +162,10 @@ ErrorDocument 401 /subscription/how_to_s
       par une directive ErrorDocument pourrait contenir ce qui suit
       :</p>
 
-      <pre class="prettyprint lang-perl">
-...
+      <pre class="prettyprint lang-perl">...
 print  "Content-type: text/html\n"; <br />
 printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
-...
-      </pre>
+...</pre>
 
 
       <p>Si un script est dédié à la gestion d'une condition d'erreur
@@ -198,10 +192,8 @@ printf "Status: %s Condition Intercepted
     <p>Dans le fichier de configuration de votre serveur, vous trouverez
     un groupe de lignes du style :</p>
 
-    <pre class="prettyprint lang-config">
-    # Multi-language error messages<br />
-    #Include conf/extra/httpd-multilang-errordoc.conf
-    </pre>
+    <pre class="prettyprint lang-config">    # Multi-language error messages<br />
+    #Include conf/extra/httpd-multilang-errordoc.conf</pre>
 
 
     <p>Décommentez la ligne <code>Include</code> pour activer cette

Modified: httpd/httpd/trunk/docs/manual/developer/API.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/API.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/API.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/API.html.en Wed Feb  5 22:28:30 2014
@@ -358,9 +358,7 @@ struct stat finfo;    /* Set by server c
 </code></p><pre>int header_only;     /* HEAD request, as opposed to GET */
 char *protocol;      /* Protocol, as given to us, or HTTP/0.9 */
 char *method;        /* GET, HEAD, POST, <em>etc.</em> */
-int method_number;   /* M_GET, M_POST, <em>etc.</em> */
-
-</pre><p><code>
+int method_number;   /* M_GET, M_POST, <em>etc.</em> */</pre><p><code>
         /* Info for logging */<br />
         <br />
         char *the_request;<br />

Modified: httpd/httpd/trunk/docs/manual/developer/filters.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/filters.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/filters.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/filters.html.en Wed Feb  5 22:28:30 2014
@@ -133,19 +133,15 @@
     same set of filters as the main request.  A graphical representation
     might help:</p>
 
-<div class="example"><pre>
-Default_handler --&gt; includes_filter --&gt; byterange --&gt; ...
-</pre></div>
+<div class="example"><pre>Default_handler --&gt; includes_filter --&gt; byterange --&gt; ...</pre></div>
 
     <p>If the includes filter creates a sub request, then we don't want the
     data from that sub-request to go through the includes filter, because it
     might not be SSI data.  So, the subrequest adds the following:</p>
 
-<div class="example"><pre>
-Default_handler --&gt; includes_filter -/-&gt; byterange --&gt; ...
+<div class="example"><pre>Default_handler --&gt; includes_filter -/-&gt; byterange --&gt; ...
                                     /
-Default_handler --&gt; sub_request_core
-</pre></div>
+Default_handler --&gt; sub_request_core</pre></div>
 
     <p>What happens if the subrequest is SSI data?  Well, that's easy, the
     <code>includes_filter</code> is a resource filter, so it will be added to

Modified: httpd/httpd/trunk/docs/manual/developer/hooks.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/hooks.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/hooks.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/hooks.html.en Wed Feb  5 22:28:30 2014
@@ -49,9 +49,7 @@
       arguments. For example, if the hook returns an <code>int</code> and
       takes a <code>request_rec *</code> and an <code>int</code> and is
       called <code>do_something</code>, then declare it like this:</p>
-      <pre class="prettyprint lang-c">
-        AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n))
-      </pre>
+      <pre class="prettyprint lang-c">        AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n))</pre>
 
 
       <p>This should go in a header which modules will include if
@@ -63,12 +61,10 @@
       which is used to record the module functions that use the hook.
       This is declared as follows:</p>
 
-      <pre class="prettyprint lang-c">
-APR_HOOK_STRUCT(
+      <pre class="prettyprint lang-c">APR_HOOK_STRUCT(
   APR_HOOK_LINK(do_something)
   ...
-)
-      </pre>
+)</pre>
 
     
 
@@ -82,9 +78,7 @@ APR_HOOK_STRUCT(
         <p>If the return value of a hook is <code>void</code>, then all the
         hooks are called, and the caller is implemented like this:</p>
 
-        <pre class="prettyprint lang-c">
-          AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n))
-        </pre>
+        <pre class="prettyprint lang-c">          AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n))</pre>
 
 
         <p>The second and third arguments are the dummy argument
@@ -92,13 +86,11 @@ APR_HOOK_STRUCT(
         calling the hook. In other words, this macro expands to
         something like this:</p>
 
-        <pre class="prettyprint lang-c">
-void ap_run_do_something(request_rec *r, int n)
+        <pre class="prettyprint lang-c">void ap_run_do_something(request_rec *r, int n)
 {
     ...
     do_something(r, n);
-}
-        </pre>
+}</pre>
 
       
 
@@ -106,9 +98,7 @@ void ap_run_do_something(request_rec *r,
         <p>If the hook returns a value, then it can either be run until
         the first hook that does something interesting, like so:</p>
 
-        <pre class="prettyprint lang-c">
-          AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED)
-        </pre>
+        <pre class="prettyprint lang-c">          AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED)</pre>
 
 
         <p>The first hook that does <em>not</em> return <code>DECLINED</code>
@@ -124,9 +114,7 @@ void ap_run_do_something(request_rec *r,
         value other than one of those two stops the loop, and its
         return is the return value. Declare these like so:</p>
 
-        <pre class="prettyprint lang-c">
-          AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED)
-        </pre>
+        <pre class="prettyprint lang-c">          AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED)</pre>
 
 
         <p>Again, <code>OK</code> and <code>DECLINED</code> are the traditional
@@ -138,12 +126,10 @@ void ap_run_do_something(request_rec *r,
       <p>At appropriate moments in the code, call the hook caller,
       like so:</p>
 
-      <pre class="prettyprint lang-c">
-int n, ret;
+      <pre class="prettyprint lang-c">int n, ret;
 request_rec *r;
 
-ret=ap_run_do_something(r, n);
-      </pre>
+ret=ap_run_do_something(r, n);</pre>
 
     
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -156,13 +142,11 @@ ret=ap_run_do_something(r, n);
       <p>Include the appropriate header, and define a static function
       of the correct type:</p>
 
-      <pre class="prettyprint lang-c">
-static int my_something_doer(request_rec *r, int n)<br />
+      <pre class="prettyprint lang-c">static int my_something_doer(request_rec *r, int n)<br />
 {
     ...
     return OK;
-}
-      </pre>
+}</pre>
 
     
 
@@ -171,8 +155,7 @@ static int my_something_doer(request_rec
       registering function, which is included in the module
       structure:</p>
 
-      <pre class="prettyprint lang-c">
-static void my_register_hooks()
+      <pre class="prettyprint lang-c">static void my_register_hooks()
 {
     ap_hook_do_something(my_something_doer, NULL, NULL, APR_HOOK_MIDDLE);
 }
@@ -181,8 +164,7 @@ mode MODULE_VAR_EXPORT my_module =
 {
     ...
     my_register_hooks       /* register hooks */
-};
-      </pre>
+};</pre>
 
     
 
@@ -215,14 +197,12 @@ mode MODULE_VAR_EXPORT my_module =
       example, suppose we want "mod_xyz.c" and "mod_abc.c" to run
       before we do, then we'd hook as follows:</p>
 
-      <pre class="prettyprint lang-c">
-static void register_hooks()
+      <pre class="prettyprint lang-c">static void register_hooks()
 {
     static const char * const aszPre[] = { "mod_xyz.c", "mod_abc.c", NULL };
 
     ap_hook_do_something(my_something_doer, aszPre, NULL, APR_HOOK_MIDDLE);
-}
-      </pre>
+}</pre>
 
 
       <p>Note that the sort used to achieve this is stable, so

Modified: httpd/httpd/trunk/docs/manual/developer/lua.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/lua.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/lua.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/lua.html.en Wed Feb  5 22:28:30 2014
@@ -88,11 +88,9 @@ a hook function will then acquire a stat
 done using it, allowing you to still gain a significant performance increase, while 
 keeping your memory footprint low. Some examples of possible settings are:
 </p>
-<pre class="prettyprint lang-config">
-LuaScope once
+<pre class="prettyprint lang-config">LuaScope once
 LuaScope thread
-LuaScope server 5 40
-</pre>
+LuaScope server 5 40</pre>
 
 <p>
 As a general rule of thumb: If your server has none to low usage, use <code>once</code> 
@@ -127,8 +125,7 @@ may be negligible, as files httpd will s
 For maximum performance, it is generally recommended that any initialization of libraries, 
 constants and master tables be kept outside the handle's scope:
 </p>
-<pre class="prettyprint lang-lua">
---[[ This is good practice ]]--
+<pre class="prettyprint lang-lua">--[[ This is good practice ]]--
 require "string"
 require "someLibrary"
 local masterTable = {}
@@ -136,11 +133,9 @@ local constant = "Foo bar baz"
 
 function handle(r)
     do_stuff()
-end
-</pre>
+end</pre>
 
-<pre class="prettyprint lang-lua">
---[[ This is bad practice ]]--
+<pre class="prettyprint lang-lua">--[[ This is bad practice ]]--
 require "string"
 
 function handle(r)
@@ -148,8 +143,7 @@ function handle(r)
     local masterTable = {}
     local constant = "Foo bar baz"
     do_stuff()
-end
-</pre>
+end</pre>
 
 
 
@@ -164,15 +158,12 @@ end
     decisions than would otherwise be allowed with said directives.
 </p>
 
-<pre class="prettyprint lang-config">
-LuaHookTranslateName /path/too/foo.lua remap
-</pre>
+<pre class="prettyprint lang-config">LuaHookTranslateName /path/too/foo.lua remap</pre>
 
 
 
 
-<pre class="prettyprint lang-lua">
---[[
+<pre class="prettyprint lang-lua">--[[
     Simple remap example.
     This example will rewrite /foo/test.bar to the physical file
     /internal/test, somewhat like how mod_alias works.
@@ -185,15 +176,13 @@ function remap(r)
         r.filename = "/internal/" .. barFile
     end
     return apache2.OK
-end
-</pre>
+end</pre>
 
 
 
 
 
-<pre class="prettyprint lang-lua">
---[[
+<pre class="prettyprint lang-lua">--[[
     Advanced remap example.
     This example will evaluate some conditions, and based on that, 
     remap a file to one of two destinations, using a rewrite map.
@@ -239,8 +228,7 @@ function remap(r)
         end
     end
     return apache2.DECLINED
-end
-</pre>
+end</pre>
 
 
 
@@ -259,15 +247,12 @@ bla bla
     document roots of each hostname.
 </p>
 
-<pre class="prettyprint lang-config">
-LuaHookTranslateName /path/too/foo.lua mass_vhost
-</pre>
+<pre class="prettyprint lang-config">LuaHookTranslateName /path/too/foo.lua mass_vhost</pre>
 
 
 
 
-<pre class="prettyprint lang-lua">
---[[
+<pre class="prettyprint lang-lua">--[[
     Simple mass vhost script
     This example will check a map for a virtual host and rewrite filename and 
     document root accordingly.
@@ -292,15 +277,13 @@ function mass_vhost(r)
         end
     end
     return apache2.DECLINED
-end
-</pre>
+end</pre>
 
 
 
 
 
-<pre class="prettyprint lang-lua">
---[[
+<pre class="prettyprint lang-lua">--[[
     Advanced mass virtual hosting
     This example will query a database for vhost entries and save them for
     60 seconds before checking for updates. For best performance, such scripts
@@ -342,8 +325,7 @@ function mass_vhost(r)
         return apache2.OK
     end
     return apache2.DECLINED
-end
-</pre>
+end</pre>
 
 
 
@@ -358,14 +340,11 @@ end
     processing, allowing you to either add new requirements that were not previously 
     supported by httpd, or tweaking existing ones to accommodate your needs. 
 </p>
-<pre class="prettyprint lang-config">
-LuaHookAuthChecker /path/too/foo.lua check_auth
-</pre>
+<pre class="prettyprint lang-config">LuaHookAuthChecker /path/too/foo.lua check_auth</pre>
 
 
 
-<pre class="prettyprint lang-lua">
---[[ 
+<pre class="prettyprint lang-lua">--[[ 
      A simple authentication hook that checks a table containing usernames and
      passwords of two accounts.
 ]]--
@@ -400,15 +379,13 @@ function check_auth(r)
     else
         return apache2.OK
     end
-end
-</pre>
+end</pre>
 
 
 
 
 
-<pre class="prettyprint lang-lua">
---[[ 
+<pre class="prettyprint lang-lua">--[[ 
      An advanced authentication checker with a database backend,
      caching account entries for 1 minute
 ]]--
@@ -464,8 +441,7 @@ function check_auth(r)
     else
         return apache2.OK
     end
-end
-</pre>
+end</pre>
 
 
 
@@ -479,19 +455,16 @@ end
     example below shows you how you can split a single htpasswd file into 
     groups with different permissions:
 </p>
-<pre class="prettyprint lang-config">
-LuaAuthzProvider rights /path/to/lua/script.lua rights_handler
+<pre class="prettyprint lang-config">LuaAuthzProvider rights /path/to/lua/script.lua rights_handler
 &lt;Directory /www/private&gt;
     Require rights member
 &lt;/Directory&gt;
 &lt;Directory /www/admin&gt;
     Require rights admin
-&lt;/Directory&gt;
-</pre>
+&lt;/Directory&gt;</pre>
 
 
-<pre class="prettyprint lang-lua">
---[[ 
+<pre class="prettyprint lang-lua">--[[ 
      This script has two user groups; members and admins, and whichever 
      is refered to by the "Require rights" directive is checked to see
      if the authenticated user belongs to this group.
@@ -518,8 +491,7 @@ function rights_handler(r, what)
         end
     end
     return apache2.AUTHZ_DENIED
-end
-</pre>
+end</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -530,13 +502,10 @@ end
     by each backend using IVM variables, and preferring the backend with least 
     requests served in total:
 </p>
-<pre class="prettyprint lang-config">
-LuaHookTranslateName /path/to/script.lua proxy_handler
-</pre>
+<pre class="prettyprint lang-config">LuaHookTranslateName /path/to/script.lua proxy_handler</pre>
 
 
-<pre class="prettyprint lang-lua">
---[[ 
+<pre class="prettyprint lang-lua">--[[ 
      This script uses a basic IVM table to determine where to 
      send the request.
 ]]--
@@ -573,8 +542,7 @@ function proxy_handler(r)
     r.proxyreq = apache2.PROXYREQ_REVERSE
     r.filename = "proxy:" .. backends[backend] .. r.uri
     return apache2.DECLINED -- let the proxy handler do this instead
-end
-</pre>
+end</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -582,9 +550,7 @@ end
 <p>
 Coming soon!
 </p>
-<pre class="prettyprint lang-config">
-LuaMapHandler ^/portal/([a-z]+)/   /path/to/lua/script.lua handle_$1
-</pre>
+<pre class="prettyprint lang-config">LuaMapHandler ^/portal/([a-z]+)/   /path/to/lua/script.lua handle_$1</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/developer/modguide.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/modguide.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/modguide.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/modguide.html.en Wed Feb  5 22:28:30 2014
@@ -82,9 +82,7 @@ using <a href="../programs/apxs.html">AP
 is called mod_example.c, compiling, installing and activating the module is 
 as simple as: 
 </p>
-<div class="example"><pre>
-apxs -i -a -c mod_example.c
-</pre></div>
+<div class="example"><pre>apxs -i -a -c mod_example.c</pre></div>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -97,8 +95,7 @@ that defines a module as <em>a separate 
 
 
 
-<pre class="prettyprint lang-c">
-module AP_MODULE_DECLARE_DATA   example_module =
+<pre class="prettyprint lang-c">module AP_MODULE_DECLARE_DATA   example_module =
 { 
     STANDARD20_MODULE_STUFF,
     create_dir_conf, /* Per-directory configuration handler */
@@ -107,8 +104,7 @@ module AP_MODULE_DECLARE_DATA   example_
     merge_svr_conf,  /* Merge handler for per-server configurations */
     directives,      /* Any directives we may have for httpd */
     register_hooks   /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -125,9 +121,7 @@ of the module is used primarily for two 
 For now, we're only concerned with the first purpose of the module name, 
 which comes into play when we need to load the module:
 </p>
-<pre class="prettyprint lang-config">
-LoadModule example_module modules/mod_example.so
-</pre>
+<pre class="prettyprint lang-config">LoadModule example_module modules/mod_example.so</pre>
 
 <p>
 In essence, this tells the server to open up <code>mod_example.so</code> and look for a module 
@@ -171,9 +165,7 @@ our example case, we want every request 
 <code>mod_example</code>, so we'll add a configuration directive that tells 
 the server to do just that:
 </p>
-<pre class="prettyprint lang-config">
-AddHandler example-handler .sum
-</pre>
+<pre class="prettyprint lang-config">AddHandler example-handler .sum</pre>
 
 <p>
 What this tells the server is the following: <em>Whenever we receive a request 
@@ -195,8 +187,7 @@ definition will look like this:</p>
 
 
 
-<pre class="prettyprint lang-c">
-module AP_MODULE_DECLARE_DATA   example_module =
+<pre class="prettyprint lang-c">module AP_MODULE_DECLARE_DATA   example_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,
@@ -205,8 +196,7 @@ module AP_MODULE_DECLARE_DATA   example_
     NULL,
     NULL,
     register_hooks   /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -223,13 +213,11 @@ to hook into its process as one of the l
 </p>
 
 
-<pre class="prettyprint lang-c">
-static void register_hooks(apr_pool_t *pool)
+<pre class="prettyprint lang-c">static void register_hooks(apr_pool_t *pool)
 {
     /* Create a hook in the request handler, so we get called when a request arrives */
     ap_hook_handler(example_handler, NULL, NULL, APR_HOOK_LAST);
-}
-</pre>
+}</pre>
 
 
 
@@ -279,8 +267,7 @@ In C code, our example handler will now 
 </p>
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     /* First off, we need to check if this is a call for the "example-handler" handler.
      * If it is, we accept it and do our things, if not, we simply return DECLINED,
@@ -298,8 +285,7 @@ static int example_handler(request_rec *
      * We do so by simply returning the value OK to the server.
      */
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -344,8 +330,7 @@ Let's try out some of these variables in
 </p>
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     /* Set the appropriate content type */
     ap_set_content_type(r, "text/html");
@@ -366,8 +351,7 @@ static int example_handler(request_rec *
         ap_rprintf(r, "Your query string was: %s", r-&gt;args);
     }
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -384,13 +368,11 @@ status code, for example:
 </p>
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     /* Return 404: Not found */
     return HTTP_NOT_FOUND;
-}
-</pre>
+}</pre>
 
 
 
@@ -500,8 +482,7 @@ apr_pool_t *p, const char *fmt, ...)</co
 
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     const char* original = "You can't edit this!";
     char* copy;
@@ -513,8 +494,7 @@ static int example_handler(request_rec *
     /* Create a copy of the 'original' variable that we can edit. */
     copy = apr_pstrdup(r-&gt;pool, original);
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -527,15 +507,13 @@ function to sort it out:
 </p>
 
 
-<pre class="prettyprint lang-c">
-static void register_hooks(apr_pool_t *pool)
+<pre class="prettyprint lang-c">static void register_hooks(apr_pool_t *pool)
 {
     /* Call a function that initializes some stuff */
     example_init_function(pool);
     /* Create a hook in the request handler, so we get called when a request arrives */
     ap_hook_handler(example_handler, NULL, NULL, APR_HOOK_LAST);
-}
-</pre>
+}</pre>
 
 
 
@@ -575,8 +553,7 @@ POST data is four simple lines:
 <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__SCRIPT.html#gaed25877b529623a4d8f99f819ba1b7bd">
 ap_args_to_table</a>(r, &amp;GET); <em>
 </em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__DAEMON.html#ga9d426b6382b49754d4f87c55f65af202">
-ap_parse_form_data</a>(r, NULL, &amp;POST, -1, 8192); 
-</pre>
+ap_parse_form_data</a>(r, NULL, &amp;POST, -1, 8192);</pre>
 
 
 
@@ -588,13 +565,11 @@ GET</code>. To extract this value, we ne
 
 
 
-<pre class="prettyprint lang-c">
-/* Get the "digest" key from the query string, if any. */
+<pre class="prettyprint lang-c">/* Get the "digest" key from the query string, if any. */
 const char *digestType = apr_table_get(GET, "digest");
 
 /* If no key was returned, we will set a default value instead. */
-if (!digestType) digestType = "sha1";
-</pre>
+if (!digestType) digestType = "sha1";</pre>
 
 
 
@@ -614,8 +589,7 @@ out the MD5 or SHA1 digest of files:
 
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     int rc, exists;
     apr_finfo_t finfo;
@@ -722,8 +696,7 @@ static int example_handler(request_rec *
     }    
     /* Let the server know that we responded to this request. */
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -752,11 +725,9 @@ what a configuration directive is. Simpl
 telling an individual module (or a set of modules) how to behave, such as 
 these directives control how <code>mod_rewrite</code> works:
 </p>
-<pre class="prettyprint lang-config">
-RewriteEngine On
+<pre class="prettyprint lang-config">RewriteEngine On
 RewriteCond %{REQUEST_URI} ^/foo/bar
-RewriteRule ^/foo/bar/(.*)$ /foobar?page=$1
-</pre>
+RewriteRule ^/foo/bar/(.*)$ /foobar?page=$1</pre>
 
 <p>
 Each of these configuration directives are handled by a separate function, 
@@ -768,13 +739,11 @@ that parses the parameters given and set
 
 
 
-<pre class="prettyprint lang-c">
-typedef struct {
+<pre class="prettyprint lang-c">typedef struct {
     int         enabled;      /* Enable or disable our module */
     const char *path;         /* Some path to...something */
     int         typeOfAction; /* 1 means action A, 2 means action B and so on */
-} example_config;
-</pre>
+} example_config;</pre>
 
 
 
@@ -786,8 +755,7 @@ values to their defaults:
 </p>
 
 
-<pre class="prettyprint lang-c">
-typedef struct {
+<pre class="prettyprint lang-c">typedef struct {
     int         enabled;      /* Enable or disable our module */
     const char *path;         /* Some path to...something */
     int         typeOfAction; /* 1 means action A, 2 means action B and so on */
@@ -824,8 +792,7 @@ module AP_MODULE_DECLARE_DATA   example_
     NULL,            /* Merge handler for per-server configurations */
     NULL,            /* Any directives we may have for httpd */
     register_hooks   /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -833,11 +800,9 @@ module AP_MODULE_DECLARE_DATA   example_
 So far so good. To access our new handler, we could add the following to 
 our configuration:
 </p>
-<pre class="prettyprint lang-config">
-&lt;Location /example&gt;
+<pre class="prettyprint lang-config">&lt;Location /example&gt;
     SetHandler example-handler
-&lt;/Location&gt;
-</pre>
+&lt;/Location&gt;</pre>
 
 <p>
 When we visit, we'll see our current configuration being spit out by our 
@@ -855,8 +820,7 @@ reference to the configuration directive
 </p>
 
 
-<pre class="prettyprint lang-c">
-module AP_MODULE_DECLARE_DATA   example_module =
+<pre class="prettyprint lang-c">module AP_MODULE_DECLARE_DATA   example_module =
 {
     STANDARD20_MODULE_STUFF,
     NULL,               /* Per-directory configuration handler */
@@ -865,8 +829,7 @@ module AP_MODULE_DECLARE_DATA   example_
     NULL,               /* Merge handler for per-server configurations */
     example_directives, /* Any directives we may have for httpd */
     register_hooks      /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -879,15 +842,13 @@ will add a structure with three directiv
 </p>
 
 
-<pre class="prettyprint lang-c">
-static const command_rec        example_directives[] =
+<pre class="prettyprint lang-c">static const command_rec        example_directives[] =
 {
     AP_INIT_TAKE1("exampleEnabled", example_set_enabled, NULL, RSRC_CONF, "Enable or disable mod_example"),
     AP_INIT_TAKE1("examplePath", example_set_path, NULL, RSRC_CONF, "The path to whatever"),
     AP_INIT_TAKE2("exampleAction", example_set_action, NULL, RSRC_CONF, "Special action value!"),
     { NULL }
-};
-</pre>
+};</pre>
 
 
 
@@ -926,8 +887,7 @@ exampleAction</code> directive to accept
 has an additional parameter defined:</p> 
 
 
-<pre class="prettyprint lang-c">
-/* Handler for the "exampleEnabled" directive */
+<pre class="prettyprint lang-c">/* Handler for the "exampleEnabled" directive */
 const char *example_set_enabled(cmd_parms *cmd, void *cfg, const char *arg)
 {
     if(!strcasecmp(arg, "on")) config.enabled = 1;
@@ -953,8 +913,7 @@ const char *example_set_action(cmd_parms
     if(!strcasecmp(arg2, "deny")) config.typeOfAction += 0x10;
     else config.typeOfAction += 0x20;
     return NULL;
-}
-</pre>
+}</pre>
 
 
 
@@ -967,8 +926,7 @@ we can assemble our module into one big 
 </p>
 
 
-<pre class="prettyprint lang-c">
-/* mod_example_config_simple.c: */
+<pre class="prettyprint lang-c">/* mod_example_config_simple.c: */
 #include &lt;stdio.h&gt;
 #include "apr_hash.h"
 #include "ap_config.h"
@@ -1079,8 +1037,7 @@ module AP_MODULE_DECLARE_DATA   example_
     NULL,               /* Merge handler for per-server configurations */
     example_directives, /* Any directives we may have for httpd */
     register_hooks      /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -1089,11 +1046,9 @@ module AP_MODULE_DECLARE_DATA   example_
 In our httpd.conf file, we can now change the hard-coded configuration by 
 adding a few lines:
 </p>
-<pre class="prettyprint lang-config">
-ExampleEnabled On
+<pre class="prettyprint lang-config">ExampleEnabled On
 ExamplePath "/usr/bin/foo"
-ExampleAction file allow
-</pre>
+ExampleAction file allow</pre>
 
 <p>
 And thus we apply the configuration, visit <code>/example</code> on our 
@@ -1113,15 +1068,13 @@ different meanings to the user of the se
 within which modules must operate. For example, let's assume you have this 
 configuration set up for mod_rewrite:
 </p>
-<pre class="prettyprint lang-config">
-&lt;Directory "/var/www"&gt;
+<pre class="prettyprint lang-config">&lt;Directory "/var/www"&gt;
     RewriteCond %{HTTP_HOST} ^example.com$
     RewriteRule (.*) http://www.example.com/$1
 &lt;/Directory&gt;
 &lt;Directory "/var/www/sub"&gt;
     RewriteRule ^foobar$ index.php?foobar=true
-&lt;/Directory&gt;
-</pre>
+&lt;/Directory&gt;</pre>
 
 <p>
 In this example, you will have set up two different contexts for 
@@ -1144,9 +1097,7 @@ directory or location in question? It do
 </p>
 
 
-<pre class="prettyprint lang-c">
-example_config *config = (example_config*) <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga1093a5908a384eacc929b028c79f2a02">ap_get_module_config</a>(r-&gt;per_dir_config, &amp;example_module);
-</pre>
+<pre class="prettyprint lang-c">example_config *config = (example_config*) <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga1093a5908a384eacc929b028c79f2a02">ap_get_module_config</a>(r-&gt;per_dir_config, &amp;example_module);</pre>
 
 
 
@@ -1165,14 +1116,12 @@ variable that we can use to track which 
 used by the server in various places:
 </p>
 
-<pre class="prettyprint lang-c">
-typedef struct {
+<pre class="prettyprint lang-c">typedef struct {
     char        context[256];
     char        path[256];
     int         typeOfAction;
     int         enabled;
-} example_config;
-</pre>
+} example_config;</pre>
 
 
 
@@ -1180,8 +1129,7 @@ typedef struct {
 
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     if(!r-&gt;handler || strcmp(r-&gt;handler, "example-handler")) return(DECLINED);
     example_config *config = (example_config*) ap_get_module_config(r-&gt;per_dir_config, &amp;example_module);
@@ -1191,8 +1139,7 @@ static int example_handler(request_rec *
     ap_rprintf("TypeOfAction: %x\n", config-&gt;typeOfAction);
     ap_rprintf("Context: %s\n", config-&gt;context);
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -1206,9 +1153,7 @@ a directive required five elements be se
 
 
 
-<pre class="prettyprint lang-c">
-AP_INIT_TAKE1("exampleEnabled", example_set_enabled, NULL, RSRC_CONF, "Enable or disable mod_example"),
-</pre>
+<pre class="prettyprint lang-c">AP_INIT_TAKE1("exampleEnabled", example_set_enabled, NULL, RSRC_CONF, "Enable or disable mod_example"),</pre>
 
 
 
@@ -1241,8 +1186,7 @@ and managing our configurations. Since w
 per-directory creator and merger function reference in our tag:</p>
 
 
-<pre class="prettyprint lang-c">
-module AP_MODULE_DECLARE_DATA   example_module =
+<pre class="prettyprint lang-c">module AP_MODULE_DECLARE_DATA   example_module =
 {
     STANDARD20_MODULE_STUFF,
     create_dir_conf, /* Per-directory configuration handler */
@@ -1251,8 +1195,7 @@ module AP_MODULE_DECLARE_DATA   example_
     NULL,            /* Merge handler for per-server configurations */
     directives,      /* Any directives we may have for httpd */
     register_hooks   /* Our hook registering function */
-};
-</pre>
+};</pre>
 
 
 
@@ -1267,8 +1210,7 @@ our first step is to make a function for
 configurations. We do so by creating the function we just referenced in 
 our name tag as the Per-directory configuration handler:</p>
 
-<pre class="prettyprint lang-c">
-void* example_create_dir_conf(apr_pool_t* pool, char* context) {
+<pre class="prettyprint lang-c">void* example_create_dir_conf(apr_pool_t* pool, char* context) {
     context = context ? context : "(undefined context)";
     example_config *cfg = apr_pcalloc(pool, sizeof(example_config));
     if(cfg) {
@@ -1279,8 +1221,7 @@ void* example_create_dir_conf(apr_pool_t
         cfg-&gt;typeOfAction = 0x11;
     }
     return cfg;
-}
-</pre>
+}</pre>
 
 
 
@@ -1293,16 +1234,14 @@ Our next step in creating a context awar
 configurations. This part of the process particularly applies to scenarios 
 where you have a parent configuration and a child, such as the following: 
 </p>
-<pre class="prettyprint lang-config">
-&lt;Directory "/var/www"&gt;
+<pre class="prettyprint lang-config">&lt;Directory "/var/www"&gt;
     ExampleEnabled On
     ExamplePath /foo/bar
     ExampleAction file allow
 &lt;/Directory&gt;
 &lt;Directory "/var/www/subdir"&gt;
     ExampleAction file deny
-&lt;/Directory&gt;
-</pre>
+&lt;/Directory&gt;</pre>
 
 <p>
 In this example, it is natural to assume that the directory <code>
@@ -1325,8 +1264,7 @@ two configurations and decide how they a
 
 
 
-<pre class="prettyprint lang-c">
-void* merge_dir_conf(apr_pool_t* pool, void* BASE, void* ADD) {
+<pre class="prettyprint lang-c">void* merge_dir_conf(apr_pool_t* pool, void* BASE, void* ADD) {
     example_config* base = (example_config *) BASE ; /* This is what was set in the parent context */
     example_config* add = (example_config *) ADD ;   /* This is what is set in the new context */
     example_config* conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */
@@ -1337,8 +1275,7 @@ void* merge_dir_conf(apr_pool_t* pool, v
     strcpy(conf-&gt;path, strlen(add-&gt;path) ? add-&gt;path : base-&gt;path);
     
     return conf ;
-}
-</pre>
+}</pre>
 
 
 
@@ -1351,8 +1288,7 @@ Now, let's try putting it all together t
 context aware. First off, we'll create a configuration that lets us test 
 how the module works:
 </p>
-<pre class="prettyprint lang-config">
-&lt;Location "/a"&gt;
+<pre class="prettyprint lang-config">&lt;Location "/a"&gt;
     SetHandler example-handler
     ExampleEnabled on
     ExamplePath "/foo/bar"
@@ -1368,8 +1304,7 @@ how the module works:
     ExampleAction db deny
     ExamplePath "/foo/bar/baz"
     ExampleEnabled on
-&lt;/Location&gt;
-</pre>
+&lt;/Location&gt;</pre>
 
 <p>
 Then we'll assemble our module code. Note, that since we are now using our 
@@ -1378,8 +1313,7 @@ added some prototypes to keep the compil
 </p>
 
 
-<pre class="prettyprint lang-c">
-/*$6
+<pre class="prettyprint lang-c">/*$6
  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  * mod_example_config.c
  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1602,8 +1536,7 @@ void *merge_dir_conf(apr_pool_t *pool, v
     conf-&gt;typeOfAction = add-&gt;typeOfAction ? add-&gt;typeOfAction : base-&gt;typeOfAction;
     strcpy(conf-&gt;path, strlen(add-&gt;path) ? add-&gt;path : base-&gt;path);
     return conf;
-}
-</pre>
+}</pre>
 
 
 
@@ -1630,8 +1563,7 @@ or check out the rest of our documentati
 
 
 
-<pre class="prettyprint lang-c">
-typedef struct {
+<pre class="prettyprint lang-c">typedef struct {
     const char* key;
     const char* value;
 } keyValuePair;
@@ -1684,8 +1616,7 @@ static int example_handler(request_rec *
         }
     }
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -1696,8 +1627,7 @@ static int example_handler(request_rec *
 
 
 
-<pre class="prettyprint lang-c">
-static int example_handler(request_rec *r)
+<pre class="prettyprint lang-c">static int example_handler(request_rec *r)
 {
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
     const apr_array_header_t    *fields;
@@ -1711,8 +1641,7 @@ static int example_handler(request_rec *
         ap_rprintf(r, "%s: %s\n", e[i].key, e[i].val);
     }
     return OK;
-}
-</pre>
+}</pre>
 
 
 
@@ -1723,8 +1652,7 @@ static int example_handler(request_rec *
 
 
 
-<pre class="prettyprint lang-c">
-static int util_read(request_rec *r, const char **rbuf, apr_off_t *size)
+<pre class="prettyprint lang-c">static int util_read(request_rec *r, const char **rbuf, apr_off_t *size)
 {
     /*~~~~~~~~*/
     int rc = OK;
@@ -1770,8 +1698,7 @@ static int example_handler(request_rec* 
         ap_rprintf(r, "We read a request body that was %" APR_OFF_T_FMT " bytes long", size);
     }
     return OK;
-}
-    </pre>
+}</pre>
 
 
 

Modified: httpd/httpd/trunk/docs/manual/developer/modules.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/modules.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/modules.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/modules.html.en Wed Feb  5 22:28:30 2014
@@ -86,8 +86,7 @@
       will be called in.</p>
 
       <p>This is the code that was added to <code>mod_mmap_static</code>:</p>
-      <div class="example"><pre>
-static void register_hooks(void)
+      <div class="example"><pre>static void register_hooks(void)
 {
     static const char * const aszPre[]={ "http_core.c",NULL };
     ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
@@ -131,8 +130,7 @@ static void register_hooks(void)
       creating your module definition. The old definition looked
       like</p>
 
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
+      <div class="example"><pre>module MODULE_VAR_EXPORT <var>module_name</var>_module =
 {
     STANDARD_MODULE_STUFF,
     /* initializer */
@@ -156,8 +154,7 @@ module MODULE_VAR_EXPORT <var>module_nam
 };</pre></div>
 
       <p>The new structure is a great deal simpler...</p>
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
+      <div class="example"><pre>module MODULE_VAR_EXPORT <var>module_name</var>_module =
 {
     STANDARD20_MODULE_STUFF,
     /* create per-directory config structures */

Modified: httpd/httpd/trunk/docs/manual/developer/modules.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/modules.html.ja.utf8?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/modules.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/developer/modules.html.ja.utf8 [utf-8] Wed Feb  5 22:28:30 2014
@@ -95,8 +95,7 @@
 
     <p>以下は、<code>mod_mmap_static</code> に追加したコードです:</p>
 
-      <div class="example"><pre>
-static void register_hooks(void)
+      <div class="example"><pre>static void register_hooks(void)
 {
     static const char * const aszPre[]={ "http_core.c",NULL };
     ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
@@ -139,8 +138,7 @@ static void register_hooks(void)
       <p>モジュールの定義を作成する際に注意しなければならない
       ステージの数は激減しています。古い定義は次のようになっていました。</p>
 
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
+      <div class="example"><pre>module MODULE_VAR_EXPORT <var>module_name</var>_module =
 {
     STANDARD_MODULE_STUFF,
     /* initializer */
@@ -164,8 +162,7 @@ module MODULE_VAR_EXPORT <var>module_nam
 };</pre></div>
 
     <p>新しい構造体はとってもシンプルです…</p>
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
+      <div class="example"><pre>module MODULE_VAR_EXPORT <var>module_name</var>_module =
 {
     STANDARD20_MODULE_STUFF,
     /* create per-directory config structures */

Modified: httpd/httpd/trunk/docs/manual/developer/output-filters.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/output-filters.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/output-filters.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/output-filters.html.en Wed Feb  5 22:28:30 2014
@@ -129,14 +129,12 @@
     brigade should have no side effects (such as changing any state
     private to the filter).</p>
 
-    <div class="example"><h3>How to handle an empty brigade</h3><pre class="prettyprint lang-c">
-    apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)<br />
+    <div class="example"><h3>How to handle an empty brigade</h3><pre class="prettyprint lang-c">    apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)<br />
     {
         if (APR_BRIGADE_EMPTY(bb)) {
             return APR_SUCCESS;
         }
-        ....
-    </pre>
+        ....</pre>
 </div>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -254,8 +252,7 @@
     <p>Taking an example which loops through the entire brigade as
     follows:</p>
 
-    <div class="example"><h3>Bad output filter -- do not imitate!</h3><pre class="prettyprint lang-c">
-apr_bucket *e = APR_BRIGADE_FIRST(bb);
+    <div class="example"><h3>Bad output filter -- do not imitate!</h3><pre class="prettyprint lang-c">apr_bucket *e = APR_BRIGADE_FIRST(bb);
 const char *data;
 apr_size_t len;
 
@@ -265,8 +262,7 @@ while (e != APR_BRIGADE_SENTINEL(bb)) {
 
 }
 
-return ap_pass_brigade(bb);
-</pre>
+return ap_pass_brigade(bb);</pre>
 </div>
 
     <p>The above implementation would consume memory proportional to
@@ -279,8 +275,7 @@ return ap_pass_brigade(bb);
     amount of memory to filter any brigade; a temporary brigade is
     needed and must be allocated only once per response, see the <a href="#state">Maintaining state</a> section.</p>
 
-    <div class="example"><h3>Better output filter</h3><pre class="prettyprint lang-c">
-apr_bucket *e;
+    <div class="example"><h3>Better output filter</h3><pre class="prettyprint lang-c">apr_bucket *e;
 const char *data;
 apr_size_t len;
 
@@ -295,8 +290,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != AP
    rv = ap_pass_brigade(f-&gt;next, tmpbb);
    if (rv) ...;
    apr_brigade_cleanup(tmpbb);
-}
-</pre>
+}</pre>
 </div>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -311,8 +305,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != AP
     temporary brigade in such a structure, to avoid having to allocate
     a new brigade per invocation as described in the <a href="#brigade">Brigade structure</a> section.</p>
 
-  <div class="example"><h3>Example code to maintain filter state</h3><pre class="prettyprint lang-c">
-struct dummy_state {
+  <div class="example"><h3>Example code to maintain filter state</h3><pre class="prettyprint lang-c">struct dummy_state {
    apr_bucket_brigade *tmpbb;
    int filter_state;
    ....
@@ -334,8 +327,7 @@ apr_status_t dummy_filter(ap_filter_t *f
        state-&gt;filter_state = ...;
 
     }
-    ...
-</pre>
+    ...</pre>
 </div>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -410,8 +402,7 @@ apr_status_t dummy_filter(ap_filter_t *f
     script; reading from such a bucket will block when waiting for the
     CGI script to produce more output.</p>
 
-    <div class="example"><h3>Example code using non-blocking bucket reads</h3><pre class="prettyprint lang-c">
-apr_bucket *e;
+    <div class="example"><h3>Example code using non-blocking bucket reads</h3><pre class="prettyprint lang-c">apr_bucket *e;
 apr_read_type_e mode = APR_NONBLOCK_READ;
 
 while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
@@ -436,8 +427,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != AP
     /* Next time, try a non-blocking read first. */
     mode = APR_NONBLOCK_READ;
     ...
-}
-</pre>
+}</pre>
 </div>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/developer/request.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/request.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/request.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/request.html.en Wed Feb  5 22:28:30 2014
@@ -150,8 +150,7 @@
 <h2><a name="security" id="security">The Security Phase</a></h2>
     <p>Needs Documentation. Code is:</p>
 
-    <pre class="prettyprint lang-c">
-if ((access_status = ap_run_access_checker(r)) != 0) {
+    <pre class="prettyprint lang-c">if ((access_status = ap_run_access_checker(r)) != 0) {
     return decl_die(access_status, "check access", r);
 }
 
@@ -161,8 +160,7 @@ if ((access_status = ap_run_check_user_i
 
 if ((access_status = ap_run_auth_checker(r)) != 0) {
     return decl_die(access_status, "check authorization", r);
-}
-    </pre>
+}</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/dns-caveats.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.html.en (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.html.en Wed Feb  5 22:28:30 2014
@@ -46,13 +46,11 @@
 <h2><a name="example" id="example">A Simple Example</a></h2>
     
 
-    <pre class="prettyprint lang-config">
-# This is a misconfiguration example, do not use on your server
+    <pre class="prettyprint lang-config"># This is a misconfiguration example, do not use on your server
 &lt;VirtualHost www.example.dom&gt;
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>In order for the server to function properly, it absolutely needs
@@ -69,13 +67,11 @@
     <p>Suppose that <code>www.example.dom</code> has address 192.0.2.1.
     Then consider this configuration snippet:</p>
 
-    <pre class="prettyprint lang-config">
-# This is a misconfiguration example, do not use on your server
+    <pre class="prettyprint lang-config"># This is a misconfiguration example, do not use on your server
 &lt;VirtualHost 192.0.2.1&gt;
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>This time httpd needs to use reverse DNS to find the
@@ -89,13 +85,11 @@
 
     <p>Here is a snippet that avoids both of these problems:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 192.0.2.1&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 192.0.2.1&gt;
   ServerName www.example.dom
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -104,16 +98,14 @@
 
     <p>Consider this configuration snippet:</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost www.example1.dom&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost www.example1.dom&gt;
   ServerAdmin webgirl@example1.dom
   DocumentRoot /www/example1
 &lt;/VirtualHost&gt;
 &lt;VirtualHost www.example2.dom&gt;
   ServerAdmin webguy@example2.dom
   DocumentRoot /www/example2
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Suppose that you've assigned 192.0.2.1 to

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/dns-caveats.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.html.fr Wed Feb  5 22:28:30 2014
@@ -48,14 +48,12 @@
 <h2><a name="example" id="example">Un exemple simple</a></h2>
     
 
-    <pre class="prettyprint lang-config">
-# Ceci est un exemple de mauvaise configuration ; ne l'utilisez pas comme base
+    <pre class="prettyprint lang-config"># Ceci est un exemple de mauvaise configuration ; ne l'utilisez pas comme base
 # de configuration
 &lt;VirtualHost www.example.dom&gt;
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Pour fonctionner correctement, le serveur a absolument besoin de deux
@@ -73,14 +71,12 @@
     <p>Supposons que l'adresse de <code>www.example.dom</code> soit
     192.0.2.1, et examinons cet extrait de configuration :</p>
 
-    <pre class="prettyprint lang-config">
-# Ceci est un exemple de mauvaise configuration ; ne l'utilisez pas comme base
+    <pre class="prettyprint lang-config"># Ceci est un exemple de mauvaise configuration ; ne l'utilisez pas comme base
 # de configuration
 &lt;VirtualHost 192.0.2.1&gt;
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Cette fois, httpd doit effectuer une recherche DNS inverse pour
@@ -96,13 +92,11 @@
     <p>Voici un extrait de configuration qui permet d'éviter ces deux
     types de problèmes :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost 192.0.2.1&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost 192.0.2.1&gt;
   ServerName www.example.dom
   ServerAdmin webgirl@example.dom
   DocumentRoot /www/example
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -111,16 +105,14 @@
 
     <p>Considérons cet extrait de configuration :</p>
 
-    <pre class="prettyprint lang-config">
-&lt;VirtualHost www.example1.dom&gt;
+    <pre class="prettyprint lang-config">&lt;VirtualHost www.example1.dom&gt;
   ServerAdmin webgirl@example1.dom
   DocumentRoot /www/example1
 &lt;/VirtualHost&gt;
 &lt;VirtualHost www.example2.dom&gt;
   ServerAdmin webguy@example2.dom
   DocumentRoot /www/example2
-&lt;/VirtualHost&gt;
-    </pre>
+&lt;/VirtualHost&gt;</pre>
 
 
     <p>Supposons que vous ayez assigné 192.0.2.1 à

Modified: httpd/httpd/trunk/docs/manual/env.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/env.html.en?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.html.en (original)
+++ httpd/httpd/trunk/docs/manual/env.html.en Wed Feb  5 22:28:30 2014
@@ -418,14 +418,12 @@
       </a></code> and <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> allows you to still accept
       these headers:</p>
 
-<pre class="prettyprint lang-config">
-# 
+<pre class="prettyprint lang-config"># 
 # The following works around a client sending a broken Accept_Encoding
 # header.
 #
 SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1
-RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding
-</pre>
+RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding</pre>
 
 
     
@@ -437,8 +435,7 @@ RequestHeader set Accept-Encoding %{fix_
         httpd.conf to deal with known client problems.  Since the affected clients
         are no longer seen in the wild, this configuration is likely no-longer
         necessary.</p>
-<pre class="prettyprint lang-config">
-#
+<pre class="prettyprint lang-config">#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
@@ -456,8 +453,7 @@ BrowserMatch "MSIE 4\.0b2;" nokeepalive 
 #
 BrowserMatch "RealPlayer 4\.0" force-response-1.0
 BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-</pre>
+BrowserMatch "JDK/1\.0" force-response-1.0</pre>
 
 
     
@@ -469,12 +465,10 @@ BrowserMatch "JDK/1\.0" force-response-1
         particular directories, or to prevent logging of requests
         coming from particular hosts.</p>
 
-        <pre class="prettyprint lang-config">
-SetEnvIf Request_URI \.gif image-request
+        <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
-CustomLog logs/access_log common env=!image-request
-        </pre>
+CustomLog logs/access_log common env=!image-request</pre>
 
 
     
@@ -487,14 +481,12 @@ CustomLog logs/access_log common env=!im
         in limited circumstances. We assume that all your images are in
         a directory called <code>/web/images</code>.</p>
 
-        <pre class="prettyprint lang-config">
-SetEnvIf Referer "^http://www\.example\.com/" local_referal
+        <pre class="prettyprint lang-config">SetEnvIf Referer "^http://www\.example\.com/" local_referal
 # Allow browsers that do not send Referer info
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;
     Require env local_referal
-&lt;/Directory&gt;
-        </pre>
+&lt;/Directory&gt;</pre>
 
 
         <p>For more information about this technique, see the

Modified: httpd/httpd/trunk/docs/manual/env.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/env.html.fr?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/env.html.fr Wed Feb  5 22:28:30 2014
@@ -449,13 +449,11 @@
       <code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code> et <code class="module"><a href="./mod/mod_header.html">mod_header</a></code>,
       et permettant de prendre en compte ces en-têtes :</p>
 
-<pre class="prettyprint lang-config">
-# L'exemple suivant montre comment prendre en compte un en-tête<br />
+<pre class="prettyprint lang-config"># L'exemple suivant montre comment prendre en compte un en-tête<br />
 # Accept_Encoding non conforme envoyé par un client.
 #
 SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1
-RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding
-</pre>
+RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding</pre>
 
 
     
@@ -468,8 +466,7 @@ RequestHeader set Accept-Encoding %{fix_
         httpd.conf pour tenir compte de problèmes connus avec certains clients.
 	Comme les clients concernés sont maintenant très peu utilisés, cet
 	ajout n'est pratiquement plus nécessaire.</p>
-<pre class="prettyprint lang-config">
-#
+<pre class="prettyprint lang-config">#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
@@ -487,8 +484,7 @@ BrowserMatch "MSIE 4\.0b2;" nokeepalive 
 #
 BrowserMatch "RealPlayer 4\.0" force-response-1.0
 BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-</pre>
+BrowserMatch "JDK/1\.0" force-response-1.0</pre>
 
 
     
@@ -500,12 +496,10 @@ BrowserMatch "JDK/1\.0" force-response-1
 	dans le fichier de trace des accès. Il peut être facilement adapté pour
 	empêcher le traçage de répertoires particuliers, ou de requêtes
         en provenance de certains hôtes.</p>
-         <pre class="prettyprint lang-config">
-SetEnvIf Request_URI \.gif image-request
+         <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
-CustomLog logs/access_log common env=!image-request
-        </pre>
+CustomLog logs/access_log common env=!image-request</pre>
 
 
     
@@ -518,14 +512,12 @@ CustomLog logs/access_log common env=!im
 	recommandée, mais elle peut fonctionner dans des circonstances bien
 	définies. Nous supposons que toutes vos images sont enregistrées dans
 	un répertoire nommé <code>/web/images</code>.</p>
-    	<pre class="prettyprint lang-config">
-SetEnvIf Referer "^http://www\.example\.com/" local_referal
+    	<pre class="prettyprint lang-config">SetEnvIf Referer "^http://www\.example\.com/" local_referal
 # Autorise les navigateurs qui n'envoient aucune information de Referer
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;
     Require env local_referal
-&lt;/Directory&gt;
-        </pre>
+&lt;/Directory&gt;</pre>
 
 
         <p>Pour plus d'informations sur cette technique, voir le tutoriel sur

Modified: httpd/httpd/trunk/docs/manual/env.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/env.html.ja.utf8?rev=1564960&r1=1564959&r2=1564960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/env.html.ja.utf8 [utf-8] Wed Feb  5 22:28:30 2014
@@ -365,8 +365,7 @@
         httpd.conf に次の行を加えるよう推奨されていましたが、
         今となっては、問題としていたクライアントは実際には見かけることは
         なくなってきたので、この設定はもはや必要ないかもしれません。</p>
-<div class="example"><pre>
-#
+<div class="example"><pre>#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
@@ -394,8 +393,7 @@ BrowserMatch "JDK/1\.0" force-response-1
         これを変更することで、特定のディレクトリのログ収集をやめたり、
         特定のホストからのリクエストのログ収集をやめたりすることが簡単にできます。
         </p>
-    <div class="example"><pre>
-SetEnvIf Request_URI \.gif image-request
+    <div class="example"><pre>SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
 CustomLog logs/access_log common env=!image-request</pre></div>
@@ -409,8 +407,7 @@ CustomLog logs/access_log common env=!im
         これは推奨されている設定ではありませんが、ある限定された状況では有効です。
         ここでは、すべての画像は <code>/web/images</code>
 	というディレクトリにあると仮定します。</p>
-    <div class="example"><pre>
-SetEnvIf Referer "^http://www\.example\.com/" local_referal
+    <div class="example"><pre>SetEnvIf Referer "^http://www\.example\.com/" local_referal
 # Allow browsers that do not send Referer info
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;



Mime
View raw message