summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2016-05-27 07:48:32 +0200
committerChristophe Jaillet <jailletc36@apache.org>2016-05-27 07:48:32 +0200
commitc4c60ad32f890ca2cfc42c760d06f0697d68aa6b (patch)
tree3ce46c2aba869d896aaccd519586cb382f00fd72 /docs/manual
parentImprove highlight (diff)
downloadapache2-c4c60ad32f890ca2cfc42c760d06f0697d68aa6b.tar.xz
apache2-c4c60ad32f890ca2cfc42c760d06f0697d68aa6b.zip
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745712 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/howto/public_html.html.en10
-rw-r--r--docs/manual/howto/public_html.xml.fr2
-rw-r--r--docs/manual/howto/public_html.xml.ja2
-rw-r--r--docs/manual/howto/public_html.xml.ko2
-rw-r--r--docs/manual/howto/public_html.xml.meta2
-rw-r--r--docs/manual/howto/public_html.xml.tr2
-rw-r--r--docs/manual/mod/mod_userdir.html.en4
-rw-r--r--docs/manual/mod/mod_userdir.xml.ja2
-rw-r--r--docs/manual/mod/mod_userdir.xml.ko2
-rw-r--r--docs/manual/mod/mod_userdir.xml.tr2
10 files changed, 15 insertions, 15 deletions
diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index 63838d2248..a27f908eda 100644
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -36,13 +36,13 @@
out of the home directory of the user "<code>username</code>", out of
the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>
<p>Note that, by default, access to these directories is <strong>not</strong>
- enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line</p>
- <div class="example"><p><code>
- #Include conf/extra/httpd-userdir.conf
- </code></p></div>
+ enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line:</p>
+ <pre class="prettyprint lang-config">#Include conf/extra/httpd-userdir.conf</pre>
+
<p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code>httpd-userdir.conf</code>
file as necessary, or by including the appropriate directives in a
- <code>Directory</code> block within the main config file.</p>
+ <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> block
+ within the main config file.</p>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li>
diff --git a/docs/manual/howto/public_html.xml.fr b/docs/manual/howto/public_html.xml.fr
index 0f28fb45ac..eee5bfb7ff 100644
--- a/docs/manual/howto/public_html.xml.fr
+++ b/docs/manual/howto/public_html.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1741842 -->
+<!-- English Revision: 1741842:1745711 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja
index e8a95ee0ce..2dc2f64a41 100644
--- a/docs/manual/howto/public_html.xml.ja
+++ b/docs/manual/howto/public_html.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: 1591191:1741842 (outdated) -->
+<!-- English Revision: 1591191:1745711 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.ko b/docs/manual/howto/public_html.xml.ko
index ed27d4bc7f..52703a3c27 100644
--- a/docs/manual/howto/public_html.xml.ko
+++ b/docs/manual/howto/public_html.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: 151408:1741842 (outdated) -->
+<!-- English Revision: 151408:1745711 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.meta b/docs/manual/howto/public_html.xml.meta
index 224e3019cd..cae6f7cca8 100644
--- a/docs/manual/howto/public_html.xml.meta
+++ b/docs/manual/howto/public_html.xml.meta
@@ -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>
diff --git a/docs/manual/howto/public_html.xml.tr b/docs/manual/howto/public_html.xml.tr
index a528752c4e..6f6d36d541 100644
--- a/docs/manual/howto/public_html.xml.tr
+++ b/docs/manual/howto/public_html.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: 1174747:1741842 (outdated) -->
+<!-- English Revision: 1174747:1745711 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_userdir.html.en b/docs/manual/mod/mod_userdir.html.en
index ef87bbed5d..cf4847b9ce 100644
--- a/docs/manual/mod/mod_userdir.html.en
+++ b/docs/manual/mod/mod_userdir.html.en
@@ -92,7 +92,7 @@ tutorial</a></li>
<p>If neither the <code>enabled</code> nor the
<code>disabled</code> keywords appear in the
- <code>Userdir</code> directive, the argument is treated as a
+ <code class="directive">Userdir</code> directive, the argument is treated as a
filename pattern, and is used to turn the name into a directory
specification. A request for
<code>http://www.example.com/~bob/one/two.html</code> will be
@@ -165,7 +165,7 @@ UserDir enabled user1 user2 user3</pre>
<p>User directory substitution is not active by default in versions
2.1.4 and later. In earlier versions, <code>UserDir public_html</code>
- was assumed if no <code class="directive"><a href="#userdir">UserDir</a></code>
+ was assumed if no <code class="directive">UserDir</code>
directive was present.</p>
<div class="note"><h3>Merging details</h3>
diff --git a/docs/manual/mod/mod_userdir.xml.ja b/docs/manual/mod/mod_userdir.xml.ja
index df4b596dea..a065f94761 100644
--- a/docs/manual/mod/mod_userdir.xml.ja
+++ b/docs/manual/mod/mod_userdir.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 657842:1673657 (outdated) -->
+<!-- English Revision: 657842:1745711 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_userdir.xml.ko b/docs/manual/mod/mod_userdir.xml.ko
index 876d5ab815..859c0fe94a 100644
--- a/docs/manual/mod/mod_userdir.xml.ko
+++ b/docs/manual/mod/mod_userdir.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673657 (outdated) -->
+<!-- English Revision: 151408:1745711 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_userdir.xml.tr b/docs/manual/mod/mod_userdir.xml.tr
index 86aad1504d..fca6fddf26 100644
--- a/docs/manual/mod/mod_userdir.xml.tr
+++ b/docs/manual/mod/mod_userdir.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673657 (outdated) -->
+<!-- English Revision: 1174747:1745711 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>