From 6bd2af90cb62d5090b8a73fa19d043e892e8e7c3 Mon Sep 17 00:00:00 2001
From: Gerald Carter
Date: Tue, 19 Feb 2002 16:59:27 +0000
Subject: merge from 2.2 and regenerate (This used to be commit
b1cbc23d82cfca1179d6be1e11b8bea2d0acdc9e)
---
docs/Samba-HOWTO-Collection.pdf | 10 ++++------
docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml | 2 +-
docs/htmldocs/Samba-HOWTO-Collection.html | 2 +-
docs/htmldocs/Samba-LDAP-HOWTO.html | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 0c6625e6f9..0813448f2c 100644
--- a/docs/Samba-HOWTO-Collection.pdf
+++ b/docs/Samba-HOWTO-Collection.pdf
@@ -1,6 +1,6 @@
%PDF-1.2
%
-1 0 obj<>endobj
+1 0 obj<>endobj
2 0 obj<>endobj
3 0 obj<>endobj
4 0 obj<>endobj
@@ -1812,10 +1812,8 @@ x
d$a;pO4nTCl. n1-h:SZ-n8&}Zm
t%hܖn3qeW.3^oNMc
*Zo8MM*"dO
-VQ%Ĺpe):e*wjDaHS{/ov+3yDl{扼/ɡua 3K>
-Q"ɲ!֪UrޟN7AL֣_1Xzf[A-K'H+GwohZF:T2.ZbȞZr#k%<vΨc5}62mjLo-LXiQ11
-V95U6W"]lcfQ֨Trį*hymo]s_o|:ݻ|z/Fw:*xQjWcl^ӦCF { endstream
+@-\_\62P%$3jU8iy?خmUX\g62mۓ'R*13J8+V`?@mlëH8D gKcuv%$u<:kn%d5Wq!gzhRn77 fۅeZv#$S+^sbZQ$nyWWꮻNO+|FkF&e0nP-a2k4XzE:M%FI ld:Gs h1^&<[ Ңb]c($s:k>l E1S̢Quo_=FU67 .߹Ngtu=H_.o]>>
+<<1fdb3822c43f6894895c14dbdc738b7a>]>>
startxref
233831
%%EOF
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index aabc052055..21d2c55ec7 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -224,7 +224,7 @@ Next, include the samba.schema file in slapd.conf
The sambaAccount object contains two attributes which depend upon other schema
files. The 'uid' attribute is defined in cosine.schema and
the 'displayName' attribute is defined in the inetorgperson.schema
-file. Bother of these must be included before the samba.schema file.
+file. Both of these must be included before the samba.schema file.
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 50d9dea7e3..7366e3ccd9 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -8530,7 +8530,7 @@ the 'displayName' attribute is defined in the inetorgperson.schema
-file. Bother of these must be included before the samba.schema file.
inetorgperson.schema
-file. Bother of these must be included before the samba.schema file.