Apache 1.3.19+mod_ssl 2.8.1 merge - also adds shared build of mod_headers

and mod_expire

1 files changed, 45 insertions, 68 deletions

diff --git a/usr.sbin/httpd/README b/usr.sbin/httpd/README
index 4757f026d0c..a4549c3c8ee 100644
--- a/usr.sbin/httpd/README
+++ b/usr.sbin/httpd/README
@@ -1,86 +1,63 @@
-                                 Apache
-                             Version 1.2 (and up)
-
-What is it?
------------
-
-Apache is an HTTP server designed as a plug-in replacement for the NCSA
-server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
-includes many frequently requested new features, and has an API which
-allows it to be extended to meet users' needs more easily.
-
-Documentation
--------------
 
-The documentation available as of the date of this release is also
-included, in HTML format, in the htdocs/manual/ directory. For the
-most up-to-date documentation, visit us on the WWW, at
-<URL:http://www.apache.org/>.
-
-Installation
-------------
-
-Unless you grabbed a binary distribution of Apache, you must compile
-it for your specific platform.  In order to compile it, you must set
-compile-time options (in particular, system type) for your system by
-editing a Configuration file, run a script which generates a Makefile
-and a small piece of C code, and then compile it.
+                                 Apache
+                             Version 1.3 (and up)
 
-For instructions on compilation, see the file 'INSTALL' in the src/ directory.
+  What is it?
+  -----------
 
-After compilation, you will have a binary called "httpd" in the src/
-directory.  If you received a binary distribution of apache, you
-should have this file already.
+  Apache is an HTTP server designed as a plug-in replacement for
+  the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in
+  the NCSA server and includes many frequently requested new
+  features, and has an API which allows it to be extended to meet
+  users' needs more easily.
 
-The next step is to edit the configuration files for the server.  In
-the subdirectory called "conf" you should find distribution versions
-of the three configuration files: srm.conf-dist, access.conf-dist, and
-httpd.conf-dist.  Copy them to srm.conf, access.conf, httpd.conf
-respectively.
+  The Latest Version
+  ------------------
 
-First edit httpd.conf.  This sets up general attributes about the
-server - the port number, the user it runs as, etc.  Next edit the
-srm.conf file - this sets up the root of the document tree, special
-functions like server-parsed HTML or internal imagemap parsing, etc.
-Finally, edit the access.conf file to at least set the base cases of
-access. Documentation for all of these is located at
-<URL:http://www.apache.org/docs/>.
+  Details of the latest version can be found on the Apache HTTP
+  server project page under http://httpd.apache.org/.
 
-Finally, make a call to httpd, with a -f to the full path to the
-httpd.conf file.  I.e., the common case:
+  Documentation
+  -------------
 
-  /usr/local/etc/apache/src/httpd -f /usr/local/etc/apache/conf/httpd.conf
+  The documentation available as of the date of this release is
+  also included, in HTML format, in the htdocs/manual/ directory.
+  For the most up-to-date documentation can be found on
+  http://httpd.apache.org/docs/.
 
-And voila!  The server should be running.
+  Installation
+  ------------
 
-By default the srm.conf and access.conf files are located by name - to
-specifically call them by other names, use the AccessConfig and
-ResourceConfig directives in httpd.conf.
+  From Apache version 1.3 and up you have two possibilities to
+  build and install the Apache package: The old commonly known
+  but manual way from Apache 1.2 and below and the new
+  out-of-the-box way through the new Apache Autoconf-style
+  Interface (APACI). For detailed instructions see the file
+  INSTALL in this directory.
 
-The Latest Version
-------------------
+  Licensing
+  ---------
 
-Details of the latest version are in the apache project page (above).
+  Please see the file called LICENSE.
 
-Licensing
----------
+  Acknowledgments
+  ----------------
 
-Please see the file called LICENSE.
+  We wish to acknowledge the following copyrighted works that
+  make up portions of the Apache software:
 
-Acknowledgments
-----------------
+  Portions of this software were developed at the National Center
+  for Supercomputing Applications (NCSA) at the University of
+  Illinois at Urbana-Champaign.
 
-We wish to acknowledge the following copyrighted works that make up
-portions of the Apache software:
+  This software contains code derived from the RSA Data Security
+  Inc. MD5 Message-Digest Algorithm, including various
+  modifications by Spyglass Inc., Carnegie Mellon University, and
+  Bell Communications Research, Inc (Bellcore).
 
-Portions of this software were developed at the National Center for
-Supercomputing Applications at the University of Illinois at
-Urbana-Champaign.
+  This package contains software written and copyrighted by Henry
+  Spencer.  Please see the file called src/regex/COPYRIGHT. 
 
-This software contains code derived from the RSA Data Security Inc. MD5
-Message-Digest Algorithm, including various modifications by Spyglass Inc.,
-Carnegie Mellon University, and Bell Communications Research, Inc. 
-(Bellcore).
+  The NT port was started with code provided to the Apache Group
+  by Ambarish Malpani of ValiCert, Inc. (http://www.valicert.com/).
 
-This package contains software written and copyrighted by Henry Spencer. 
-Please see the file called src/regex/COPYRIGHT.