summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Bowen <rbowen@apache.org>2011-01-13 17:13:33 +0100
committerRich Bowen <rbowen@apache.org>2011-01-13 17:13:33 +0100
commitee3b22a3b6fb3e88b8c6e92b9406f1edfc0928f0 (patch)
tree9cdcf57d11cad3780ecc9a52ea6b4baca2e9214b
parentRemove unnecessary <pre> formatting inside <example>s (diff)
downloadapache2-ee3b22a3b6fb3e88b8c6e92b9406f1edfc0928f0.tar.xz
apache2-ee3b22a3b6fb3e88b8c6e92b9406f1edfc0928f0.zip
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058645 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/caching.html.en32
-rw-r--r--docs/manual/caching.xml.tr2
-rw-r--r--docs/manual/env.html.en55
-rw-r--r--docs/manual/env.xml.ja2
-rw-r--r--docs/manual/env.xml.ko2
-rw-r--r--docs/manual/env.xml.tr2
6 files changed, 51 insertions, 44 deletions
diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en
index ed27b00f90..7370814927 100644
--- a/docs/manual/caching.html.en
+++ b/docs/manual/caching.html.en
@@ -129,12 +129,13 @@
in which it matters: If you are using <a href="howto/ssi.html">Server
Side Includes</a>;</p>
- <div class="example"><pre>
-&lt;!-- The following include can be cached --&gt;
-&lt;!--#include virtual="/footer.html" --&gt;
-
-&lt;!-- The following include can not be cached --&gt;
-&lt;!--#include file="/path/to/footer.html" --&gt;</pre></div>
+ <div class="example"><p><code>
+&lt;!-- The following include can be cached --&gt;<br />
+&lt;!--#include virtual="/footer.html" --&gt; <br />
+<br />
+&lt;!-- The following include can not be cached --&gt;<br />
+&lt;!--#include file="/path/to/footer.html" --&gt;
+ </code></p></div>
<p>If you are using Server Side Includes, and want the benefit of speedy
serves from the cache, you should use <code>virtual</code> include
@@ -398,7 +399,9 @@ Vary: negotiate,accept-language,accept-charset
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>
- <div class="example"><pre>CacheFile /usr/local/apache2/htdocs/index.html</pre></div>
+ <div class="example"><p><code>
+ CacheFile /usr/local/apache2/htdocs/index.html
+ </code></p></div>
<p>If you intend to cache a large number of files in this manner, you
must ensure that your operating system's limit for the number of open
@@ -489,7 +492,9 @@ 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>
- <div class="example"><pre>MMapFile /usr/local/apache2/htdocs/index.html</pre></div>
+ <div class="example"><p><code>
+ MMapFile /usr/local/apache2/htdocs/index.html
+ </code></p></div>
<p>As with the
<code class="directive"><a href="./mod/mod_file_cache.html#cachefile">CacheFile</a></code> directive, any
@@ -516,11 +521,12 @@ sys 0m0.000s</pre></div>
<p>Typically the module will be configured as so;</p>
- <div class="example"><pre>
-CacheRoot /var/cache/apache/
-CacheEnable disk /
-CacheDirLevels 2
-CacheDirLength 1</pre></div>
+ <div class="example"><p><code>
+CacheRoot /var/cache/apache/<br />
+CacheEnable disk /<br />
+CacheDirLevels 2<br />
+CacheDirLength 1
+ </code></p></div>
<p>Importantly, as the cached files are locally stored, operating system
in-memory caching will typically be applied to their access also. So
diff --git a/docs/manual/caching.xml.tr b/docs/manual/caching.xml.tr
index 75acd37ab0..c051bd181a 100644
--- a/docs/manual/caching.xml.tr
+++ b/docs/manual/caching.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="style/manual.tr.xsl"?>
-<!-- English Revision: 922237:1037244 (outdated) -->
+<!-- English Revision: 922237:1058639 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index a723d6c535..ef5fb0e334 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -405,14 +405,14 @@
</a></code> and <code class="module"><a href="./mod/mod_header.html">mod_header</a></code> allows you to still accept
these headers:</p>
-<div class="example"><pre>
-#
-# The following works around a client sending a broken Accept_Encoding
-# header.
-#
-SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1
+<div class="example"><p><code>
+# <br />
+# The following works around a client sending a broken Accept_Encoding<br />
+# header.<br />
+#<br />
+SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1<br />
RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding
-</pre></div>
+</code></p></div>
@@ -423,26 +423,27 @@ RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encodin
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>
-<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.
-# The second directive is for Microsoft Internet Explorer 4.0b2
-# which has a broken HTTP/1.1 implementation and does not properly
-# support keepalive when it is used on 301 or 302 (redirect) responses.
-#
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-
-#
-# The following directive disables HTTP/1.1 responses to browsers which
-# are in violation of the HTTP/1.0 spec by not being able to grok a
-# basic 1.1 response.
-#
-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></div>
+<div class="example"><p><code>
+#<br />
+# The following directives modify normal HTTP response behavior.<br />
+# The first directive disables keepalive for Netscape 2.x and browsers that<br />
+# spoof it. There are known problems with these browser implementations.<br />
+# The second directive is for Microsoft Internet Explorer 4.0b2<br />
+# which has a broken HTTP/1.1 implementation and does not properly<br />
+# support keepalive when it is used on 301 or 302 (redirect) responses.<br />
+#<br />
+BrowserMatch "Mozilla/2" nokeepalive<br />
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0<br />
+<br />
+#<br />
+# The following directive disables HTTP/1.1 responses to browsers which<br />
+# are in violation of the HTTP/1.0 spec by not being able to understand a<br />
+# basic 1.1 response.<br />
+#<br />
+BrowserMatch "RealPlayer 4\.0" force-response-1.0<br />
+BrowserMatch "Java/1\.0" force-response-1.0<br />
+BrowserMatch "JDK/1\.0" force-response-1.0
+</code></p></div>
<h3><a name="no-img-log" id="no-img-log">Do not log requests for images in the access log</a></h3>
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index 26c631f247..e280b9134e 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 659902:1053353 (outdated) -->
+<!-- English Revision: 659902:1058643 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko
index 9a6fb64896..6474939c73 100644
--- a/docs/manual/env.xml.ko
+++ b/docs/manual/env.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1053353 (outdated) -->
+<!-- English Revision: 105989:1058643 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.tr b/docs/manual/env.xml.tr
index c882ce398d..02bc84412f 100644
--- a/docs/manual/env.xml.tr
+++ b/docs/manual/env.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 810187:1053353 (outdated) -->
+<!-- English Revision: 810187:1058643 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>