www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-30 20:03:10 +03:00
Code Activity

Seems I wasn't quite done editing these files after all.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330277 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2012-04-25 13:28:56 +00:00
parent b18f4f9f64
commit 331c0f599c
27 changed files with 233 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/manual/howto/access.html.en
View File

@ -91,17 +91,15 @@
board, and you want to keep them out, you could do the
following:</p>
<div class="example"><p><code>
Require not ip 10.252.46.165
</code></p></div>
<pre class="prettyprint lang-config">Require not ip 10.252.46.165</pre>
<p>Visitors coming from that address will not be able to see
the content covered by this directive. If, instead, you have a
machine name, rather than an IP address, you can use that.</p>
<div class="example"><p><code>
Require not host <var>host.example.com</var>
</code></p></div>
<pre class="prettyprint lang-config">Require not host <var>host.example.com</var></pre>
<p>And, if you'd like to block access from an entire domain,
you can specify just part of an address or domain name:</p>

8
docs/manual/howto/access.xml
View File

@ -89,17 +89,13 @@
board, and you want to keep them out, you could do the
following:</p>
<example>
Require not ip 10.252.46.165
</example>
<highlight language="config">Require not ip 10.252.46.165</highlight>
<p>Visitors coming from that address will not be able to see
the content covered by this directive. If, instead, you have a
machine name, rather than an IP address, you can use that.</p>
<example>
Require not host <var>host.example.com</var>
</example>
<highlight language="config">Require not host <var>host.example.com</var></highlight>
<p>And, if you'd like to block access from an entire domain,
you can specify just part of an address or domain name:</p>

17
docs/manual/howto/auth.html.en
View File

@ -142,9 +142,7 @@ module from each group.</p>
an <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive like the
following:</p>
<pre class="prettyprint lang-config">
AllowOverride AuthConfig
</pre>
<pre class="prettyprint lang-config">AllowOverride AuthConfig</pre>
<p>Or, if you are just going to put the directives directly in
@ -334,9 +332,8 @@ person in</a></h2>
specific. Rather than creating a group file, you can just use
the following directive:</p>
<div class="example"><p><code>
Require valid-user
</code></p></div>
<pre class="prettyprint lang-config">Require valid-user</pre>
<p>Using that rather than the <code>Require user rbowen</code>
line will allow anyone in that is listed in the password file,
@ -521,17 +518,13 @@ person in</a></h2>
that will be called during the authorization stage of the request
processing. For example:</p>
<pre class="prettyprint lang-config">
Require ip <var>address</var>
</pre>
<pre class="prettyprint lang-config">Require ip <var>address</var></pre>
<p>where <var>address</var> is an IP address (or a partial IP
address) or:</p>
<pre class="prettyprint lang-config">
Require host <var>domain_name</var>
</pre>
<pre class="prettyprint lang-config">Require host <var>domain_name</var></pre>
<p>where <var>domain_name</var> is a fully qualified domain name

16
docs/manual/howto/auth.xml
View File

@ -127,9 +127,7 @@ module from each group.</p>
an <directive module="core">AllowOverride</directive> directive like the
following:</p>
<highlight language="config">
AllowOverride AuthConfig
</highlight>
<highlight language="config">AllowOverride AuthConfig</highlight>
<p>Or, if you are just going to put the directives directly in
your main server configuration file, you will of course need to
@ -323,9 +321,7 @@ person in</title>
specific. Rather than creating a group file, you can just use
the following directive:</p>
<example>
Require valid-user
</example>
<highlight language="config">Require valid-user</highlight>
<p>Using that rather than the <code>Require user rbowen</code>
line will allow anyone in that is listed in the password file,
@ -508,16 +504,12 @@ person in</title>
that will be called during the authorization stage of the request
processing. For example:</p>
<highlight language="config">
Require ip <var>address</var>
</highlight>
<highlight language="config">Require ip <var>address</var></highlight>
<p>where <var>address</var> is an IP address (or a partial IP
address) or:</p>
<highlight language="config">
Require host <var>domain_name</var>
</highlight>
<highlight language="config">Require host <var>domain_name</var></highlight>
<p>where <var>domain_name</var> is a fully qualified domain name
(or a partial domain name); you may provide multiple addresses or

2
docs/manual/howto/auth.xml.fr
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision : 1328337 -->
<!-- English Revision: 1328337:1330260 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviwed by : Vincent Deffontaines -->

2
docs/manual/howto/auth.xml.ja
View File

@ -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: 479777:1328337 (outdated) -->
<!-- English Revision: 479777:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/auth.xml.ko
View File

@ -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:1328337 (outdated) -->
<!-- English Revision: 105989:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/auth.xml.meta
View File

@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>

2
docs/manual/howto/auth.xml.tr
View File

@ -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: 1070891:1328337 (outdated) -->
<!-- English Revision: 1070891:1330260 (outdated) -->
<!-- =====================================================
Translated by: Umut Samuk <umut belgeler.org>
Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>

32
docs/manual/howto/htaccess.html.en
View File

@ -65,9 +65,8 @@ changes on a per-directory basis.</p>
if you would rather call the file <code>.config</code> then you
can put the following in your server configuration file:</p>
<div class="example"><p><code>
AccessFileName .config
</code></p></div>
<pre class="prettyprint lang-config">AccessFileName .config</pre>
</div>
<p>In general, <code>.htaccess</code> files use the same syntax as
@ -195,16 +194,18 @@ changes on a per-directory basis.</p>
<div class="example"><h3>Contents of .htaccess file in
<code>/www/htdocs/example</code></h3><p><code>
AddType text/example .exm
<pre class="prettyprint lang-config">AddType text/example .exm</pre>
</code></p></div>
<div class="example"><h3>Section from your <code>httpd.conf</code>
file</h3><p><code>
<pre class="prettyprint lang-config">
&lt;Directory /www/htdocs/example&gt;<br />
<span class="indent">
AddType text/example .exm<br />
</span>
&lt;/Directory&gt;
</pre>
</code></p></div>
<p>However, putting this configuration in your server configuration
@ -216,9 +217,8 @@ changes on a per-directory basis.</p>
by setting the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
directive to <code>none</code>:</p>
<div class="example"><p><code>
AllowOverride None
</code></p></div>
<pre class="prettyprint lang-config">AllowOverride None</pre>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="how" id="how">How directives are applied</a></h2>
@ -239,9 +239,8 @@ changes on a per-directory basis.</p>
<p>In the directory <code>/www/htdocs/example1</code> we have a
<code>.htaccess</code> file containing the following:</p>
<div class="example"><p><code>
Options +ExecCGI
</code></p></div>
<pre class="prettyprint lang-config">Options +ExecCGI</pre>
<p>(Note: you must have "<code>AllowOverride Options</code>" in effect
to permit the use of the "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" directive in
@ -250,9 +249,8 @@ changes on a per-directory basis.</p>
<p>In the directory <code>/www/htdocs/example1/example2</code> we have
a <code>.htaccess</code> file containing:</p>
<div class="example"><p><code>
Options Includes
</code></p></div>
<pre class="prettyprint lang-config">Options Includes</pre>
<p>Because of this second <code>.htaccess</code> file, in the directory
<code>/www/htdocs/example1/example2</code>, CGI execution is not
@ -352,7 +350,7 @@ changes on a per-directory basis.</p>
implemented with the following configuration:</p>
<pre class="prettyprint lang-config">
Options +ExecCGI<br />
Options +ExecCGI
AddHandler cgi-script cgi pl
</pre>
@ -362,7 +360,7 @@ changes on a per-directory basis.</p>
configuration:</p>
<pre class="prettyprint lang-config">
Options +ExecCGI<br />
Options +ExecCGI
SetHandler cgi-script
</pre>

26
docs/manual/howto/htaccess.xml
View File

@ -77,9 +77,7 @@ changes on a per-directory basis.</p>
if you would rather call the file <code>.config</code> then you
can put the following in your server configuration file:</p>
<example>
AccessFileName .config
</example>
<highlight language="config">AccessFileName .config</highlight>
</note>
<p>In general, <code>.htaccess</code> files use the same syntax as
@ -218,16 +216,16 @@ changes on a per-directory basis.</p>
<example><title>Contents of .htaccess file in
<code>/www/htdocs/example</code></title>
AddType text/example .exm
<highlight language="config">AddType text/example .exm</highlight>
</example>
<example><title>Section from your <code>httpd.conf</code>
file</title>
<highlight language="config">
&lt;Directory /www/htdocs/example&gt;<br />
<indent>
AddType text/example .exm<br />
</indent>
&lt;/Directory&gt;
</highlight>
</example>
<p>However, putting this configuration in your server configuration
@ -239,9 +237,7 @@ changes on a per-directory basis.</p>
by setting the <directive module="core">AllowOverride</directive>
directive to <code>none</code>:</p>
<example>
AllowOverride None
</example>
<highlight language="config">AllowOverride None</highlight>
</section>
<section id="how"><title>How directives are applied</title>
@ -262,9 +258,7 @@ changes on a per-directory basis.</p>
<p>In the directory <code>/www/htdocs/example1</code> we have a
<code>.htaccess</code> file containing the following:</p>
<example>
Options +ExecCGI
</example>
<highlight language="config">Options +ExecCGI</highlight>
<p>(Note: you must have "<code>AllowOverride Options</code>" in effect
to permit the use of the "<directive
@ -274,9 +268,7 @@ changes on a per-directory basis.</p>
<p>In the directory <code>/www/htdocs/example1/example2</code> we have
a <code>.htaccess</code> file containing:</p>
<example>
Options Includes
</example>
<highlight language="config">Options Includes</highlight>
<p>Because of this second <code>.htaccess</code> file, in the directory
<code>/www/htdocs/example1/example2</code>, CGI execution is not
@ -378,7 +370,7 @@ changes on a per-directory basis.</p>
implemented with the following configuration:</p>
<highlight language="config">
Options +ExecCGI<br />
Options +ExecCGI
AddHandler cgi-script cgi pl
</highlight>
@ -387,7 +379,7 @@ changes on a per-directory basis.</p>
configuration:</p>
<highlight language="config">
Options +ExecCGI<br />
Options +ExecCGI
SetHandler cgi-script
</highlight>

2
docs/manual/howto/htaccess.xml.fr
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision : 1326216 -->
<!-- English Revision: 1326216:1330260 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

2
docs/manual/howto/htaccess.xml.ja
View File

@ -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: 574882:1326216 (outdated) -->
<!-- English Revision: 574882:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/htaccess.xml.ko
View File

@ -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: 151408:1326216 (outdated) -->
<!-- English Revision: 151408:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/htaccess.xml.meta
View File

@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">pt-br</variant>

2
docs/manual/howto/htaccess.xml.pt-br
View File

@ -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.pt-br.xsl"?>
<!-- English Revision: 151408:1326216 (outdated) -->
<!-- English Revision: 151408:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

26
docs/manual/howto/public_html.html.en
View File

@ -68,9 +68,8 @@
assumed to be a directory path relative to the home directory of the
specified user. Given this configuration:</p>
<div class="example"><p><code>
UserDir public_html
</code></p></div>
<pre class="prettyprint lang-config">UserDir public_html</pre>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
translated to the file path
@ -80,9 +79,7 @@
constructed using that path, plus the username specified. Given this
configuration:</p>
<pre class="prettyprint lang-config">
UserDir /var/html
</pre>
<pre class="prettyprint lang-config">UserDir /var/html</pre>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
@ -92,9 +89,7 @@
in which the asterisk is replaced with the username. Given this
configuration:</p>
<pre class="prettyprint lang-config">
UserDir /var/www/*/docs
</pre>
<pre class="prettyprint lang-config">UserDir /var/www/*/docs</pre>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
@ -103,9 +98,8 @@
<p>Multiple directories or directory paths can also be set.</p>
<div class="example"><p><code>
UserDir public_html /var/html
</code></p></div>
<pre class="prettyprint lang-config">UserDir public_html /var/html</pre>
<p>For the URL <code>http://example.com/~rbowen/file.html</code>,
Apache will search for <code>~rbowen</code>. If it isn't found,
@ -120,9 +114,7 @@
<p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive can be
used to redirect user directory requests to external URLs.</p>
<pre class="prettyprint lang-config">
UserDir http://example.org/users/*/
</pre>
<pre class="prettyprint lang-config">UserDir http://example.org/users/*/</pre>
<p>The above example will redirect a request for
@ -137,9 +129,7 @@
<p>Using the syntax shown in the UserDir documentation, you can restrict
what users are permitted to use this functionality:</p>
<pre class="prettyprint lang-config">
UserDir disabled root jro fish
</pre>
<pre class="prettyprint lang-config">UserDir disabled root jro fish</pre>
<p>The configuration above will enable the feature for all users

24
docs/manual/howto/public_html.xml
View File

@ -72,9 +72,7 @@
assumed to be a directory path relative to the home directory of the
specified user. Given this configuration:</p>
<example>
UserDir public_html
</example>
<highlight language="config">UserDir public_html</highlight>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
translated to the file path
@ -84,9 +82,7 @@
constructed using that path, plus the username specified. Given this
configuration:</p>
<highlight language="config">
UserDir /var/html
</highlight>
<highlight language="config">UserDir /var/html</highlight>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
translated to the file path <code>/var/html/rbowen/file.html</code></p>
@ -95,9 +91,7 @@
in which the asterisk is replaced with the username. Given this
configuration:</p>
<highlight language="config">
UserDir /var/www/*/docs
</highlight>
<highlight language="config">UserDir /var/www/*/docs</highlight>
<p>the URL <code>http://example.com/~rbowen/file.html</code> will be
translated to the file path
@ -105,9 +99,7 @@
<p>Multiple directories or directory paths can also be set.</p>
<example>
UserDir public_html /var/html
</example>
<highlight language="config">UserDir public_html /var/html</highlight>
<p>For the URL <code>http://example.com/~rbowen/file.html</code>,
Apache will search for <code>~rbowen</code>. If it isn't found,
@ -122,9 +114,7 @@
<p>The <directive module="mod_userdir">UserDir</directive> directive can be
used to redirect user directory requests to external URLs.</p>
<highlight language="config">
UserDir http://example.org/users/*/
</highlight>
<highlight language="config">UserDir http://example.org/users/*/</highlight>
<p>The above example will redirect a request for
<code>http://example.com/~bob/abc.html</code> to
@ -138,9 +128,7 @@
<p>Using the syntax shown in the UserDir documentation, you can restrict
what users are permitted to use this functionality:</p>
<highlight language="config">
UserDir disabled root jro fish
</highlight>
<highlight language="config">UserDir disabled root jro fish</highlight>
<p>The configuration above will enable the feature for all users
except for those listed in the <code>disabled</code> statement.

2
docs/manual/howto/public_html.xml.fr
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision : 1174747 -->
<!-- English Revision: 1174747:1330260 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

2
docs/manual/howto/public_html.xml.ja
View File

@ -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:1174747 (outdated) -->
<!-- English Revision: 659902:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/public_html.xml.ko
View File

@ -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: 151408:1174747 (outdated) -->
<!-- English Revision: 151408:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

4
docs/manual/howto/public_html.xml.meta
View File

@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant>tr</variant>
<variant outdated="yes">tr</variant>
</variants>
</metafile>

2
docs/manual/howto/public_html.xml.tr
View File

@ -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: 1174747 -->
<!-- English Revision: 1174747:1330260 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>

2
docs/manual/howto/ssi.xml.fr
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision : 1174747 -->
<!-- English Revision: 1174747:1330260 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

2
docs/manual/howto/ssi.xml.ja
View File

@ -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:1174747 (outdated) -->
<!-- English Revision: 659902:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/ssi.xml.ko
View File

@ -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: 659902:1174747 (outdated) -->
<!-- English Revision: 659902:1330260 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more

2
docs/manual/howto/ssi.xml.meta
View File

@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>