summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/manual/mod/core.html.en10
-rw-r--r--docs/manual/mod/core.xml.de2
-rw-r--r--docs/manual/mod/core.xml.ja2
-rw-r--r--docs/manual/mod/core.xml.tr2
-rw-r--r--docs/manual/mod/mod_alias.html.en2
-rw-r--r--docs/manual/mod/mod_alias.xml.ja2
-rw-r--r--docs/manual/mod/mod_alias.xml.ko2
-rw-r--r--docs/manual/mod/mod_alias.xml.tr2
-rw-r--r--docs/manual/mod/mod_authnz_ldap.html.en70
-rw-r--r--docs/manual/mod/mod_info.html.en2
-rw-r--r--docs/manual/mod/mod_info.xml.ja2
-rw-r--r--docs/manual/mod/mod_info.xml.ko2
-rw-r--r--docs/manual/mod/mod_proxy.html.en9
-rw-r--r--docs/manual/mod/mod_proxy.xml.ja2
-rw-r--r--docs/manual/rewrite/access.html.en10
-rw-r--r--docs/manual/rewrite/vhosts.html.en6
-rw-r--r--docs/manual/sections.html.en4
-rw-r--r--docs/manual/sections.html.fr2
-rw-r--r--docs/manual/sections.xml.fr2
-rw-r--r--docs/manual/sections.xml.ja2
-rw-r--r--docs/manual/sections.xml.ko2
-rw-r--r--docs/manual/sections.xml.meta2
-rw-r--r--docs/manual/sections.xml.tr2
-rw-r--r--docs/manual/ssl/ssl_howto.html.en6
-rw-r--r--docs/manual/vhosts/examples.html.en4
-rw-r--r--docs/manual/vhosts/examples.html.fr2
-rw-r--r--docs/manual/vhosts/examples.xml.fr2
-rw-r--r--docs/manual/vhosts/examples.xml.ja2
-rw-r--r--docs/manual/vhosts/examples.xml.ko2
-rw-r--r--docs/manual/vhosts/examples.xml.meta2
-rw-r--r--docs/manual/vhosts/examples.xml.tr2
-rw-r--r--docs/manual/vhosts/index.html.en2
-rw-r--r--docs/manual/vhosts/index.html.fr2
-rw-r--r--docs/manual/vhosts/index.xml.de2
-rw-r--r--docs/manual/vhosts/index.xml.fr2
-rw-r--r--docs/manual/vhosts/index.xml.ja2
-rw-r--r--docs/manual/vhosts/index.xml.ko2
-rw-r--r--docs/manual/vhosts/index.xml.meta2
-rw-r--r--docs/manual/vhosts/index.xml.tr2
-rw-r--r--docs/manual/vhosts/ip-based.html.en12
-rw-r--r--docs/manual/vhosts/ip-based.html.fr2
-rw-r--r--docs/manual/vhosts/ip-based.xml.fr2
-rw-r--r--docs/manual/vhosts/ip-based.xml.ja2
-rw-r--r--docs/manual/vhosts/ip-based.xml.ko2
-rw-r--r--docs/manual/vhosts/ip-based.xml.meta2
-rw-r--r--docs/manual/vhosts/ip-based.xml.tr2
46 files changed, 106 insertions, 99 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 3856bca35d..5a0cedf062 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -814,7 +814,7 @@ from the web</td></tr>
</code></p></div>
<p>then an access to
- <code>http://www.my.host.com/index.html</code> refers to
+ <code>http://my.example.com/index.html</code> refers to
<code>/usr/web/index.html</code>. If the <var>directory-path</var> is
not absolute then it is assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
@@ -3435,8 +3435,8 @@ to name-virtual hosts</td></tr>
<div class="example"><p><code>
&lt;VirtualHost *:80&gt;<br />
- ServerName server.domain.com<br />
- ServerAlias server server2.domain.com server2<br />
+ ServerName server.example.com<br />
+ ServerAlias server server2.example.com server2<br />
ServerAlias *.example.com<br />
UseCanonicalName Off<br />
# ...<br />
@@ -3919,10 +3919,10 @@ port</td></tr>
type a shortname, and a URL which is a directory, such as
<code>http://www/splat</code>, <em>without the trailing
slash</em> then Apache httpd will redirect them to
- <code>http://www.domain.com/splat/</code>. If you have
+ <code>http://www.example.com/splat/</code>. If you have
authentication enabled, this will cause the user to have to
authenticate twice (once for <code>www</code> and once again
- for <code>www.domain.com</code> -- see <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
+ for <code>www.example.com</code> -- see <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
FAQ on this subject for more information</a>). But if
<code class="directive">UseCanonicalName</code> is set <code>Off</code>, then
Apache httpd will redirect to <code>http://www/splat/</code>.</p>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index be9d64c0e9..1a3f63224a 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:1041620 (outdated) -->
+<!-- English Revision: 167959:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 8adcc880f8..0a24d9469b 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1041620 (outdated) -->
+<!-- English Revision: 669847:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 249c2c83a3..e3ce8ef5d0 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.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: 813376:1041620 (outdated) -->
+<!-- English Revision: 813376:1042758 (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_alias.html.en b/docs/manual/mod/mod_alias.html.en
index a29aa261bc..95a4bff86a 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -369,7 +369,7 @@ of the current URL</td></tr>
another server, one might use:</p>
<div class="example"><p><code>
- RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
+ RedirectMatch (.*)\.gif$ http://other.example.com$1.jpg
</code></p></div>
<p>The considerations related to the difference between
diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index a4be079890..6967970121 100644
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.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: 151408:1031084 (outdated) -->
+<!-- English Revision: 151408:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko
index 95899f7ed3..0050e07a18 100644
--- a/docs/manual/mod/mod_alias.xml.ko
+++ b/docs/manual/mod/mod_alias.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:1031084 (outdated) -->
+<!-- English Revision: 151408:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_alias.xml.tr b/docs/manual/mod/mod_alias.xml.tr
index 7abdc485ea..09717c1983 100644
--- a/docs/manual/mod/mod_alias.xml.tr
+++ b/docs/manual/mod/mod_alias.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: 770506:1031084 (outdated) -->
+<!-- English Revision: 770506:1042758 (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_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 0814b54f2d..67f2200dc0 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -360,7 +360,7 @@ for HTTP Basic authentication.</td></tr>
must be surrounded with double quotes. Multiple users can also be
granted access by using multiple <code>Require ldap-user</code>
directives, with one user per line. For example, with a <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> of
- <code>ldap://ldap/o=Airius?cn</code> (i.e., <code>cn</code> is
+ <code>ldap://ldap/o=Example?cn</code> (i.e., <code>cn</code> is
used for searches), the following Require directives could be used
to restrict access:</p>
<div class="example"><p><code>
@@ -390,47 +390,47 @@ Require ldap-user "Joe Manager"<br />
For example, assume that the following entry existed in
the LDAP directory:</p>
<div class="example"><p><code>
-dn: cn=Administrators, o=Airius<br />
+dn: cn=Administrators, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Barbara Jenson, o=Airius<br />
-uniqueMember: cn=Fred User, o=Airius<br />
+uniqueMember: cn=Barbara Jenson, o=Example<br />
+uniqueMember: cn=Fred User, o=Example<br />
</code></p></div>
<p>The following directive would grant access to both Fred and
Barbara:</p>
-<div class="example"><p><code>Require ldap-group cn=Administrators, o=Airius</code></p></div>
+<div class="example"><p><code>Require ldap-group cn=Administrators, o=Example</code></p></div>
<p>Members can also be found within sub-groups of a specified LDAP group
if <code class="directive"><a href="#authldapmaxsubgroupdepth">AuthLDAPMaxSubGroupDepth</a></code>
is set to a value greater than 0. For example, assume the following entries
exist in the LDAP directory:</p>
<div class="example"><p><code>
-dn: cn=Employees, o=Airius<br />
+dn: cn=Employees, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Managers, o=Airius<br />
-uniqueMember: cn=Administrators, o=Airius<br />
-uniqueMember: cn=Users, o=Airius<br />
+uniqueMember: cn=Managers, o=Example<br />
+uniqueMember: cn=Administrators, o=Example<br />
+uniqueMember: cn=Users, o=Example<br />
<br />
-dn: cn=Managers, o=Airius<br />
+dn: cn=Managers, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Bob Ellis, o=Airius<br />
-uniqueMember: cn=Tom Jackson, o=Airius<br />
+uniqueMember: cn=Bob Ellis, o=Example<br />
+uniqueMember: cn=Tom Jackson, o=Example<br />
<br />
-dn: cn=Administrators, o=Airius<br />
+dn: cn=Administrators, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Barbara Jenson, o=Airius<br />
-uniqueMember: cn=Fred User, o=Airius<br />
+uniqueMember: cn=Barbara Jenson, o=Example<br />
+uniqueMember: cn=Fred User, o=Example<br />
<br />
-dn: cn=Users, o=Airius<br />
+dn: cn=Users, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Allan Jefferson, o=Airius<br />
-uniqueMember: cn=Paul Tilley, o=Airius<br />
-uniqueMember: cn=Temporary Employees, o=Airius<br />
+uniqueMember: cn=Allan Jefferson, o=Example<br />
+uniqueMember: cn=Paul Tilley, o=Example<br />
+uniqueMember: cn=Temporary Employees, o=Example<br />
<br />
-dn: cn=Temporary Employees, o=Airius<br />
+dn: cn=Temporary Employees, o=Example<br />
objectClass: groupOfUniqueNames<br />
-uniqueMember: cn=Jim Swenson, o=Airius<br />
-uniqueMember: cn=Elliot Rhodes, o=Airius<br />
+uniqueMember: cn=Jim Swenson, o=Example<br />
+uniqueMember: cn=Elliot Rhodes, o=Example<br />
</code></p></div>
<p>The following directives would allow access for Bob Ellis, Tom Jackson,
@@ -438,7 +438,7 @@ uniqueMember: cn=Elliot Rhodes, o=Airius<br />
allow access for Jim Swenson, or Elliot Rhodes (since they are at a
sub-group depth of 2):</p>
<div class="example"><p><code>
-Require ldap-group cn=Employees, o-Airius<br />
+Require ldap-group cn=Employees, o-Example<br />
AuthLDAPSubGroupDepth 1<br />
</code></p></div>
@@ -458,7 +458,7 @@ AuthLDAPSubGroupDepth 1<br />
<p>The following directive would grant access to a specific
DN:</p>
-<div class="example"><p><code>Require ldap-dn cn=Barbara Jenson, o=Airius</code></p></div>
+<div class="example"><p><code>Require ldap-dn cn=Barbara Jenson, o=Example</code></p></div>
<p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></code>
directive.</p>
@@ -522,7 +522,7 @@ AuthLDAPSubGroupDepth 1<br />
Grant access to anyone who exists in the LDAP directory,
using their UID for searches.
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br />
+AuthLDAPURL "ldap://ldap1.example.com:389/ou=People, o=Example?uid?sub?(objectClass=*)"<br />
Require valid-user
</code></p></div>
</li>
@@ -531,7 +531,7 @@ Require valid-user
The next example is the same as above; but with the fields
that have useful defaults omitted. Also, note the use of a
redundant LDAP server.
-<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br />
+<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/ou=People, o=Example"<br />
Require valid-user
</code></p></div>
</li>
@@ -546,7 +546,7 @@ Require valid-user
choose an attribute that is guaranteed unique in your
directory, such as <code>uid</code>.
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br />
+AuthLDAPURL "ldap://ldap.example.com/ou=People, o=Example?cn"<br />
Require valid-user
</code></p></div>
</li>
@@ -555,19 +555,19 @@ Require valid-user
Grant access to anybody in the Administrators group. The
users must authenticate using their UID.
<div class="example"><p><code>
-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid<br />
-Require ldap-group cn=Administrators, o=Airius
+AuthLDAPURL ldap://ldap.example.com/o=Example?uid<br />
+Require ldap-group cn=Administrators, o=Example
</code></p></div>
</li>
<li>
- The next example assumes that everyone at Airius who
+ The next example assumes that everyone at Example who
carries an alphanumeric pager will have an LDAP attribute
of <code>qpagePagerID</code>. The example will grant access
only to people (authenticated via their UID) who have
alphanumeric pagers:
<div class="example"><p><code>
-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)<br />
+AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(qpagePagerID=*)<br />
Require valid-user
</code></p></div>
</li>
@@ -583,7 +583,7 @@ Require valid-user
have a pager, but does need to access the same
resource:</p>
<div class="example"><p><code>
-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))<br />
+AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(|(qpagePagerID=*)(uid=jmanager))<br />
Require valid-user
</code></p></div>
@@ -983,9 +983,9 @@ group membership</td></tr>
membership. Otherwise, the username will be used. For example,
assume that the client sent the username <code>bjenson</code>,
which corresponds to the LDAP DN <code>cn=Babs Jenson,
- o=Airius</code>. If this directive is set,
+ o=Example</code>. If this directive is set,
<code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will check if the group has
- <code>cn=Babs Jenson, o=Airius</code> as a member. If this
+ <code>cn=Babs Jenson, o=Example</code> as a member. If this
directive is not set, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will
check if the group has <code>bjenson</code> as a member.</p>
@@ -1317,7 +1317,7 @@ You can of course use search parameters on each of these.</p>
<code>(&amp;(<em>filter</em>)(<em>attribute</em>=<em>username</em>))</code>.</p>
<p>For example, consider an URL of
- <code>ldap://ldap.airius.com/o=Airius?cn?sub?(posixid=*)</code>. When
+ <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>. When
a client attempts to connect using a username of <code>Babs
Jenson</code>, the resulting search filter will be
<code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index ce96d2bbf4..379dcf5fc1 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -53,7 +53,7 @@ configuration</td></tr>
&lt;Location /server-info&gt;<br />
<span class="indent">
SetHandler server-info<br />
- Require host yourcompany.com<br />
+ Require host example.com<br />
</span>
&lt;/Location&gt;
</code></p></div>
diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja
index aff894b442..4cb0676b46 100644
--- a/docs/manual/mod/mod_info.xml.ja
+++ b/docs/manual/mod/mod_info.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: 450473:1031084 (outdated) -->
+<!-- English Revision: 450473:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko
index 673c633c88..83caaf8cc8 100644
--- a/docs/manual/mod/mod_info.xml.ko
+++ b/docs/manual/mod/mod_info.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: 125277:1031084 (outdated) -->
+<!-- English Revision: 125277:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index e41c027e6b..d1f0d96065 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -705,14 +705,13 @@ proxied</td></tr>
well. That may slow down the startup time of the server.</p>
<div class="example"><h3>Example</h3><p><code>
- ProxyBlock joes-garage.com some-host.co.uk rocky.wotsamattau.edu
+ ProxyBlock news.example.com auctions.example.com friends.example.com
</code></p></div>
- <p><code>rocky.wotsamattau.edu</code> would also be matched if referenced by
- IP address.</p>
+ <p>Note that <code>example</code> would also be sufficient to match any
+ of these sites.</p>
- <p>Note that <code>wotsamattau</code> would also be sufficient to match
- <code>wotsamattau.edu</code>.</p>
+ <p>Hosts would also be matched if referenced by IP address.</p>
<p>Note also that</p>
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 7ff235b351..faf695d5d0 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.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: 344971:1032399 (outdated) -->
+<!-- English Revision: 344971:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/rewrite/access.html.en b/docs/manual/rewrite/access.html.en
index 9248dff973..4e3f3d36b2 100644
--- a/docs/manual/rewrite/access.html.en
+++ b/docs/manual/rewrite/access.html.en
@@ -89,12 +89,12 @@ RewriteRule <strong>\.(gif|jpg|png)$</strong> /images/go-away.png [R,NC]
</pre></div>
<p>In the third example, we redirect the request to an image on some
- third-party site.</p>
+ other site.</p>
<div class="example"><pre>
RewriteCond %{HTTP_REFERER} <strong>!^$</strong>
RewriteCond %{HTTP_REFERER} !www.example.com [NC]
-RewriteRule <strong>\.(gif|jpg|png)$</strong> http://other.site.com/image.gif [R,NC]
+RewriteRule <strong>\.(gif|jpg|png)$</strong> http://other.example.com/image.gif [R,NC]
</pre></div>
<p>Of these techniques, the last two tend to be the most effective
@@ -286,9 +286,9 @@ RewriteRule ^.* ${deflector:%{HTTP_REFERER}} [R,L]
## deflector.map
##
-http://www.badguys.com/bad/index.html -
-http://www.badguys.com/bad/index2.html -
-http://www.badguys.com/bad/index3.html http://somewhere.com/
+http://badguys.example.com/bad/index.html -
+http://badguys.example.com/bad/index2.html -
+http://badguys.example.com/bad/index3.html http://somewhere.example.com/
</pre></div>
</dd>
diff --git a/docs/manual/rewrite/vhosts.html.en b/docs/manual/rewrite/vhosts.html.en
index 1ff3f6bc0b..4a9bfcc7e4 100644
--- a/docs/manual/rewrite/vhosts.html.en
+++ b/docs/manual/rewrite/vhosts.html.en
@@ -166,10 +166,10 @@ RewriteRule ^/(.*)$ /www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1 [H=cgi-
this:</p>
<div class="example"><p><code>
-www.customer-1.com /www/customers/1<br />
-www.customer-2.com /www/customers/2<br />
+customer-1.example.com /www/customers/1<br />
+customer-2.example.com /www/customers/2<br />
# ...<br />
-www.customer-N.com /www/customers/N<br />
+customer-N.example.com /www/customers/N<br />
</code></p></div>
<p>The <code>httpd.conf</code> should contain the following:</p>
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 0c7cabe5f3..3b109391ae 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -341,10 +341,10 @@ containers apply enclosed configuration directives only
to sites accessed through <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>'s proxy server
that match the specified URL. For example, the following configuration
will prevent the proxy server from being used to access the
-<code>cnn.com</code> website.</p>
+<code>www.example.com</code> website.</p>
<div class="example"><p><code>
-&lt;Proxy http://cnn.com/*&gt;<br />
+&lt;Proxy http://www.example.com/*&gt;<br />
Order allow,deny<br />
Deny from all<br />
&lt;/Proxy&gt;
diff --git a/docs/manual/sections.html.fr b/docs/manual/sections.html.fr
index 92ef2ee55c..4861770fa6 100644
--- a/docs/manual/sections.html.fr
+++ b/docs/manual/sections.html.fr
@@ -24,6 +24,8 @@
<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Les directives des <a href="configuring.html">fichiers de configuration</a> peuvent s'appliquer
au serveur dans son ensemble, ou seulement à des répertoires, fichiers, hôtes,
ou URLs particuliers. Ce document décrit comment utiliser les conteneurs de
diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr
index c6c4af084e..9a4ed5b144 100644
--- a/docs/manual/sections.xml.fr
+++ b/docs/manual/sections.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1040808 -->
+<!-- English Revision: 1040808:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja
index cf6d21e330..ac47042e50 100644
--- a/docs/manual/sections.xml.ja
+++ b/docs/manual/sections.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: 420990:1040808 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko
index b0ee185809..f579b8c982 100644
--- a/docs/manual/sections.xml.ko
+++ b/docs/manual/sections.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:1040808 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.meta b/docs/manual/sections.xml.meta
index ab12bbbc90..eb3e72c9be 100644
--- a/docs/manual/sections.xml.meta
+++ b/docs/manual/sections.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/sections.xml.tr b/docs/manual/sections.xml.tr
index c2b9080cef..85f789fc2c 100644
--- a/docs/manual/sections.xml.tr
+++ b/docs/manual/sections.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: 735922:1040808 (outdated) -->
+<!-- English Revision: 735922:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index 10400fc467..cc0075e344 100644
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -54,10 +54,10 @@ following directives.</p>
Listen 443<br />
&lt;VirtualHost _default_:443&gt;<br />
<span class="indent">
- ServerName www.domain.com<br />
+ ServerName www.example.com<br />
SSLEngine on<br />
- SSLCertificateFile /path/to/www.comain.com.cert<br />
- SSLCertificateKeyFile /path/to/www.domain.com.key<br />
+ SSLCertificateFile /path/to/www.example.com.cert<br />
+ SSLCertificateKeyFile /path/to/www.example.com.key<br />
</span>
&lt;/VirtualHost&gt;
</code></p></div>
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 5bf0c17ec8..f9cffac803 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -155,7 +155,7 @@
</div>
<p>The server has two IP addresses. On one (<code>172.20.30.40</code>), we
- will serve the "main" server, <code>server.domain.com</code> and on the
+ will serve the "main" server, <code>server.example.com</code> and on the
other (<code>172.20.30.50</code>), we will serve two or more virtual hosts.</p>
<div class="example"><h3>Server configuration</h3><p><code>
@@ -164,7 +164,7 @@
Listen 80<br />
<br />
# This is the "main" server running on 172.20.30.40<br />
- ServerName server.domain.com<br />
+ ServerName server.example.com<br />
DocumentRoot /www/mainserver<br />
<br />
# This is the other address<br />
diff --git a/docs/manual/vhosts/examples.html.fr b/docs/manual/vhosts/examples.html.fr
index 321b61a7bf..839e9b14c6 100644
--- a/docs/manual/vhosts/examples.html.fr
+++ b/docs/manual/vhosts/examples.html.fr
@@ -24,6 +24,8 @@
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/examples.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Le but de ce document est d'essayer de répondre aux questions
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index fe70276e2d..2275cefc3a 100644
--- a/docs/manual/vhosts/examples.xml.fr
+++ b/docs/manual/vhosts/examples.xml.fr
@@ -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: 1031197 -->
+<!-- English Revision: 1031197:1042758 (outdated) -->
<!-- French translation by Vincent Deffontaines, Alain B., review by -->
<!-- updated by Lucien Gentis -->
diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja
index 967e01a93c..e5eacd6a01 100644
--- a/docs/manual/vhosts/examples.xml.ja
+++ b/docs/manual/vhosts/examples.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:1031197 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko
index fbfb275b0d..ca612998f2 100644
--- a/docs/manual/vhosts/examples.xml.ko
+++ b/docs/manual/vhosts/examples.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:1031197 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.meta b/docs/manual/vhosts/examples.xml.meta
index 7776d53b0a..0bc7ae58c2 100644
--- a/docs/manual/vhosts/examples.xml.meta
+++ b/docs/manual/vhosts/examples.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/vhosts/examples.xml.tr b/docs/manual/vhosts/examples.xml.tr
index 4c9e0a9a96..60d492e45c 100644
--- a/docs/manual/vhosts/examples.xml.tr
+++ b/docs/manual/vhosts/examples.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: 659902:1031197 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en
index 1b7e3393ec..531d6302bc 100644
--- a/docs/manual/vhosts/index.html.en
+++ b/docs/manual/vhosts/index.html.en
@@ -29,7 +29,7 @@
<p>The term <cite>Virtual Host</cite> refers to the practice of
running more than one web site (such as
- <code>www.company1.com</code> and <code>www.company2.com</code>)
+ <code>company1.example.com</code> and <code>company2.example.com</code>)
on a single machine. Virtual hosts can be "<a href="ip-based.html">IP-based</a>", meaning that you have a
different IP address for every web site, or "<a href="name-based.html">name-based</a>", meaning that you have
multiple names running on each IP address. The fact that they
diff --git a/docs/manual/vhosts/index.html.fr b/docs/manual/vhosts/index.html.fr
index 4b592b28a3..1fc7f5f246 100644
--- a/docs/manual/vhosts/index.html.fr
+++ b/docs/manual/vhosts/index.html.fr
@@ -25,6 +25,8 @@
<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Le principe des <cite>Serveurs Virtuels</cite> consiste à
diff --git a/docs/manual/vhosts/index.xml.de b/docs/manual/vhosts/index.xml.de
index 557e328151..3b4c28cae1 100644
--- a/docs/manual/vhosts/index.xml.de
+++ b/docs/manual/vhosts/index.xml.de
@@ -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.de.xsl"?>
-<!-- English Revision: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.fr b/docs/manual/vhosts/index.xml.fr
index eaa9eabf09..445b8742e4 100644
--- a/docs/manual/vhosts/index.xml.fr
+++ b/docs/manual/vhosts/index.xml.fr
@@ -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: 932383 -->
+<!-- English Revision: 932383:1042758 (outdated) -->
<!-- french translation by alain B, review by Vincent Deffontaines -->
<!--
diff --git a/docs/manual/vhosts/index.xml.ja b/docs/manual/vhosts/index.xml.ja
index 1ca5719f35..85673843e8 100644
--- a/docs/manual/vhosts/index.xml.ja
+++ b/docs/manual/vhosts/index.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: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.ko b/docs/manual/vhosts/index.xml.ko
index 777921b551..bd8a63f761 100644
--- a/docs/manual/vhosts/index.xml.ko
+++ b/docs/manual/vhosts/index.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:932383 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.meta b/docs/manual/vhosts/index.xml.meta
index 265ed0a726..42dbaa47ac 100644
--- a/docs/manual/vhosts/index.xml.meta
+++ b/docs/manual/vhosts/index.xml.meta
@@ -9,7 +9,7 @@
<variants>
<variant outdated="yes">de</variant>
<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/vhosts/index.xml.tr b/docs/manual/vhosts/index.xml.tr
index bfdc15c366..0cd50746db 100644
--- a/docs/manual/vhosts/index.xml.tr
+++ b/docs/manual/vhosts/index.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: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index 38dcc002be..2c31c612e3 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -102,7 +102,7 @@
that daemon services. e.g.</p>
<div class="example"><p><code>
- Listen www.smallco.com:80
+ Listen www.example.com:80
</code></p></div>
<p>It is recommended that you use an IP address instead of a
@@ -122,11 +122,11 @@
<div class="example"><p><code>
&lt;VirtualHost 172.20.30.40:80&gt;<br />
- ServerAdmin webmaster@mail.smallco.com<br />
- DocumentRoot /groups/smallco/www<br />
- ServerName www.smallco.com<br />
- ErrorLog /groups/smallco/logs/error_log<br />
- TransferLog /groups/smallco/logs/access_log<br />
+ ServerAdmin webmaster@mail.example.com<br />
+ DocumentRoot /groups/example/www<br />
+ ServerName www.example.com<br />
+ ErrorLog /groups/example/logs/error_log<br />
+ TransferLog /groups/example/logs/access_log<br />
&lt;/VirtualHost&gt;<br />
<br />
&lt;VirtualHost 172.20.30.50:80&gt;<br />
diff --git a/docs/manual/vhosts/ip-based.html.fr b/docs/manual/vhosts/ip-based.html.fr
index 19275b0ff7..432fc28df9 100644
--- a/docs/manual/vhosts/ip-based.html.fr
+++ b/docs/manual/vhosts/ip-based.html.fr
@@ -24,6 +24,8 @@
<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Système requis</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#howto">Comment configurer Apache</a></li>
diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr
index 4832774926..a7fe14d2c0 100644
--- a/docs/manual/vhosts/ip-based.xml.fr
+++ b/docs/manual/vhosts/ip-based.xml.fr
@@ -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.en.xsl"?>
-<!-- English Revision: 987242 -->
+<!-- English Revision: 987242:1042758 (outdated) -->
<!-- French translation by alain B, review by Vincent Deffontaines -->
<!--
diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja
index 3aa705a632..4616345057 100644
--- a/docs/manual/vhosts/ip-based.xml.ja
+++ b/docs/manual/vhosts/ip-based.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:987242 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.ko b/docs/manual/vhosts/ip-based.xml.ko
index 718d0bbc67..7819682513 100644
--- a/docs/manual/vhosts/ip-based.xml.ko
+++ b/docs/manual/vhosts/ip-based.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:987242 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.meta b/docs/manual/vhosts/ip-based.xml.meta
index d3c670cc20..03687ce26f 100644
--- a/docs/manual/vhosts/ip-based.xml.meta
+++ b/docs/manual/vhosts/ip-based.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/vhosts/ip-based.xml.tr b/docs/manual/vhosts/ip-based.xml.tr
index 11c35725fc..c01e7022b1 100644
--- a/docs/manual/vhosts/ip-based.xml.tr
+++ b/docs/manual/vhosts/ip-based.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: 752951:987242 (outdated) -->
+<!-- English Revision: 752951:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>