merge apache 1.3.29 and mod_ssl 2.8.16

ok brad@

1 files changed, 18 insertions, 14 deletions

diff --git a/usr.sbin/httpd/INSTALL b/usr.sbin/httpd/INSTALL
index a02df5c15f7..767a0df3f07 100644
--- a/usr.sbin/httpd/INSTALL
+++ b/usr.sbin/httpd/INSTALL
@@ -213,16 +213,20 @@
                whether these paths contain ``apache'' or not. Although the
                defaults were defined with experience in mind you always should
                make sure the paths fit your situation by checking the finally
-               chosen paths via the --layout option.
+               chosen paths via the --show-layout option.
 
      Use the --with-layout=[F:]ID option to select a particular installation
-     path base-layout. You always _HAVE_ to select a base-layout. There are
-     currently two layouts pre-defined in the file config.layout: `Apache' for
-     the classical Apache path layout and `GNU' for a path layout conforming
-     to the GNU `standards' document. When you want to use your own custom
-     layout FOO, either add a corresponding "<Layout FOO>...</Layout>" section
-     to config.layout and use --with-layout=FOO or place it into your own
-     file, say config.mypaths, and use --with-layout=config.mypaths:FOO.
+     path base-layout. There are many layouts pre-defined in the file
+     config.layout. Except on MacOS(X) configure defaults to the `Apache'
+     classical path layout. You can get an overview of the existing layouts
+     by using the command:
+
+     grep "^<Layout" config.layout
+
+     When you want to use your own custom layout FOO, either add a
+     corresponding "<Layout FOO>...</Layout>" section to config.layout and
+     use --with-layout=FOO or place it into your own file, say config.mypaths,
+     and use --with-layout=config.mypaths:FOO.
  
      Use the --show-layout option to check the final installation path layout
      while fiddling with the options above.
@@ -239,9 +243,9 @@
      outside the Apache source tree, for instance /path/to/mod_foo.c, or a
      path to an already existing C source code file in src/modules/extra/, such
      as src/modules/extra/mod_foo.c, in which case no copying will be done.
-     The added module this is way is automatically activated and enabled. Use
-     this option to automatically include a simple third-party module to the
-     Apache build process.
+     The added module is automatically activated and enabled. Use this option
+     to automatically include a simple third-party module to the Apache build
+     process.
 
      Use the --activate-module=FILE option to add an entry for an existing
      module object or library file into the configuration file on-the-fly.
@@ -517,8 +521,8 @@
 
      o If you want to be informed about new code releases, bug fixes, 
        security fixes, general news and information about the Apache server
-       subscribe to the apache-announce mailing list as described under
-       http://www.apache.org/announcelist.html
+       subscribe to the announcements mailing list as described under
+       http://httpd.apache.org/lists.html#http-announce
 
      o If you want freely available support for running Apache please join the
        Apache user community by subscribing at least to the following USENET
@@ -531,7 +535,7 @@
 
      o If you have a concrete bug report for Apache please go to the
        Apache Group Bug Database and submit your report:
-       http://www.apache.org/bug_report.html
+       http://httpd.apache.org/bug_report.html
 
      o If you want to participate in actively developing Apache please
        subscribe to the `dev@httpd.apache.org' mailing list as described at