Resync a few documentation stanzas [all I have time for today], but

  MOST SIGNIFICANTLY;

  Unwind '_' characters from ALL of our example IP names.  Since we waste
  oodles of time stating 'Underscores are invalid in DNS entries' - why
  have examples that contradict the RFC?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92577 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-nw.conf b/docs/conf/httpd-nw.conf
index 6a480f3f178715d9af4024cec9180a9e45cc6ab5..ce91028b260bd3674673bd9336bae5f4ceef2e4b 100644 (file)
--- a/docs/conf/httpd-nw.conf
+++ b/docs/conf/httpd-nw.conf
@@ -203,7 +203,7 @@ ServerName @@ServerName@@
 DocumentRoot "@@ServerRoot@@/htdocs"
 
 #
-# Each directory to which Apache has access, can be configured with respect
+# Each directory to which Apache has access can be configured with respect
 # to which services and features are allowed and/or disabled in that
 # directory (and its subdirectories). 
 #
@@ -228,18 +228,23 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 <Directory "@@ServerRoot@@/htdocs">
 
 #
-# This may also be "None", "All", or any combination of "Indexes",
-# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
 #
 # Note that "MultiViews" must be named *explicitly* --- "Options All"
 # doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs-2.0/mod/core.html#options
+# for more information.
 #
     Options Indexes FollowSymLinks
 
 #
-# This controls which options the .htaccess files in directories can
-# override. Can also be "All", or any combination of "Options", "FileInfo", 
-# "AuthConfig", and "Limit"
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit
 #
     AllowOverride None
 
@@ -289,14 +294,14 @@ UserDir "public_html"
 #</Directory>
 
 #
-# DirectoryIndex: Name of the file or files to use as a pre-written HTML
-# directory index.  Separate multiple entries with spaces.
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
 #
 DirectoryIndex index.html
 
 #
 # AccessFileName: The name of the file to look for in each directory
-# for access control information.
+# for access control information.  See also the AllowOverride directive.
 #
 AccessFileName .htaccess
 
@@ -854,7 +859,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #
 # Allow remote server configuration reports, with the URL of
 #  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #    SetHandler server-info
@@ -873,7 +878,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #<Proxy *>
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Proxy>
 
 #
@@ -893,7 +898,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #CacheMaxExpire 24
 #CacheLastModifiedFactor 0.1
 #CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index b05c0c4e69acb84bf3615a2b549b498ffd3ba430..4055b06c4d6feb183c139151807860bbc52864ad 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -258,7 +258,7 @@ Group #-1
 #
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
-# as error documents.
+# as error documents.  e.g. admin@your-domain.com
 #
 ServerAdmin you@your.address
 
@@ -271,6 +271,8 @@ ServerAdmin you@your.address
 # redirections will not work.  See also the UseCanonicalName directive.
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
+# You will have to access it by its address (e.g., http://123.45.67.89/)
+# anyway, and this will make redirections work in a sensible way.
 #
 #ServerName new.host.name:80
 
@@ -322,7 +324,7 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 
 #
 # AllowOverride controls what directives may be placed in .htaccess files.
-# It can be "All", "None", or any combination of:
+# It can be "All", "None", or any combination of the keywords:
 #   Options FileInfo AuthConfig Limit
 #
     AllowOverride None
@@ -901,25 +903,25 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 
 #
 # Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-status>
 #    SetHandler server-status
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Location>
 
 #
 # Allow remote server configuration reports, with the URL of
 #  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #    SetHandler server-info
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Location>
 
 #
@@ -932,7 +934,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #<Proxy *>
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Proxy>
 
 #
@@ -952,7 +954,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #CacheMaxExpire 24
 #CacheLastModifiedFactor 0.1
 #CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 49bfe76632ccebd814b3b3bee7470c24527620a3..42149c22a8bdb3347e73837df39dd0f484d954b8 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -163,22 +163,18 @@ Listen @@Port@@
 ServerAdmin @@ServerAdmin@@
 
 #
-# ServerName allows you to set a host name which is sent back to clients for
-# your server if it's different than the one the program would get (i.e., use
-# "www" instead of the host's real name).
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
 #
-# 127.0.0.1 is the TCP/IP local loop-back address. Your machine
-# always knows itself by this address. If you machine is connected to
-# a network, you should change this to be your machine's name
+# If this is not set to valid DNS name for your host, server-generated
+# redirections will not work.  See also the UseCanonicalName directive.
 #
-# Note: You cannot just invent host names and hope they work. The name you 
-# define here must be a valid DNS name for your host. If you don't understand
-# this, ask your network administrator.
 # If your host doesn't have a registered DNS name, enter its IP address here.
 # You will have to access it by its address (e.g., http://123.45.67.89/)
 # anyway, and this will make redirections work in a sensible way.
 #
-ServerName @@ServerName@@
+ServerName @@ServerName@@:@@Port@@
 
 #
 # DocumentRoot: The directory out of which you will serve your
@@ -839,7 +835,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #
 # Allow remote server configuration reports, with the URL of
 #  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #    SetHandler server-info
@@ -858,7 +854,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #<Proxy *>
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Proxy>
 
 #
@@ -878,7 +874,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #CacheMaxExpire 24
 #CacheLastModifiedFactor 0.1
 #CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.