Skip to content

Commit ff533a9

Browse files
trawicktrawick
committed
follow up r1042758 and r1043011 with more fixes to use
proper example domains (and show some respect in our mangled version of prep.ai.mit.edu by using .edu instead of .com) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1043126 13f79535-47bb-0310-9956-ffa450edef68
1 parent 434b717 commit ff533a9

11 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎docs/manual/mod/mod_access_compat.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ server</description>
107107

108108
<dd>
109109
<example><title>Example:</title>
110-
Allow from apache.org<br />
110+
Allow from example.org<br />
111111
Allow from .net example.edu
112112
</example>
113113
<p>Hosts whose names match, or end in, this string are allowed
114114
access. Only complete components are matched, so the above
115-
example will match <code>foo.apache.org</code> but it will not
116-
match <code>fooapache.org</code>. This configuration will cause
115+
example will match <code>foo.example.org</code> but it will not
116+
match <code>fooexample.org</code>. This configuration will cause
117117
Apache httpd to perform a double DNS lookup on the client IP
118118
address, regardless of the setting of the <directive
119119
module="core">HostnameLookups</directive> directive. It will do
@@ -324,35 +324,35 @@ evaluated.</description>
324324
</tr>
325325
</table>
326326

327-
<p>In the following example, all hosts in the apache.org domain
327+
<p>In the following example, all hosts in the example.org domain
328328
are allowed access; all other hosts are denied access.</p>
329329

330330
<example>
331331
Order Deny,Allow<br />
332332
Deny from all<br />
333-
Allow from apache.org
333+
Allow from example.org
334334
</example>
335335

336-
<p>In the next example, all hosts in the apache.org domain are
336+
<p>In the next example, all hosts in the example.org domain are
337337
allowed access, except for the hosts which are in the
338-
foo.apache.org subdomain, who are denied access. All hosts not
339-
in the apache.org domain are denied access because the default
338+
foo.example.org subdomain, who are denied access. All hosts not
339+
in the example.org domain are denied access because the default
340340
state is to <directive module="mod_access_compat">Deny</directive>
341341
access to the server.</p>
342342

343343
<example>
344344
Order Allow,Deny<br />
345-
Allow from apache.org<br />
346-
Deny from foo.apache.org
345+
Allow from example.org<br />
346+
Deny from foo.example.org
347347
</example>
348348

349349
<p>On the other hand, if the <directive>Order</directive> in the
350350
last example is changed to <code>Deny,Allow</code>, all hosts will
351351
be allowed access. This happens because, regardless of the actual
352352
ordering of the directives in the configuration file, the
353-
<code>Allow from apache.org</code> will be evaluated last and will
354-
override the <code>Deny from foo.apache.org</code>. All hosts not in
355-
the <code>apache.org</code> domain will also be allowed access
353+
<code>Allow from example.org</code> will be evaluated last and will
354+
override the <code>Deny from foo.example.org</code>. All hosts not in
355+
the <code>example.org</code> domain will also be allowed access
356356
because the default state is <directive
357357
module="mod_access_compat">Allow</directive>.</p>
358358

‎docs/manual/mod/mod_authz_host.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ address)</description>
131131
<p>A (partial) domain-name</p>
132132

133133
<example>
134-
Require host apache.org<br />
134+
Require host example.org<br />
135135
Require host .net example.edu
136136
</example>
137137

138138
<p>Hosts whose names match, or end in, this string are allowed
139139
access. Only complete components are matched, so the above
140-
example will match <code>foo.apache.org</code> but it will not
141-
match <code>fooapache.org</code>. This configuration will cause
140+
example will match <code>foo.example.org</code> but it will not
141+
match <code>fooexample.org</code>. This configuration will cause
142142
Apache to perform a double reverse DNS lookup on the client IP
143143
address, regardless of the setting of the <directive
144144
module="core">HostnameLookups</directive> directive. It will do

‎docs/manual/mod/mod_cache.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,19 @@ manager</description>
356356
CacheEnable disk /<br /><br />
357357
# Cache FTP-proxied url's<br />
358358
CacheEnable disk ftp://<br /><br />
359-
# Cache content from www.apache.org<br />
360-
CacheEnable disk http://www.apache.org/<br />
359+
# Cache content from www.example.org<br />
360+
CacheEnable disk http://www.example.org/<br />
361361
</example>
362362

363363
<p>A hostname starting with a <strong>"*"</strong> matches all hostnames with
364364
that suffix. A hostname starting with <strong>"."</strong> matches all
365365
hostnames containing the domain components that follow.</p>
366366

367367
<example>
368-
# Match www.apache.org, and fooapache.org<br />
369-
CacheEnable disk http://*apache.org/<br />
370-
# Match www.apache.org, but not fooapache.org<br />
371-
CacheEnable disk http://.apache.org/<br />
368+
# Match www.example.org, and fooexample.org<br />
369+
CacheEnable disk http://*example.org/<br />
370+
# Match www.example.org, but not fooexample.org<br />
371+
CacheEnable disk http://.example.org/<br />
372372
</example>
373373

374374
<p> The <code>no-cache</code> environment variable can be set to

‎docs/manual/mod/mod_proxy.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ directly</description>
14421442
all ending in <var>Domain</var>).</p>
14431443

14441444
<example><title>Examples</title>
1445-
.com .apache.org.
1445+
.com .example.org.
14461446
</example>
14471447

14481448
<p>To distinguish <var>Domain</var>s from <var><a href="#hostname"
@@ -1511,8 +1511,8 @@ directly</description>
15111511
of hosts with different <var><a href="#ipaddr">IPAddr</a></var>s).</p>
15121512

15131513
<example><title>Examples</title>
1514-
prep.ai.example.com<br />
1515-
www.apache.org
1514+
prep.ai.example.edu<br />
1515+
www.example.org
15161516
</example>
15171517

15181518
<note><title>Note</title>

‎docs/manual/mod/mod_setenvif.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ without respect to case</description>
316316
and differs only in that the regular expression matching is
317317
performed in a case-insensitive manner. For example:</p>
318318
<example>
319-
SetEnvIfNoCase Host Apache\.Org site=apache
319+
SetEnvIfNoCase Host Example\.Org site=example
320320
</example>
321321

322322
<p>This will cause the <code>site</code> environment variable
323-
to be set to "<code>apache</code>" if the HTTP request header
323+
to be set to "<code>example</code>" if the HTTP request header
324324
field <code>Host:</code> was included and contained
325-
<code>Apache.Org</code>, <code>apache.org</code>, or any other
325+
<code>Example.Org</code>, <code>example.org</code>, or any other
326326
combination.</p>
327327
</usage>
328328
</directivesynopsis>

‎docs/manual/platform/windows.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@
102102
<ol>
103103
<li><p><strong>Network Domain.</strong> Enter the DNS domain in which
104104
your server is or will be registered in. For example, if your
105-
server's full DNS name is <code>server.mydomain.net</code>, you would
106-
type <code>mydomain.net</code> here.</p></li>
105+
server's full DNS name is <code>server.example.net</code>, you would
106+
type <code>example.net</code> here.</p></li>
107107

108108
<li><p><strong>Server Name.</strong> Your server's full DNS name.
109-
From the example above, you would type <code>server.mydomain.net</code>
109+
From the example above, you would type <code>server.example.net</code>
110110
here.</p></li>
111111

112112
<li><p><strong>Administrator's Email Address.</strong> Enter the

‎docs/manual/rewrite/flags.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ browsers that support this feature.</dd>
159159

160160
<example>
161161
RewriteEngine On<br />
162-
RewriteRule ^/index\.html - [CO=frontdoor:yes:.apache.org:1440:/]
162+
RewriteRule ^/index\.html - [CO=frontdoor:yes:.example.com:1440:/]
163163
</example>
164164

165165
<p>In the example give, the rule doesn't rewrite the request.
166166
The "-" rewrite target tells mod_rewrite to pass the request
167167
through unchanged. Instead, it sets a cookie
168168
called 'frontdoor' to a value of 'yes'. The cookie is valid for any host
169-
in the <code>.apache.org</code> domain. It will be set to expire in 1440
169+
in the <code>.example.com</code> domain. It will be set to expire in 1440
170170
minutes (24 hours) and will be returned for all URIs.</p>
171171

172172
</section>

‎docs/manual/upgrading.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,18 @@
142142
Require all granted
143143
</example>
144144

145-
<p>In the following example, all hosts in the apache.org domain
145+
<p>In the following example, all hosts in the example.org domain
146146
are allowed access; all other hosts are denied access.</p>
147147

148148
<example>
149149
<title>2.2 configuration:</title>
150150
Order Deny,Allow<br />
151151
Deny from all<br />
152-
Allow from apache.org
152+
Allow from example.org
153153
</example>
154154
<example>
155155
<title>2.4 configuration:</title>
156-
Require host apache.org
156+
Require host example.org
157157
</example>
158158
</section>
159159

‎docs/manual/vhosts/examples.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,22 +384,22 @@
384384
&lt;VirtualHost 172.20.30.40&gt;<br />
385385
<indent>
386386
DocumentRoot /www/example3<br />
387-
ServerName www.example3.net<br />
387+
ServerName www.example.net<br />
388388
</indent>
389389
&lt;/VirtualHost&gt;<br />
390390
<br />
391391
# IP-based<br />
392392
&lt;VirtualHost 172.20.30.50&gt;<br />
393393
<indent>
394394
DocumentRoot /www/example4<br />
395-
ServerName www.example4.edu<br />
395+
ServerName www.example.edu<br />
396396
</indent>
397397
&lt;/VirtualHost&gt;<br />
398398
<br />
399399
&lt;VirtualHost 172.20.30.60&gt;<br />
400400
<indent>
401401
DocumentRoot /www/example5<br />
402-
ServerName www.example5.gov<br />
402+
ServerName www.example.gov<br />
403403
</indent>
404404
&lt;/VirtualHost&gt;
405405
</example>

‎docs/manual/vhosts/ip-based.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,19 @@
127127

128128
<example>
129129
&lt;VirtualHost 172.20.30.40:80&gt;<br />
130-
ServerAdmin webmaster@example1.com<br />
131-
DocumentRoot /www/vhosts/example1<br />
132-
ServerName www.example1.com<br />
133-
ErrorLog /www/logs/example1/error_log<br />
134-
CustomLog /www/logs/example1/access_log combined<br />
130+
ServerAdmin webmaster@www1.example.com<br />
131+
DocumentRoot /www/vhosts/www1<br />
132+
ServerName www1.example.com<br />
133+
ErrorLog /www/logs/www1/error_log<br />
134+
CustomLog /www/logs/www1/access_log combined<br />
135135
&lt;/VirtualHost&gt;<br />
136136
<br />
137137
&lt;VirtualHost 172.20.30.50:80&gt;<br />
138-
ServerAdmin webmaster@example2.org<br />
139-
DocumentRoot /www/vhosts/example2<br />
140-
ServerName www.example2.org<br />
141-
ErrorLog /www/logs/example2/error_log<br />
142-
CustomLog /www/logs/example2/access_log combined<br />
138+
ServerAdmin webmaster@www2.example.org<br />
139+
DocumentRoot /www/vhosts/www2<br />
140+
ServerName www2.example.org<br />
141+
ErrorLog /www/logs/www2/error_log<br />
142+
CustomLog /www/logs/www2/access_log combined<br />
143143
&lt;/VirtualHost&gt;
144144
</example>
145145

0 commit comments

Comments
 (0)