More term updates

diff --git a/doc/guide/admin/glossary.sdf b/doc/guide/admin/glossary.sdf
index 566e2fa7b824093d731ceedf658159ee907c35e2..63d0cf4ec66c20737947d0595a0aa50f9423a0de 100644 (file)
--- a/doc/guide/admin/glossary.sdf
+++ b/doc/guide/admin/glossary.sdf
@@ -7,10 +7,10 @@ H2: Terms
 !catalog terms ''; headings; columns="Term,Definition"
 
 H2: Related Organizations
-!catalog organisations ''; headings; columns="Name,Long,Jump"
+!catalog organisations ''; headings; columns="ORG:Name,Long,URL:Jump"
 
 H2: Related Products
-!catalog products ''; headings; columns="Name,Jump"
+!catalog products ''; headings; columns="PRD:Name,URL:Jump"
 
 H2: References
-!catalog references ''; headings; columns="Reference,Document,Status,Jump"
+!catalog references ''; headings; columns="REF:Reference,Document,Status,URL:Jump"

diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index 9cf731c6f647ffe55e4eebec3974285517588524..e34e6906d0855e0208abdc25f46649701008f0b2 100644 (file)
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -17,21 +17,21 @@ This document is considered a part of OpenLDAP Software.  This
 document is subject to terms of conditions set forth in {{SECT:OpenLDAP
 Software Copyright Notices}} and the {{SECT:OpenLDAP Public License}}.
 Complete copies of the notices and associated license can be found
-in Appendix B and C, respectively.
+in Appendix C and D, respectively.
 
 
 P2[notoc] Scope of this Document
 
 This document provides a guide for installing [[DOC_NAME]]
-({{URL:http://www.openldap.org/software/}})
-on {{TERM:UNIX}} (and UNIX-like) systems.  The document is aimed at
-experienced system administrators but who may not have prior experience
-operating {{TERM:LDAP}}-based directory software.
+({{URL:http://www.openldap.org/software/}}) on {{TERM:UNIX}} (and
+UNIX-like) systems.  The document is aimed at experienced system
+administrators with basic understanding of {{TERM:LDAP}}-based
+directory services.
 
 This document is meant to be used in conjunction with other OpenLDAP
-information resources provided with the software package and on
-the project's extensive site ({{URL:http://www.OpenLDAP.org/}}) on
-the {{TERM[expand]WWW}}.  The site makes available a number of resources.
+information resources provided with the software package and on the
+project's site ({{URL:http://www.OpenLDAP.org/}}) on the
+{{TERM[expand]WWW}}.  The site makes available a number of resources.
 
 !block table; align=Center; coltags="N,URL"; \
        title="OpenLDAP Resources"
@@ -40,6 +40,7 @@ Document Catalog|http://www.OpenLDAP.org/doc/
 Frequently Asked Questions|http://www.OpenLDAP.org/faq/
 Issue Tracking System|http://www.OpenLDAP.org/its/
 Mailing Lists|http://www.OpenLDAP.org/lists/
+Manual Pages|http://www.OpenLDAP.org/software/man.cgi
 Software Pages|http://www.OpenLDAP.org/software/
 Support Pages|http://www.OpenLDAP.org/support/
 !endblock
@@ -47,13 +48,14 @@ Support Pages|http://www.OpenLDAP.org/support/
 
 P2[notoc] Acknowledgments
 
-The {{ORG[expand]OLP}} is comprised of a team of volunteers.  This document
-would not be possible without their contribution of time and energy.
+The {{ORG[expand]OLP}} is comprised of a team of volunteers.  This
+document would not be possible without their contribution of time
+and energy.
 
 The OpenLDAP Project would also like to thank the {{ORG[expand]UMLDAP}}
 for building the foundation of LDAP software and information to
 which OpenLDAP Software is built upon.  This document is based upon
-U-Mich LDAP document: {{The SLAPD and SLURPD Administrators Guide}}.
+University of Michigan document: {{REF[expand]UM-GUIDE}}.
 
 
 P2[notoc] Amendments
@@ -65,7 +67,7 @@ submitted using the {{PRD:OpenLDAP}} {{TERM[expand]ITS}}
 
 P2[notoc] About this document
 
-This document was produced using the {{TERM[expand]SDF}} (SDF)
+This document was produced using the {{TERM[expand]SDF}} ({{TERM:SDF}})
 documentation system
 ({{URL:http://search.cpan.org/src/IANC/sdf-2.001/doc/}}) developed
 by {{Ian Clatworthy}}.  Tools for SDF are available from {{ORG:CPAN}}

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index be9b2af5746311213a1b735a14ce8351fad9d449..e15db8bb072ea992719ba2eacdbf3d3beee956fc 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -101,7 +101,7 @@ ________________<BR>
 !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/
+BSI|British Standards Institute|http://www.bsi-global.com/
 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/
@@ -276,6 +276,7 @@ syncrepl|LDAP Sync-based Replication
 
 !block references; data; sort=Reference; style=grid
 Reference|Status|Document|Jump
+UM-GUIDE|O|The SLAPD and SLURPD Administrators Guide|http://www.umich.edu/~dirsvcs/ldap/doc/guides/slapd/guide.pdf
 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
 RFC2307|X|An Approach for Using LDAP as a Network Information Service|http://www.rfc-editor.org/rfc/rfc2307.txt