From b1cbc23d82cfca1179d6be1e11b8bea2d0acdc9e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 19 Feb 2002 16:59:27 +0000
Subject: merge from 2.2 and regenerate

---
 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 0c6625e6f92..0813448f2cb 100644
--- a/docs/Samba-HOWTO-Collection.pdf
+++ b/docs/Samba-HOWTO-Collection.pdf
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20020202060013Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20020219164220Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -1812,10 +1812,8 @@ x
 †d$­a; Ñp‚O¿4ããÜÿòn¦óTÆCl.½ nÿùÂ1-ÖÈh:™SZÄåî-¢n8&}ÒÙZm
 £²½‰t%h§Ü–þøüøånñ½3 ÞÖqeôW.3^¤ÈoNéŒMûÏc
 Ã*Zo8ãMM*‹’"–d‹<×ÆÑZr[|s¬Ç(ÒEæH¯¾ËÈÁ–DvŠ+ƒ_µ9•æ?iîi­ŒuˆœØ‡Ï/dà¬ôØh+SËD’Ód‘Ç·ö<[:zªÄÿ1ñ) „7£µ»¡jyâ—»Q^å]GéKõ5Ib‘÷«ÐýXx—¯rïî€0çÑÏ*8÷Ò­
-@í-\_À\´6´¸‚2ŒP™%·Ó$œ3jU8iy?Ø®ÑÜmU´¥X¢¸˜Š\g¤‘±¡¾6 2Èm¡âÛ“'RûÖ*“13ÚJ8Ò+ÀVÎ`?¾@ìm¬lžˆÃ«Håõ8ðD Èg“Kcuv%$u<UÕé5Ç·’ÒB[Éš­¸…ÎJBÇØÏsxTÜwJH=4z)¸›jÉéŒZP3ËîÂ²É-»’©5	ô|/Ð;1­Ì„(·¼«+Àb}×}I§§¾l¤~Ãµ÷ÐH#“2Fîéf?ÿr¨–4XŽ?™î5ÊÁUsž|,½È"¦ÃËmy‚À¤ÖtÐíÿŠÙãG«äŸçOÃÑ`®^_Þ–wžÀP ¶MËEN2ejn(#ÀÃ>O£¸Ç
-›Vò–ÅQ%ÎÄ¹­peÊ)²:eÑÇ*’–ÐôåwÕ”jôDaåºH’S»Û{ÿ/oâv¨+ò3y­“Dïøl‘{‘æ‰¼/É¡Ìua 3K©ÀÁá>ž
-Q"¬…É²ËÓ!×ÖªUràÔÞŸ­ ÞNí7A„¥L’åÝõÖ£_1X«¡¨z‚›f[Aœ·-K '÷þH+“G‡ÉwoÔhžZùêÛF:Tžï2‘.»Z•bÈžZ•r#íýÑkÝ%<¼èò¸v»ùÎ¨øªc¬5}62mj‡£×¹À´°Lo“ã-LXiQ1‚®1
-”V’9Æ5U6W×"]áâç˜è©øÊlócfQÖ¨úº·TrÄ¯£*hyŸîm—o]s_§³€o‚|:Ý»Þÿ|z¤/F—wžÏ:*xŒ¯Q½jW¯Úöc·´ñlŒ©^ÞÓ¦CFþÝù { áendstream
+@í-\_À\´6´¸‚2ŒP™%·Ó$œ3jU8iy?Ø®ÑÜmU´¥X¢¸˜Š\g¤‘±¡¾6 2Èm¡âÛ“'RûÖ*“13ÚJ8Ò+ÀVÎ`?¾@ìm¬lžˆÃ«Håõ8ðD Èg“Kcuv%$u<¡:ÒkŽn%¥d¶’5Wq›•„Š!¯Ÿgð¨·î“zhóRn77ÔÓ± f–ýÛ…e“Zv#$S+Øù^ sbZ˜Q$nyWW€Äê®»’NO+|ÙFý†kï¡‘F&eŒ0ÜÑÍnþåP-a°2Ýk„ÿ‚«æ4ùXz‘E:M%F—ÛòI­é Ú	þ“Ç<VÉ?ÏŸ†£Á\½¾¼-ï<- @l›–‹œdÊ6´ÜPF€‡}žq6­Æãæ+‹£Jœ‰s[áÊ”SŒ	duÊ¢U$-¡åËïª+(Õè‰ÂÊu‘$§f·÷(þ_ÞÄíPWä'òZ'‰ÞñÉ"÷"Íy_“C7)˜êÂ@f–R‚Ã}<¢DX“e—gC®­U«äÀÿ¨½?=ZA½Úÿn4‚K;™$Ë»ë­G/¾b°VCQ;õ7Í¶:‚8m[–@OîýV&“ïÞ¨Ñ<µ<òÕ·t¨<ße"]v/´*;Äˆ=µ*åFÚû£×ºKx2xÑåqív%òQñUÇXk8>úldÚÔ:G¯s	h1^™Þ&<Ä[˜ ±Ò¢b]c(­$s:‹kª>l® ¯EºÂÄÏ1ÑSñ•ÙæÇÌ¢¬Qõuo©äˆ_=FUÐò67 ÜÚ.ß¹æþ¶Ngßùútºu½=þùôH_Œ.o<ŸuTð9^¢zÕ®^µíÇîhãÙS½¼¥M‡Œ2ü»ó? 
+endstream
 endobj
 822 0 obj
 1030
@@ -3351,7 +3349,7 @@ xref
 0000233521 00000 n 
 0000233616 00000 n 
 trailer
-<</Size 1035/Root 1034 0 R/Info 1 0 R/ID[<ac5ef860b16b55585a372299929b2521><ac5ef860b16b55585a372299929b2521>]>>
+<</Size 1035/Root 1034 0 R/Info 1 0 R/ID[<1fdb3822c43f6894895c14dbdc738b7a><1fdb3822c43f6894895c14dbdc738b7a>]>>
 startxref
 233831
 %%EOF
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index aabc052055b..21d2c55ec7a 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -224,7 +224,7 @@ Next, include the <filename>samba.schema</filename> file in <filename>slapd.conf
 The sambaAccount object contains two attributes which depend upon other schema
 files.  The 'uid' attribute is defined in <filename>cosine.schema</filename> and
 the 'displayName' attribute is defined in the <filename>inetorgperson.schema</filename>
-file.  Bother of these must be included before the <filename>samba.schema</filename> file.
+file.  Both of these must be included before the <filename>samba.schema</filename> file.
 </para>
 
 <para><programlisting>
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 50d9dea7e30..7366e3ccd94 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 <TT
 CLASS="FILENAME"
 >inetorgperson.schema</TT
 >
-file.  Bother of these must be included before the <TT
+file.  Both of these must be included before the <TT
 CLASS="FILENAME"
 >samba.schema</TT
 > file.</P
diff --git a/docs/htmldocs/Samba-LDAP-HOWTO.html b/docs/htmldocs/Samba-LDAP-HOWTO.html
index 30bd21520af..3fb4e1df096 100644
--- a/docs/htmldocs/Samba-LDAP-HOWTO.html
+++ b/docs/htmldocs/Samba-LDAP-HOWTO.html
@@ -336,7 +336,7 @@ the 'displayName' attribute is defined in the <TT
 CLASS="FILENAME"
 >inetorgperson.schema</TT
 >
-file.  Bother of these must be included before the <TT
+file.  Both of these must be included before the <TT
 CLASS="FILENAME"
 >samba.schema</TT
 > file.</P
-- 
cgit