merge from 2.2 and regenerate

diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 0c6625e6f9201f39b244fef0d464839113944cd8..0813448f2cbec794a5a9ae9db4c5d9aace2aea47 100644 (file)
--- 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\ 1
 \86d$­a; Ñp\82O¿4\19\ 6ãã\12Ü\a\ 3ÿòn¦ó\a\18TÆCl.½ nÿù\81Â1-ÖÈh:\99\ 4SZÄåî\ 1-¢n8\b&\ 1}ÒÙZm
 £²\r½\89t%h§Ü\96þøüøånñ½3 Þ\bÖqe\1d\ 6ôW.3^¤Èo\14Né\8cMûÏc
 Ã*Zo8ãM\vM*\8b\92"\96d\8b<×ÆÑZ\er[|s¬Ç(ÒEæH¯¾ËÈÁ\96Dv\8a\10+\83_µ9\90\95æ?iîi­\8cu\88\9c\1fØ\87Ï/dà\10¬ô\18Øh+S\ 1ËD\92Ód\13\91Ç·ö<[:z\ eªÄ\ 1ÿ1ñ) \847£µ»¡jyâ\97»Q^å]GéK\17õ5\10Ib\91÷«Ðý\8fXx\97¯rïî\8f\800\bçÑÏ*8÷Ò­
-\ 2@í-\_À\´6\ 4´¸\822\8c\9dP\99%·Ó$\9c3jU8iy?Ø®ÑÜmU´¥X¢¸\98\8a\g¤\91±¡\ 6¾6 2Èm¡âÛ\93'R\16ûÖ*\9313ÚJ8Ò\16+\1eÀVÎ`?¾@ìm¬l\9e\88ëHåõ8\17ðD Èg\93Kcuv%$\v\ 5u<UÕé5Ç·\92Ò\ 2B[É\9a­¸\85ÎJBÇ\10ØÏsxTÜ\ 3wJH=4z)¸\9b\ejÉé\8cZP3\fË\ eî²É\ 2-»\11\92©5   ô\8d|/Ð;1­\ eÌ\84(\12·¼«+À\10b}×}I§§\15¾l¤~õ÷ÐH#\932F\18îéf?ÿr¨\964X\8e?\99î5Ê\7fÁUs\9e|,½È"\9d¦\12ÃËm\ 1y\82À¤ÖtÐ\ 5í\ 4ÿ\8aÙãG\1e«ä\9fçOÃÑ`\ 6®^_Þ\96w\9eÀ\16P ¶MËEN2e\ejn(#ÀÃ>O£¸Ç
-\9bV\ 3ò\ 5\13\96ÅQ%ÎĹ­peÊ)\ 6\ 2\ f\ 5²:eÑÇ*\92\96ÐôåwÕ\15\94jôDaåºH\92S»Û{\14ÿ/oâv¨+ò3y­\93Dïøl\91{\91æ\89¼/\81É¡\e\f\15Ìua 3K©À\11Áá>\9e
-Q"¬\85ɲËÓ!×ÖªUrà\7fÔÞ\9f\1f­ ÞNí\7f7\1aA\84¥\9dL\92åÝõÖ£\17_1X«¡¨\9dz\ 1\82\9bf[\1d\8fA\9c·-K '÷þH+\93G\87ÉwoÔh\9eZ\1eùêÛF:T\9eï2\91.»\17Z\95\1dbÈ\9eZ\95r#íýÑkÝ%<\19¼èò¸v»\12ùΨøªc¬5\1c\1f}62mj\9d\87£×¹À\ 4´\18°Lo\93\ e\1eã-L\90XiQ1\82®1
-\94V\929\9dÆ5U\1f6W\90\ 2\81×"]á\10âç\98è©øÊlócfQÖ¨úº·Trį\1e£*hy\9f\e\10îm\97o]s\7f_\b§³\80o\82|\81:Ý»Þ\1eÿ|z¤/F\97w\9eÏ:*x\8c\1c¯Q½jW¯Úöc·´ñl\8c©^ÞÓ¦CF\ f\19þÝù\1f\0{ áendstream
+\ 2@í-\_À\´6\ 4´¸\822\8c\9dP\99%·Ó$\9c3jU8iy?Ø®ÑÜmU´¥X¢¸\98\8a\g¤\91±¡\ 6¾6 2Èm¡âÛ\93'R\16ûÖ*\9313ÚJ8Ò\16+\1eÀVÎ`?¾@ìm¬l\9e\88ëHåõ8\17ðD Èg\93Kcuv%$\v\ 5u<¡:Òk\8en%¥\ 5d¶\925Wq\v\9b\95\84\8a!¯\9fgð¨·\aî\93\90zhóRn77Ô\12Ó\19± f\18\96ýÛ\85e\93\ 3Zv#$S+\12Ø\eù^ sbZ\1d\98\aQ$nyWW\80\11Äê®»\92NO+|ÙFý\86kï¡\91F&e\8c0ÜÑÍnþåP-a°\18\7f2Ýk\84ÿ\82«æ4ùXz\91E:M%F\97Û\ 2ò\ 4\81I­é \vÚ       þ\15\93Ç\ f<VÉ?Ï\9f\86£Á\f\½¾¼-ï<\81- @l\9b\96\8b\9cdÊ6´ÜPF\80\87}\9e\ 6q\8f\156­Æã\væ+\8b£J\9c\89s[áÊ\94S\8c\ 3\1e     duÊ¢\8fU$-¡åËïª+(Õè\89ÂÊu\91$§f·÷(þ_ÞÄíPWä'òZ'\89ÞñÉ"÷"Í\13y_\ 2\93C7\18)\98êÂ@f\96R\81\ 3\82Ã}<\13¢DX\v\93e\97gC®­U«äÀÿ¨½?=ZA½\9dÚÿn4\82\bK;\99$Ë»ë­G/¾b°VCQ;õ\ 2\ 47Ͷ:\1e\828m[\96@Oîý\81V&\8f\ e\93ïÞ¨Ñ<µ<òÕ·\8dt¨<ße"]v/´*;Ä\88=µ*åFÚû£×ºKx2xÑåqív%ò\9dQñUÇXk8>úldÚÔ:\ fG¯s\81 h1^\99Þ&\1d<Ä[\98 ±Ò¢b\ 4]c\14(­$s:\8bkª>l® \ 5\ 2¯EºÂ\11ÄÏ1ÑSñ\95ÙæÇÌ¢¬Qõuo©ä\88_=FUÐò67 ÜÚ.ß¹æþ¶\10Ng\ 1ß\ 3ùútºu½=þùôH_\8c.o<\9fuTð\189^¢zÕ®^µíÇîhãÙ\18S½¼¥M\87\8c\1e2ü»ó?\19\9d 
+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 aabc052055b23cd439b8938f0dbbd6f0350b2c1e..21d2c55ec7ab9ee5d0996ff2c33dddc8984f38ef 100644 (file)
--- 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 50d9dea7e300cd0aec7b5b4e8fba06c132964aed..7366e3ccd944835ad3ad4623c0493f5ff32ce4fa 100644 (file)
--- 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 30bd21520afd5f2ec4ae123532028d74939e3d30..3fb4e1df096e24eb42fa9a7161c5ce4a393fed15 100644 (file)
--- 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