Misc cleanup

doc/guide/admin/config.sdf

@@ -4,7 +4,7 @@
 H1: The Big Picture - Configuration Choices
 
 This section gives a brief overview of various {{TERM:LDAP}} directory
-configurations, and how your stand-alone LDAP server {{slapd}}(8)
+configurations, and how your Standalone LDAP Daemon {{slapd}}(8)
 fits in with the rest of the world.
 
 

doc/guide/admin/glossary.sdf

@@ -4,13 +4,13 @@
 H1: Glossary
 
 H2: Terms
-!catalog terms ''; columns="Term,Definition"
+!catalog terms ''; headings; columns="Term,Definition"
 
 H2: Related Organizations
-!catalog organisations ''; columns="Name,Long,Jump"
+!catalog organisations ''; headings; columns="Name,Long,Jump"
 
 H2: Related Products
-!catalog products ''; columns="Name,Jump"
+!catalog products ''; headings; columns="Name,Jump"
 
 H2: References
-!catalog references ''; columns="Reference,Document,Status,Jump"
+!catalog references ''; headings; columns="Reference,Document,Status,Jump"

doc/guide/admin/install.sdf

@@ -5,8 +5,8 @@
 H1: Building and Installing OpenLDAP Software
 
 This chapter details how to build and install the {{PRD:OpenLDAP}}
-Software package including {{slapd}}(8), the stand-alone {{TERM:LDAP}}
-daemon.  Building and installing OpenLDAP Software requires several
+Software package including {{slapd}}(8), the Standalone {{TERM:LDAP}}
+Daemon.  Building and installing OpenLDAP Software requires several
 steps: installing prerequisite software, configuring OpenLDAP
 Software itself, making, and finally installing.  The following
 sections describe this process in detail.

doc/guide/admin/intro.sdf

@@ -5,8 +5,8 @@ H1: Introduction to OpenLDAP Directory Services
 
 This document describes how to build, configure, and operate
 {{PRD:OpenLDAP}} Software to provide directory services.  This
-includes details on how to configure and run the stand-alone
-{{TERM:LDAP}} daemon, {{slapd}}(8).  It is intended for new and
+includes details on how to configure and run the Standalone
+{{TERM:LDAP}} Daemon, {{slapd}}(8).  It is intended for new and
 experienced administrators alike.  This section provides a basic
 introduction to directory services and, in particular, the directory
 services provided by {{slapd}}(8).  This introduction is only
@@ -156,16 +156,15 @@ services.
 
 H2: How does LDAP work?
 
-LDAP directory service is based on a {{client-server}} model. One
-or more LDAP servers contain the data making up the directory
-information tree (DIT).  The client connects to servers and
-asks it a question.  The server responds with an answer and/or 
-with a pointer to where the client can get additional information
-(typically, another LDAP server).  No matter which LDAP server a
-client connects to, it sees the same view of the directory; a name
-presented to one LDAP server references the same entry it would at
-another LDAP server. This is an important feature of a global
-directory service, like LDAP.
+LDAP utilizes a {{client-server model}}. One or more LDAP servers
+contain the data making up the directory information tree ({{TERM:DIT}}).
+The client connects to servers and asks it a question.  The server
+responds with an answer and/or with a pointer to where the client
+can get additional information (typically, another LDAP server).
+No matter which LDAP server a client connects to, it sees the same
+view of the directory; a name presented to one LDAP server references
+the same entry it would at another LDAP server.  This is an important
+feature of a global directory service.
 
 
 H2: What about X.500?
@@ -185,7 +184,7 @@ While LDAP is still used to access X.500 directory service via
 gateways, LDAP is now more commonly directly implemented in X.500
 servers. 
 
-The stand-alone LDAP daemon, or {{slapd}}(8), can be viewed as a
+The Standalone LDAP Daemon, or {{slapd}}(8), can be viewed as a
 {{lightweight}} X.500 directory server.  That is, it does not
 implement the X.500's DAP nor does it support the complete X.500
 models.

doc/guide/admin/quickstart.sdf

@@ -5,7 +5,7 @@
 H1: A Quick-Start Guide
 
 The following is a quick start guide to [[DOC_NAME]],
-including the stand-alone {{TERM:LDAP}} daemon, {{slapd}}(8).
+including the Standalone {{TERM:LDAP}} Daemon, {{slapd}}(8).
 
 It is meant to walk you through the basic steps needed to install
 and configure OpenLDAP Software. It should be used in conjunction

doc/guide/admin/runningslapd.sdf

@@ -3,10 +3,10 @@
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 H1: Running slapd
 
-{{slapd}}(8) is designed to be run as a stand-alone server.  This allows
-the server to take advantage of caching, manage concurrency issues
-with underlying databases, and conserve system resources.  Running
-from {{inetd}}(8) is {{NOT}} an option.
+{{slapd}}(8) is designed to be run as a standalone service.  This
+allows the server to take advantage of caching, manage concurrency
+issues with underlying databases, and conserve system resources.
+Running from {{inetd}}(8) is {{NOT}} an option.
 
 
 H2: Command-Line Options

doc/guide/preamble.sdf

@@ -98,22 +98,23 @@ ________________<BR>
 
 
 # OpenLDAP related organization
-!block organisations; data
+!block organisations; data; sort='Name'
 Name|Long|Jump
 ANSI|American National Standards Institute|http://www.ansi.org/
 BSI|British Standards Institute|http://www.bsa-global.com/
-Cyrus|Project Cyrus|http://cyrusimap.web.cmu.edu/
+COSINE|Co-operation and Open Systems Interconnection in Europe
 CPAN|Comprehensive Perl Archive Network|http://cpan.org/
+Cyrus|Project Cyrus|http://cyrusimap.web.cmu.edu/
 FSF|Free Software Foundation|http://www.fsf.org/
 GNU|GNU Not Unix Project|http://www.gnu.org/
 IAB|Internet Architecture Board|http://www.iab.org/
 IANA|Internet Assigned Numbers Authority|http://www.iana.org/
-IEEE|Institute of Electrical and Electronics Engineers
+IEEE|Institute of Electrical and Electronics Engineers|http://www.ieee.org
 IESG|Internet Engineering Steering Group|http://www.ietf.org/iesg/
 IETF|Internet Engineering Task Force|http://www.ietf.org/
 IRTF|Internet Research Task Force|http://www.irtf.org/
-ISOC|Internet Society|http://www.isoc.org/
 ISO|International Standards Organisation|http://www.iso.org/
+ISOC|Internet Society|http://www.isoc.org/
 ITU|International Telephone Union|http://www.itu.int/
 OLF|OpenLDAP Foundation|http://www.openldap.org/foundation/
 OLP|OpenLDAP Project|http://www.openldap.org/project/
@@ -124,11 +125,11 @@ UM|University of Michigan|http://www.umich.edu/
 UMLDAP|University of Michigan LDAP Team|http://www.umich.edu/~dirsvcs/ldap/ldap.html
 !endblock
 
-!block products; data
+!block products; data; sort='Name'
 Name|Jump
 Berkeley DB|http://www.oracle.com/database/berkeley-db/db/index.html
 CVS|http://www.cvshome.org/
-Cyrus:http://cyrusimap.web.cmu.edu/generalinfo.html
+Cyrus|http://cyrusimap.web.cmu.edu/generalinfo.html
 Cyrus SASL|http://asg.web.cmu.edu/sasl/sasl-library.html
 GNU|http://www.gnu.org/software/
 GDBM|http://www.gnu.org/software/gdbm/
@@ -146,7 +147,7 @@ UMLDAP|http://www.umich.edu/~dirsvcs/ldap/ldap.html
 !endblock
 
 # Internet and X.500 terms
-!block terms; data
+!block terms; data; sort='Term'
 Term|Definition
 3DES|Triple DES
 ABNF|Augmented Backus-Naur Form
@@ -157,6 +158,7 @@ ACID|Atomicity, Consistency, Isolation, and Durability
 ACI|Access Control Information
 ACL|Access Control List
 AES|Advance Encryption Standard
+ABI|Application Binary Interface
 API|Application Program Interface
 ASN.1|Abstract Syntax Notation - One
 AVA|Attribute Value Assertion
@@ -168,15 +170,13 @@ BCP|Best Current Practice
 BDB|Berkeley DB (Backend)
 BER|Basic Encoding Rules
 BNF|Backus-Naur Form
+C|The C Programming Language
 CA|Certificate Authority
-CCITT|International Telegraph and Telephone Consultative Committee
 CER|Canonical Encoding Rules
 CLDAP|Connection-less LDAP
 CN|Common Name
-COSINE|Co-operation and Open Systems Interconnection in Europe
 CRAM-MD5|SASL MD5 Challedge/Response Authentication Mechanism
 CRL|Certificate Revocation List
-C|The C Programming Language
 DAP|Directory Access Protocol
 DC|Domain Component
 DER|Distinguished Encoding Rules
@@ -235,7 +235,6 @@ PKI|Public Key Infrastructure
 PKIX|Public Key Infrastructure (X.509)
 PLAIN|SASL Plaintext Password Authentication Mechanism
 POSIX|Portable Operating System Interface
-PRDMD|Private Directory Management Domain
 PS|Proposed Standard
 RDN|Relative Distinguished Name
 RFC|Request for Comments
@@ -275,7 +274,7 @@ XML|Extensible Markup Language
 syncrepl|LDAP Sync-based Replication
 !endblock
 
-!block references; data
+!block references; data; sort=Reference; style=grid
 Reference|Status|Document|Jump
 RFC2079|PS|Definition of an X.500 Attribute Type and an Object Class to Hold Uniform Resource Identifers|http://www.rfc-editor.org/rfc/rfc2079.txt
 RFC2296|PS|Use of Language Codes in LDAP|http://www.rfc-editor.org/rfc/rfc2296.txt