--- openldap-1.2.9.prev/doc/man/man5/ldap.conf.5	Mon Sep  6 12:26:37 1999
+++ openldap-1.2.9/doc/man/man5/ldap.conf.5	Fri Feb 25 16:29:27 2000
@@ -1,9 +1,10 @@
 .TH LDAP.CONF 5 "29 November 1998" "OpenLDAP LDVERSION"
 .UC 6
 .SH NAME
-ldap.conf \- ldap configuration file
+ldap.conf, .ldaprc \- ldap configuration file
 .SH SYNOPSIS
 ETCDIR/ldap.conf
+~/.ldaprc
 .SH DESCRIPTION
 The
 .I ldap.conf
--- openldap-1.2.9.prev/doc/man/man5/ldap.conf.5.links	Wed Dec 31 19:00:00 1969
+++ openldap-1.2.9/doc/man/man5/ldap.conf.5.links	Fri Feb 25 16:29:27 2000
@@ -0,0 +1 @@
+ldaprc.5
--- openldap-1.2.9.prev/doc/man/man5/slapd.conf.5	Sat Jan 23 16:24:59 1999
+++ openldap-1.2.9/doc/man/man5/slapd.conf.5	Fri Feb 25 16:29:27 2000
@@ -128,7 +128,7 @@
 Specify the level at which debugging statements and operation 
 statistics should be syslogged (currently logged to the
 .BR syslogd (8) 
-LOG_LOCAL4 facility).  Log levels are additive, and available levels
+LOG_DAEMON facility).  Log levels are additive, and available levels
 are:
 .RS
 .RS
--- openldap-1.2.9.prev/doc/man/man5/ud.conf.5	Mon Nov 30 14:57:04 1998
+++ openldap-1.2.9/doc/man/man5/ud.conf.5	Fri Feb 25 16:31:54 2000
@@ -90,7 +90,7 @@
 .SH FILES
 .I  ETCDIR/ud.conf
 .SH "SEE ALSO"
-ud(1),
+ud-openldap(1),
 ldap(3)
 .SH AUTHOR
 Bryan Beecher, University of Michigan
--- openldap-1.2.9.prev/doc/man/man8/go500.8	Sat Oct 24 19:41:52 1998
+++ openldap-1.2.9/doc/man/man8/go500.8	Fri Feb 25 16:29:28 2000
@@ -127,7 +127,7 @@
 .BR go500 .
 .TP
 .B \-l
-Enable logging of various status and errors to the LOG_LOCAL3 facility via
+Enable logging of various status and errors to the LOG_DAEMON facility via
 syslog(8).
 .TP
 .BI \-p " port"
--- openldap-1.2.9.prev/doc/man/man8/go500gw.8	Sat Oct 24 19:41:52 1998
+++ openldap-1.2.9/doc/man/man8/go500gw.8	Fri Feb 25 16:29:28 2000
@@ -123,7 +123,7 @@
 in the "About the Gopher to X.500 Gateway" menu item.
 .TP
 .B \-l
-Enable logging of various status and errors to the LOG_LOCAL3 facility via
+Enable logging of various status and errors to the LOG_DAEMON facility via
 .BR syslog (8).
 .TP
 .BI \-p " listenport"
--- openldap-1.2.9.prev/doc/man/man8/in.xfingerd.8	Sat Oct 24 19:41:52 1998
+++ openldap-1.2.9/doc/man/man8/in.xfingerd.8	Fri Feb 25 16:29:28 2000
@@ -44,7 +44,8 @@
 request from standard input.  This is useful for debugging.
 .TP
 .B \-l
-Disable logging of various status and errors to the LOG_LOCAL4 facility via
+Disable logging of various status and errors to the LOG_DAEMON facility
+via
 .BR syslog (8).
 Note that this flag turns OFF logging.  The default is on.
 .TP
--- openldap-1.2.9.prev/doc/man/man8/ldapd.8	Sat Oct 24 19:41:52 1998
+++ openldap-1.2.9/doc/man/man8/ldapd.8	Fri Feb 25 16:29:28 2000
@@ -64,7 +64,7 @@
 different kind of debugging information.  See <ldap.h> for details.
 .TP
 .B \-l
-Enable logging of various status and errors to the LOG_LOCAL4 facility via
+Enable logging of various status and errors to the LOG_DAEMON facility via
 .BR syslog (8).
 .TP
 .RB \-c " dsaname"
--- openldap-1.2.9.prev/doc/man/man8/mail500.8	Sat Oct 24 19:41:52 1998
+++ openldap-1.2.9/doc/man/man8/mail500.8	Fri Feb 25 16:29:28 2000
@@ -4,13 +4,13 @@
 .LP
 fax500 \- X.500 capable fax delivery agent
 .SH SYNOPSIS
-.B LIBEXECDIR/mail500 [\-d level] [\-f mailfrom]
-.B [\-h hostname] [\-l ldaphost]
-.B [\-m address] [\-v vacationhost]
-.LP
-.B LIBEXECDIR/fax500 [\-d level] [\-f mailfrom]
-.B [\-h hostname] [\-l ldaphost]
-.B [\-m address]
+.B LIBEXECDIR/mail500 [\-d \fIlevel\fP] [\-f \fImailfrom\fP]
+.B [\-h \fIhostname\fP] [\-l \fIldaphost\fP]
+.B [\-m \fIaddress\fP] [\-v \fIvacationhost\fP]
+.LP
+.B LIBEXECDIR/fax500 [\-d \fIlevel\fP] [\-f \fImailfrom\fP]
+.B [\-h \fIhostname\fP] [\-l \fIldaphost\fP]
+.B [\-m \fIaddress\fP]
 .SH DESCRIPTION
 .B mail500
 is an LDAP/X.500-capable mailer, suitable to be invoked from a
@@ -27,7 +27,8 @@
 or send mail to
 .BR tpc-faq@town.hall.org .
 .SH OPTIONS
-.RB \- d level
+.TP
+.BI \-d " level"
 Turn on debugging as defined by
 .I level.
 This option directs
@@ -39,7 +40,7 @@
 .BI \-f " mailfrom"
 This option tells
 .B mail500/fax500
-what to set the envelop from address to when (re)invoking sendmail
+what to set the envelope from address to when (re)invoking sendmail
 to deliver mail.
 .I mailfrom
 should be a valid email address.  Normally, this option is passed
@@ -53,11 +54,11 @@
 .TP
 .BI \-m " address"
 If
-.I mail500/fax500
+.B mail500/fax500
 produces a rejection message, this is the
 .I address
 from which it will com.  Normally, this option is passed to
-.I mail500/fax500
+.B mail500/fax500
 via the sendmail.cf(5) mailer definition, and is set to something
 like $n@$w (typically, mailer-daemon@hostname).
 .TP
@@ -65,7 +66,7 @@
 If the vacation facility is operative, this option specifies the
 host to which the mail of users who are on vacation should be sent.
 .SH HOW MAIL500 AND FAX500 WORK
-When mail500/fax500 gets invoked with one or more names to which to
+When \fBmail500/fax500\fP gets invoked with one or more names to which to
 deliver mail, it searches for each name in X.500.  Where it searches,
 and what kind(s) of search(es) it does are compile-time configurable
 by changing the
@@ -87,7 +88,8 @@
 .fi
 .LP
 which means that in delivering mail to "name@umich.edu"
-.B mail500/fax500would do the
+.B mail500/fax500
+would do the
 the following searches, stopping if it finds a match at any step:
 .LP
 .nf
@@ -101,8 +103,8 @@
 	for (&(cn=name)(associatedDomain=umich.edu))
 .fi
 .LP
-Notice that when specifying a filter %s is replaced by the name,
-or user portion of the address while %h is replaced by whatever is
+Notice that when specifying a filter, %s is replaced by the name
+or user portion of the address, while %h is replaced by whatever is
 passed in to
 .B mail500/fax500
 via the
@@ -150,7 +152,8 @@
 values for the mail attribute, multiple copies of the mail would be sent.
 .LP
 In the case of
-.BR fax500 , if my entry has the attribute
+.BR fax500 , 
+if my entry has the attribute
 .LP
 .nf
 	facsimileTelephoneNumber= +1 313 764 5140
@@ -158,8 +161,8 @@
 .LP
 A message sent to tim@fax.umich.edu (assuming the sendmail.cf file
 is set up to pass mail @fax.umich.edu to
-.BR fax500 \-
-see below)
+.B fax500 
+- see below)
 will generate a message to
 remote-printer.Timothy_A_Howes@0.4.1.5.4.6.7.3.1.3.1.tpc.int.
 .LP
@@ -181,7 +184,7 @@
 		telecommunicationAttributeSet, postalAttributeSet
 .fi
 .LP
-And you will need to add these to your local oidtable.at:
+And you will need to add these to your local \fBoidtable.at\fP:
 .LP
 .nf
 	# attrs for rfc822mailgroups
@@ -205,17 +208,19 @@
 do is create an rfc822MailGroup and fill in the errorsTo or
 rfc822ErrorsTo attributes (or both).  That will cause any errors
 encountered when delivering mail to the group to go to the addresses
-listed (or X.500 entry via it's mail attribute).
+listed (or X.500 entry via its mail attribute).
 .LP
 If you fill in the requestsTo or rfc822RequestsTo (or both) attributes,
 mail sent to groupname-request will be sent to the addresses listed
 there.  If you fill in the owner attribute, mail sent to
-groupname-owner will be sent to the addresses listed there.  mail500
+groupname-owner will be sent to the addresses listed there.  
+.B mail500
 does this automatically, so you don't have to explicitly add the
 groupname-request or groupname-owner aliases to your group.
 .LP
 To allow users to join a group, there is the joinable flag.  If TRUE,
-mail500 will search for entries that have a memberOfGroup attribute
+.B mail500 
+will search for entries that have a memberOfGroup attribute
 equal to the DN of the group, using the same algorithm it used to find
 the group in the first place (i.e. the DNs and filters listed in the
 base array).  This allows people to join (or subscribe to) a group
@@ -231,11 +236,11 @@
 .fi
 .LP
 These rules say that any address that ends in @umich.edu will cause
-the mail500 mailer to be called to deliver the mail, and any address
-that ends in @fax.umich.edu will cause the fax500 mailer to
+the \fBmail500\fP mailer to be called to deliver the mail, and any address
+that ends in @fax.umich.edu will cause the \fBfax500\fP mailer to
 be called.  You probably
 also want to do something to prevent addresses like terminator!tim@umich.edu
-or tim%terminator.rs.itd.umich.edu@umich.edu from being passed to mail500.
+or tim%terminator.rs.itd.umich.edu@umich.edu from being passed to \fBmail500\fP.
 At U-M, we do this by adding rules like this to rule set 9 where we
 strip off our local names:
 .LP
@@ -249,7 +254,7 @@
 above examples.  See the sample sendmail.cf file in the ldap source
 directory clients/mail500/ for more details.
 .LP
-The mail500 and fax500 mailers should be defined similar to this in the
+The \fBmail500\fP and \fBfax500\fP mailers should be defined similar to this in the
 sendmail.cf file:
 .LP
 .nf
@@ -257,19 +262,19 @@
 Mfax500, P=LIBEXECDIR/fax500, F=DFMSmnXuh, A=fax500 -f $f -h $h -m $n@$w $u
 .fi
 .LP
-This defines how mail500/fax500 will be treated by sendmail and what
+This defines how \fBmail500/fax500\fP will be treated by sendmail and what
 arguments it will have when it's called.  The various flags specified
 by the F=... parameter are explained in your local sendmail book (with
-any luck).  The arguments to mail500/fax500 are as defined under OPTIONS
+any luck).  The arguments to \fBmail500/fax500\fP are as defined under OPTIONS
 above.  The final argument $u is used to stand for the addresses to which
 to deliver the mail.
 .SH NOTES
-The default values for several #defines that control how mail500 
-and fax500 works are configured at compile time in the 
+The default values for several #defines that control how \fBmail500\fP 
+and \fBfax500\fP works are configured at compile time in the 
 include/ldapconfig.h.edit include file.  You should edit this 
 file to suit your site.
 .SH BUGS
-mail500/fax500 should use the ldap_getfilter(3) facility, instead of 
+\fBmail500/fax500\fP should use the ldap_getfilter(3) facility, instead of 
 compiling in the search filters to use.  This is shameful.
 .LP
 The support for joinable groups (searching to find members who have
@@ -277,14 +282,14 @@
 have good enough access control to allow people to add and delete
 themselves from the group itself.
 .LP
-At one point, mail500 and fax500 were exactly the same binary, and
+At one point, \fBmail500\fP and \fBfax500\fP were exactly the same binary, and
 would behave appropriately based on how they were invoked.  Unfortunately,
-several new features (e.g. vacation support) were added to mail500
-but not to fax500.
+several new features (e.g. vacation support) were added to \fBmail500\fP
+but not to \fBfax500\fP.
 .SH "SEE ALSO"
-.BR ldap(3),
-.BR sendmail.cf(5),
-.BR sendmail(8),
+.BR ldap (3),
+.BR sendmail.cf (5),
+.BR sendmail (8)
 .SH ACKNOWLEDGEMENTS
 .B	OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
