Merge r1807655 from trunk:

[apache] / README

diff --git a/README b/README
index 7f90fb1987f51f1267bccacb9fe2a9ac424045ec..603374420f021b2eb0b802ec43baf00e40cbf594 100644 (file)
--- a/README
+++ b/README
@@ -24,7 +24,7 @@
   The documentation available as of the date of this release is
   included in HTML format in the docs/manual/ directory.  The most
   up-to-date documentation can be found at
-  http://httpd.apache.org/docs/trunk/.
+  http://httpd.apache.org/docs/2.4/.
 
   Installation
   ------------
@@ -70,11 +70,14 @@
     SSL facilities.
 
     In addition, some versions of apr-util provide an abstract interface
-    for SSL encrypted network sockets in the files under the directory
-       srclib/apr-util/ssl/
-    that makes use of a general-purpose encryption library, such as
-    OpenSSL or the operating system's platform-specific SSL facilities.
-    Apache httpd currently does not use that apr-util interface.
+    for symmetrical cryptographic functions that make use of a
+    general-purpose encryption library, such as OpenSSL, NSS, or the
+    operating system's platform-specific facilities. This interface is
+    known as the apr_crypto interface, with implementation beneath the
+    /crypto directory. The apr_crypto interface is used by the
+    mod_session_crypto module available under
+      modules/session
+    for optional encryption of session information.
 
     Some object code distributions of Apache httpd, indicated with the
     word "crypto" in the package name, may include object code for the
@@ -95,22 +98,11 @@
        subscribe to the apache-announce 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 to Users Mailing List at
-       <http://httpd.apache.org/userslist.html> or one of the following
-       USENET newsgroups:
-         comp.infosystems.www.servers.unix
-         comp.infosystems.www.servers.ms-windows
-       Also available at: 
-         <http://groups.google.com/groups?group=comp.infosystems.www.servers>
-
-     o If you want commercial support for running Apache please contact
-       one of the companies and contractors which are listed at
-       <http://www.apache.org/info/support.cgi>
-
-     o If you have a concrete bug report for Apache please go to the
-       Apache Group Bug Database and submit your report:
-       <http://httpd.apache.org/bug_report.html>
+     o If you want freely available support for running Apache please see the
+       resources at <http://httpd.apache.org/support.html>
+
+     o If you have a concrete bug report for Apache please see the instructions
+       for bug reporting at <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