From 7cc734e529c75546d4c12828f0fe02386a908f25 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 9 Dec 2006 16:53:09 +0000 Subject: [PATCH] Misc updates (mostly terms) --- doc/guide/admin/intro.sdf | 11 ++++++----- doc/guide/admin/preface.sdf | 6 +++--- doc/guide/admin/security.sdf | 2 +- doc/guide/admin/slapdconf2.sdf | 6 +++--- doc/guide/admin/slapdconfig.sdf | 8 ++++---- doc/guide/admin/tls.sdf | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf index 94d781e5dd..aba05a41dd 100644 --- a/doc/guide/admin/intro.sdf +++ b/doc/guide/admin/intro.sdf @@ -68,8 +68,8 @@ it is a lightweight protocol for accessing directory services, specifically {{TERM:X.500}}-based directory services. LDAP runs over {{TERM:TCP}}/{{TERM:IP}} or other connection oriented transfer services. LDAP is an {{ORG:IETF}} Standard Track protocol and is -specified as detailed in "Lightweight Directory Access Protocol -(LDAP) Technical Specification Road Map" {{REF:RFC4510}}. +specified in "Lightweight Directory Access Protocol (LDAP) Technical +Specification Road Map" {{REF:RFC4510}}. This section gives an overview of LDAP from a user's perspective. @@ -83,8 +83,8 @@ common name, or "{{EX:mail}}" for email address. The syntax of values depend on the attribute type. For example, a {{EX:cn}} attribute might contain the value {{EX:Babs Jensen}}. A {{EX:mail}} attribute might contain the value "{{EX:babs@example.com}}". A -{{EX:jpegPhoto}} attribute would contain a photograph in the JPEG -(binary) format. +{{EX:jpegPhoto}} attribute would contain a photograph in the +{{TERM:JPEG}} (binary) format. {{How is the information arranged?}} In LDAP, directory entries are arranged in a hierarchical tree-like structure. Traditionally, @@ -231,7 +231,8 @@ service, or run a service all by yourself. Some of slapd's more interesting features and capabilities include: {{B:LDAPv3}}: {{slapd}} implements version 3 of {{TERM[expand]LDAP}}. -{{slapd}} supports LDAP over both IPv4 and IPv6 and Unix IPC. +{{slapd}} supports LDAP over both {{TERM:IPv4}} and {{TERM:IPv6}} +and Unix {{TERM:IPC}}. {{B:{{TERM[expand]SASL}}}}: {{slapd}} supports strong authentication and data security (integrity and confidentiality) services through diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf index e34e6906d0..5ac2aefb45 100644 --- a/doc/guide/admin/preface.sdf +++ b/doc/guide/admin/preface.sdf @@ -69,7 +69,7 @@ P2[notoc] About this document 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}} -({{URL:http://search.cpan.org/search?query=SDF}}). +({{URL:http://search.cpan.org/src/IANC/sdf-2.001/doc/catalog.html}}) +developed by {{Ian Clatworthy}}. Tools for SDF are available from +{{ORG:CPAN}} ({{URL:http://search.cpan.org/search?query=SDF}}). diff --git a/doc/guide/admin/security.sdf b/doc/guide/admin/security.sdf index 547b84ae02..3ba16e6386 100644 --- a/doc/guide/admin/security.sdf +++ b/doc/guide/admin/security.sdf @@ -145,7 +145,7 @@ the session. User/password authenticated bind is enabled by default. However, as this mechanism itself offers no evesdropping protection (e.g., the password is set in the clear), it is recommended that it be used only in tightly controlled systems or when the LDAP -session is protected by other means (e.g., TLS, {{TERM:IPSEC}}). +session is protected by other means (e.g., TLS, {{TERM:IPsec}}). Where the administrator relies on TLS to protect the password, it is recommended that unprotected authentication be disabled. This is done by setting "{{EX:disallow bind_simple_unprotected}}" in diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf index faa70aedd1..14fa55fc7b 100644 --- a/doc/guide/admin/slapdconf2.sdf +++ b/doc/guide/admin/slapdconf2.sdf @@ -504,8 +504,8 @@ to the slave slapd. Simple authentication should not be used unless adequate data integrity and confidentiality protections are in place (e.g. TLS -or IPSEC). Simple authentication requires specification of -{{EX:binddn}} and {{EX:credentials}} parameters. +or {{TERM:IPsec}}). Simple authentication requires specification +of {{EX:binddn}} and {{EX:credentials}} parameters. SASL authentication is generally recommended. SASL authentication requires specification of a mechanism using the {{EX:saslmech}} parameter. @@ -713,7 +713,7 @@ to the provider slapd. Simple authentication should not be used unless adequate data integrity and confidentiality protections are in place (e.g. TLS -or IPSEC). Simple authentication requires specification of {{EX:binddn}} +or IPsec). Simple authentication requires specification of {{EX:binddn}} and {{EX:credentials}} parameters. SASL authentication is generally recommended. SASL authentication diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf index ba5107bd99..68a64eaeb6 100644 --- a/doc/guide/admin/slapdconfig.sdf +++ b/doc/guide/admin/slapdconfig.sdf @@ -321,7 +321,7 @@ authentication is to be used when connecting to the slave slapd. Simple authentication should not be used unless adequate data integrity and confidentiality protections are in place (e.g. TLS -or IPSEC). Simple authentication requires specification of +or {{TERM:IPsec}}). Simple authentication requires specification of {{EX:binddn}} and {{EX:credentials}} parameters. SASL authentication is generally recommended. SASL authentication @@ -514,7 +514,7 @@ to the provider slapd. Simple authentication should not be used unless adequate data integrity and confidentiality protections are in place (e.g. TLS -or IPSEC). Simple authentication requires specification of {{EX:binddn}} +or IPsec). Simple authentication requires specification of {{EX:binddn}} and {{EX:credentials}} parameters. SASL authentication is generally recommended. SASL authentication @@ -588,9 +588,9 @@ containing the database and associated indices live. > directory /usr/local/var/openldap-data -H2: Access Control +H2: The access Configuration Directive -Access to slapd entries and attributes is controlled by the +Access to entries and attributes is controlled by the access configuration file directive. The general form of an access line is: diff --git a/doc/guide/admin/tls.sdf b/doc/guide/admin/tls.sdf index 116f04af9a..9126e06ebe 100644 --- a/doc/guide/admin/tls.sdf +++ b/doc/guide/admin/tls.sdf @@ -187,7 +187,7 @@ command to continue. In LDAPv2 environments, TLS is normally started using the LDAP Secure URI scheme ({{EX:ldaps://}}) instead of the normal LDAP URI scheme ({{EX:ldap://}}). OpenLDAP command line tools allow either -scheme to used with the {{EX:-U}} flag and with the {{EX:URI}} +scheme to used with the {{EX:-H}} flag and with the {{EX:URI}} {{ldap.conf}}(5) option. -- 2.39.5