diff --git a/README b/README
index 2bf158743c..d67eac8faa 100644
--- a/README
+++ b/README
@@ -4,12 +4,12 @@ OpenLDAP 2.2 README
     changes from previous releases, see the CHANGES file in this
     directory.
 
-    This is 2.2 release, it includes significant changes from
-    prior releases.
+    This is 2.2 release, it includes significant changes from prior
+    releases.
 
 REQUIRED SOFTWARE
-    Build OpenLDAP requires a number of software packages to be
-    preinstalled.  Additional information regarding prerequisite
+    Building OpenLDAP Software 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):
@@ -33,8 +33,8 @@ REQUIRED SOFTWARE
 
 MAKING AND INSTALLING THE DISTRIBUTION
     Please see the INSTALL file for basic instructions.  More
-    detailed instructions can be found in the OpenLDAP
-    Admnistrator's Guide (see DOCUMENTATION section).
+    detailed instructions can be found in the OpenLDAP Admnistrator's
+    Guide (see DOCUMENTATION section).
 
 
 DOCUMENTATION
@@ -43,47 +43,44 @@ DOCUMENTATION
 
     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/
+    etc..  It is located at <http://www.OpenLDAP.org/>.
 
-    The OpenLDAP Administrator's Guide and other documentation
-    is available at:
-        http://www.openldap.org/doc/
+    The OpenLDAP Administrator's Guide and other documentation is
+    available at <http://www.openldap.org/doc/>.
 
-    The OpenLDAP Software FAQ is available at:
-        http://www.openldap.org/faq/
+    The OpenLDAP Software FAQ is available at
+    <http://www.openldap.org/faq/>.
 
 
 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/>.  If you cannot find
-    the answer, please enquire on the OpenLDAP-software list.
+    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/>.  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.org/its/>.
-    Do not use this system for software enquiries.  Please
-    direct these to an appropriate mailing list.
+    Issues, such as bug reports, should be reported using our our
+    Issue Tracking System <http://www.OpenLDAP.org/its/>.  Do not
+    use this system for software enquiries.  Please direct these
+    to an appropriate mailing list.
 
 
 CONTRIBUTING
     See <http://www.openldap.org/devel/contributing.html> for
     information regarding how to contribute code or documentation
     to the OpenLDAP Project for inclusion in OpenLDAP Software.
-    While you are encouraged to coordinate and discuss the
-    development activities on the <openldap-devel@openldap.org>
-    mailing list prior to submission, it is noted that
-    contributions must be submitted using the Issue Tracking
-    System <http://www.openldap.org/its/> to be considered.
+    While you are encouraged to coordinate and discuss the development
+    activities on the <openldap-devel@openldap.org> mailing list
+    prior to submission, it is noted that contributions must be
+    submitted using the Issue Tracking System
+    <http://www.openldap.org/its/> to be considered.
 
 ---
 $OpenLDAP$
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
-Copyright 1998-2004 The OpenLDAP Foundation.
-All rights reserved.
+Copyright 1998-2004 The OpenLDAP Foundation.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP