diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1
index 462d71425e1e8b59d052d94dec99114cba29781d..4a8ad9e7406087765adc994e2a482b2e051d2417 100644
--- a/doc/man/man1/ldapcompare.1
+++ b/doc/man/man1/ldapcompare.1
@@ -197,7 +197,7 @@ file compares.
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1
index 0f04e5547f018d378bde1266ed61638bc8361f70..8dd37364a6e34443961024209d904bdc2b841508 100644
--- a/doc/man/man1/ldapdelete.1
+++ b/doc/man/man1/ldapdelete.1
@@ -210,7 +210,7 @@ status and a diagnostic message being written to standard error.
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index 3b1182dd7be4b8f0b59d1cabbcbb022921ffffa1..82a346ea976a103dee7d3906623c558af60a4d48 100644
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -381,7 +381,7 @@ exit status and a diagnostic message being written to standard error.
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1
index be1d2cfc6add43298209a3f3c00450462f28e6b5..49b50f90ff19671dd59fe106f1970ebf8b36321c 100644
--- a/doc/man/man1/ldapmodrdn.1
+++ b/doc/man/man1/ldapmodrdn.1
@@ -231,7 +231,7 @@ status and a diagnostic message being written to standard error.
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index 252c80816abc305b8227feb61125f067f3c09ce3..e258a827e7cee9cdfc6281d9436e98aab9a31ca2 100644
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -183,7 +183,7 @@ the command will require the operation to be successful
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index b05068f37284ab7bba863683afc4c03d34d45690..865d48829d98951bf65793194dcabf97b40f5ceb 100644
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -281,15 +281,15 @@ output in LDAP Data Interchange Format or
.BR ldif (5):
.LP
.nf
- version: 1
+ version: 1
- # bjensen, example, net
- dn: uid=bjensen,dc=example,dc=net
- objectClass: person
- objectClass: dcObject
- uid: bjensen
- cn: Barbara Jensen
- sn: Jensen
+ # bjensen, example, net
+ dn: uid=bjensen,dc=example,dc=net
+ objectClass: person
+ objectClass: dcObject
+ uid: bjensen
+ cn: Barbara Jensen
+ sn: Jensen
...
.fi
.LP
@@ -313,20 +313,20 @@ The output might look something like this if two entries are found:
.LP
.nf
dn: uid=jts,dc=example,dc=com
- cn: John Smith
- cn: John T. Smith
- sn: Smith
- sn;lang-en: Smith
- sn;lang-de: Schmidt
- telephoneNumber: 1 555 123-4567
+ cn: John Smith
+ cn: John T. Smith
+ sn: Smith
+ sn;lang-en: Smith
+ sn;lang-de: Schmidt
+ telephoneNumber: 1 555 123-4567
- dn: uid=sss,dc=example,dc=com
- cn: Steve Smith
- cn: Steve S. Smith
- sn: Smith
- sn;lang-en: Smith
- sn;lang-de: Schmidt
- telephoneNumber: 1 555 765-4321
+ dn: uid=sss,dc=example,dc=com
+ cn: Steve Smith
+ cn: Steve S. Smith
+ sn: Smith
+ sn;lang-en: Smith
+ sn;lang-de: Schmidt
+ telephoneNumber: 1 555 765-4321
.fi
.LP
The command:
@@ -401,7 +401,7 @@ a diagnostic message being written to standard error.
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1
index 20cc26727f95a909f547ad85b2ea8234ec53b74b..03b4eb43caf88939fb41b3714f1df70a59e8dc21 100644
--- a/doc/man/man1/ldapwhoami.1
+++ b/doc/man/man1/ldapwhoami.1
@@ -146,7 +146,7 @@ Issue StartTLS (Transport Layer Security) extended operation. If you use
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/lber-decode.3 b/doc/man/man3/lber-decode.3
index 0494010a43e142963d1313505fd43e48e3e3a11e..3a6275cb7d5f6ef640cc780d56a5d7315818f375 100644
--- a/doc/man/man3/lber-decode.3
+++ b/doc/man/man3/lber-decode.3
@@ -350,7 +350,7 @@ which must be freed by the caller using supplied deallocation routines.
.BR lber-sockbuf (3),
.BR lber-types (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/lber-encode.3 b/doc/man/man3/lber-encode.3
index c9a11150748a606926be585de2232fbc6c6724df..8d08af7e91ef450195cd89d67e6dcc6f6b4a6a87 100644
--- a/doc/man/man3/lber-encode.3
+++ b/doc/man/man3/lber-encode.3
@@ -244,7 +244,7 @@ can be achieved like so:
ber = ber_alloc_t( LBER_USE_DER );
if ( ber == NULL ) {
- /* error */
+ /* error */
}
rc = ber_printf( ber, "{siiiib{v}}", dn, scope, ali,
@@ -269,7 +269,7 @@ The return values for all of these functions are declared in the
.BR lber-sockbuf (3),
.BR lber-types (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/lber-memory.3 b/doc/man/man3/lber-memory.3
index 62aeccc92579a243aa30c40630e574a40a2aedd5..896353b585378f9eb7503fb76c6d61124bed4310 100644
--- a/doc/man/man3/lber-memory.3
+++ b/doc/man/man3/lber-memory.3
@@ -46,7 +46,7 @@ arbitrary dynamically allocated objects.
.BR lber-types (3)
.LP
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/lber-types.3 b/doc/man/man3/lber-types.3
index 2421bc5fa81f1a15b1824ffdad6d85045122ee7e..e5f2340ca3c043bf67faab68aca35629aea3a49a 100644
--- a/doc/man/man3/lber-types.3
+++ b/doc/man/man3/lber-types.3
@@ -164,7 +164,7 @@ does nothing. If \fIfreebuf\fP is zero, the internal buffer is not freed.
.BR lber-memory (3)
.LP
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap.3 b/doc/man/man3/ldap.3
index 3f38547ac7515debdb315d643c5824d1b4cabd70..24b364f1f3eb370cb125bdadbb5aaff6d9b71e6f 100644
--- a/doc/man/man3/ldap.3
+++ b/doc/man/man3/ldap.3
@@ -283,9 +283,9 @@ case insensitive string comparison
.BR slapd (8),
.BR draft-ietf-ldapext-ldap-c-api-xx.txt \ <http://www.ietf.org>
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
.LP
These API manual pages are based upon descriptions provided in the
diff --git a/doc/man/man3/ldap_abandon.3 b/doc/man/man3/ldap_abandon.3
index bc3fe40f10146c10d9c2db000faaf12ec5cbe81e..98f110dd00b45edca1b891878ad1bd37dcc99a41 100644
--- a/doc/man/man3/ldap_abandon.3
+++ b/doc/man/man3/ldap_abandon.3
@@ -62,7 +62,7 @@ for details.
.BR ldap_result (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_add.3 b/doc/man/man3/ldap_add.3
index f65bd5e8a21454c086d91daa4699a258a774fca4..e42cc279a5ca773ea9be6c8c830bead43b34a2d9 100644
--- a/doc/man/man3/ldap_add.3
+++ b/doc/man/man3/ldap_add.3
@@ -84,7 +84,7 @@ also directly return LDAP error codes.
.BR ldap (3),
.BR ldap_modify (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_bind.3 b/doc/man/man3/ldap_bind.3
index 5714b04303cb2d3039375ec1c1964497de5729e7..86dc518822471694cb3eead05cae6d97fbd09433 100644
--- a/doc/man/man3/ldap_bind.3
+++ b/doc/man/man3/ldap_bind.3
@@ -221,7 +221,7 @@ for more information.
.B Cyrus SASL
(http://asg.web.cmu.edu/sasl/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_compare.3 b/doc/man/man3/ldap_compare.3
index 0f0363be8c92ba809a43ac1602a35d0355ae48a6..0e5f231d7ab5f97d08791cb3d8959f0fd3ef7b1e 100644
--- a/doc/man/man3/ldap_compare.3
+++ b/doc/man/man3/ldap_compare.3
@@ -54,7 +54,7 @@ There is no way to compare binary values, but there should be.
.BR ldap (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_delete.3 b/doc/man/man3/ldap_delete.3
index 737507871205132c22bee14a129608e60dd40321..a9352fd3938cc34ee325bf54fe91b65629b6d2c2 100644
--- a/doc/man/man3/ldap_delete.3
+++ b/doc/man/man3/ldap_delete.3
@@ -51,7 +51,7 @@ non-negative message id of the request if things went ok.
.BR ldap (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_error.3 b/doc/man/man3/ldap_error.3
index b86af8422fea1b61fd9f88609a9dd666bc64c543..8e871cb01609955c863cb12c6fb94b7fdc4e504f 100644
--- a/doc/man/man3/ldap_error.3
+++ b/doc/man/man3/ldap_error.3
@@ -205,7 +205,7 @@ library routine.
.BR ldap (3),
.BR perror (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_first_attribute.3 b/doc/man/man3/ldap_first_attribute.3
index cdc18dbf2a4b5809523680779e2a321c9a8ab59d..af7ed34af6232fecb4ca75c9f6362a1a986949f4 100644
--- a/doc/man/man3/ldap_first_attribute.3
+++ b/doc/man/man3/ldap_first_attribute.3
@@ -70,7 +70,7 @@ return dynamically allocated memory that must be freed by the caller via
.BR ldap_get_values (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_first_entry.3 b/doc/man/man3/ldap_first_entry.3
index 884c98d878a897da1052c5bc99336272566cd3d2..f917492943280725c3c803767c355664f16e4bc0 100644
--- a/doc/man/man3/ldap_first_entry.3
+++ b/doc/man/man3/ldap_first_entry.3
@@ -77,7 +77,7 @@ for a description of possible error codes.
.BR ldap_get_values (3),
.BR ldap_get_dn (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_first_message.3 b/doc/man/man3/ldap_first_message.3
index 87e2411a200334da9f2dc80c754be2b83a871380..bda99a1db4facfcc96e9c493908a8b29549970d3 100644
--- a/doc/man/man3/ldap_first_message.3
+++ b/doc/man/man3/ldap_first_message.3
@@ -80,7 +80,7 @@ NULL is returned. If an error occurs in
.BR ldap_first_entry (3),
.BR ldap_first_reference (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_first_reference.3 b/doc/man/man3/ldap_first_reference.3
index f7401391e65fc9e33dcc8a489ab51865ae3f86ef..abfeda8c119785ff8160c72c33cae3ebf450de3f 100644
--- a/doc/man/man3/ldap_first_reference.3
+++ b/doc/man/man3/ldap_first_reference.3
@@ -69,7 +69,7 @@ NULL is returned. If an error occurs in
.BR ldap_search (3),
.BR ldap_parse_reference (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_get_dn.3 b/doc/man/man3/ldap_get_dn.3
index 1b51a6bb286e0492941a14b16dc4c0996e3d0321..70b52606483dce5fa2f0859c89c6f45f1e131499 100644
--- a/doc/man/man3/ldap_get_dn.3
+++ b/doc/man/man3/ldap_get_dn.3
@@ -234,7 +234,7 @@ These routines dynamically allocate memory that the caller must free.
.BR ldap_memfree (3),
.BR ldap_value_free (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_get_values.3 b/doc/man/man3/ldap_get_values.3
index 9aa28fb401ff19a6298d51679953985625ef7bbe..fabf943617f009479bb5ab1e6a9b99cecf32445b 100644
--- a/doc/man/man3/ldap_get_values.3
+++ b/doc/man/man3/ldap_get_values.3
@@ -99,7 +99,7 @@ using the supplied routines.
.BR ldap_first_attribute (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_modify.3 b/doc/man/man3/ldap_modify.3
index d71a93fdc62be07bf563789118af0d8874c5781b..178f3140371718c5a1e18890a8e76ac69d87024b 100644
--- a/doc/man/man3/ldap_modify.3
+++ b/doc/man/man3/ldap_modify.3
@@ -48,8 +48,8 @@ defined below.
int mod_op;
char *mod_type;
union {
- char **modv_strvals;
- struct berval **modv_bvals;
+ char **modv_strvals;
+ struct berval **modv_bvals;
} mod_vals;
struct ldapmod *mod_next;
} LDAPMod;
@@ -116,7 +116,7 @@ field of \fIld\fP.
.BR ldap_error (3),
.BR ldap_add (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_modrdn.3 b/doc/man/man3/ldap_modrdn.3
index 3036dd20769e74bfe5cf7be0098d5eb0597a87cc..f217f26ad29d5a47011187ae52fa37521f444f77 100644
--- a/doc/man/man3/ldap_modrdn.3
+++ b/doc/man/man3/ldap_modrdn.3
@@ -78,7 +78,7 @@ for more details.
.BR ldap (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_open.3 b/doc/man/man3/ldap_open.3
index 01278035cecbb3912220ff16a6f5a4122a0b150e..3d39babfc28714030d8f010d41057cd00c81484b 100644
--- a/doc/man/man3/ldap_open.3
+++ b/doc/man/man3/ldap_open.3
@@ -70,7 +70,7 @@ for more details.
char *ld_matched;
int ld_refhoplimit;
unsigned long ld_options;
- #define LDAP_OPT_REFERRALS 0x00000002 /* set by default */
+ #define LDAP_OPT_REFERRALS 0x00000002 /* set by default */
#define LDAP_OPT_RESTART 0x00000004
/* ... other stuff you should not mess with ... */
} LDAP;
@@ -116,7 +116,7 @@ in the LDAP structure.
.BR ldap_bind (3),
.BR errno (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_parse_reference.3 b/doc/man/man3/ldap_parse_reference.3
index 01723180ae9ab1e99de080e0721dee8c55fdf31e..3c72ca88fe0a9b2a51e20b527101521e83d7cabd 100644
--- a/doc/man/man3/ldap_parse_reference.3
+++ b/doc/man/man3/ldap_parse_reference.3
@@ -13,7 +13,8 @@ OpenLDAP LDAP (libldap, -lldap)
.LP
.ft B
int ldap_parse_reference( LDAP *ld, LDAPMessage *reference,
- char ***referralsp, LDAPControl ***serverctrlsp, int freeit )
+ char ***referralsp, LDAPControl ***serverctrlsp,
+ int freeit )
.SH DESCRIPTION
.LP
The
@@ -57,7 +58,7 @@ Upon success LDAP_SUCCESS is returned. Otherwise the values of the
.BR ldap_get_values (3),
.BR ldap_controls_free (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_parse_result.3 b/doc/man/man3/ldap_parse_result.3
index 471f2f755a4040c3c78252ba36803416b5978052..4c0d0cbc9cc367552145ba65b35b02ece7ae7f4d 100644
--- a/doc/man/man3/ldap_parse_result.3
+++ b/doc/man/man3/ldap_parse_result.3
@@ -14,7 +14,8 @@ OpenLDAP LDAP (libldap, -lldap)
.ft B
int ldap_parse_result( LDAP *ld, LDAPMessage *result,
int *errcodep, char **matcheddnp, char **errmsgp,
- char ***referralsp, LDAPControl ***serverctrlsp, int freeit )
+ char ***referralsp, LDAPControl ***serverctrlsp,
+ int freeit )
.LP
.ft B
int ldap_parse_sasl_bind_result( LDAP *ld, LDAPMessage *result,
@@ -102,7 +103,7 @@ result parameters are undefined.
.BR ldap_controls_free (3),
.BR lber-types (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_result.3 b/doc/man/man3/ldap_result.3
index 128d79a551ff24a5f84b9b328afbbaa3f02f43a2..61bbfbee2e89fdc6d984726b35795eec0964ce1a 100644
--- a/doc/man/man3/ldap_result.3
+++ b/doc/man/man3/ldap_result.3
@@ -125,7 +125,7 @@ return -1 on error.
.BR ldap_first_message (3),
.BR select (2)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_schema.3 b/doc/man/man3/ldap_schema.3
index ffa50beb5b02974d037b3eb7171e52315afbb0f3..b7dc7c410b1d8e5452b4fa605467abdc82d9bbea 100644
--- a/doc/man/man3/ldap_schema.3
+++ b/doc/man/man3/ldap_schema.3
@@ -324,8 +324,8 @@ Unexpected end of data.
.SH SEE ALSO
.BR ldap (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_search.3 b/doc/man/man3/ldap_search.3
index 3530b25b6ac4c78c5cd0e9989d24e16bd16a3753..0c9958b965d379658e01dc489875b538e40d92f0 100644
--- a/doc/man/man3/ldap_search.3
+++ b/doc/man/man3/ldap_search.3
@@ -127,7 +127,7 @@ in <ldap.h>.
.BR ldap_getfilter (3),
.BR ldap_error (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man3/ldap_sort.3 b/doc/man/man3/ldap_sort.3
index 8ef18ed1259f972d5bdb4c1d62c9ac0fcee79d0c..3797152eafbfa6a604e92962789afaf44fdb7f3b 100644
--- a/doc/man/man3/ldap_sort.3
+++ b/doc/man/man3/ldap_sort.3
@@ -77,10 +77,14 @@ For example:
LDAP *ld;
LDAPMessage *res;
- /* ... call to ldap_search_s(), fill in res, retrieve sn attr ... */
+ /*
+ * ... call to ldap_search_s(), fill in res,
+ * retrieve sn attr ...
+ */
/* now sort the entries on surname attribute */
- if ( ldap_sort_entries( ld, &res, "sn", ldap_sort_strcasecmp ) != 0 )
+ if ( ldap_sort_entries( ld, &res, "sn",
+ ldap_sort_strcasecmp ) != 0 )
ldap_perror( ld, "ldap_sort_entries" );
.ft
.fi
@@ -106,7 +110,7 @@ deallocation routines.
.BR ldap_result (3),
.BR qsort (3)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 64078fbfdfa920758b2aed33dcd76658c0b1eb1e..6ec30bfe988969ec94324897f949a88130e372ed 100644
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -278,7 +278,7 @@ local ldap configuration file
.SH AUTHOR
Kurt Zeilenga, The OpenLDAP Project
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
index 5b0c9e07df0da2b349045f8faaef08b588a4d46a..d47ecdb419a1fbb426c50a9581c484b64b4742df 100644
--- a/doc/man/man5/ldif.5
+++ b/doc/man/man5/ldif.5
@@ -16,12 +16,12 @@ The basic form of an LDIF entry is:
.LP
.nf
.ft tt
- dn: <distinguished name>
- <attrdesc>: <attrvalue>
- <attrdesc>: <attrvalue>
- <attrdesc>:: <base64-encoded-value>
- <attrdesc>:< <URL>
- ...
+ dn: <distinguished name>
+ <attrdesc>: <attrvalue>
+ <attrdesc>: <attrvalue>
+ <attrdesc>:: <base64-encoded-value>
+ <attrdesc>:< <URL>
+ ...
.ft
.fi
.LP
@@ -33,8 +33,8 @@ or tab, e.g.,
.LP
.nf
.ft tt
- dn: cn=Barbara J Jensen,dc=exam
- ple,dc=com
+ dn: cn=Barbara J Jensen,dc=exam
+ ple,dc=com
.ft
.fi
.LP
@@ -44,8 +44,8 @@ Multiple attribute values are specified on separate lines, e.g.,
.LP
.nf
.ft tt
- cn: Barbara J Jensen
- cn: Babs Jensen
+ cn: Barbara J Jensen
+ cn: Babs Jensen
.ft
.fi
.LP
@@ -56,7 +56,7 @@ the value " begins with a space" would be encoded like this:
.LP
.nf
.ft tt
- cn:: IGJlZ2lucyB3aXRoIGEgc3BhY2U=
+ cn:: IGJlZ2lucyB3aXRoIGEgc3BhY2U=
.ft
.fi
.LP
@@ -66,7 +66,7 @@ in the file /tmp/value would be listed like this:
.LP
.nf
.ft tt
- cn:< file:///tmp/value
+ cn:< file:///tmp/value
.ft
.fi
Other URI schemes (ftp,http) may be supported as well.
@@ -78,28 +78,28 @@ Here is an example of an LDIF file containing three entries.
.LP
.nf
.ft tt
- dn: cn=Barbara J Jensen,dc=example,dc=com
- cn: Barbara J Jensen
- cn: Babs Jensen
- objectclass: person
- description:< file://tmp/babs
- sn: Jensen
+ dn: cn=Barbara J Jensen,dc=example,dc=com
+ cn: Barbara J Jensen
+ cn: Babs Jensen
+ objectclass: person
+ description:< file://tmp/babs
+ sn: Jensen
- dn: cn=Bjorn J Jensen,dc=example,dc=com
- cn: Bjorn J Jensen
- cn: Bjorn Jensen
- objectclass: person
- sn: Jensen
+ dn: cn=Bjorn J Jensen,dc=example,dc=com
+ cn: Bjorn J Jensen
+ cn: Bjorn Jensen
+ objectclass: person
+ sn: Jensen
- dn: cn=Jennifer J Jensen,dc=example,dc=com
- cn: Jennifer J Jensen
- cn: Jennifer Jensen
- objectclass: person
- sn: Jensen
- jpegPhoto:: /9j/4AAQSkZJRgABAAAAAQABAAD/2wBDABALD
- A4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkzODdASFxOQ
- ERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVG
- ...
+ dn: cn=Jennifer J Jensen,dc=example,dc=com
+ cn: Jennifer J Jensen
+ cn: Jennifer Jensen
+ objectclass: person
+ sn: Jensen
+ jpegPhoto:: /9j/4AAQSkZJRgABAAAAAQABAAD/2wBDABALD
+ A4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkzODdASFxOQ
+ ERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVG
+ ...
.ft
.fi
.LP
@@ -113,7 +113,7 @@ Jensen's entry is encoded using base 64.
.LP
"LDAP Data Interchange Format," Good, G., RFC 2849.
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index 9dcb1affb82e2cd9db363b735a166b3b9f40b6d3..e05ddb835dd4efa0f75a5c383a2ccbfd40a6ba89 100644
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -712,7 +712,7 @@ returned is less than <max_entries>. Consistency check is performed every
"time to live(\fBTTL\fP)" are removed. A sample cache configuration is:
.LP
.RS
-cacheparams \fB10000 150000 1 50 100\fP
+cacheparams \fB10000 150000 1 50 100\fP
.RE
.TP
.B attrset <index> <attrs...>
@@ -730,7 +730,7 @@ The following adds a template with filter string (&sn=)(givenName=)) and attribu
.LP
.RS
.nf
-attrset \fB0 mail postaladdress telephonenumber\fP
+attrset \fB0 mail postaladdress telephonenumber\fP
addtemplate \fB(&(sn=)(givenName=)) 0 3600\fP
.fi
.RE
diff --git a/doc/man/man5/slapd-monitor.5 b/doc/man/man5/slapd-monitor.5
index 76259c5ab604b59bef2dd786e1892c7681c8f489..faa85348da62ef322095848473e7221436fb489e 100644
--- a/doc/man/man5/slapd-monitor.5
+++ b/doc/man/man5/slapd-monitor.5
@@ -42,7 +42,7 @@ directive.
.LP
The following directives can be used:
.TP
-.B l <locality>
+.B l <locality>
The
.B <locality>
string is added to the "\fIcn=Monitor\fP" entry as value of the
@@ -69,7 +69,7 @@ file:
.LP
.RS
.nf
-database monitor
+database monitor
.fi
.RE
.TP
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 3f6755672dcd158c3693faadd714139febcc64e0..e2f625facc32aa2b2bb7cb45ed838b20bfada625 100644
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -35,7 +35,7 @@ is as follows:
# comment - these options apply to every database
<global configuration options>
# first database definition & configuration options
- database <backend 1 type>
+ database <backend 1 type>
<configuration options specific to backend 1>
# subsequent database definitions & configuration options
...
@@ -1230,7 +1230,7 @@ default slapd configuration file
.LP
"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man5/slapd.replog.5 b/doc/man/man5/slapd.replog.5
index 668132afae0d411209d1e1980dfb201613acabed..cb7df69367d4e32dbe0007d182e97bebcab7104b 100644
--- a/doc/man/man5/slapd.replog.5
+++ b/doc/man/man5/slapd.replog.5
@@ -164,7 +164,7 @@ lockfile for slapd.replog
.BR slapd (8),
.BR slurpd (8)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 9ffba940ec8307184484d2aad0dd6b636677d972..6bc17bac58531fe85d46ccf5be8fa121bea9e8eb 100644
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -105,7 +105,7 @@ database give the command:
.LP
"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man8/slapcat.8 b/doc/man/man8/slapcat.8
index 26b51715eed28ead2edbe232f93c693b40bd3ea0..e53faf497cc4022c2d6759ef7aebe8d6b61743b1 100644
--- a/doc/man/man8/slapcat.8
+++ b/doc/man/man8/slapcat.8
@@ -99,7 +99,7 @@ give the command:
.LP
"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index fd2df48272d0898da64d280a4ad7d85cd4137c41..3b59b39a11b926ddb8a9a1d45420443199d5d42e 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -211,7 +211,7 @@ To test whether the configuration file is correct or not, type:
.SH BUGS
See http://www.openldap.org/its/
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man8/slapindex.8 b/doc/man/man8/slapindex.8
index 1434391e340d5238c830efc1e7ed72d184205b93..43d967f5115bf5d3bdb4d3381a0b6e260f4a1884 100644
--- a/doc/man/man8/slapindex.8
+++ b/doc/man/man8/slapindex.8
@@ -79,7 +79,7 @@ To reindex your SLAPD database, give the command:
.LP
"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
diff --git a/doc/man/man8/slurpd.8 b/doc/man/man8/slurpd.8
index 8d855155247e8574a2a78c0ae4e7c59e835516b0..255b44c17b4a9a050611af2f85666eb86ffa3e77 100644
--- a/doc/man/man8/slurpd.8
+++ b/doc/man/man8/slurpd.8
@@ -166,7 +166,7 @@ on voluminous debugging which will be printed on standard error, type:
.LP
"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
.SH ACKNOWLEDGEMENTS
-.B OpenLDAP
+.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B OpenLDAP
+.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.