Fix bad merge of inet_ntop changes (which broke IPv6 detection)

[openldap] / README

diff --git a/README b/README
index f42349eb0e69a78a64ec6d7adbc543374c192ecb..bf0f8d857261dcd1d90aaeda2c22ce31f6d158be 100644 (file)
--- a/README
+++ b/README
@@ -1,66 +1,58 @@
-OpenLDAP 2.0 Gamma README
-       This is an gamma release of OpenLDAP 2.0.  It is provided
-       for testing purposes only.  It is not for general use.
+OpenLDAP 2.0 README
+       
+       For a description of what this distribution contains, see the
+       ANNOUNCEMENT file in this directory.  For a description of
+       changes from previous releases, see the CHANGES file in this
+       directory.
 
-       The OpenLDAP Developer's FAQ is available at:
-               http://www.openldap.org/faq/index.cgi?file=4
-
-       Testers should provide feedback regarding this release using
-       the OpenLDAP Issue Tracking System <http://www.openldap.org/its/>.
-       Developer's wishing to contribute changes should work with latest
-       devel codes.
-
-       For a more detailed description of how to make an install the
-       distribution, see the INSTALL file in this directory.  Additional
-       installation information can be found on the OpenLDAP website:
-               http://www.openldap.org/
+       This is the first release of 2.0 and includes significant
+       changes from prior releases.  The software may be a little
+       rough around the edges, use with appropriate care.  Those
+       seeking stable LDAP servers may want to use 1.2.
 
 
 REQUIRED SOFTWARE
-       Build OpenLDAP requires the following software components:
+       Build OpenLDAP requires a number of software packages to be
+       preinstalled.  Additional information regarding prerequisite
+       software can be found in the OpenLDAP Administrator's Guide.
 
        Base system (libraries and tools):
-               Standard C compiler, headers, and libraries (required)
-               Cryus SASL software (recommended)
+               Standard C compiler (required)
+               Cyrus SASL software (recommended)
                OpenSSL TLS software (recommended)
                POSIX REGEX software (required)
 
        SLAPD:
                LDBM compatible datastore (required)
-                       e.g. Sleepycat Berkeley DB 3.1 (recommended) or GDBM
+                       [Sleepycat Berkeley DB 3.1 (recommended) or GDBM]
 
        SLURPD:
                LTHREAD compatible thread package
-                       (POSIX threads, Mach Cthreads, Sun LWP, or GNU Pth)
+                       [POSIX threads, Mach Cthreads, Sun LWP, or GNU Pth]
 
        CLIENTS/CONTRIB ware:
                Depends on package.  See per package README.
-               
+
 
 MAKING AND INSTALLING THE DISTRIBUTION
-       Please see the INSTALL file for details.
+       Please see the INSTALL file for basic instructions.  More
+       detailed instructions can be found in the OpenLDAP
+       Admnistrator's Guide (see DOCUMENTATION section).
 
 
 DOCUMENTATION
        There are man pages for most programs in the distribution and
        routines in the various libraries.  See ldap(3) for details.
 
-       Additional documentation can be found in the doc directory.
-               doc/devel   Developer Information
-               doc/drafts  LDAP-related IETF drafts
-               doc/install Installation and Integration
-               doc/man     Raw man(1) pages
-               doc/rfcs    LDAP-related Request for Comments
-
-       There is an OpenLDAP home page available that contains the latest
-       LDAP news, releases announcements, pointers to other LDAP resources,
+       The OpenLDAP website is available and contains the latest LDAP
+       news, releases announcements, pointers to other LDAP resources,
        etc..  It is located at:
                http://www.OpenLDAP.org/
 
-       A draft of the "OpenLDAP Administrator's Guide" is available at:
-               http://www.openldap.org/devel/admin/
+       The OpenLDAP Administrator's Guide is available at:
+               http://www.openldap.org/doc/admin/
 
-       The OpenLDAP 2.0 Software FAQ is available at:
+       The OpenLDAP Software FAQ is available at:
                http://www.openldap.org/faq/index.cgi
 
 
@@ -68,13 +60,14 @@ SUPPORT / FEEDBACK / PROBLEM REPORTS / DISCUSSIONS
        OpenLDAP is user supported.  If you have problems, please
        review the OpenLDAP FAQ <http://www.openldap.org/faq/> and
        archives of the OpenLDAP-software and OpenLDAP-bugs mailing
-       lists <http://www.openldap.org/lists/>.
+       lists <http://www.openldap.org/lists/>.  If you cannot find
+       the answer, please enquire on the OpenLDAP-software list.
 
        Issues, such as bug reports, should be reported using our
        our Issue Tracking System <http://www.OpenLDAP.com/its/> or
        by sending mail to OpenLDAP-its@OpenLDAP.org.  Do not use
-       this system for general or software equiries.  Please direct
-       these to the appropriate mailing list.
+       this system for software enquiries.  Please direct these
+       to an appropriate mailing list.
 
 ---
 $OpenLDAP$