summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gruno <humbedooh@apache.org>2012-04-26 16:42:22 +0200
committerDaniel Gruno <humbedooh@apache.org>2012-04-26 16:42:22 +0200
commitbbe7712f755090d42e5d84d3d24b0624fdf61226 (patch)
tree7e380b94b5bf0c3e54c13655672ed8add2bd05d9
parentSyntax and formatting fixings (diff)
downloadapache2-bbe7712f755090d42e5d84d3d24b0624fdf61226.tar.xz
apache2-bbe7712f755090d42e5d84d3d24b0624fdf61226.zip
syntax for misc/ and platform/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330882 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/misc/security_tips.xml38
-rw-r--r--docs/manual/platform/windows.xml34
2 files changed, 39 insertions, 33 deletions
diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml
index ed605b172f..efa1f8f7fd 100644
--- a/docs/manual/misc/security_tips.xml
+++ b/docs/manual/misc/security_tips.xml
@@ -328,9 +328,9 @@
<p>In the server configuration file, put</p>
<highlight language="config">
- &lt;Directory /&gt;
- AllowOverride None
- &lt;/Directory&gt;
+&lt;Directory /&gt;
+ AllowOverride None
+&lt;/Directory&gt;
</highlight>
<p>This prevents the use of <code>.htaccess</code> files in all
@@ -359,10 +359,10 @@
configuration:</p>
<highlight language="config">
- &lt;Directory /&gt;
- Order Deny,Allow
- Deny from all
- &lt;/Directory&gt;
+&lt;Directory /&gt;
+ Order Deny,Allow
+ Deny from all
+&lt;/Directory&gt;
</highlight>
<p>This will forbid default access to filesystem locations. Add
@@ -370,14 +370,14 @@
allow access only in those areas you wish. For example,</p>
<highlight language="config">
- &lt;Directory /usr/users/*/public_html&gt;
- Order Deny,Allow
- Allow from all
- &lt;/Directory&gt;
- &lt;Directory /usr/local/httpd&gt;
- Order Deny,Allow
- Allow from all
- &lt;/Directory&gt;
+&lt;Directory /usr/users/*/public_html&gt;
+ Order Deny,Allow
+ Allow from all
+&lt;/Directory&gt;
+&lt;Directory /usr/local/httpd&gt;
+ Order Deny,Allow
+ Allow from all
+&lt;/Directory&gt;
</highlight>
<p>Pay particular attention to the interactions of <directive
@@ -437,10 +437,10 @@
file:</p>
<highlight language="config">
- &lt;Files ".ht*"&gt;
- Order allow,deny
- Deny from all
- &lt;/Files&gt;
+&lt;Files ".ht*"&gt;
+ Order allow,deny
+ Deny from all
+&lt;/Files&gt;
</highlight>
</section>
diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index c7cb183117..44ce9c891d 100644
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -284,12 +284,12 @@
how it is accessed. If you wish to assure that only lowercase
is used in URLs, you can use something like:</p>
- <example>
- RewriteEngine On<br />
- RewriteMap lowercase int:tolower<br />
- RewriteCond %{REQUEST_URI} [A-Z]<br />
- RewriteRule (.*) ${lowercase:$1} [R,L]
- </example></li>
+ <highlight language="config">
+RewriteEngine On
+RewriteMap lowercase int:tolower
+RewriteCond %{REQUEST_URI} [A-Z]
+RewriteRule (.*) ${lowercase:$1} [R,L]
+ </highlight></li>
<li><p>When running, Apache needs write access only to the logs
directory and any configured cache directory tree. Due to the
@@ -310,9 +310,9 @@
module, use the following (in addition to the status-activating
directives in <code>access.conf</code>):</p>
- <example>
+ <highlight language="config">
LoadModule status_module modules/mod_status.so
- </example>
+ </highlight>
<p>Information on <a href="../mod/mod_so.html#creating">creating
loadable modules</a> is also available.</p></li>
@@ -782,19 +782,25 @@
on mapped drive letters, but this is not recommended.)</p>
<example><title>Example DocumentRoot with UNC path</title>
+ <highlight language="config">
DocumentRoot //dochost/www/html/
+ </highlight>
</example>
<example><title>Example DocumentRoot with IP address in UNC path</title>
- DocumentRoot //192.168.1.50/docs/<br />
+ <highlight language="config">
+ DocumentRoot //192.168.1.50/docs/
+ </highlight>
</example>
<example><title>Example Alias and corresponding Directory with UNC path</title>
- Alias /images/ //imagehost/www/images/<br />
- <br />
- &lt;Directory //imagehost/www/images/&gt;<br />
- ...<br />
- &lt;Directory&gt;<br />
+ <highlight language="config">
+Alias /images/ //imagehost/www/images/
+
+&lt;Directory //imagehost/www/images/&gt;
+#...
+&lt;Directory&gt;
+ </highlight>
</example>
<p>When running Apache httpd as a service, you must create a