summaryrefslogtreecommitdiff
path: root/usr.sbin/ldapd
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2012-09-26 16:19:46 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2012-09-26 16:19:46 +0000
commitfb0cbf719a280641f24a62b97c2870a571f8c5a4 (patch)
treec05f5f0a85a6a2d38e7967b47ab8e4784eece87d /usr.sbin/ldapd
parent02385ef57cde28837d528302190cf2131765f132 (diff)
last stage of rfc changes, using consistent Rs/Re blocks, and moving the
references into a STANDARDS section;
Diffstat (limited to 'usr.sbin/ldapd')
-rw-r--r--usr.sbin/ldapd/ldapd.812
-rw-r--r--usr.sbin/ldapd/ldapd.conf.59
2 files changed, 13 insertions, 8 deletions
diff --git a/usr.sbin/ldapd/ldapd.8 b/usr.sbin/ldapd/ldapd.8
index 767afa3978e..05719743807 100644
--- a/usr.sbin/ldapd/ldapd.8
+++ b/usr.sbin/ldapd/ldapd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldapd.8,v 1.9 2011/01/28 09:26:22 martinh Exp $
+.\" $OpenBSD: ldapd.8,v 1.10 2012/09/26 16:19:44 jmc Exp $
.\"
.\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: January 28 2011 $
+.Dd $Mdocdate: September 26 2012 $
.Dt LDAPD 8
.Os
.Sh NAME
@@ -131,15 +131,19 @@ database files
.Xr ldapd.conf 5 ,
.Xr login.conf 5 ,
.Xr ldapctl 8
+.Sh STANDARDS
.Rs
+.%A J. Sermersheim
+.%D June 2006
.%R RFC 4511
.%T Lightweight Directory Access Protocol (LDAP): The Protocol
-.%D June 2006
.Re
+.Pp
.Rs
+.%A K. Zeilenga
+.%D June 2006
.%R RFC 4512
.%T Lightweight Directory Access Protocol (LDAP): Directory Information Models
-.%D June 2006
.Re
.Sh HISTORY
The
diff --git a/usr.sbin/ldapd/ldapd.conf.5 b/usr.sbin/ldapd/ldapd.conf.5
index 5112336626b..ea31221838a 100644
--- a/usr.sbin/ldapd/ldapd.conf.5
+++ b/usr.sbin/ldapd/ldapd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldapd.conf.5,v 1.15 2012/04/24 14:56:09 jmc Exp $
+.\" $OpenBSD: ldapd.conf.5,v 1.16 2012/09/26 16:19:44 jmc Exp $
.\"
.\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: April 24 2012 $
+.Dd $Mdocdate: September 26 2012 $
.Dt LDAPD.CONF 5
.Os
.Sh NAME
@@ -36,7 +36,6 @@ and extend to the end of the current line.
Care should be taken when commenting out multi-line text:
the comment is effective until the end of the entire block.
.Pp
-.Pp
Argument names not beginning with a letter, digit, or underscore
must be quoted.
Arguments containing whitespace should be surrounded by double quotes
@@ -337,10 +336,12 @@ Default schema definition files.
.Sh SEE ALSO
.Xr ldapctl 8 ,
.Xr ldapd 8
+.Sh STANDARDS
.Rs
+.%A K. Zeilenga
+.%D June 2006
.%R RFC 4512
.%T Lightweight Directory Access Protocol (LDAP): Directory Information Models
-.%D June 2006
.Re
.Sh HISTORY
The