42 files changed, 3107 insertions, 1357 deletions
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 2d9a2009ac3..e9e530034f5 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:20020401145915Z)/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:20020508150805Z)/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
@@ -403,33 +403,33 @@
 283 0 obj[282 0 R
 ]endobj
 284 0 obj<</S/URI/URI(http://samba.org/)>>endobj
-285 0 obj<</Subtype/Link/Rect[196.9 385.4 308.1 398.4]/Border[0 0 0]/A 284 0 R>>endobj
+285 0 obj<</Subtype/Link/Rect[196.9 345.8 308.1 358.8]/Border[0 0 0]/A 284 0 R>>endobj
 286 0 obj[285 0 R
 ]endobj
 287 0 obj<</S/URI/URI(winbindd.8.html)>>endobj
-288 0 obj<</Subtype/Link/Rect[311.8 208.2 366.1 221.2]/Border[0 0 0]/A 287 0 R>>endobj
+288 0 obj<</Subtype/Link/Rect[311.8 142.2 366.1 155.2]/Border[0 0 0]/A 287 0 R>>endobj
 289 0 obj<</S/URI/URI(#WINBINDSEPARATOR)>>endobj
-290 0 obj<</Subtype/Link/Rect[100.0 137.2 191.8 148.2]/Border[0 0 0]/A 289 0 R>>endobj
-291 0 obj<</S/URI/URI(#WINBINDUID)>>endobj
-292 0 obj<</Subtype/Link/Rect[100.0 115.6 159.4 126.6]/Border[0 0 0]/A 291 0 R>>endobj
-293 0 obj<</S/URI/URI(#WINBINDGID)>>endobj
-294 0 obj<</Subtype/Link/Rect[100.0 94.0 159.4 105.0]/Border[0 0 0]/A 293 0 R>>endobj
-295 0 obj<</S/URI/URI(#WINBINDENUMUSERS)>>endobj
-296 0 obj<</Subtype/Link/Rect[100.0 72.4 197.2 83.4]/Border[0 0 0]/A 295 0 R>>endobj
-297 0 obj<</S/URI/URI(#WINBINDENUMGROUP)>>endobj
-298 0 obj<</Subtype/Link/Rect[100.0 61.6 202.6 72.6]/Border[0 0 0]/A 297 0 R>>endobj
-299 0 obj[288 0 R
+290 0 obj<</Subtype/Link/Rect[100.0 71.2 191.8 82.2]/Border[0 0 0]/A 289 0 R>>endobj
+291 0 obj[288 0 R
 290 0 R
-292 0 R
-294 0 R
-296 0 R
-298 0 R
 ]endobj
+292 0 obj<</S/URI/URI(#WINBINDUID)>>endobj
+293 0 obj<</Subtype/Link/Rect[100.0 722.0 159.4 733.0]/Border[0 0 0]/A 292 0 R>>endobj
+294 0 obj<</S/URI/URI(#WINBINDGID)>>endobj
+295 0 obj<</Subtype/Link/Rect[100.0 700.4 159.4 711.4]/Border[0 0 0]/A 294 0 R>>endobj
+296 0 obj<</S/URI/URI(#WINBINDENUMUSERS)>>endobj
+297 0 obj<</Subtype/Link/Rect[100.0 678.8 197.2 689.8]/Border[0 0 0]/A 296 0 R>>endobj
+298 0 obj<</S/URI/URI(#WINBINDENUMGROUP)>>endobj
+299 0 obj<</Subtype/Link/Rect[100.0 668.0 202.6 679.0]/Border[0 0 0]/A 298 0 R>>endobj
 300 0 obj<</S/URI/URI(#TEMPLATEHOMEDIR)>>endobj
-301 0 obj<</Subtype/Link/Rect[100.0 711.2 186.4 722.2]/Border[0 0 0]/A 300 0 R>>endobj
+301 0 obj<</Subtype/Link/Rect[100.0 646.4 186.4 657.4]/Border[0 0 0]/A 300 0 R>>endobj
 302 0 obj<</S/URI/URI(#TEMPLATESHELL)>>endobj
-303 0 obj<</Subtype/Link/Rect[100.0 700.4 175.6 711.4]/Border[0 0 0]/A 302 0 R>>endobj
-304 0 obj[301 0 R
+303 0 obj<</Subtype/Link/Rect[100.0 635.6 175.6 646.6]/Border[0 0 0]/A 302 0 R>>endobj
+304 0 obj[293 0 R
+295 0 R
+297 0 R
+299 0 R
+301 0 R
 303 0 R
 ]endobj
 305 0 obj<</S/URI/URI(http://carol.wins.uva.nl/~leeuw/samba/warp.html)>>endobj
@@ -677,11 +677,11 @@
 449 0 obj<</Subtype/Link/Rect[108.0 248.4 274.8 261.4]/Border[0 0 0]/Dest[846 0 R/XYZ null 673 0]>>endobj
 450 0 obj<</Subtype/Link/Rect[108.0 235.2 208.5 248.2]/Border[0 0 0]/Dest[846 0 R/XYZ null 483 0]>>endobj
 451 0 obj<</Subtype/Link/Rect[108.0 222.0 265.4 235.0]/Border[0 0 0]/Dest[846 0 R/XYZ null 332 0]>>endobj
-452 0 obj<</Subtype/Link/Rect[108.0 208.8 195.4 221.8]/Border[0 0 0]/Dest[846 0 R/XYZ null 221 0]>>endobj
-453 0 obj<</Subtype/Link/Rect[108.0 195.6 202.1 208.6]/Border[0 0 0]/Dest[849 0 R/XYZ null 581 0]>>endobj
-454 0 obj<</Subtype/Link/Rect[108.0 182.4 226.6 195.4]/Border[0 0 0]/Dest[849 0 R/XYZ null 298 0]>>endobj
-455 0 obj<</Subtype/Link/Rect[108.0 169.2 183.5 182.2]/Border[0 0 0]/Dest[864 0 R/XYZ null 355 0]>>endobj
-456 0 obj<</Subtype/Link/Rect[108.0 156.0 182.9 169.0]/Border[0 0 0]/Dest[867 0 R/XYZ null 768 0]>>endobj
+452 0 obj<</Subtype/Link/Rect[108.0 208.8 195.4 221.8]/Border[0 0 0]/Dest[846 0 R/XYZ null 181 0]>>endobj
+453 0 obj<</Subtype/Link/Rect[108.0 195.6 202.1 208.6]/Border[0 0 0]/Dest[849 0 R/XYZ null 541 0]>>endobj
+454 0 obj<</Subtype/Link/Rect[108.0 182.4 226.6 195.4]/Border[0 0 0]/Dest[849 0 R/XYZ null 258 0]>>endobj
+455 0 obj<</Subtype/Link/Rect[108.0 169.2 183.5 182.2]/Border[0 0 0]/Dest[864 0 R/XYZ null 278 0]>>endobj
+456 0 obj<</Subtype/Link/Rect[108.0 156.0 182.9 169.0]/Border[0 0 0]/Dest[867 0 R/XYZ null 726 0]>>endobj
 457 0 obj<</Subtype/Link/Rect[72.0 129.6 228.8 142.6]/Border[0 0 0]/Dest[870 0 R/XYZ null 798 0]>>endobj
 458 0 obj<</Subtype/Link/Rect[108.0 116.4 159.0 129.4]/Border[0 0 0]/Dest[870 0 R/XYZ null 730 0]>>endobj
 459 0 obj<</Subtype/Link/Rect[108.0 103.2 499.0 116.2]/Border[0 0 0]/Dest[870 0 R/XYZ null 700 0]>>endobj
@@ -749,7 +749,7 @@
 ]endobj
 471 0 obj<</Dests 472 0 R>>endobj
 472 0 obj<</Kids[473 0 R]>>endobj
-473 0 obj<</Limits[(aen1056)(winbind)]/Names[(aen1056)474 0 R(aen1061)475 0 R(aen1094)476 0 R(aen1100)477 0 R(aen1139)478 0 R(aen1182)479 0 R(aen119)480 0 R(aen1201)481 0 R(aen1236)482 0 R(aen1245)483 0 R(aen1260)484 0 R(aen1308)485 0 R(aen135)486 0 R(aen1352)487 0 R(aen144)488 0 R(aen1466)489 0 R(aen1492)490 0 R(aen1511)491 0 R(aen1519)492 0 R(aen1527)493 0 R(aen1535)494 0 R(aen1542)495 0 R(aen1578)496 0 R(aen1591)497 0 R(aen1594)498 0 R(aen160)499 0 R(aen1604)500 0 R(aen1640)501 0 R(aen1644)502 0 R(aen1652)503 0 R(aen1655)504 0 R(aen1658)505 0 R(aen1661)506 0 R(aen1665)507 0 R(aen1681)508 0 R(aen1702)509 0 R(aen1722)510 0 R(aen174)511 0 R(aen1751)512 0 R(aen1756)513 0 R(aen1768)514 0 R(aen1770)515 0 R(aen1787)516 0 R(aen179)517 0 R(aen1815)518 0 R(aen1820)519 0 R(aen183)520 0 R(aen1840)521 0 R(aen186)522 0 R(aen1910)523 0 R(aen1918)524 0 R(aen1947)525 0 R(aen195)526 0 R(aen1951)527 0 R(aen1964)528 0 R(aen1971)529 0 R(aen1975)530 0 R(aen1980)531 0 R(aen1984)532 0 R(aen199)533 0 R(aen20)534 0 R(aen2000)535 0 R(aen2008)536 0 R(aen2012)537 0 R(aen2015)538 0 R(aen2020)539 0 R(aen2033)540 0 R(aen2047)541 0 R(aen2058)542 0 R(aen2077)543 0 R(aen209)544 0 R(aen2102)545 0 R(aen2118)546 0 R(aen212)547 0 R(aen2129)548 0 R(aen2165)549 0 R(aen2187)550 0 R(aen2234)551 0 R(aen2244)552 0 R(aen2258)553 0 R(aen226)554 0 R(aen2260)555 0 R(aen2275)556 0 R(aen2284)557 0 R(aen2288)558 0 R(aen2304)559 0 R(aen2309)560 0 R(aen2312)561 0 R(aen2317)562 0 R(aen2345)563 0 R(aen248)564 0 R(aen264)565 0 R(aen28)566 0 R(aen280)567 0 R(aen291)568 0 R(aen299)569 0 R(aen311)570 0 R(aen323)571 0 R(aen328)572 0 R(aen336)573 0 R(aen341)574 0 R(aen344)575 0 R(aen356)576 0 R(aen366)577 0 R(aen394)578 0 R(aen4)579 0 R(aen402)580 0 R(aen419)581 0 R(aen426)582 0 R(aen431)583 0 R(aen436)584 0 R(aen457)585 0 R(aen501)586 0 R(aen508)587 0 R(aen528)588 0 R(aen56)589 0 R(aen563)590 0 R(aen583)591 0 R(aen592)592 0 R(aen60)593 0 R(aen603)594 0 R(aen623)595 0 R(aen638)596 0 R(aen652)597 0 R(aen659)598 0 R(aen681)599 0 R(aen74)600 0 R(aen745)601 0 R(aen766)602 0 R(aen788)603 0 R(aen799)604 0 R(aen8)605 0 R(aen80)606 0 R(aen834)607 0 R(aen851)608 0 R(aen862)609 0 R(aen887)610 0 R(aen895)611 0 R(aen899)612 0 R(aen90)613 0 R(aen909)614 0 R(aen912)615 0 R(aen916)616 0 R(aen938)617 0 R(aen992)618 0 R(body.html)619 0 R(cvs-access)620 0 R(domain-security)621 0 R(install)622 0 R(integrate-ms-networks)623 0 R(migration)624 0 R(msdfs)625 0 R(os2)626 0 R(pam)627 0 R(printing)628 0 R(samba-bdc)629 0 R(samba-ldap-howto)630 0 R(samba-pdc)631 0 R(samba-project-documentation)632 0 R(unix-permissions)633 0 R(winbind)634 0 R]>>endobj
+473 0 obj<</Limits[(aen1056)(winbind)]/Names[(aen1056)474 0 R(aen1061)475 0 R(aen1094)476 0 R(aen1100)477 0 R(aen1139)478 0 R(aen1182)479 0 R(aen119)480 0 R(aen1201)481 0 R(aen1236)482 0 R(aen1245)483 0 R(aen1260)484 0 R(aen1308)485 0 R(aen135)486 0 R(aen1352)487 0 R(aen144)488 0 R(aen1466)489 0 R(aen1492)490 0 R(aen1511)491 0 R(aen1519)492 0 R(aen1527)493 0 R(aen1535)494 0 R(aen1542)495 0 R(aen1578)496 0 R(aen1591)497 0 R(aen1594)498 0 R(aen160)499 0 R(aen1604)500 0 R(aen1640)501 0 R(aen1644)502 0 R(aen1652)503 0 R(aen1655)504 0 R(aen1658)505 0 R(aen1661)506 0 R(aen1665)507 0 R(aen1681)508 0 R(aen1702)509 0 R(aen1722)510 0 R(aen174)511 0 R(aen1751)512 0 R(aen1756)513 0 R(aen1768)514 0 R(aen1770)515 0 R(aen1787)516 0 R(aen179)517 0 R(aen1815)518 0 R(aen1820)519 0 R(aen183)520 0 R(aen1840)521 0 R(aen186)522 0 R(aen1910)523 0 R(aen1918)524 0 R(aen1947)525 0 R(aen195)526 0 R(aen1951)527 0 R(aen1964)528 0 R(aen1971)529 0 R(aen1975)530 0 R(aen1980)531 0 R(aen1984)532 0 R(aen199)533 0 R(aen20)534 0 R(aen2000)535 0 R(aen2008)536 0 R(aen2012)537 0 R(aen2015)538 0 R(aen2022)539 0 R(aen2035)540 0 R(aen2049)541 0 R(aen2060)542 0 R(aen2079)543 0 R(aen209)544 0 R(aen2104)545 0 R(aen212)546 0 R(aen2120)547 0 R(aen2131)548 0 R(aen2167)549 0 R(aen2189)550 0 R(aen2236)551 0 R(aen2246)552 0 R(aen226)553 0 R(aen2260)554 0 R(aen2262)555 0 R(aen2277)556 0 R(aen2286)557 0 R(aen2290)558 0 R(aen2306)559 0 R(aen2311)560 0 R(aen2314)561 0 R(aen2319)562 0 R(aen2347)563 0 R(aen248)564 0 R(aen264)565 0 R(aen28)566 0 R(aen280)567 0 R(aen291)568 0 R(aen299)569 0 R(aen311)570 0 R(aen323)571 0 R(aen328)572 0 R(aen336)573 0 R(aen341)574 0 R(aen344)575 0 R(aen356)576 0 R(aen366)577 0 R(aen394)578 0 R(aen4)579 0 R(aen402)580 0 R(aen419)581 0 R(aen426)582 0 R(aen431)583 0 R(aen436)584 0 R(aen457)585 0 R(aen501)586 0 R(aen508)587 0 R(aen528)588 0 R(aen56)589 0 R(aen563)590 0 R(aen583)591 0 R(aen592)592 0 R(aen60)593 0 R(aen603)594 0 R(aen623)595 0 R(aen638)596 0 R(aen652)597 0 R(aen659)598 0 R(aen681)599 0 R(aen74)600 0 R(aen745)601 0 R(aen766)602 0 R(aen788)603 0 R(aen799)604 0 R(aen8)605 0 R(aen80)606 0 R(aen834)607 0 R(aen851)608 0 R(aen862)609 0 R(aen887)610 0 R(aen895)611 0 R(aen899)612 0 R(aen90)613 0 R(aen909)614 0 R(aen912)615 0 R(aen916)616 0 R(aen938)617 0 R(aen992)618 0 R(body.html)619 0 R(cvs-access)620 0 R(domain-security)621 0 R(install)622 0 R(integrate-ms-networks)623 0 R(migration)624 0 R(msdfs)625 0 R(os2)626 0 R(pam)627 0 R(printing)628 0 R(samba-bdc)629 0 R(samba-ldap-howto)630 0 R(samba-pdc)631 0 R(samba-project-documentation)632 0 R(unix-permissions)633 0 R(winbind)634 0 R]>>endobj
 474 0 obj<</D[744 0 R/XYZ null 383 null]>>endobj
 475 0 obj<</D[744 0 R/XYZ null 166 null]>>endobj
 476 0 obj<</D[750 0 R/XYZ null 706 null]>>endobj
@@ -815,22 +815,22 @@
 536 0 obj<</D[843 0 R/XYZ null 673 null]>>endobj
 537 0 obj<</D[843 0 R/XYZ null 483 null]>>endobj
 538 0 obj<</D[843 0 R/XYZ null 332 null]>>endobj
-539 0 obj<</D[843 0 R/XYZ null 221 null]>>endobj
-540 0 obj<</D[846 0 R/XYZ null 581 null]>>endobj
-541 0 obj<</D[846 0 R/XYZ null 298 null]>>endobj
-542 0 obj<</D[846 0 R/XYZ null 132 null]>>endobj
-543 0 obj<</D[849 0 R/XYZ null 619 null]>>endobj
+539 0 obj<</D[843 0 R/XYZ null 181 null]>>endobj
+540 0 obj<</D[846 0 R/XYZ null 541 null]>>endobj
+541 0 obj<</D[846 0 R/XYZ null 258 null]>>endobj
+542 0 obj<</D[849 0 R/XYZ null 753 null]>>endobj
+543 0 obj<</D[849 0 R/XYZ null 552 null]>>endobj
 544 0 obj<</D[654 0 R/XYZ null 768 null]>>endobj
-545 0 obj<</D[849 0 R/XYZ null 279 null]>>endobj
-546 0 obj<</D[852 0 R/XYZ null 691 null]>>endobj
-547 0 obj<</D[654 0 R/XYZ null 683 null]>>endobj
-548 0 obj<</D[852 0 R/XYZ null 530 null]>>endobj
-549 0 obj<</D[855 0 R/XYZ null 467 null]>>endobj
-550 0 obj<</D[858 0 R/XYZ null 511 null]>>endobj
-551 0 obj<</D[861 0 R/XYZ null 355 null]>>endobj
-552 0 obj<</D[864 0 R/XYZ null 768 null]>>endobj
-553 0 obj<</D[867 0 R/XYZ null 730 null]>>endobj
-554 0 obj<</D[657 0 R/XYZ null 706 null]>>endobj
+545 0 obj<</D[849 0 R/XYZ null 213 null]>>endobj
+546 0 obj<</D[654 0 R/XYZ null 683 null]>>endobj
+547 0 obj<</D[852 0 R/XYZ null 626 null]>>endobj
+548 0 obj<</D[852 0 R/XYZ null 465 null]>>endobj
+549 0 obj<</D[855 0 R/XYZ null 404 null]>>endobj
+550 0 obj<</D[858 0 R/XYZ null 452 null]>>endobj
+551 0 obj<</D[861 0 R/XYZ null 278 null]>>endobj
+552 0 obj<</D[864 0 R/XYZ null 726 null]>>endobj
+553 0 obj<</D[657 0 R/XYZ null 706 null]>>endobj
+554 0 obj<</D[867 0 R/XYZ null 730 null]>>endobj
 555 0 obj<</D[867 0 R/XYZ null 700 null]>>endobj
 556 0 obj<</D[867 0 R/XYZ null 348 null]>>endobj
 557 0 obj<</D[870 0 R/XYZ null 768 null]>>endobj
@@ -1794,18 +1794,16 @@ endobj
 endobj
 816 0 obj<</Type/Page/Parent 635 0 R/Contents 817 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>/Annots 247 0 R>>endobj
 817 0 obj<</Length 818 0 R/Filter/FlateDecode>>stream
-x�XMs���Wt�e�*�)�����7���q�ڝt�HPBL\��F�>�B�d;����1E
-�������+#S�u�Ml<�.6>��Q��Z�Skjm��Ӈ�q�*��5�����-%LeҦFm����S����h0	�������w�s�QcD�8Qw��8�f'ɖ�ZX��֣���rUȈ��[��p0�:Ѹ�F��-�ǁvkh#�J����6�ʐ�3�:��Ku�ʺ��*�6�y��Q"�ׁ
-U�Т��z@Jm�ImP.̙IaP��j
-���Bᔴc�)�c#s�B�9�.
-�gg,vڈO�iu�hr�������E<�EsZ&7�
-�� ˷�SAόI�s�����_jY9M��zz���h�4�_���~i,.2QG�l��˝?X>}H;TM�a
-��F���ڝ���"���K��x�:/{X����
-�UO��ds�ہ�}e��U��6�T�2Ju9=���f1�����K��G���M(xq;s��i�W�H�ᮤ�J�����qg%G���7'��T�SO��P\��m(ֈ�)`��mU���n��mdIwY�*eѳhulکt�5'��G1qMB���	��v��p��e)��8K��䮐If��&�Z�~��5):ƛ-Łj�_��I;Y�y[�0�؀�%�j�0� ���h�=���HgY��Nq�Z�{������ӄ{e��/�V_N��)-�����6z�V"U�>鶖����?m���=s��Dc��7�B�,�����uE�ڢX<'�ƙ�r�ˏ"|�����??��Q-�K�E
-�{5��[���S�� F&p����
-`�9��Js����1�7�88W��;�n��1C2���o�]���?p28��ҏ�����$�G���)g��e~��h�,=tГ7�ӛ��6`�õ?w5�ic�UV�ؘÃ�����y�r{�le��������o�f
-佰0��j�7�����b�"{`�-���p�,5�
-�΋%��W͎��)�A�� ��-7.L���,�GN���6;�Z�jח�DA=��nP�=��w��
-�_��R��h����$����O�CT?�Wd'ȫ.@�w�)���^sJ�~w��THH�߅ނ}�#]���@���k{�210Đ�(���0]�w6HX2/g�2	'�ϐ���1�E��������n�B�ȋ�
-i�L�$��f!%�M���z��W�8�wDld]��G��u�k<GӬLq�#�� "��kfXu�v�X.dQ������B��Y��u�Ÿ�o�Jףx}y�$܉���bkw.�VD)Щ��Y�U5a�#C~���� "�#�,ӡw�+W����A�Jw�B�
-�ȋ
-Ԡ�	��x3!t�9 a``H�������9#����?�H�rU����K@�5��V�gj3��2,Ӿ��=�q���vP�����=��=D��<Mp}HzL�q?A~�E�T�\��'���pw��>@,�J)E�X+��]����tҘ�7�!�XdA
-��~�{z�4�BR��:��?��2]�CЗ�9��S������6�.
+x�XMs���Wt�e�*��(�����7���q�ڝt�HHBL\��F�>�B�d;����1E
+��W5=��Ѣ�C���x�>2����d�
+('�W؂��g�R����X�9N{U�{�b�I!,b�M��pa�d5�h5���s�ޙ�!V���$
+"�X�u���a~�[T��T��/@����%q��4P|����Y�";Q^���+HO	���S���=�BB��.���2�4k���cb`4Đ�(���0]�w6HX�/g�r	'Vϐҫ�!�E����������B�ȋ�
+�Y+��]����tҘ�7�!�X�Q
+F��~�{zl5�BR��:�k89�2}�CЗF�����mX�
+;Q�kT����jPY��
 endobj
 818 0 obj
-2086
+2085
 endobj
 819 0 obj<</Type/Page/Parent 635 0 R/Contents 820 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 5 0 R/F4 7 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>/Annots 256 0 R>>endobj
 820 0 obj<</Length 821 0 R/Filter/FlateDecode>>stream
@@ -1930,95 +1928,98 @@ endobj
 endobj
 846 0 obj<</Type/Page/Parent 635 0 R/Contents 847 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 283 0 R>>endobj
 847 0 obj<</Length 848 0 R/Filter/FlateDecode>>stream
-x�W�r�6}�W웕��(ْ���Mⶹ4Q&}�L"!	6	(
-M��\Wڗ�jڭUE���B��p*�W5���L�*�,ek�=��9+w_��O�t>')8�k�М�'K�i*���<7v�d��o8h�58�t���0p���D��?#U��Z�s$�H��;w�~���_�|�`�ʿw�t\��Er�`@l s�����{tV{S�/�v����S�gŧ;@y]譲5��Q�\U�52v�g�o��6��Q��aD�b����g�J�"$̯�І��q2��l�����(��e�4�D�]ή��'<��	~��:��l�������2W_�'p��(�J.2�^K�����z?����)����\=8Y �)oQ��i�4��m����ۋH��pD�0�uU�)7˥���|����/P�dkZ+����+Mn���7��2q���^�	�iC��J���sװ8<\����*�_S��@�n�ѽh������Dj�C\앤{p,���1�yn�F~ۥY�9
-�jԨeb����Eyg Xk^��Ŝ�ｼ����	�1ch�%v,���M����B,0bO,��P�:�
-�5���v(6�r��'!6j����.D�U��ڏ����
-�N����I��$�*<*fo�Ծ+=����s�__�d9�8��˄>I��Jekd�u��FlnA&��������J��
-'�Џ�����Zo@ʹ�y��T�v�? /�/�K��ls�meT�%X
-�����焱�v?cl������P���h�Ş�0w�z�`�p/Pk�����jA�2���[8dc�>޾1@H���U��v�Z�TQ��M|��{�1#�	,G�=�n�K����N�M��jin-e�����E'+&���cb�|4(�:|``-׏�
-�ItmF��<�zt����b~d��L�Z�,@,��5��n�@a m?8PS�`!����r���-�I�����)�\���ݎ��=�s�s
-y?u{"��.�uȼY@7����JW�������ΰ��Zٕq�io�XM����cg�!ڣ+$e�jO[?��=�T����>?8�	�����P��7X��X3MQ�� �h<}.חɈ��!���X˫���-c9���le���3hԐ}��|����0�����i�*���@�2�Q<�й�27�����j�S�"���hs,؈�v���~qd�M�
-���U](
-E�A��$B��Q�`�8U��X5�	��^j�;��.4�d��ց���N#H�k��Nea�0��X���fI̤�8
-)��
-���E�����(k/ PX:�MY��88'/PZb�bcI���z �q�x=k^t�+.���2��N����=��+p��OS�����}�L���+�a�
-������endstream
+x�W�r�6}�W�[���dْ���uⶹ4V&}�L"!	6	0
+�չ�$w*�W5����V&U�q�ҵN�Hٌ�����'C:]$c2p>�>�9{5N�*�T�'XWYf�
+&��m�p�~cpt�<}3va�b���VawJ*�B�ZgH�.t�w���9����>kP���m4��H�
+��4ZP�Y8��A��7��o�Qa��o>#8+>���\o���I�x��e�����۾�c�9ЃF1��K���e�_@�+e�p0��O@�_$�̦�}��bYvM�Id���:�:��h�L�_���;����nw$�1>�}�\|����o��+�Ȩ{-��bdn��\Jb*�
+
+�,�Qx`�3�Xe�A�����(9j!"�{�c)�\�^4X3�s����XW-(\ġ�uU{�lL��۷"	�᫖�*w`��Tk�j#��O��qo6�a�3�娽��m>`��z�T�i�)�P-ͭ�lTԞ�ô�d��wrLl��eX������4��D�fԉ�3�GGz�,�G�
+�$�
+���ѫZ��\�6��/�jJ,D��u_Np!���e:�s�2R��� 8^���1��q�` RV���m�8�f!��踟w�x2:�J��= ��E�qHo]5���	�Zl�4����;�g�/��!�4��%�毜�+�x���h��|��g�������ܣ=u.;��:8�+<b���JtX���Ru�p�O��l��`�����?5�
+[�0���x��M�X�Ӡ��T��A�n�$�;d�7��U1����s+c'2
+���}��`1�����}��^�^y����W�H�S5�Pe��E`���V%�g�E㋑��%���nּʍ�8���e2�e(����#��n�oB�Y<~6�9��W��t�re:d;��?O���� endstream
 endobj
 848 0 obj
-1782
+1766
 endobj
 849 0 obj<</Type/Page/Parent 635 0 R/Contents 850 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>/Annots 286 0 R>>endobj
 850 0 obj<</Length 851 0 R/Filter/FlateDecode>>stream
-x�XMs�6��W����H�H˒==t�4i3�n��/��$$"�J�V�����ƹt2�%xx�v��Y(s�e��R��������R�P�>Z^�d��<���N&�AlV�y*���Ɍ����v%ݮ�*���u:y��+�/�K��E�`��kl������7�ooD��)�mj�T5Ϩu~��tKD�XY6&Q���B'�����+>��L}�s��Aĳ�{'��9#Rm$�
-eh��um�ތ���$�ʭ���:�W�z�b�N�O��f'��$�ڲ���ҳ��.%}���O�CV�ٍ5�V�)�.�p0i��������N��T[�-	sb�����37r�ZQ�1�.�t��p�~%���O��a�*S��1Y���25ʨ�5���
-���2w��A�iv��M]t��*�Ƈ�fv�S5�ذ��3ՈU&���`9?���on�t�L�V.�B�W#źi�
-Zy._~?�Ep-�s�Y!�e���[._��s|
-��{:U��J�s��FH�T�K��Q��`�z\�>�^H^�8��;�^,��d/����8��q�]lP.�ν��������3|*��cȃ�Ē���l���7�
-n�8�D�vu�lR@8>���x}�M��<Nvy�ݺ6M h�6��X���V7�F؅2����g\r����}�zQ�<ӃV:��y��J?bx�h�0�tܕ��V�AV�U6���c�t?5
-��"�~Q6%nMN2s��.�P��w���E�m�ر:�	�g=wa�k3��3�a��q��m
-w4$�Г�1i���GL�䮞��_š+�*�
-)��1�`�OZ�>k�
-��鄫�.�����D�y���lpAX��5nX��r,q8�Մ���~��S��	'���yy� ��^�.GG�6�B�˻�f
-0���a!��v2SkҘ�YL�_��(�%��Z�)?�;]�[p�U�3
-�+7�����ZK"t�#¾�;����a���U�^��$��ޝ<0���.��UۅG�f~�l͹��K�b����
-�E���__�Aendstream
+x�XMs�6��W����H�(˖3=t�4i3�n�N.��$$!&	� ���w i�uz�dK&�>w�=毳X���j!W�go�g��ǲ�����J̣֙�|.�t��'��}[��N9I�.�P����MeQ���~W�,�e]����u��:�͓���b6"Gۈ��4Δ[Q��w���8\I���r�z��l.��"Z �	o��OZj+����(�'�ĵl�
+}ة��6?p0p�A�zt���jSFf��hI��vGq;��|���������*�F�p�aq���+���|�T�ۃ�!}��}{#*+LɬUm+��t~[�#�_�&U�M
+��N�;�y}�͔�O�Z���N6���G6�n$��24W$hM$ҙA;�)��ܢ!����Ewz����٠3*MmS�}P!3Xz�UԖ�+/�=W�v�M4�V��#��)���+v�)�ig�%2aM���8�5���A)���0��ʯ
+Y������
+���o����Ԣ�,/W�Չ��qt-"���jL���N	E�P�&m�<,r-%�-7f۠��
+[��P	fI�I��BKї�:Q4���ͻO�q-��t�x���>9{��q��t���$*}�fϊ����L�u���Ue�gG�	䰂l�
+#9Hl�~�'h���Rf��$��T��Gt{���(������ݷ��eo��z}05��T�uw�*ȋz�4��E2�S���0����'��P�Δ:��}����]<�ҫ:�B�.�}qɱ`��5�g�8I]���E@��U��s�
+�@?�&2nG'桇���#�`+�5�����8~u���D�M���1!/������VH~�<J�A�g�[g�`��)�}W����	��WPh!��x�Ŕ�6^O�jQ�7�D�YS�����L�����0�%�?_~;���\�sL�B��(�����k���}!S��%��!#��
+:і������YF���,�����xzqŃ���?�Qm��c*`�v�rtlo����X���S���򨡦����
+JYi!L�Ӄ�J�b�QQavBjWn�JUUAe�TY�\�)�{���h)T'1������_E����*SM���]Ka7����� ��<Z-g�Ex�kM�(!�Y��n�CY���t��49�r����~ҹ�s���G��Q�^���Q,<����C��{�Z�D���;ҡ�`���5���׍v��� pQ���#HI��#0�Zy4H�n6d�O9�%�Nf��mʒ��n���|j
+0��i.T鲛�H���7����)_:D���
+��9�	߸Dx��u��h�(@z�<�~"2�n,�����G)�txu2X�2SU��b�{+�P
+vv&݉k�X�|D�����ǣ�ys	of�_��c�]!VIƖ��{aRD���r����0mO1C�i+�9��U�x�����'
 endobj
 851 0 obj
-1989
+1951
 endobj
-852 0 obj<</Type/Page/Parent 635 0 R/Contents 853 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 299 0 R>>endobj
+852 0 obj<</Type/Page/Parent 635 0 R/Contents 853 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 291 0 R>>endobj
 853 0 obj<</Length 854 0 R/Filter/FlateDecode>>stream
-x�W�n�F}�W��(�E���A[ i�"I�ZouQ�ȕĄ�\Ҏ�~|��rI�!`H��̙9s��"��_D˘�J��7�_�g�`���Q��1�8�c�Z���`A��-�Nh:���-M�V���b��rZp��T�����pP�NeyB�dTS?{��x^Fn�΀|��TS�Ĕ[�܊��8�
-����B}Ҕ�Z��*�*�d� Q�^�� tR�h<���=�&+�o�Ȧ}�Y�J[�<w2fEL��h/��}��g�n�<?���z���>�G����7��E�2
-[��ITZUlԱ�Q@WZS��T(vRR�4�.kUg��lKw��sGS��V�5��zk
-}��p�έ�m-�I��Ц��TT��NI�IS�M�I�)�٦RU�m VH�Lh��"�\�s���//ZOa�|z�Q�@
-�g���Y�gF���>�}P{y#A�N|��ڱ���3s��~�Z����R�v�^������Jp:�T������,o�,2��	Ƭ�Ce�bI��s�Ϟ�5N�D�
-�1 ���vL�������#�fП�	�d#QxԶj6,u��md�]P�wPH���|�8.\]�e��~��۽J��p����Fq��G�����hX7�KTPvg��'WW�/nu�E3�#f%
-�[��GX�S�P9È�KɁR��Em���E\U�y[�um�PC�n��S�����RE�#.���)�s��E�\�hk4V�`�ʆ�w4}Yև=0�������]��K��
-r\:粽l���X
-�/f:�|�t�ch�5�XvΤ��C!���")`o�mRe�*��R�D�;���M���s�ɽ��_0�~���[�w��ᑲ�9�y�O2�V����c���Q
-�f۶Qfe�7��t�n�koK�_��lT�7Y�p���~��Ŕ{�� ~zl��r���#�tr�s7(SH�zO�_>?we���^�}��/�@�}��K�$2�H�����ޯ��1ȟ���S��^ȸ١�$���H/ű���85Y��V�㘏�e�8o�d�5A���͌���U���+�����GA��@9����_�����¿��C�C�w�w��.1�#�xJGU�\��'�#�S�:�B��U�?N�����?�Ϛ%tExu�ȹ�G�1'3�є闏S�����枔���K�L�� ��|��]�]s~��G$:�2��H�D�%�����|ێAkmy�A=��҇Fz�l9Cٔ�K�&���Тe�endstream
+x�W]o�6}ϯ�@ꢱlɎ�ۀv]�>���-�@I��F=R�k`?~璢,�i�v)�Z&yy?�9�ꯋ����2�ق��������4Z���a6x�R��c�Z��j-�H*��k<���l�r�X�g�Ww��n�?p�����Z���������(���h����BmZ�uN��v��t�������.&7���8YDs���;�9�(]��g]x�,�l�����6�6{a��J��m��)�A�,U�@�n(�|����,J��Zf�Za�˝�sUo�����V6[iHw�[ڊ��>(���@i�J���*��Z%m�C��5�)�qr�#4Z7O�b�g	V��|$�Fs�'g�n}�Ƽ�K�+q���R��j�T]��Ld[���M�W8MB%��{�l�Q#7��:ơ����jۈ��6�Ơ��Yx ��
+�1
+K�P�hD���*�r���U���'C����ף�Z�>�FGP�9o8)p�!���i����:�P-e.�&��.h�*\rpjoD��؍#F��-7�E����7���N�4�לE�^���(t'������Q��(�p�XݚLN����v�G�+�t� +o|�ݢ��AA���Ns��R���Ju�2$���un�5��s�3^~�s�|��wzI�g�	�@��Գ�D6Y����G\9�QRk���
+*�#��5�+탲��P]���r���}��������=-��Zߣ�l �#�^s�R_���A��N�\����X�z�吺~�ۭ��~�?�~�ѥ��C=3|l�c�i�n"� ,��PPNg�U �+�[]�@4�E�B�4��F�B����s,��R�@-?6!���7�Bn�+�c��k)���m�T�!�X2t7b�0s]?eu���=#��X僕�[��/�c�ĢNB04~��Q�Y:
+o�qי���l�bqj
+}
+x�>q_�"d�]i&7
 endobj
 854 0 obj
-1521
+1516
 endobj
-855 0 obj<</Type/Page/Parent 635 0 R/Contents 856 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 304 0 R>>endobj
+855 0 obj<</Type/Page/Parent 635 0 R/Contents 856 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 304 0 R>>endobj
 856 0 obj<</Length 857 0 R/Filter/FlateDecode>>stream
-x�Vko�F��_�MXA$Jԃ�
-�ہ$NkA�|9�'�6�c�R��w���dE6�q@�����������z�iܧADq~�~zr5=��	�z����x'c<�	Z�S�֋�#�܎D�0�k� �#�e��} B��Gg4�#�ѧ���4n�{M�t%i���H�2R�Pdd�2��[Kن
-)�P:'��Z
-��2+�%�Ҙoo�N|�M!g��Ǔ>����O9�!'��2�clv�H�?��1��'le^f�JZ�\&��x������W��.�*l��e��}��O$!$�c�"��b"
--�K���L.�!��AB~���F֌l�J��~t�M���n�b�u��g�˼sg�2&�^�8�:��B���i
-J�J���)Ua��g���,U�%4���e��d�j���ļ�I�������:М���θǼ�=��!\,:��Q@wVhKU�J��)�D�\NVK����yL�+Y�Jd٦�
-����֢�N�*I��<���p8D3�NK7�De�J6�p��X��5�9�]�T�M%�5�*���iVq���2&�e�]�Ia��&���Yڦ�|�jc���)������3���6�Z~��hV����?���YFnNs�ZlP�ТPi��RF�6S�T��=׌F�@WE�
-�����PGH��Z�
-�ɳiN�y�dhŤ�%�S��1���Q&'볬ii�yЃ��F�띻�O�����j��`�ޤ�1�Ro��iW18ܠHLb�rC�X5�Z}��sU����,�l��S��YmH2���D�C��׬~�h��Z{���6YH��˿Nz٦W/�=�j`��qǭ���N��4MZ�n���|�"֌�*���l�7��G�?؎p:��Q���؂���>ġp��|
-d't�ϗ���l��ʰk��K[kB��q�STt���F���#�Î����N]���/�c,
-Dp"�&!20��K�#��[h�ܗ�\���*h�Y�N��_G}Ѓkh�:zx�k�-|����
-q�St�zG��Ճ�-]����u�#xU'�������ES��͋���ʱ5!7q<��8��8��ne	endstream
+x�Vێ�6}߯�&�k[���(6�l�ri� /y�%��F�Z�@?�gHɷx
+�w![ə9g��|��)�_L��cJ�����׳��7���b���h�N'�9�b$-�4���Uoܼ�����M{T=\b����"������5lnr���������FtE�%S,��,�F4K;kU�U�Q�������l���G�t��n2�n��pR���j+i�2K�����&���P��JZ]W�OL!��!����G#�
+�S�nJ�ț#<P�@5�0T�\���-X6tI�纨��j�v9&�W�5~0��-�2��-���G4��e tl�Xd�}�����<
+�3�E�����QF�~-H�k�A�R��S�+F�[CT|�#n>���e	���~�:+K]!�_4|Y���	c� ��GE�R��T29�	��
+���Lv6x����� JF�Q���n��׈��Y�o�iqI�l�%TŢ�!#1�q�rA�9kxC�9ϼ��#��B������΀�/H2���E���C�9��$���s��ۧ[g�ڷ1�?�^^ҝ��۶�ض����`?�PRF1־z����4�;P3���ym2�6��{o��
 endobj
 857 0 obj
-1268
+1317
 endobj
-858 0 obj<</Type/Page/Parent 635 0 R/Contents 859 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
+858 0 obj<</Type/Page/Parent 635 0 R/Contents 859 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 859 0 obj<</Length 860 0 R/Filter/FlateDecode>>stream
-x�Vmo�6��_qH���bɒ;)P��Ŗ�-چa�Y�#6��T<c��)َke��@�tG��s�s�c'��0	a8���F��3���`�P��2�0���hB���b0GW\?z���e:<>FO����9F�uz����
-����_� �~
+x�Wmo�F�ί���t��@9�T�StMH�U���b�a/�.�]��^�{gwm�U�Z�L�3;/�<3�yj��o
+��+	Pp�2|LD+Ï��K�峜D�
+R�7��A$7�#U}��s�p	��b����-���2t�@'�
+#1VX�։#J����RYb)Ll�
+��xT��Ha#
+	ٜ��Ou���u6\����fW5�K�̙I�t]˼`�:��}.v$L��ŨC.�))2
+H�,S��55�]���.*K�%w�CB����A��֖�i�"���t;�����8����v�
+�[��X��z�S��.��*��Z�^�3�4��|�T*�]P�H��'e�ͺ#�^2�s˔r,�8҅��g�4Q�����b�텹��3f�<�j��!��H| @b��ʌtɶc��M��᧍ӄ�����r�-9�8q��X�K���I��6sƟv�q_��G�˖]I�Bd}*(�)����
+�Z6Ga��V�r
+���c
 endobj
 860 0 obj
-1172
+1218
 endobj
 861 0 obj<</Type/Page/Parent 635 0 R/Contents 862 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 862 0 obj<</Length 863 0 R/Filter/FlateDecode>>stream
-x�Wko�6��_q��ؒ�ď�tm�`�c��aX����X�$:����w.Iɲg�l��u��IDC�G4�����������d�f��;|�h\��l���-i��C���x�E45&�Q0ۛ�G{�)���S�@��zH/h�D��5O��!����u�e�b2�"9�=� B�����v���ϗ�^y/�:�꧛o.O?�}zd�Ҡ�g�_VUY��%j��lIF�4��%�o�/�+��w�[Z,�"9���V���y�������f�@ރ�Q/��Y9�+���s,)|:�T�M�0;�O��� Z��F]2���������9�h�1�n��SmJ�K*W����ܫi�����{j*�!Q$ݍm�[�)2W�!�)��6*-ʾMͬT�%��$��RQ��B�ة8ߺ�sW��BXKM��\��2_`�keJ^O]�[�a���*�?`VW��1�ҩE�"�����G{.�cE�88����ezW��'������n�3V���X�I�H$�����u��(0�HZ��h�P[��<ҥ��
-Yb`g���X��D���tm�����V��=��Ɂo��a�4�Z�l^8:t
-� Ӻ���w���o���ѱ��t��hqo��=C~B�A�H�N�J��:(�RW1�K�ߜ;�@��,[#Ѫ&C��j���^C�s'=�������o��ҵ�JZ{�Ύ��%�rh��j��5?L��k�w��z��h2��Q0��r���}��+_�ި���a+�wM��t�:I�߀h�;%_E�+<
-}��!{�_P����c��]뗓mq��endstream
+x�Wio�F��_1p�D$R�-)��i�hs4ZUQ�ȥ����V����ovIL�~HQ�=�x�����ـ���dH�1%�ٳ�ً�Y?�Ni�a���
+Gј��|�)YI���j|
+���8�
+[0�]x�}�R���ep<�Nh���>͒�l)�+��!e�NJe4-�#A��V��ѩ�w$ui�Tr˪��l4��JN�{�H\�)�Ƭ�Q�V��=��}<�_��;Pox�@gi��;�K��O��7@�A���o�?9������2Y�i�8���J�u�7wQ=�S�W*���$�Ez�����o~|r���>�pb+����_�[��oH��J��@�ϊ�	~�^���D~��P,��O`yO4��VF�����قz���ƹIV��n�b��Da}��
+-�JaK�Y��uݸ������.��4T8:��u��Ô
+Y�^����Q������TyJIb���
+�Ak���x���($�D��
+�%/'�)��T�b����+y]��7�&��ȩ��Dl��"�n��W� �y
+���/�dm4
+H�m0���Q4��{�3uW�ZMgɻ����6r9�<��X�{I�H%��L�
+����v'�X#�	�f|�E�3�Md����d�n�ԡTY����\l��	|@u���<
+���g�)�����7��?j�D��=��2k
+N�]�]�'���tc�kn;������ĬU�G���9�#V-�?�
+歓IeU��+��[�Ɩ����\ʢx���|!�8W��1t:���p�b�51n�l�ڷ�A_��e�ya���c���[ٔ�L�R�;�FtKA\s�5�����B���'+
+?���T��i�;J��������$T���z��9�$���}��=��&#x��`8r��QYM?��^�%��Fh�d�m��%��Pbric�7��.7�;�k�O@k���� hi�9�'��|���%�
+�E�Y��F�|\�jW "
+Lj����?BJ?Wf�G놧f8ϣ%���n~���DFڵ��P�
+5Nɕ�J�`����I*�i�d��lrx�R.>��jpn��p�s�:��7Uui��J��4�9��d
+n^?��w�|�W�s�T�����z�xo2��]i�~��O>~'̖�t����jr������5��S觳
 endobj
 863 0 obj
-1385
+1422
 endobj
 864 0 obj<</Type/Page/Parent 635 0 R/Contents 865 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>>>endobj
 865 0 obj<</Length 866 0 R/Filter/FlateDecode>>stream
-x�X]o�6}ϯ����Ilg@�v�E�x��DIl$R%����;��l�q���)��{��8̗�)M�3�Ō���'oV'��N&�rI�7[�ÄΗ�~�\�}:�Jfd%�xxB��e�K紘�ϰ�ð�7�4����V9ϗZea}B�ttk,�!'��J�#ohc�5�4�V�)u����*�3����!�|)-Q)%)��G����LY�zc��q8����Bija����|2���9�Ye#QY)�椓ړ���?ҞNHK��-M��zyY7��X3$��Z�=�`_��h��r�&!Z��L�д�$�SU4<�U������-( �\�NR�����툊ʬaa؎���g�+ǀ6'��������#�f�ҧ�F�I6c�)W�6��X�KU�
-��k��)xv���B4r�V�
-5�ZB��κ�Q�l�ł�퉒-<[Kp߈XV?��'g�\���^����Qi�YWq��wC<
-�x���K���?_��N2$r�;�mԣ�#�qCVedr�Z0]�E�iו<���n|�}Cr��l����h�zv;h���M�{X���d��F�⋄~�F�/��]���XԎ��EN	��^#dx]�v��Q�����ne͇�Oa
-��<� �C��6��Cw�`c0]a/!���<{�A��,{�|Jy�����
-��"�n���f7a�a�î<*����7��9��j�"
+x�W[o�6~ϯ8�����΀<��X�n�=(h���H�JRq����b�q�]�0��R�������׳)M�7�Ռ�K�˳����6g�h����f�1��d�h�^��tr��VR��'�x3�'��ZF���r���&~iس\/�=8nX
+�K �$ayB�x$����H�6_��7�N�Ջ)]̖
+�3��L�%�|.-Q.$)���Ԣ�DY{c�Jq8ޢĔBi�a$@��8P��J�40'�Ԟ�����H{N8!΅�d��ܔ8��А�eU�5C�2��=@���[���MD��a�b�i+I
+����@�tւi�.C�G��F���㨎(+���m�]|���ce����x
+�Uw�`v,}<�D%c0v��R�\�h#�
+uϤ*�c����ϩ�X���p	�q��c'��*�pD>��
+�
+�l�V�|H?��υ����gc��ؙ־��Nw'�2W�A��p�`��h<ă��bq�
+9d��J�߈%7\��l5�9R���r��n�B�[��G���?.#���+��
+{�އ�98�7eً�sbϻ���!x[+�gG�P/,����
+��pI�y	��	�#� �n��y�A���.W՚�"s;9k)���ZꝔ��4��X����+N�X���,h�e�oQG�z�受;Oz�I�9���lc2X�)��l����X[Wx���tޚF&'c�߁��}�ͻ��<�̮��ː=��apĽ�]��n?A
 endobj
 866 0 obj
-1577
+1592
 endobj
 867 0 obj<</Type/Page/Parent 635 0 R/Contents 868 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 868 0 obj<</Length 869 0 R/Filter/FlateDecode>>stream
-xmR�n�0��+�
-~J4+�Րcv�f��~FY�=�I��B�ȋ�@+o�2or<X#��5���W(˹�j����	�6��(��>и@蝍]�_B�{��;1��Zp�t���!v�x��
-�u���K�qh��:�Q��W�:�q�x}ͬ��<������a���`��ɀG+��!\���/g�r�}x+����|�8���*z��
+xmRю�0|�+�1�
+�c��J}H�6T��c���6I�ﻆH�N'@��;3;��	_)��=U�ǯ9�U>�U�$N��\Xr�*�����+��7i8�h��/�ksq�UY�C�}�"BQq�|]r��c	�L�	i��L��\�1�i\�x6Z��c�
 endobj
 869 0 obj
-399
+445
 endobj
 870 0 obj<</Type/Page/Parent 635 0 R/Contents 871 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>/Annots 313 0 R>>endobj
 871 0 obj<</Length 872 0 R/Filter/FlateDecode>>stream
@@ -2306,11 +2307,11 @@ endobj
 1016 0 obj<</Parent 1007 0 R/Title(11.4.4. User and Group ID Allocation)/Dest[846 0 R/XYZ null 669 null]/Prev 1015 0 R/Next 1017 0 R>>endobj
 1017 0 obj<</Parent 1007 0 R/Title(11.4.5. Result Caching)/Dest[846 0 R/XYZ null 479 null]/Prev 1016 0 R/Next 1018 0 R>>endobj
 1018 0 obj<</Parent 1007 0 R/Title(11.5. Installation and Configuration)/Dest[846 0 R/XYZ null 328 null]/Prev 1017 0 R/Next 1019 0 R>>endobj
-1019 0 obj<</Parent 1007 0 R/Title(11.5.1. Introduction)/Dest[846 0 R/XYZ null 217 null]/Prev 1018 0 R/Next 1020 0 R>>endobj
-1020 0 obj<</Parent 1007 0 R/Title(11.5.2. Requirements)/Dest[849 0 R/XYZ null 577 null]/Prev 1019 0 R/Next 1021 0 R>>endobj
-1021 0 obj<</Parent 1007 0 R/Title(11.5.3. Testing Things Out)/Dest[849 0 R/XYZ null 294 null]/Prev 1020 0 R/Next 1022 0 R>>endobj
-1022 0 obj<</Parent 1007 0 R/Title(11.6. Limitations)/Dest[864 0 R/XYZ null 351 null]/Prev 1021 0 R/Next 1023 0 R>>endobj
-1023 0 obj<</Parent 1007 0 R/Title(11.7. Conclusion)/Dest[867 0 R/XYZ null 750 null]/Prev 1022 0 R>>endobj
+1019 0 obj<</Parent 1007 0 R/Title(11.5.1. Introduction)/Dest[846 0 R/XYZ null 177 null]/Prev 1018 0 R/Next 1020 0 R>>endobj
+1020 0 obj<</Parent 1007 0 R/Title(11.5.2. Requirements)/Dest[849 0 R/XYZ null 537 null]/Prev 1019 0 R/Next 1021 0 R>>endobj
+1021 0 obj<</Parent 1007 0 R/Title(11.5.3. Testing Things Out)/Dest[849 0 R/XYZ null 254 null]/Prev 1020 0 R/Next 1022 0 R>>endobj
+1022 0 obj<</Parent 1007 0 R/Title(11.6. Limitations)/Dest[864 0 R/XYZ null 274 null]/Prev 1021 0 R/Next 1023 0 R>>endobj
+1023 0 obj<</Parent 1007 0 R/Title(11.7. Conclusion)/Dest[867 0 R/XYZ null 722 null]/Prev 1022 0 R>>endobj
 1024 0 obj<</Parent 894 0 R/Count -5/First 1025 0 R/Last 1029 0 R/Title(Chapter 12. OS2 Client HOWTO)/Dest[870 0 R/XYZ null 750 null]/Prev 1007 0 R/Next 1030 0 R>>endobj
 1025 0 obj<</Parent 1024 0 R/Title(12.1. FAQs)/Dest[870 0 R/XYZ null 726 null]/Next 1026 0 R>>endobj
 1026 0 obj<</Parent 1024 0 R/Title(12.1.1. How can I configure OS/2 Warp Connect or  OS/2 Warp 4 as a client for Samba?)/Dest[870 0 R/XYZ null 696 null]/Prev 1025 0 R/Next 1027 0 R>>endobj
@@ -2617,754 +2618,754 @@ xref
 0000020690 00000 n 
 0000020777 00000 n 
 0000020826 00000 n 
-0000020913 00000 n 
-0000020956 00000 n 
-0000021043 00000 n 
-0000021086 00000 n 
-0000021172 00000 n 
-0000021221 00000 n 
-0000021306 00000 n 
-0000021355 00000 n 
-0000021440 00000 n 
-0000021506 00000 n 
-0000021554 00000 n 
-0000021641 00000 n 
-0000021687 00000 n 
-0000021774 00000 n 
-0000021808 00000 n 
-0000021887 00000 n 
-0000021974 00000 n 
-0000022056 00000 n 
-0000022142 00000 n 
-0000022217 00000 n 
-0000022304 00000 n 
-0000022377 00000 n 
-0000022464 00000 n 
-0000022514 00000 n 
-0000022592 00000 n 
-0000022679 00000 n 
-0000022705 00000 n 
-0000022768 00000 n 
-0000022855 00000 n 
-0000022918 00000 n 
-0000023005 00000 n 
-0000023059 00000 n 
-0000023146 00000 n 
-0000023188 00000 n 
-0000023229 00000 n 
-0000023316 00000 n 
-0000023342 00000 n 
-0000023447 00000 n 
-0000023553 00000 n 
-0000023659 00000 n 
-0000023765 00000 n 
-0000023871 00000 n 
-0000023977 00000 n 
-0000024083 00000 n 
-0000024189 00000 n 
-0000024295 00000 n 
-0000024401 00000 n 
-0000024507 00000 n 
-0000024613 00000 n 
-0000024719 00000 n 
-0000024825 00000 n 
-0000024931 00000 n 
-0000025037 00000 n 
-0000025143 00000 n 
-0000025249 00000 n 
-0000025355 00000 n 
-0000025461 00000 n 
-0000025566 00000 n 
-0000025672 00000 n 
-0000025778 00000 n 
-0000025884 00000 n 
-0000025990 00000 n 
-0000026096 00000 n 
-0000026202 00000 n 
-0000026308 00000 n 
-0000026414 00000 n 
-0000026520 00000 n 
-0000026626 00000 n 
-0000026732 00000 n 
-0000026838 00000 n 
-0000026944 00000 n 
-0000027050 00000 n 
-0000027156 00000 n 
-0000027262 00000 n 
-0000027368 00000 n 
-0000027474 00000 n 
-0000027579 00000 n 
-0000027685 00000 n 
-0000027791 00000 n 
-0000027897 00000 n 
-0000028000 00000 n 
-0000028104 00000 n 
-0000028482 00000 n 
-0000028588 00000 n 
-0000028693 00000 n 
-0000028799 00000 n 
-0000028905 00000 n 
-0000029011 00000 n 
-0000029117 00000 n 
-0000029223 00000 n 
-0000029329 00000 n 
-0000029435 00000 n 
-0000029541 00000 n 
-0000029647 00000 n 
-0000029752 00000 n 
-0000029858 00000 n 
-0000029964 00000 n 
-0000030070 00000 n 
-0000030176 00000 n 
-0000030282 00000 n 
-0000030388 00000 n 
-0000030494 00000 n 
-0000030600 00000 n 
-0000030706 00000 n 
-0000030812 00000 n 
-0000030918 00000 n 
-0000031024 00000 n 
-0000031130 00000 n 
-0000031235 00000 n 
-0000031341 00000 n 
-0000031447 00000 n 
-0000031553 00000 n 
-0000031658 00000 n 
-0000031764 00000 n 
-0000031870 00000 n 
-0000031976 00000 n 
-0000032082 00000 n 
-0000032188 00000 n 
-0000032294 00000 n 
-0000032400 00000 n 
-0000032506 00000 n 
-0000032612 00000 n 
-0000032718 00000 n 
-0000032824 00000 n 
-0000032929 00000 n 
-0000033033 00000 n 
-0000033137 00000 n 
-0000033507 00000 n 
-0000033612 00000 n 
-0000033718 00000 n 
-0000033824 00000 n 
-0000033930 00000 n 
-0000034036 00000 n 
-0000034142 00000 n 
-0000034248 00000 n 
-0000034354 00000 n 
-0000034460 00000 n 
-0000034565 00000 n 
-0000034671 00000 n 
-0000034777 00000 n 
-0000034883 00000 n 
-0000034989 00000 n 
-0000035095 00000 n 
-0000035201 00000 n 
-0000035307 00000 n 
-0000035413 00000 n 
-0000035519 00000 n 
-0000035625 00000 n 
-0000035731 00000 n 
-0000035837 00000 n 
-0000035942 00000 n 
-0000036048 00000 n 
-0000036154 00000 n 
-0000036260 00000 n 
-0000036366 00000 n 
-0000036472 00000 n 
-0000036578 00000 n 
-0000036684 00000 n 
-0000036790 00000 n 
-0000036896 00000 n 
-0000037002 00000 n 
-0000037108 00000 n 
-0000037214 00000 n 
-0000037320 00000 n 
-0000037426 00000 n 
-0000037532 00000 n 
-0000037638 00000 n 
-0000037743 00000 n 
-0000037849 00000 n 
-0000037955 00000 n 
-0000038060 00000 n 
-0000038164 00000 n 
-0000038268 00000 n 
-0000038646 00000 n 
-0000038751 00000 n 
-0000038857 00000 n 
-0000038963 00000 n 
-0000039069 00000 n 
-0000039175 00000 n 
-0000039279 00000 n 
-0000039345 00000 n 
-0000039379 00000 n 
-0000039413 00000 n 
-0000042026 00000 n 
-0000042075 00000 n 
-0000042124 00000 n 
-0000042173 00000 n 
-0000042222 00000 n 
-0000042271 00000 n 
-0000042320 00000 n 
-0000042369 00000 n 
-0000042418 00000 n 
-0000042467 00000 n 
-0000042516 00000 n 
-0000042565 00000 n 
-0000042614 00000 n 
-0000042663 00000 n 
-0000042712 00000 n 
-0000042761 00000 n 
-0000042810 00000 n 
-0000042859 00000 n 
-0000042908 00000 n 
-0000042957 00000 n 
-0000043006 00000 n 
-0000043055 00000 n 
-0000043104 00000 n 
-0000043153 00000 n 
-0000043202 00000 n 
-0000043251 00000 n 
-0000043300 00000 n 
-0000043349 00000 n 
-0000043398 00000 n 
-0000043447 00000 n 
-0000043496 00000 n 
-0000043545 00000 n 
-0000043594 00000 n 
-0000043643 00000 n 
-0000043692 00000 n 
-0000043741 00000 n 
-0000043790 00000 n 
-0000043839 00000 n 
-0000043888 00000 n 
-0000043937 00000 n 
-0000043986 00000 n 
-0000044035 00000 n 
-0000044084 00000 n 
-0000044133 00000 n 
-0000044182 00000 n 
-0000044231 00000 n 
-0000044280 00000 n 
-0000044329 00000 n 
-0000044378 00000 n 
-0000044427 00000 n 
-0000044476 00000 n 
-0000044525 00000 n 
-0000044574 00000 n 
-0000044623 00000 n 
-0000044672 00000 n 
-0000044721 00000 n 
-0000044770 00000 n 
-0000044819 00000 n 
-0000044868 00000 n 
-0000044917 00000 n 
-0000044966 00000 n 
-0000045015 00000 n 
-0000045064 00000 n 
-0000045113 00000 n 
-0000045162 00000 n 
-0000045211 00000 n 
-0000045260 00000 n 
-0000045309 00000 n 
-0000045358 00000 n 
-0000045407 00000 n 
-0000045456 00000 n 
-0000045505 00000 n 
-0000045554 00000 n 
-0000045603 00000 n 
-0000045652 00000 n 
-0000045701 00000 n 
-0000045750 00000 n 
-0000045799 00000 n 
-0000045848 00000 n 
-0000045897 00000 n 
-0000045946 00000 n 
-0000045995 00000 n 
-0000046044 00000 n 
-0000046093 00000 n 
-0000046142 00000 n 
-0000046191 00000 n 
-0000046240 00000 n 
-0000046289 00000 n 
-0000046338 00000 n 
-0000046387 00000 n 
-0000046436 00000 n 
-0000046485 00000 n 
-0000046534 00000 n 
-0000046583 00000 n 
-0000046632 00000 n 
-0000046681 00000 n 
-0000046730 00000 n 
-0000046779 00000 n 
-0000046828 00000 n 
-0000046877 00000 n 
-0000046926 00000 n 
-0000046975 00000 n 
-0000047024 00000 n 
-0000047073 00000 n 
-0000047122 00000 n 
-0000047171 00000 n 
-0000047220 00000 n 
-0000047269 00000 n 
-0000047318 00000 n 
-0000047367 00000 n 
-0000047416 00000 n 
-0000047465 00000 n 
-0000047514 00000 n 
-0000047563 00000 n 
-0000047612 00000 n 
-0000047661 00000 n 
-0000047710 00000 n 
-0000047759 00000 n 
-0000047808 00000 n 
-0000047857 00000 n 
-0000047906 00000 n 
-0000047955 00000 n 
-0000048004 00000 n 
-0000048053 00000 n 
-0000048102 00000 n 
-0000048151 00000 n 
-0000048200 00000 n 
-0000048249 00000 n 
-0000048298 00000 n 
-0000048347 00000 n 
-0000048396 00000 n 
-0000048445 00000 n 
-0000048494 00000 n 
-0000048543 00000 n 
-0000048592 00000 n 
-0000048641 00000 n 
-0000048690 00000 n 
-0000048739 00000 n 
-0000048788 00000 n 
-0000048837 00000 n 
-0000048886 00000 n 
-0000048935 00000 n 
-0000048984 00000 n 
-0000049033 00000 n 
-0000049082 00000 n 
-0000049131 00000 n 
-0000049180 00000 n 
-0000049229 00000 n 
-0000049278 00000 n 
-0000049327 00000 n 
-0000049376 00000 n 
-0000049425 00000 n 
-0000049474 00000 n 
-0000049523 00000 n 
-0000049572 00000 n 
-0000049621 00000 n 
-0000049670 00000 n 
-0000049719 00000 n 
-0000049768 00000 n 
-0000049817 00000 n 
-0000049866 00000 n 
-0000049915 00000 n 
-0000050672 00000 n 
-0000050828 00000 n 
-0000051551 00000 n 
-0000051572 00000 n 
-0000051746 00000 n 
-0000052908 00000 n 
-0000052930 00000 n 
-0000053081 00000 n 
-0000054587 00000 n 
-0000054609 00000 n 
-0000054769 00000 n 
-0000056205 00000 n 
-0000056227 00000 n 
-0000056405 00000 n 
-0000057665 00000 n 
-0000057687 00000 n 
-0000057829 00000 n 
-0000059413 00000 n 
-0000059435 00000 n 
-0000059568 00000 n 
-0000061403 00000 n 
-0000061425 00000 n 
-0000061558 00000 n 
-0000062081 00000 n 
-0000062102 00000 n 
-0000062263 00000 n 
-0000063547 00000 n 
-0000063569 00000 n 
-0000063730 00000 n 
-0000065485 00000 n 
-0000065507 00000 n 
-0000065667 00000 n 
-0000067312 00000 n 
-0000067334 00000 n 
-0000067476 00000 n 
-0000069546 00000 n 
-0000069568 00000 n 
-0000069710 00000 n 
-0000071522 00000 n 
-0000071544 00000 n 
-0000071686 00000 n 
-0000073411 00000 n 
-0000073433 00000 n 
-0000073584 00000 n 
-0000075348 00000 n 
-0000075370 00000 n 
-0000075545 00000 n 
-0000077652 00000 n 
-0000077674 00000 n 
-0000077834 00000 n 
-0000079430 00000 n 
-0000079452 00000 n 
-0000079627 00000 n 
-0000081122 00000 n 
-0000081144 00000 n 
-0000081296 00000 n 
-0000082103 00000 n 
-0000082124 00000 n 
-0000082275 00000 n 
-0000083913 00000 n 
-0000083935 00000 n 
-0000084100 00000 n 
-0000085872 00000 n 
-0000085894 00000 n 
-0000086059 00000 n 
-0000086952 00000 n 
-0000086973 00000 n 
-0000087147 00000 n 
-0000088752 00000 n 
-0000088774 00000 n 
-0000088917 00000 n 
-0000089675 00000 n 
-0000089696 00000 n 
-0000089879 00000 n 
-0000091747 00000 n 
-0000091769 00000 n 
-0000091938 00000 n 
-0000093792 00000 n 
-0000093814 00000 n 
-0000093974 00000 n 
-0000095658 00000 n 
-0000095680 00000 n 
-0000095853 00000 n 
-0000097582 00000 n 
-0000097604 00000 n 
-0000097755 00000 n 
-0000098679 00000 n 
-0000098700 00000 n 
-0000098884 00000 n 
-0000100709 00000 n 
-0000100731 00000 n 
-0000100905 00000 n 
-0000103078 00000 n 
-0000103100 00000 n 
-0000103293 00000 n 
-0000105220 00000 n 
-0000105242 00000 n 
-0000105426 00000 n 
-0000107336 00000 n 
-0000107358 00000 n 
-0000107534 00000 n 
-0000109335 00000 n 
-0000109357 00000 n 
-0000109527 00000 n 
-0000111125 00000 n 
-0000111147 00000 n 
-0000111332 00000 n 
-0000112808 00000 n 
-0000112830 00000 n 
-0000113023 00000 n 
-0000114594 00000 n 
-0000114616 00000 n 
-0000114791 00000 n 
-0000116571 00000 n 
-0000116593 00000 n 
-0000116749 00000 n 
-0000118310 00000 n 
-0000118332 00000 n 
-0000118517 00000 n 
-0000120369 00000 n 
-0000120391 00000 n 
-0000120557 00000 n 
-0000122204 00000 n 
-0000122226 00000 n 
-0000122411 00000 n 
-0000124360 00000 n 
-0000124382 00000 n 
-0000124566 00000 n 
-0000126293 00000 n 
-0000126315 00000 n 
-0000126485 00000 n 
-0000128090 00000 n 
-0000128112 00000 n 
-0000128281 00000 n 
-0000130154 00000 n 
-0000130176 00000 n 
-0000130361 00000 n 
-0000132225 00000 n 
-0000132247 00000 n 
-0000132423 00000 n 
-0000134513 00000 n 
-0000134535 00000 n 
-0000134710 00000 n 
-0000136650 00000 n 
-0000136672 00000 n 
-0000136848 00000 n 
-0000139164 00000 n 
-0000139186 00000 n 
-0000139338 00000 n 
-0000141318 00000 n 
-0000141340 00000 n 
-0000141500 00000 n 
-0000143367 00000 n 
-0000143389 00000 n 
-0000143540 00000 n 
-0000145292 00000 n 
-0000145314 00000 n 
-0000145446 00000 n 
-0000147320 00000 n 
-0000147342 00000 n 
-0000147484 00000 n 
-0000149555 00000 n 
-0000149577 00000 n 
-0000149728 00000 n 
-0000151522 00000 n 
-0000151544 00000 n 
-0000151676 00000 n 
-0000153469 00000 n 
-0000153491 00000 n 
-0000153614 00000 n 
-0000154068 00000 n 
-0000154089 00000 n 
-0000154246 00000 n 
-0000155880 00000 n 
-0000155902 00000 n 
-0000156054 00000 n 
-0000157714 00000 n 
-0000157736 00000 n 
-0000157878 00000 n 
-0000158761 00000 n 
-0000158782 00000 n 
-0000158967 00000 n 
-0000161124 00000 n 
-0000161146 00000 n 
-0000161322 00000 n 
-0000163507 00000 n 
-0000163529 00000 n 
-0000163680 00000 n 
-0000164781 00000 n 
-0000164803 00000 n 
-0000164979 00000 n 
-0000166479 00000 n 
-0000166501 00000 n 
-0000166686 00000 n 
-0000168538 00000 n 
-0000168560 00000 n 
-0000168745 00000 n 
-0000170652 00000 n 
-0000170674 00000 n 
-0000170831 00000 n 
-0000171762 00000 n 
-0000171783 00000 n 
-0000171935 00000 n 
-0000173676 00000 n 
-0000173698 00000 n 
-0000173840 00000 n 
-0000175602 00000 n 
-0000175624 00000 n 
-0000175775 00000 n 
-0000177666 00000 n 
-0000177688 00000 n 
-0000177845 00000 n 
-0000179698 00000 n 
-0000179720 00000 n 
-0000179914 00000 n 
-0000181974 00000 n 
-0000181996 00000 n 
-0000182171 00000 n 
-0000183763 00000 n 
-0000183785 00000 n 
-0000183969 00000 n 
-0000185308 00000 n 
-0000185330 00000 n 
-0000185490 00000 n 
-0000186733 00000 n 
-0000186755 00000 n 
-0000186906 00000 n 
-0000188362 00000 n 
-0000188384 00000 n 
-0000188545 00000 n 
-0000190193 00000 n 
-0000190215 00000 n 
-0000190348 00000 n 
-0000190818 00000 n 
-0000190839 00000 n 
-0000191006 00000 n 
-0000192674 00000 n 
-0000192696 00000 n 
-0000192853 00000 n 
-0000194041 00000 n 
-0000194063 00000 n 
-0000194220 00000 n 
-0000195772 00000 n 
-0000195794 00000 n 
-0000195978 00000 n 
-0000196783 00000 n 
-0000196804 00000 n 
-0000196961 00000 n 
-0000202384 00000 n 
-0000202406 00000 n 
-0000202563 00000 n 
-0000207857 00000 n 
-0000207879 00000 n 
-0000208036 00000 n 
-0000213253 00000 n 
-0000213275 00000 n 
-0000213432 00000 n 
-0000214202 00000 n 
-0000214223 00000 n 
-0000214280 00000 n 
-0000214385 00000 n 
-0000214563 00000 n 
-0000214682 00000 n 
-0000214817 00000 n 
+0000020911 00000 n 
+0000020945 00000 n 
+0000020988 00000 n 
+0000021075 00000 n 
+0000021118 00000 n 
+0000021205 00000 n 
+0000021254 00000 n 
+0000021341 00000 n 
+0000021390 00000 n 
+0000021477 00000 n 
+0000021525 00000 n 
+0000021612 00000 n 
+0000021658 00000 n 
+0000021745 00000 n 
+0000021811 00000 n 
+0000021890 00000 n 
+0000021977 00000 n 
+0000022059 00000 n 
+0000022145 00000 n 
+0000022220 00000 n 
+0000022307 00000 n 
+0000022380 00000 n 
+0000022467 00000 n 
+0000022517 00000 n 
+0000022595 00000 n 
+0000022682 00000 n 
+0000022708 00000 n 
+0000022771 00000 n 
+0000022858 00000 n 
+0000022921 00000 n 
+0000023008 00000 n 
+0000023062 00000 n 
+0000023149 00000 n 
+0000023191 00000 n 
+0000023232 00000 n 
+0000023319 00000 n 
+0000023345 00000 n 
+0000023450 00000 n 
+0000023556 00000 n 
+0000023662 00000 n 
+0000023768 00000 n 
+0000023874 00000 n 
+0000023980 00000 n 
+0000024086 00000 n 
+0000024192 00000 n 
+0000024298 00000 n 
+0000024404 00000 n 
+0000024510 00000 n 
+0000024616 00000 n 
+0000024722 00000 n 
+0000024828 00000 n 
+0000024934 00000 n 
+0000025040 00000 n 
+0000025146 00000 n 
+0000025252 00000 n 
+0000025358 00000 n 
+0000025464 00000 n 
+0000025569 00000 n 
+0000025675 00000 n 
+0000025781 00000 n 
+0000025887 00000 n 
+0000025993 00000 n 
+0000026099 00000 n 
+0000026205 00000 n 
+0000026311 00000 n 
+0000026417 00000 n 
+0000026523 00000 n 
+0000026629 00000 n 
+0000026735 00000 n 
+0000026841 00000 n 
+0000026947 00000 n 
+0000027053 00000 n 
+0000027159 00000 n 
+0000027265 00000 n 
+0000027371 00000 n 
+0000027477 00000 n 
+0000027582 00000 n 
+0000027688 00000 n 
+0000027794 00000 n 
+0000027900 00000 n 
+0000028003 00000 n 
+0000028107 00000 n 
+0000028485 00000 n 
+0000028591 00000 n 
+0000028696 00000 n 
+0000028802 00000 n 
+0000028908 00000 n 
+0000029014 00000 n 
+0000029120 00000 n 
+0000029226 00000 n 
+0000029332 00000 n 
+0000029438 00000 n 
+0000029544 00000 n 
+0000029650 00000 n 
+0000029755 00000 n 
+0000029861 00000 n 
+0000029967 00000 n 
+0000030073 00000 n 
+0000030179 00000 n 
+0000030285 00000 n 
+0000030391 00000 n 
+0000030497 00000 n 
+0000030603 00000 n 
+0000030709 00000 n 
+0000030815 00000 n 
+0000030921 00000 n 
+0000031027 00000 n 
+0000031133 00000 n 
+0000031238 00000 n 
+0000031344 00000 n 
+0000031450 00000 n 
+0000031556 00000 n 
+0000031661 00000 n 
+0000031767 00000 n 
+0000031873 00000 n 
+0000031979 00000 n 
+0000032085 00000 n 
+0000032191 00000 n 
+0000032297 00000 n 
+0000032403 00000 n 
+0000032509 00000 n 
+0000032615 00000 n 
+0000032721 00000 n 
+0000032827 00000 n 
+0000032932 00000 n 
+0000033036 00000 n 
+0000033140 00000 n 
+0000033510 00000 n 
+0000033615 00000 n 
+0000033721 00000 n 
+0000033827 00000 n 
+0000033933 00000 n 
+0000034039 00000 n 
+0000034145 00000 n 
+0000034251 00000 n 
+0000034357 00000 n 
+0000034463 00000 n 
+0000034568 00000 n 
+0000034674 00000 n 
+0000034780 00000 n 
+0000034886 00000 n 
+0000034992 00000 n 
+0000035098 00000 n 
+0000035204 00000 n 
+0000035310 00000 n 
+0000035416 00000 n 
+0000035522 00000 n 
+0000035628 00000 n 
+0000035734 00000 n 
+0000035840 00000 n 
+0000035945 00000 n 
+0000036051 00000 n 
+0000036157 00000 n 
+0000036263 00000 n 
+0000036369 00000 n 
+0000036475 00000 n 
+0000036581 00000 n 
+0000036687 00000 n 
+0000036793 00000 n 
+0000036899 00000 n 
+0000037005 00000 n 
+0000037111 00000 n 
+0000037217 00000 n 
+0000037323 00000 n 
+0000037429 00000 n 
+0000037535 00000 n 
+0000037641 00000 n 
+0000037746 00000 n 
+0000037852 00000 n 
+0000037958 00000 n 
+0000038063 00000 n 
+0000038167 00000 n 
+0000038271 00000 n 
+0000038649 00000 n 
+0000038754 00000 n 
+0000038860 00000 n 
+0000038966 00000 n 
+0000039072 00000 n 
+0000039178 00000 n 
+0000039282 00000 n 
+0000039348 00000 n 
+0000039382 00000 n 
+0000039416 00000 n 
+0000042029 00000 n 
+0000042078 00000 n 
+0000042127 00000 n 
+0000042176 00000 n 
+0000042225 00000 n 
+0000042274 00000 n 
+0000042323 00000 n 
+0000042372 00000 n 
+0000042421 00000 n 
+0000042470 00000 n 
+0000042519 00000 n 
+0000042568 00000 n 
+0000042617 00000 n 
+0000042666 00000 n 
+0000042715 00000 n 
+0000042764 00000 n 
+0000042813 00000 n 
+0000042862 00000 n 
+0000042911 00000 n 
+0000042960 00000 n 
+0000043009 00000 n 
+0000043058 00000 n 
+0000043107 00000 n 
+0000043156 00000 n 
+0000043205 00000 n 
+0000043254 00000 n 
+0000043303 00000 n 
+0000043352 00000 n 
+0000043401 00000 n 
+0000043450 00000 n 
+0000043499 00000 n 
+0000043548 00000 n 
+0000043597 00000 n 
+0000043646 00000 n 
+0000043695 00000 n 
+0000043744 00000 n 
+0000043793 00000 n 
+0000043842 00000 n 
+0000043891 00000 n 
+0000043940 00000 n 
+0000043989 00000 n 
+0000044038 00000 n 
+0000044087 00000 n 
+0000044136 00000 n 
+0000044185 00000 n 
+0000044234 00000 n 
+0000044283 00000 n 
+0000044332 00000 n 
+0000044381 00000 n 
+0000044430 00000 n 
+0000044479 00000 n 
+0000044528 00000 n 
+0000044577 00000 n 
+0000044626 00000 n 
+0000044675 00000 n 
+0000044724 00000 n 
+0000044773 00000 n 
+0000044822 00000 n 
+0000044871 00000 n 
+0000044920 00000 n 
+0000044969 00000 n 
+0000045018 00000 n 
+0000045067 00000 n 
+0000045116 00000 n 
+0000045165 00000 n 
+0000045214 00000 n 
+0000045263 00000 n 
+0000045312 00000 n 
+0000045361 00000 n 
+0000045410 00000 n 
+0000045459 00000 n 
+0000045508 00000 n 
+0000045557 00000 n 
+0000045606 00000 n 
+0000045655 00000 n 
+0000045704 00000 n 
+0000045753 00000 n 
+0000045802 00000 n 
+0000045851 00000 n 
+0000045900 00000 n 
+0000045949 00000 n 
+0000045998 00000 n 
+0000046047 00000 n 
+0000046096 00000 n 
+0000046145 00000 n 
+0000046194 00000 n 
+0000046243 00000 n 
+0000046292 00000 n 
+0000046341 00000 n 
+0000046390 00000 n 
+0000046439 00000 n 
+0000046488 00000 n 
+0000046537 00000 n 
+0000046586 00000 n 
+0000046635 00000 n 
+0000046684 00000 n 
+0000046733 00000 n 
+0000046782 00000 n 
+0000046831 00000 n 
+0000046880 00000 n 
+0000046929 00000 n 
+0000046978 00000 n 
+0000047027 00000 n 
+0000047076 00000 n 
+0000047125 00000 n 
+0000047174 00000 n 
+0000047223 00000 n 
+0000047272 00000 n 
+0000047321 00000 n 
+0000047370 00000 n 
+0000047419 00000 n 
+0000047468 00000 n 
+0000047517 00000 n 
+0000047566 00000 n 
+0000047615 00000 n 
+0000047664 00000 n 
+0000047713 00000 n 
+0000047762 00000 n 
+0000047811 00000 n 
+0000047860 00000 n 
+0000047909 00000 n 
+0000047958 00000 n 
+0000048007 00000 n 
+0000048056 00000 n 
+0000048105 00000 n 
+0000048154 00000 n 
+0000048203 00000 n 
+0000048252 00000 n 
+0000048301 00000 n 
+0000048350 00000 n 
+0000048399 00000 n 
+0000048448 00000 n 
+0000048497 00000 n 
+0000048546 00000 n 
+0000048595 00000 n 
+0000048644 00000 n 
+0000048693 00000 n 
+0000048742 00000 n 
+0000048791 00000 n 
+0000048840 00000 n 
+0000048889 00000 n 
+0000048938 00000 n 
+0000048987 00000 n 
+0000049036 00000 n 
+0000049085 00000 n 
+0000049134 00000 n 
+0000049183 00000 n 
+0000049232 00000 n 
+0000049281 00000 n 
+0000049330 00000 n 
+0000049379 00000 n 
+0000049428 00000 n 
+0000049477 00000 n 
+0000049526 00000 n 
+0000049575 00000 n 
+0000049624 00000 n 
+0000049673 00000 n 
+0000049722 00000 n 
+0000049771 00000 n 
+0000049820 00000 n 
+0000049869 00000 n 
+0000049918 00000 n 
+0000050675 00000 n 
+0000050831 00000 n 
+0000051554 00000 n 
+0000051575 00000 n 
+0000051749 00000 n 
+0000052911 00000 n 
+0000052933 00000 n 
+0000053084 00000 n 
+0000054590 00000 n 
+0000054612 00000 n 
+0000054772 00000 n 
+0000056208 00000 n 
+0000056230 00000 n 
+0000056408 00000 n 
+0000057668 00000 n 
+0000057690 00000 n 
+0000057832 00000 n 
+0000059416 00000 n 
+0000059438 00000 n 
+0000059571 00000 n 
+0000061406 00000 n 
+0000061428 00000 n 
+0000061561 00000 n 
+0000062084 00000 n 
+0000062105 00000 n 
+0000062266 00000 n 
+0000063550 00000 n 
+0000063572 00000 n 
+0000063733 00000 n 
+0000065488 00000 n 
+0000065510 00000 n 
+0000065670 00000 n 
+0000067315 00000 n 
+0000067337 00000 n 
+0000067479 00000 n 
+0000069549 00000 n 
+0000069571 00000 n 
+0000069713 00000 n 
+0000071525 00000 n 
+0000071547 00000 n 
+0000071689 00000 n 
+0000073414 00000 n 
+0000073436 00000 n 
+0000073587 00000 n 
+0000075351 00000 n 
+0000075373 00000 n 
+0000075548 00000 n 
+0000077655 00000 n 
+0000077677 00000 n 
+0000077837 00000 n 
+0000079433 00000 n 
+0000079455 00000 n 
+0000079630 00000 n 
+0000081125 00000 n 
+0000081147 00000 n 
+0000081299 00000 n 
+0000082106 00000 n 
+0000082127 00000 n 
+0000082278 00000 n 
+0000083916 00000 n 
+0000083938 00000 n 
+0000084103 00000 n 
+0000085875 00000 n 
+0000085897 00000 n 
+0000086062 00000 n 
+0000086955 00000 n 
+0000086976 00000 n 
+0000087150 00000 n 
+0000088755 00000 n 
+0000088777 00000 n 
+0000088920 00000 n 
+0000089678 00000 n 
+0000089699 00000 n 
+0000089882 00000 n 
+0000091750 00000 n 
+0000091772 00000 n 
+0000091941 00000 n 
+0000093795 00000 n 
+0000093817 00000 n 
+0000093977 00000 n 
+0000095661 00000 n 
+0000095683 00000 n 
+0000095856 00000 n 
+0000097585 00000 n 
+0000097607 00000 n 
+0000097758 00000 n 
+0000098682 00000 n 
+0000098703 00000 n 
+0000098887 00000 n 
+0000100712 00000 n 
+0000100734 00000 n 
+0000100908 00000 n 
+0000103081 00000 n 
+0000103103 00000 n 
+0000103296 00000 n 
+0000105223 00000 n 
+0000105245 00000 n 
+0000105429 00000 n 
+0000107339 00000 n 
+0000107361 00000 n 
+0000107537 00000 n 
+0000109338 00000 n 
+0000109360 00000 n 
+0000109530 00000 n 
+0000111128 00000 n 
+0000111150 00000 n 
+0000111335 00000 n 
+0000112811 00000 n 
+0000112833 00000 n 
+0000113026 00000 n 
+0000114597 00000 n 
+0000114619 00000 n 
+0000114794 00000 n 
+0000116574 00000 n 
+0000116596 00000 n 
+0000116752 00000 n 
+0000118313 00000 n 
+0000118335 00000 n 
+0000118520 00000 n 
+0000120372 00000 n 
+0000120394 00000 n 
+0000120560 00000 n 
+0000122207 00000 n 
+0000122229 00000 n 
+0000122414 00000 n 
+0000124363 00000 n 
+0000124385 00000 n 
+0000124569 00000 n 
+0000126296 00000 n 
+0000126318 00000 n 
+0000126488 00000 n 
+0000128093 00000 n 
+0000128115 00000 n 
+0000128284 00000 n 
+0000130157 00000 n 
+0000130179 00000 n 
+0000130364 00000 n 
+0000132228 00000 n 
+0000132250 00000 n 
+0000132426 00000 n 
+0000134516 00000 n 
+0000134538 00000 n 
+0000134713 00000 n 
+0000136653 00000 n 
+0000136675 00000 n 
+0000136851 00000 n 
+0000139167 00000 n 
+0000139189 00000 n 
+0000139341 00000 n 
+0000141321 00000 n 
+0000141343 00000 n 
+0000141503 00000 n 
+0000143370 00000 n 
+0000143392 00000 n 
+0000143543 00000 n 
+0000145295 00000 n 
+0000145317 00000 n 
+0000145449 00000 n 
+0000147323 00000 n 
+0000147345 00000 n 
+0000147487 00000 n 
+0000149558 00000 n 
+0000149580 00000 n 
+0000149731 00000 n 
+0000151525 00000 n 
+0000151547 00000 n 
+0000151679 00000 n 
+0000153472 00000 n 
+0000153494 00000 n 
+0000153617 00000 n 
+0000154071 00000 n 
+0000154092 00000 n 
+0000154249 00000 n 
+0000155883 00000 n 
+0000155905 00000 n 
+0000156057 00000 n 
+0000157717 00000 n 
+0000157739 00000 n 
+0000157881 00000 n 
+0000158764 00000 n 
+0000158785 00000 n 
+0000158970 00000 n 
+0000161126 00000 n 
+0000161148 00000 n 
+0000161324 00000 n 
+0000163509 00000 n 
+0000163531 00000 n 
+0000163682 00000 n 
+0000164783 00000 n 
+0000164805 00000 n 
+0000164981 00000 n 
+0000166481 00000 n 
+0000166503 00000 n 
+0000166688 00000 n 
+0000168540 00000 n 
+0000168562 00000 n 
+0000168747 00000 n 
+0000170654 00000 n 
+0000170676 00000 n 
+0000170833 00000 n 
+0000171764 00000 n 
+0000171785 00000 n 
+0000171937 00000 n 
+0000173678 00000 n 
+0000173700 00000 n 
+0000173842 00000 n 
+0000175604 00000 n 
+0000175626 00000 n 
+0000175777 00000 n 
+0000177668 00000 n 
+0000177690 00000 n 
+0000177847 00000 n 
+0000179684 00000 n 
+0000179706 00000 n 
+0000179900 00000 n 
+0000181922 00000 n 
+0000181944 00000 n 
+0000182119 00000 n 
+0000183706 00000 n 
+0000183728 00000 n 
+0000183903 00000 n 
+0000185291 00000 n 
+0000185313 00000 n 
+0000185482 00000 n 
+0000186771 00000 n 
+0000186793 00000 n 
+0000186944 00000 n 
+0000188437 00000 n 
+0000188459 00000 n 
+0000188620 00000 n 
+0000190283 00000 n 
+0000190305 00000 n 
+0000190438 00000 n 
+0000190954 00000 n 
+0000190975 00000 n 
+0000191142 00000 n 
+0000192810 00000 n 
+0000192832 00000 n 
+0000192989 00000 n 
+0000194177 00000 n 
+0000194199 00000 n 
+0000194356 00000 n 
+0000195908 00000 n 
+0000195930 00000 n 
+0000196114 00000 n 
+0000196919 00000 n 
+0000196940 00000 n 
+0000197097 00000 n 
+0000202520 00000 n 
+0000202542 00000 n 
+0000202699 00000 n 
+0000207993 00000 n 
+0000208015 00000 n 
+0000208172 00000 n 
+0000213389 00000 n 
+0000213411 00000 n 
+0000213568 00000 n 
+0000214338 00000 n 
+0000214359 00000 n 
+0000214416 00000 n 
+0000214521 00000 n 
+0000214699 00000 n 
+0000214818 00000 n 
 0000214953 00000 n 
-0000215101 00000 n 
-0000215251 00000 n 
-0000215391 00000 n 
-0000215532 00000 n 
-0000215685 00000 n 
-0000215847 00000 n 
-0000215996 00000 n 
-0000216184 00000 n 
-0000216317 00000 n 
-0000216445 00000 n 
-0000216563 00000 n 
+0000215089 00000 n 
+0000215237 00000 n 
+0000215387 00000 n 
+0000215527 00000 n 
+0000215668 00000 n 
+0000215821 00000 n 
+0000215983 00000 n 
+0000216132 00000 n 
+0000216320 00000 n 
+0000216453 00000 n 
+0000216581 00000 n 
 0000216699 00000 n 
-0000216841 00000 n 
-0000216957 00000 n 
-0000217083 00000 n 
-0000217199 00000 n 
-0000217390 00000 n 
-0000217489 00000 n 
-0000217637 00000 n 
-0000217755 00000 n 
-0000217879 00000 n 
-0000218001 00000 n 
-0000218127 00000 n 
-0000218285 00000 n 
-0000218415 00000 n 
-0000218539 00000 n 
-0000218657 00000 n 
-0000218775 00000 n 
-0000218894 00000 n 
-0000219084 00000 n 
-0000219270 00000 n 
-0000219423 00000 n 
-0000219586 00000 n 
-0000219737 00000 n 
-0000219841 00000 n 
-0000220058 00000 n 
-0000220164 00000 n 
-0000220296 00000 n 
-0000220418 00000 n 
-0000220623 00000 n 
-0000220728 00000 n 
-0000220828 00000 n 
-0000221032 00000 n 
-0000221193 00000 n 
-0000221341 00000 n 
-0000221469 00000 n 
-0000221612 00000 n 
-0000221736 00000 n 
-0000221865 00000 n 
-0000222010 00000 n 
-0000222175 00000 n 
-0000222327 00000 n 
-0000222507 00000 n 
-0000222612 00000 n 
-0000222731 00000 n 
-0000222856 00000 n 
-0000223001 00000 n 
-0000223143 00000 n 
-0000223293 00000 n 
-0000223424 00000 n 
-0000223550 00000 n 
-0000223675 00000 n 
-0000223815 00000 n 
-0000223942 00000 n 
-0000224073 00000 n 
-0000224204 00000 n 
-0000224382 00000 n 
-0000224510 00000 n 
+0000216835 00000 n 
+0000216977 00000 n 
+0000217093 00000 n 
+0000217219 00000 n 
+0000217335 00000 n 
+0000217526 00000 n 
+0000217625 00000 n 
+0000217773 00000 n 
+0000217891 00000 n 
+0000218015 00000 n 
+0000218137 00000 n 
+0000218263 00000 n 
+0000218421 00000 n 
+0000218551 00000 n 
+0000218675 00000 n 
+0000218793 00000 n 
+0000218911 00000 n 
+0000219030 00000 n 
+0000219220 00000 n 
+0000219406 00000 n 
+0000219559 00000 n 
+0000219722 00000 n 
+0000219873 00000 n 
+0000219977 00000 n 
+0000220194 00000 n 
+0000220300 00000 n 
+0000220432 00000 n 
+0000220554 00000 n 
+0000220759 00000 n 
+0000220864 00000 n 
+0000220964 00000 n 
+0000221168 00000 n 
+0000221329 00000 n 
+0000221477 00000 n 
+0000221605 00000 n 
+0000221748 00000 n 
+0000221872 00000 n 
+0000222001 00000 n 
+0000222146 00000 n 
+0000222311 00000 n 
+0000222463 00000 n 
+0000222643 00000 n 
+0000222748 00000 n 
+0000222867 00000 n 
+0000222992 00000 n 
+0000223137 00000 n 
+0000223279 00000 n 
+0000223429 00000 n 
+0000223560 00000 n 
+0000223686 00000 n 
+0000223811 00000 n 
+0000223951 00000 n 
+0000224078 00000 n 
+0000224209 00000 n 
+0000224340 00000 n 
+0000224518 00000 n 
 0000224646 00000 n 
-0000224781 00000 n 
-0000224987 00000 n 
-0000225100 00000 n 
-0000225216 00000 n 
-0000225361 00000 n 
-0000225532 00000 n 
-0000225681 00000 n 
-0000225836 00000 n 
-0000225976 00000 n 
-0000226108 00000 n 
-0000226242 00000 n 
-0000226374 00000 n 
-0000226512 00000 n 
-0000226662 00000 n 
-0000226830 00000 n 
-0000226977 00000 n 
-0000227201 00000 n 
-0000227314 00000 n 
-0000227430 00000 n 
-0000227586 00000 n 
-0000227744 00000 n 
-0000227875 00000 n 
-0000228021 00000 n 
-0000228155 00000 n 
-0000228288 00000 n 
-0000228509 00000 n 
-0000228610 00000 n 
-0000228729 00000 n 
-0000228858 00000 n 
-0000229017 00000 n 
-0000229152 00000 n 
-0000229285 00000 n 
-0000229414 00000 n 
-0000229554 00000 n 
-0000229689 00000 n 
-0000229841 00000 n 
-0000229990 00000 n 
-0000230095 00000 n 
-0000230305 00000 n 
-0000230410 00000 n 
-0000230533 00000 n 
-0000230665 00000 n 
-0000230789 00000 n 
-0000230917 00000 n 
-0000231062 00000 n 
-0000231194 00000 n 
-0000231339 00000 n 
-0000231480 00000 n 
-0000231607 00000 n 
-0000231748 00000 n 
-0000231873 00000 n 
-0000231998 00000 n 
-0000232129 00000 n 
-0000232251 00000 n 
-0000232358 00000 n 
-0000232528 00000 n 
-0000232629 00000 n 
-0000232818 00000 n 
-0000233012 00000 n 
-0000233199 00000 n 
-0000233361 00000 n 
-0000233553 00000 n 
-0000233662 00000 n 
-0000233796 00000 n 
-0000233926 00000 n 
-0000234039 00000 n 
-0000234134 00000 n 
+0000224782 00000 n 
+0000224917 00000 n 
+0000225123 00000 n 
+0000225236 00000 n 
+0000225352 00000 n 
+0000225497 00000 n 
+0000225668 00000 n 
+0000225817 00000 n 
+0000225972 00000 n 
+0000226112 00000 n 
+0000226244 00000 n 
+0000226378 00000 n 
+0000226510 00000 n 
+0000226648 00000 n 
+0000226798 00000 n 
+0000226966 00000 n 
+0000227113 00000 n 
+0000227337 00000 n 
+0000227450 00000 n 
+0000227566 00000 n 
+0000227722 00000 n 
+0000227880 00000 n 
+0000228011 00000 n 
+0000228157 00000 n 
+0000228291 00000 n 
+0000228424 00000 n 
+0000228645 00000 n 
+0000228746 00000 n 
+0000228865 00000 n 
+0000228994 00000 n 
+0000229153 00000 n 
+0000229288 00000 n 
+0000229421 00000 n 
+0000229550 00000 n 
+0000229690 00000 n 
+0000229825 00000 n 
+0000229977 00000 n 
+0000230126 00000 n 
+0000230231 00000 n 
+0000230441 00000 n 
+0000230546 00000 n 
+0000230669 00000 n 
+0000230801 00000 n 
+0000230925 00000 n 
+0000231053 00000 n 
+0000231198 00000 n 
+0000231330 00000 n 
+0000231475 00000 n 
+0000231616 00000 n 
+0000231743 00000 n 
+0000231884 00000 n 
+0000232009 00000 n 
+0000232134 00000 n 
+0000232265 00000 n 
+0000232387 00000 n 
+0000232494 00000 n 
+0000232664 00000 n 
+0000232765 00000 n 
+0000232954 00000 n 
+0000233148 00000 n 
+0000233335 00000 n 
+0000233497 00000 n 
+0000233689 00000 n 
+0000233798 00000 n 
+0000233932 00000 n 
+0000234062 00000 n 
+0000234175 00000 n 
+0000234270 00000 n 
 trailer
-<</Size 1037/Root 1036 0 R/Info 1 0 R/ID[<59d643d3d56fb4ff0981d084417582f1><59d643d3d56fb4ff0981d084417582f1>]>>
+<</Size 1037/Root 1036 0 R/Info 1 0 R/ID[<57917625c1363da5bb6b71712e14ebaf><57917625c1363da5bb6b71712e14ebaf>]>>
 startxref
-234349
+234485
 %%EOF
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index 46f36834df4..d5c89064e74 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -177,13 +177,14 @@
 		<listitem><para>The -l parameter specifies a directory 
 		into which the "log.nmbd" log file will be created
 		for operational data from the running
-		<command>nmbd</command> server.</para>
-
-		<para>The default log directory is compiled into Samba
+		<command>nmbd</command> server. The default log directory is compiled into Samba
 		as part of the build process. Common defaults are <filename>
 		/usr/local/samba/var/log.nmb</filename>, <filename>
 		/usr/samba/var/log.nmb</filename> or
-		<filename>/var/log/log.nmb</filename>.</para></listitem>
+		<filename>/var/log/log.nmb</filename>.  <emphasis>Beware:</emphasis>
+                If the directory specified does not exist, <command>nmbd</command>
+                will log to the default debug log location defined at compile time.
+		</para></listitem>
 		</varlistentry>
 		
 		
@@ -198,25 +199,25 @@
 		<filename>smb.conf</filename>.</para></listitem>
 		</varlistentry>
 
-		
+
 		<varlistentry>
 		<term>-p &lt;UDP port number&gt;</term>
 		<listitem><para>UDP port number is a positive integer value.
-		This option changes the default UDP port number (normally 137) 
-		that <command>nmbd</command> responds to name queries on. Don't 
-		use this option unless you are an expert, in which case you 
+		This option changes the default UDP port number (normally 137)
+		that <command>nmbd</command> responds to name queries on. Don't
+		use this option unless you are an expert, in which case you
 		won't need help!</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term>-s &lt;configuration file&gt;</term>
-		<listitem><para>The default configuration file name 
+		<listitem><para>The default configuration file name
 		is set at build time, typically as <filename>
 		/usr/local/samba/lib/smb.conf</filename>, but
 		this may be changed when Samba is autoconfigured.</para>
 
-		<para>The file specified contains the configuration details 
-		required by the server. See <ulink url="smb.conf.5.html"> 
+		<para>The file specified contains the configuration details
+		required by the server. See <ulink url="smb.conf.5.html">
 		<filename>smb.conf(5)</filename></ulink> for more information.
 		</para></listitem>
 		</varlistentry>
@@ -229,55 +230,55 @@
 	<variablelist>
 		<varlistentry>
 		<term><filename>/etc/inetd.conf</filename></term>
-		<listitem><para>If the server is to be run by the 
-		<command>inetd</command> meta-daemon, this file 
-		must contain suitable startup information for the 
+		<listitem><para>If the server is to be run by the
+		<command>inetd</command> meta-daemon, this file
+		must contain suitable startup information for the
 		meta-daemon. See the <ulink
 		url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
 		for details.
 		</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/etc/rc</filename></term>
-		<listitem><para>or whatever initialization script your 
+		<listitem><para>or whatever initialization script your
 		system uses).</para>
 
-		<para>If running the server as a daemon at startup, 
-		this file will need to contain an appropriate startup 
+		<para>If running the server as a daemon at startup,
+		this file will need to contain an appropriate startup
 		sequence for the server. See the <ulink
 		url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
 		for details.</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/etc/services</filename></term>
-		<listitem><para>If running the server via the 
-		meta-daemon <command>inetd</command>, this file 
-		must contain a mapping of service name (e.g., netbios-ssn) 
-		to service port (e.g., 139) and protocol type (e.g., tcp). 
+		<listitem><para>If running the server via the
+		meta-daemon <command>inetd</command>, this file
+		must contain a mapping of service name (e.g., netbios-ssn)
+		to service port (e.g., 139) and protocol type (e.g., tcp).
 		See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
 		document for details.</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
-		<listitem><para>This is the default location of the 
+		<listitem><para>This is the default location of the
 		<ulink url="smb.conf.5.html"><filename>smb.conf</filename></ulink>
-		server configuration file. Other common places that systems 
-		install this file are <filename>/usr/samba/lib/smb.conf</filename> 
+		server configuration file. Other common places that systems
+		install this file are <filename>/usr/samba/lib/smb.conf</filename>
 		and <filename>/etc/smb.conf</filename>.</para>
-		
-		<para>When run as a WINS server (see the 
+
+		<para>When run as a WINS server (see the
 		<ulink url="smb.conf.5.html#WINSSUPPORT">wins support</ulink>
 		parameter in the <filename>smb.conf(5)</filename> man page),
 		<command>nmbd</command>
-		will store the WINS database in the file <filename>wins.dat</filename> 
-		in the <filename>var/locks</filename> directory configured under 
+		will store the WINS database in the file <filename>wins.dat</filename>
+		in the <filename>var/locks</filename> directory configured under
 		wherever Samba was configured to install itself.</para>
 
 		<para>If <command>nmbd</command> is acting as a <emphasis>
-		browse master</emphasis> (see the <ulink 
+		browse master</emphasis> (see the <ulink
 		url="smb.conf.5.html#LOCALMASTER">local master</ulink>
 		parameter in the <filename>smb.conf(5)</filename> man page,
 		<command>nmbd</command>
@@ -292,20 +293,20 @@
 <refsect1>
 	<title>SIGNALS</title>
 
-	<para>To shut down an <command>nmbd</command> process it is recommended 
-	that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last 
-	resort, as this may leave the name database in an inconsistent state. 
-	The correct way to terminate <command>nmbd</command> is to send it 
+	<para>To shut down an <command>nmbd</command> process it is recommended
+	that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last
+	resort, as this may leave the name database in an inconsistent state.
+	The correct way to terminate <command>nmbd</command> is to send it
 	a SIGTERM (-15) signal and wait for it to die on its own.</para>
 
-	<para><command>nmbd</command> will accept SIGHUP, which will cause 
+	<para><command>nmbd</command> will accept SIGHUP, which will cause
 	it to dump out its namelists into the file <filename>namelist.debug
-	</filename> in the <filename>/usr/local/samba/var/locks</filename> 
-	directory (or the <filename>var/locks</filename> directory configured 
-	under wherever Samba was configured to install itself). This will also 
+	</filename> in the <filename>/usr/local/samba/var/locks</filename>
+	directory (or the <filename>var/locks</filename> directory configured
+	under wherever Samba was configured to install itself). This will also
 	cause <command>nmbd</command> to dump out its server database in
 	the <filename>log.nmb</filename> file.</para>
-	
+
 	<para>The debug log level of nmbd may be raised or lowered using
 	<ulink url="smbcontrol.1.html"><command>smbcontrol(1)</command>
 	</ulink> (SIGUSR[1|2] signals are no longer used in Samba 2.2). This is
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 4a6de97f921..e8846e4b269 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -542,8 +542,10 @@
 	steps fail, then the connection request is rejected.  However, if one of the 
 	steps succeeds, then the following steps are not checked.</para>
 
-	<para>If the service is marked "guest only = yes" then
-	steps 1 to 5 are skipped.</para>
+	<para>If the service is marked "guest only = yes" and the
+	server is running with share-level security ("security = share")
+	then steps 1 to 5 are skipped.</para>
+
 
 	<orderedlist numeration="Arabic">
 		<listitem><para>If the client has passed a username/password 
@@ -653,6 +655,9 @@
 		<listitem><para><link linkend="LOCALMASTER"><parameter>local master</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOCKDIR"><parameter>lock dir</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOCKDIRECTORY"><parameter>lock directory</parameter></link></para></listitem>
+		<listitem><para><link linkend="LOCKSPINCOUNT"><parameter>lock spin count</parameter></link></para></listitem>
+		<listitem><para><link linkend="LOCKSPINTIME"><parameter>lock spin time</parameter></link></para></listitem>
+		<listitem><para><link linkend="PIDDIRECTORY"><parameter>pid directory</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGFILE"><parameter>log file</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGLEVEL"><parameter>log level</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGONDRIVE"><parameter>logon drive</parameter></link></para></listitem>
@@ -833,6 +838,7 @@
 		<listitem><para><link linkend="HOSTSALLOW"><parameter>hosts allow</parameter></link></para></listitem>
 		<listitem><para><link linkend="HOSTSDENY"><parameter>hosts deny</parameter></link></para></listitem>
 		<listitem><para><link linkend="INCLUDE"><parameter>include</parameter></link></para></listitem>
+		<listitem><para><link linkend="INHERITACLS"><parameter>inherit acls</parameter></link></para></listitem>
 		<listitem><para><link linkend="INHERITPERMISSIONS"><parameter>inherit permissions</parameter></link></para></listitem>
 		<listitem><para><link linkend="INVALIDUSERS"><parameter>invalid users</parameter></link></para></listitem>
 		<listitem><para><link linkend="LEVEL2OPLOCKS"><parameter>level2 oplocks</parameter></link></para></listitem>
@@ -3094,6 +3100,24 @@
 
 
 		<varlistentry>
+		<term><anchor id="INHERITACLS">inherit acls (S)</term>
+		<listitem><para>This parameter can be used to ensure
+		that if default acls exist on parent directories,
+		they are always honored when creating a subdirectory.
+		The default behavior is to use the mode specified
+		when creating the directory.  Enabling this option
+		sets the mode to 0777, thus guaranteeing that 
+		default directory acls are propagated.
+		</para>
+
+		<para>Default: <command>inherit acls = no</command>
+		</para></listitem>
+		</varlistentry>
+		
+
+
+
+		<varlistentry>
 		<term><anchor id="INHERITPERMISSIONS">inherit permissions (S)</term>
 		<listitem><para>The permissions on new files and directories 
 		are normally governed by <link linkend="CREATEMASK"><parameter>
@@ -3601,6 +3625,39 @@
 
 
 		<varlistentry>
+		<term><anchor id="LOCKSPINCOUNT">lock spin count (G)</term>
+		<listitem><para>This parameter controls the number of times
+		that smbd should attempt to gain a byte range lock on the 
+		behalf of a client request.  Experiments have shown that
+		Windows 2k servers do not reply with a failure if the lock
+		could not be immediately granted, but try a few more times
+		in case the lock could later be aquired.  This behavior
+		is used to support PC database formats such as MS Access
+		and FoxPro.
+		</para>
+
+		<para>Default: <command>lock spin count = 2</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+
+		<varlistentry>
+		<term><anchor id="LOCKSPINTIME">lock spin time (G)</term>
+		<listitem><para>The time in microseconds that smbd should 
+		pause before attempting to gain a failed lock.  See
+		<link linkend="LOCKSPINCOUNT"><parameter>lock spin 
+		count</parameter></link> for more details.
+		</para>
+
+		<para>Default: <command>lock spin time = 10</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term><anchor id="LOCKING">locking (S)</term>
 		<listitem><para>This controls whether or not locking will be 
 		performed by the server in response to lock requests from the 
@@ -3889,8 +3946,8 @@
 		takes a printer name as its only parameter and outputs printer 
 		status information.</para>
 
-		<para>Currently eight styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+		<para>Currently nine styles of printer status information 
+		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
 		This covers most UNIX systems. You control which type is expected 
 		using the <parameter>printing =</parameter> option.</para>
 
@@ -3906,7 +3963,10 @@
 
 		<para>Note that it is good practice to include the absolute path 
 		in the <parameter>lpq command</parameter> as the <envar>$PATH
-		</envar> may not be available to the server.</para>
+		</envar> may not be available to the server.  When compiled with
+		the CUPS libraries, no <parameter>lpq command</parameter> is
+		needed because smbd will make a library call to obtain the 
+		print queue listing.</para>
 
 		<para>See also the <link linkend="PRINTING"><parameter>printing
 		</parameter></link> parameter.</para>
@@ -5479,6 +5539,18 @@
 
 
 		<varlistentry>
+		<term><anchor id="PIDDIRECTORY">pid directory (G)</term>
+		<listitem><para>This option specifies the directory where pid 
+		files will be placed.  </para>
+
+		<para>Default: <command>pid directory = ${prefix}/var/locks</command></para>
+		<para>Example: <command>pid directory = /var/run/</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term><anchor id="POSIXLOCKING">posix locking (S)</term>
 		<listitem><para>The <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
 		daemon maintains an database of file locks obtained by SMB clients.
@@ -5657,14 +5729,23 @@
 		manually remove old spool files.</para>
 		
 		<para>The print command is simply a text string. It will be used 
-		verbatim, with two exceptions: All occurrences of <parameter>%s
-		</parameter> and <parameter>%f</parameter> will be replaced by the 
-		appropriate spool file name, and all occurrences of <parameter>%p
-		</parameter> will be replaced by the appropriate printer name. The 
-		spool file name is generated automatically by the server.  The 
-		<parameter>%J</parameter> macro can be used to access the job 
+		verbatim after macro substitutions have been made:</para>
+
+		<para>s, %p - the path to the spool
+		file name</para>
+
+		<para>%p - the appropriate printer 
+		name</para>
+
+		<para>%J - the job 
 		name as transmitted by the client.</para>
 
+		<para>%c - The number of printed pages
+		of the spooled job (if known).</para>
+
+		<para>%z - the size of the spooled
+		print job (in bytes)</para>
+
 		<para>The print command <emphasis>MUST</emphasis> contain at least 
 		one occurrence of <parameter>%s</parameter> or <parameter>%f
 		</parameter> - the <parameter>%p</parameter> is optional. At the time 
@@ -5708,6 +5789,17 @@
 		<para>For <command>printing = SOFTQ :</command></para>
 		<para><command>print command = lp -d%p -s %s; rm %s</command></para>
 
+		<para>For printing = CUPS :   If SAMBA is compiled against
+		libcups, then <link linkend="PRINTING">printcap = cups</link> 
+		uses the CUPS API to
+		submit jobs, etc.  Otherwise it maps to the System V
+		commands with the -oraw option for printing, i.e. it
+		uses <command>lp -c -d%p -oraw; rm %s</command>.   
+		With <command>printing = cups</command>,
+		and if SAMBA is compiled against libcups, any manually 
+		set print command will be ignored.</para>
+
+
 		<para>Example: <command>print command = /usr/local/samba/bin/myprintscript
 		%p %s</command></para>
 		</listitem>
@@ -5762,7 +5854,13 @@
 		why you might want to do this.</para>
 
 		<para>To use the CUPS printing interface set <command>printcap name = cups
-		</command>.</para>
+		</command>. This should be supplemented by an addtional setting 
+		<link linkend="PRINTING">printing = cups</link> in the [global] 
+		section.  <command>printcap name = cups</command> will use the  
+		"dummy" printcap created by CUPS, as specified in your CUPS
+		configuration file.
+		</para>
+
 		<para>On System V systems that use <command>lpstat</command> to 
 		list available printers you can use <command>printcap name = lpstat
 		</command> to automatically obtain lists of available printers. This 
@@ -8089,7 +8187,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDCACHETIME">winbind cache time</term>
+		<term><anchor id="WINBINDCACHETIME">winbind cache time (G)</term>
 		<listitem><para>This parameter specifies the number of seconds the
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> daemon will cache 
 		user and group information before querying a Windows NT server 
@@ -8101,8 +8199,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDENUMUSERS">winbind enum
-		users</term> <listitem><para>On large installations using
+		<term><anchor id="WINBINDENUMUSERS">winbind enum users (G)</term> 
+		<listitem><para>On large installations using
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
 		necessary to suppress the enumeration of users through the
 		<command> setpwent()</command>,
@@ -8123,8 +8221,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		</varlistentry>
 		
 		<varlistentry>
-		<term><anchor id="WINBINDENUMGROUPS">winbind enum
-		groups</term> <listitem><para>On large installations using
+		<term><anchor id="WINBINDENUMGROUPS">winbind enum groups (G)</term> 
+		<listitem><para>On large installations using
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
 		necessary to suppress the enumeration of groups through the
 		<command> setgrent()</command>,
@@ -8144,7 +8242,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 	
 		<varlistentry>
-		<term><anchor id="WINBINDGID">winbind gid</term>
+		<term><anchor id="WINBINDGID">winbind gid (G)</term>
 		<listitem><para>The winbind gid parameter specifies the range of group 
 		ids that are allocated by the <ulink url="winbindd.8.html">
 		winbindd(8)</ulink> daemon.  This range of group ids should have no 
@@ -8160,7 +8258,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDSEPARATOR">winbind separator</term>
+		<term><anchor id="WINBINDSEPARATOR">winbind separator (G)</term>
 		<listitem><para>This parameter allows an admin to define the character 
 		used when listing a username of the form of <replaceable>DOMAIN
 		</replaceable>\<replaceable>user</replaceable>.  This parameter 
@@ -8172,8 +8270,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		with group membership at least on glibc systems, as the character +
 		is used as a special character for NIS in /etc/group.</para>
 
-		<para>Example: <command>winbind separator = \\</command></para>
-		<para>Example: <command>winbind separator = /</command></para>
+		<para>Default: <command>winbind separator = '\'</command></para>
+		<para>Example: <command>winbind separator = +</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -8181,7 +8279,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDUID">winbind uid</term>
+		<term><anchor id="WINBINDUID">winbind uid (G)</term>
 		<listitem><para>The winbind gid parameter specifies the range of group 
 		ids that are allocated by the <ulink url="winbindd.8.html">
 		winbindd(8)</ulink> daemon.  This range of ids should have no 
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 4f36de15767..31031dafc46 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -434,9 +434,9 @@ domain = &lt;value&gt;
 		
 		<varlistentry>
 		<term>-W WORKGROUP</term>
-		<listitem><para>Override the default workgroup specified in the 
-		workgroup parameter of the <filename>smb.conf</filename> file 
-		for this connection. This may be needed to connect to some 
+		<listitem><para>Override the default workgroup (domain) specified
+		in the workgroup parameter of the <filename>smb.conf</filename>
+		file for this connection. This may be needed to connect to some
 		servers. </para></listitem>
 		</varlistentry>
 		
@@ -634,6 +634,44 @@ domain = &lt;value&gt;
 		</varlistentry>
 		
 		
+		<varlistentry>
+		<term>altname file</term>
+		<listitem><para>The client will request that the server return
+		the "alternate" name (the 8.3 name) for a file or directory.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>cancel jobid0 [jobid1] ... [jobidN]</term>
+		<listitem><para>The client will request that the server cancel
+		the printjobs identified by the given numeric print job ids.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		
+		<varlistentry>
+		<term>chmod file mode in octal</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX permissions to the given octal mode, in standard UNIX format.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		
+		<varlistentry>
+		<term>chown file uid gid</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX user and group ownership to the given decimal values. Note there is
+		currently no way to remotely look up the UNIX uid and gid values for a given name.
+		This may be addressed in future versions of the CIFS UNIX extensions.
+		</para></listitem>
+		</varlistentry>
+		
+		
 		
 		<varlistentry>
 		<term>cd [directory name]</term>
@@ -701,6 +739,17 @@ domain = &lt;value&gt;
 		
 		
 		<varlistentry>
+		<term>link source destination</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a hard link between the source and destination files. The source file
+		must not exist.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term>lowercase</term>
 		<listitem><para>Toggle lowercasing of filenames for the get and 
 		mget commands. </para>
@@ -878,6 +927,30 @@ domain = &lt;value&gt;
 		
 		
 		<varlistentry>
+		<term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
+		<listitem><para>A version of the DOS attrib command to set 
+		file permissions. For example: </para>
+
+		<para><command>setmode myfile +r </command></para>
+		
+		<para>would make myfile read only. </para></listitem>
+		</varlistentry>
+
+
+		
+		<varlistentry>
+		<term>symlink source destination</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a symbolic hard link between the source and destination files. The source file
+		must not exist. Note that the server will not create a link to any path that lies 
+		outside the currently connected share. This is enforced by the Samba server.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term>tar &lt;c|x&gt;[IXbgNa]</term>
 		<listitem><para>Performs a tar operation - see the <parameter>-T
 		</parameter> command line option above. Behavior may be affected 
@@ -907,16 +980,6 @@ domain = &lt;value&gt;
 		</varlistentry>
 		
 		
-		<varlistentry>
-		<term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
-		<listitem><para>A version of the DOS attrib command to set 
-		file permissions. For example: </para>
-
-		<para><command>setmode myfile +r </command></para>
-		
-		<para>would make myfile read only. </para></listitem>
-		</varlistentry>
-		
 	</variablelist>
 </refsect1>
 
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index 05e05f4a6ab..517e2ca41f4 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -9,7 +9,7 @@
 
 <refnamediv>
 	<refname>smbcontrol</refname>
-	<refpurpose>send messages to smbd or nmbd processes</refpurpose>
+	<refpurpose>send messages to smbd, nmbd or winbindd processes</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -33,9 +33,10 @@
 	Samba</ulink> suite.</para>
 
 	<para><command>smbcontrol</command> is a very small program, which 
-	sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink> or 
-	an <ulink url="nmbd.8.html">nmbd(8)</ulink> daemon running on the 
-	system.</para>
+	sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink>, 
+	an <ulink url="nmbd.8.html">nmbd(8)</ulink>
+	or a <ulink url="winbindd.8.html">winbindd(8)</ulink> 
+	daemon running on the system.</para>
 </refsect1>
 
 
@@ -81,8 +82,9 @@
 		message to smbd which will then close the client connections to
 		the named share. Note that this doesn't affect client connections
 		to any other shares. This message-type takes an argument of the
-		share name for which client connections will be close, or the
+		share name for which client connections will be closed, or the
 		"*" character which will close all currently open shares.
+		This may be useful if you made changes to the access controls on the share.
 		This message can only be sent to <constant>smbd</constant>.</para>
 
 		<para>The <constant>debug</constant> message-type allows 
@@ -105,7 +107,7 @@
 		collection, "off" to turn off profile stats collection, "count"
 		to enable only collection of count stats (time stats are 
 		disabled), and "flush" to zero the current profile stats. This can 
-		be sent to any of the destinations.</para>
+		be sent to any smbd or nmbd destinations.</para>
 
 		<para>The <constant>debuglevel</constant> message-type sends 
 		a "request debug level" message. The current debug level setting 
@@ -115,18 +117,13 @@
 		<para>The <constant>profilelevel</constant> message-type sends 
 		a "request profile level" message.  The current profile level 
 		setting is returned by a  "profilelevel" message. This can be sent 
-		to any of the destinations.</para>
+		to any smbd or nmbd destinations.</para>
 
 		<para>The <constant>printer-notify</constant> message-type sends a 
 		message to smbd which in turn sends a printer notify message to 
 		any Windows NT clients connected to  a printer.  This message-type 
 		takes an argument of the printer name to  send notify messages to.   
 		This message can only be sent to <constant>smbd</constant>.</para>
-
-		<para>The <constant>close-share</constant> message-type sends a
-		message to smbd which forces smbd to close the share that was
-		specified as an argument. This may be useful if you made changes
-		to the access controls on the share.  </para>
 		</listitem>
 		</varlistentry>
 
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 824ae20241c..509007c4bc8 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -176,7 +176,9 @@
 		its size may be controlled by the <ulink 
 		url="smb.conf.5.html#maxlogsize">max log size</ulink>
 		option in the <ulink url="smb.conf.5.html"><filename>
-		smb.conf(5)</filename></ulink> file.
+		smb.conf(5)</filename></ulink> file. <emphasis>Beware:</emphasis>
+		If the directory specified does not exist, <command>smbd</command>
+		will log to the default debug log location defined at compile time.
 		</para>
 
 		<para>The default log directory is specified at
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index b4a77e51c9f..ec4dbbaff1f 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -14,7 +14,7 @@
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>smbumount</command>
+		<command>smbmount</command>
 		<arg choice="req">service</arg>
 		<arg choice="req">mount-point</arg>
 		<arg choice="opt">-o options</arg>
diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index 46adac6b79d..82efb334ba7 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -16,6 +16,13 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>smbsh</command>
+		<arg choice="opt">-W workgroup</arg>
+		<arg choice="opt">-U username</arg>
+		<arg choice="opt">-P prefix</arg>
+		<arg choice="opt">-R &lt;name resolve order&gt;</arg>
+		<arg choice="opt">-d &lt;debug level&gt;</arg>
+		<arg choice="opt">-l logfile</arg>
+		<arg choice="opt">-L libdir</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -30,6 +37,129 @@
 	egrep</command>, and <command>rcp</command>. You must use a 
 	shell that is dynamically linked in order for <command>smbsh</command> 
 	to work correctly.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+	    <varlistentry>
+		<term>-W WORKGROUP</term>
+		<listitem><para>Override the default workgroup specified in the 
+		workgroup parameter of the <filename>smb.conf</filename> file 
+		for this session. This may be needed to connect to some 
+		servers. </para></listitem>
+	    </varlistentry>
+		
+	    <varlistentry>
+		<term>-U username[%pass]</term>
+		<listitem><para>Sets the SMB username or username and password.
+		If this option is not specified, the user will be prompted for 
+		both the username and the password.  If %pass is not specified, 
+		the user will be prompted for the password.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-P prefix</term><listitem><para>This option allows
+		the user to set the directory prefix for SMB access. The 
+		default value if this option is not specified is 
+		<emphasis>smb</emphasis>.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-R &lt;name resolve order&gt;</term> 
+		<listitem><para>This option is used to determine what naming 
+		services and in what order to resolve 
+		host names to IP addresses. The option takes a space-separated 
+		string of different name resolution options.</para>
+
+		<para>The options are :"lmhosts", "host", "wins" and "bcast". 
+		They cause names to be resolved as follows :</para>
+
+		<itemizedlist>
+			<listitem><para><constant>lmhosts</constant> : 
+			Lookup an IP address in the Samba lmhosts file. If the 
+			line in lmhosts has no name type attached to the 
+			NetBIOS name 
+			(see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink>
+			for details) then any name type matches for lookup.
+			</para></listitem>
+
+			<listitem><para><constant>host</constant> : 
+			Do a standard host name to IP address resolution, using
+			the system <filename>/etc/hosts</filename>, NIS, or DNS
+			lookups. This method of name resolution is operating 
+			system dependent, for instance on IRIX or Solaris this 
+			may be controlled by the <filename>/etc/nsswitch.conf
+			</filename> file).  Note that this method is only used 
+			if the NetBIOS name type being queried is the 0x20 
+			(server) name type, otherwise it is ignored.
+			</para></listitem>
+
+			<listitem><para><constant>wins</constant> : 
+			Query a name with the IP address listed in the 
+			<parameter>wins server</parameter> parameter.  If no 
+			WINS server has been specified this method will be 
+			ignored.
+			</para></listitem>
+
+			<listitem><para><constant>bcast</constant> : 
+			Do a broadcast on each of the known local interfaces 
+			listed in the <parameter>interfaces</parameter>
+			parameter. This is the least reliable of the name 
+			resolution methods as it depends on the target host 
+			being on a locally connected subnet.
+			</para></listitem>
+		</itemizedlist>
+
+		<para>If this parameter is not set then the name resolve order 
+		defined in the <filename>smb.conf</filename> file parameter  
+		(name resolve order) will be used. </para>
+
+		<para>The default order is lmhosts, host, wins, bcast. Without 
+		this parameter or any entry in the <parameter>name resolve order
+		</parameter> parameter of the <filename>smb.conf</filename> 
+		file, the name resolution methods will be attempted in this 
+		order. </para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-d &lt;debug level&gt;</term>
+		<listitem><para>debug level is an integer from 0 to 10.</para>
+
+		<para>The default value if this parameter is not specified
+		is zero.</para>
+
+		<para>The higher this value, the more detail will be logged
+		about the activities of <command>nmblookup</command>. At level
+		0, only critical errors and serious warnings will be logged.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-l logfilename</term>
+		<listitem><para>If specified causes all debug messages to be
+		written to the file specified by <replaceable>logfilename
+		</replaceable>. If not specified then all messages will be 
+		written to<replaceable>stderr</replaceable>.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-L libdir</term>
+		<listitem><para>This parameter specifies the location of the 
+		shared libraries used by <command>smbsh</command>. The default
+		value is specified at compile time.
+		</para></listitem>
+	    </varlistentry>
+
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
 
 	<para>To use the <command>smbsh</command> command, execute <command>
 	smbsh</command> from the prompt and enter the username and password 
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 7f2c4624a9a..f1461b07b9c 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,6 +17,8 @@
 		<command>wbinfo</command>
 		<arg choice="opt">-u</arg>
 		<arg choice="opt">-g</arg>
+		<arg choice="opt">-h name</arg>
+		<arg choice="opt">-i ip</arg>
 		<arg choice="opt">-n name</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">-U uid</arg>
@@ -25,8 +27,9 @@
 		<arg choice="opt">-Y sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-m</arg>
+		<arg choice="opt">-r user</arg>
 		<arg choice="opt">-a user%password</arg>
-		<arg choice="opt">-p</arg>
+		<arg choice="opt">-A user%password</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -71,6 +74,26 @@
 		
 		
 		<varlistentry>
+		<term>-h name</term>
+		<listitem><para>The <parameter>-h</parameter> option 
+		queries <command>winbindd(8)</command> to query the WINS
+		server for the IP address associated with the NetBIOS name
+		specified by the <parameter>name</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-i ip</term>
+		<listitem><para>The <parameter>-i</parameter> option 
+		queries <command>winbindd(8)</command> to send a node status
+		request to get the NetBIOS name associated with the IP address
+		specified by the <parameter>ip</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
 		<term>-n name</term>
 		<listitem><para>The <parameter>-n</parameter> option 
 		queries <command>winbindd(8)</command> for the SID 		
@@ -143,6 +166,16 @@
 		</para></listitem>
 		</varlistentry>
 
+
+		<varlistentry>
+		<term>-r username</term>
+		<listitem><para>Try to obtain the list of UNIX group ids
+		to which the user belongs.  This only works for users
+		defined on a Domain Controller.
+		</para></listitem>
+		</varlistentry>
+
+
 		<varlistentry>
 		<term>-a username%password</term>
 		<listitem><para>Attempt to authenticate a user via winbindd. 
@@ -150,10 +183,14 @@
 		</para></listitem>
 		</varlistentry>
 
+
 		<varlistentry>
-		<term>-p</term>
-		<listitem><para>Attempt a simple 'ping' check that the winbindd
-                is indeed alive.
+		<term>-A username%password</term>
+		<listitem><para>Store username and password used by winbindd 
+		during session setup to a domain controller.  This enables
+		winbindd to operate in a Windows 2000 domain with Restrict
+		Anonymous turned on (a.k.a. Permissions compatiable with
+		Windows 2000 servers only).
 		</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index bd1dafa07e8..0325f9bfe14 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -57,6 +57,15 @@
 
 	<variablelist>
 		<varlistentry>
+		<term>hosts</term>
+		<listitem><para>User information traditionally stored in 
+		the <filename>hosts(5)</filename> file and used by 
+		<command>gethostbyname(3)</command> functions. Names are
+		resolved through the WINS server or by broadcast.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>passwd</term>
 		<listitem><para>User information traditionally stored in 
 		the <filename>passwd(5)</filename> file and used by 
@@ -81,6 +90,12 @@
 passwd:         files winbind
 group:          files winbind
 	</programlisting></para>  
+
+	<para>The following simple configuration in the
+	<filename>/etc/nsswitch.conf</filename> file can be used to initially
+	resolve hostnames from <filename>/etc/hosts</filename> and then from the
+	WINS server.</para>
+
 </refsect1>
 
 
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index 21d2c55ec7a..c6c04ccab83 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -13,8 +13,8 @@
 			<address><email>olem@IDEALX.org</email></address>
 		</affiliation>
 	</author>
-	
-		
+
+
 	<pubdate> (13 Jan 2002) </pubdate>
 </chapterinfo>
 
@@ -98,7 +98,7 @@ Identified (RID).
 As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
 is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <parameter>--with-ldapsam</parameter> or
 <parameter>--with-tdbsam</parameter>) requires compile time support.
 </para>
@@ -515,7 +515,6 @@ something other than the default (e.g. \\MOBY\becky).
 
 
 
-
 <sect1>
 <title>Example LDIF Entries for a sambaAccount</title>
 
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index fc8d8d52a12..62e065914b4 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.sgml
@@ -324,6 +324,14 @@ to control access and authenticate users on your Linux box using
 the winbind services which come with SAMBA 2.2.2.
 </para>
 
+<para>
+There is also some Solaris specific information in 
+<filename>docs/textdocs/Solaris-Winbind-HOWTO.txt</filename>.
+Future revisions of this document will incorporate that
+information.
+</para>
+
+
 
 <sect2>
 <title>Introduction</title>
diff --git a/docs/faq/README b/docs/faq/README
new file mode 100644
index 00000000000..f4f0e8ab69a
--- /dev/null
+++ b/docs/faq/README
@@ -0,0 +1,8 @@
+This directory contains the old Samba FAQ.
+It is now horribly outdated and unmaintained.
+It is being left here in case there is some
+useful information within. 
+
+
+--jerry@samba.org
+
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 5b44d17968d..5175bd4c8dd 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -878,29 +878,29 @@ HREF="#AEN2015"
 ><DL
 ><DT
 >11.5.1. <A
-HREF="#AEN2020"
+HREF="#AEN2022"
 >Introduction</A
 ></DT
 ><DT
 >11.5.2. <A
-HREF="#AEN2033"
+HREF="#AEN2035"
 >Requirements</A
 ></DT
 ><DT
 >11.5.3. <A
-HREF="#AEN2047"
+HREF="#AEN2049"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.5.3.1. <A
-HREF="#AEN2058"
+HREF="#AEN2060"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >11.5.3.2. <A
-HREF="#AEN2077"
+HREF="#AEN2079"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -909,22 +909,22 @@ winbind libraries</A
 ></DT
 ><DT
 >11.5.3.3. <A
-HREF="#AEN2102"
+HREF="#AEN2104"
 >Configure smb.conf</A
 ></DT
 ><DT
 >11.5.3.4. <A
-HREF="#AEN2118"
+HREF="#AEN2120"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >11.5.3.5. <A
-HREF="#AEN2129"
+HREF="#AEN2131"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >11.5.3.6. <A
-HREF="#AEN2165"
+HREF="#AEN2167"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -932,7 +932,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >11.5.3.7. <A
-HREF="#AEN2187"
+HREF="#AEN2189"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -941,12 +941,12 @@ HREF="#AEN2187"
 ></DD
 ><DT
 >11.6. <A
-HREF="#AEN2234"
+HREF="#AEN2236"
 >Limitations</A
 ></DT
 ><DT
 >11.7. <A
-HREF="#AEN2244"
+HREF="#AEN2246"
 >Conclusion</A
 ></DT
 ></DL
@@ -960,32 +960,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >12.1. <A
-HREF="#AEN2258"
+HREF="#AEN2260"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1.1. <A
-HREF="#AEN2260"
+HREF="#AEN2262"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
 >12.1.2. <A
-HREF="#AEN2275"
+HREF="#AEN2277"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
 >12.1.3. <A
-HREF="#AEN2284"
+HREF="#AEN2286"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >12.1.4. <A
-HREF="#AEN2288"
+HREF="#AEN2290"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -1002,24 +1002,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >13.1. <A
-HREF="#AEN2304"
+HREF="#AEN2306"
 >Introduction</A
 ></DT
 ><DT
 >13.2. <A
-HREF="#AEN2309"
+HREF="#AEN2311"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >13.2.1. <A
-HREF="#AEN2312"
+HREF="#AEN2314"
 >Access via CVSweb</A
 ></DT
 ><DT
 >13.2.2. <A
-HREF="#AEN2317"
+HREF="#AEN2319"
 >Access via cvs</A
 ></DT
 ></DL
@@ -1028,7 +1028,7 @@ HREF="#AEN2317"
 ></DD
 ><DT
 ><A
-HREF="#AEN2345"
+HREF="#AEN2347"
 >Index</A
 ></DT
 ></DL
@@ -8347,7 +8347,7 @@ Identified (RID).</P
 >As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
 is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <TT
 CLASS="PARAMETER"
 ><I
@@ -9535,12 +9535,20 @@ for providing the HOWTO for this section.</P
 >This HOWTO describes how to get winbind services up and running 
 to control access and authenticate users on your Linux box using 
 the winbind services which come with SAMBA 2.2.2.</P
+><P
+>There is also some Solaris specific information in 
+<TT
+CLASS="FILENAME"
+>docs/textdocs/Solaris-Winbind-HOWTO.txt</TT
+>.
+Future revisions of this document will incorporate that
+information.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2020"
+NAME="AEN2022"
 >11.5.1. Introduction</A
 ></H2
 ><P
@@ -9591,7 +9599,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2033"
+NAME="AEN2035"
 >11.5.2. Requirements</A
 ></H2
 ><P
@@ -9649,7 +9657,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2047"
+NAME="AEN2049"
 >11.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -9694,7 +9702,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2058"
+NAME="AEN2060"
 >11.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -9769,7 +9777,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2077"
+NAME="AEN2079"
 >11.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -9859,7 +9867,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2102"
+NAME="AEN2104"
 >11.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -9943,7 +9951,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2118"
+NAME="AEN2120"
 >11.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -9989,7 +9997,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2129"
+NAME="AEN2131"
 >11.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -10130,7 +10138,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2165"
+NAME="AEN2167"
 >11.5.3.6. Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -10260,7 +10268,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2187"
+NAME="AEN2189"
 >11.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -10482,7 +10490,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2234"
+NAME="AEN2236"
 >11.6. Limitations</A
 ></H1
 ><P
@@ -10523,7 +10531,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2244"
+NAME="AEN2246"
 >11.7. Conclusion</A
 ></H1
 ><P
@@ -10547,7 +10555,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2258"
+NAME="AEN2260"
 >12.1. FAQs</A
 ></H1
 ><DIV
@@ -10555,7 +10563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2260"
+NAME="AEN2262"
 >12.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -10614,7 +10622,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN2277"
 >12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
@@ -10667,7 +10675,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2284"
+NAME="AEN2286"
 >12.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -10689,7 +10697,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2288"
+NAME="AEN2290"
 >12.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -10745,7 +10753,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2304"
+NAME="AEN2306"
 >13.1. Introduction</A
 ></H1
 ><P
@@ -10767,7 +10775,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2309"
+NAME="AEN2311"
 >13.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -10780,7 +10788,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2312"
+NAME="AEN2314"
 >13.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -10801,7 +10809,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2317"
+NAME="AEN2319"
 >13.2.2. Access via cvs</A
 ></H2
 ><P
@@ -10907,7 +10915,7 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2345"
+NAME="AEN2347"
 >Index</A
 ></H1
 ><DL
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index 4e5993f3bc4..76fd5de6ba2 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -295,9 +295,7 @@ CLASS="FILENAME"
 		<B
 CLASS="COMMAND"
 >nmbd</B
-> server.</P
-><P
->The default log directory is compiled into Samba
+> server. The default log directory is compiled into Samba
 		as part of the build process. Common defaults are <TT
 CLASS="FILENAME"
 >		/usr/local/samba/var/log.nmb</TT
@@ -308,7 +306,15 @@ CLASS="FILENAME"
 		<TT
 CLASS="FILENAME"
 >/var/log/log.nmb</TT
->.</P
+>.  <EM
+>Beware:</EM
+>
+                If the directory specified does not exist, <B
+CLASS="COMMAND"
+>nmbd</B
+>
+                will log to the default debug log location defined at compile time.
+		</P
 ></DD
 ><DT
 >-n &#60;primary NetBIOS name&#62;</DT
@@ -340,31 +346,30 @@ CLASS="FILENAME"
 ><DD
 ><P
 >UDP port number is a positive integer value.
-		This option changes the default UDP port number (normally 137) 
+		This option changes the default UDP port number (normally 137)
 		that <B
 CLASS="COMMAND"
 >nmbd</B
-> responds to name queries on. Don't 
-		use this option unless you are an expert, in which case you 
+> responds to name queries on. Don't
+		use this option unless you are an expert, in which case you
 		won't need help!</P
 ></DD
 ><DT
 >-s &#60;configuration file&#62;</DT
 ><DD
 ><P
->The default configuration file name 
+>The default configuration file name
 		is set at build time, typically as <TT
 CLASS="FILENAME"
 >		/usr/local/samba/lib/smb.conf</TT
 >, but
 		this may be changed when Samba is autoconfigured.</P
 ><P
->The file specified contains the configuration details 
+>The file specified contains the configuration details
 		required by the server. See <A
 HREF="smb.conf.5.html"
 TARGET="_top"
-> 
-		<TT
+>		<TT
 CLASS="FILENAME"
 >smb.conf(5)</TT
 ></A
@@ -377,7 +382,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN130"
+NAME="AEN131"
 ></A
 ><H2
 >FILES</H2
@@ -393,12 +398,12 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->If the server is to be run by the 
+>If the server is to be run by the
 		<B
 CLASS="COMMAND"
 >inetd</B
-> meta-daemon, this file 
-		must contain suitable startup information for the 
+> meta-daemon, this file
+		must contain suitable startup information for the
 		meta-daemon. See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -414,11 +419,11 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->or whatever initialization script your 
+>or whatever initialization script your
 		system uses).</P
 ><P
->If running the server as a daemon at startup, 
-		this file will need to contain an appropriate startup 
+>If running the server as a daemon at startup,
+		this file will need to contain an appropriate startup
 		sequence for the server. See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -433,13 +438,13 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->If running the server via the 
+>If running the server via the
 		meta-daemon <B
 CLASS="COMMAND"
 >inetd</B
->, this file 
-		must contain a mapping of service name (e.g., netbios-ssn) 
-		to service port (e.g., 139) and protocol type (e.g., tcp). 
+>, this file
+		must contain a mapping of service name (e.g., netbios-ssn)
+		to service port (e.g., 139) and protocol type (e.g., tcp).
 		See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -454,7 +459,7 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->This is the default location of the 
+>This is the default location of the
 		<A
 HREF="smb.conf.5.html"
 TARGET="_top"
@@ -463,17 +468,17 @@ CLASS="FILENAME"
 >smb.conf</TT
 ></A
 >
-		server configuration file. Other common places that systems 
+		server configuration file. Other common places that systems
 		install this file are <TT
 CLASS="FILENAME"
 >/usr/samba/lib/smb.conf</TT
-> 
+>
 		and <TT
 CLASS="FILENAME"
 >/etc/smb.conf</TT
 >.</P
 ><P
->When run as a WINS server (see the 
+>When run as a WINS server (see the
 		<A
 HREF="smb.conf.5.html#WINSSUPPORT"
 TARGET="_top"
@@ -490,11 +495,11 @@ CLASS="COMMAND"
 		will store the WINS database in the file <TT
 CLASS="FILENAME"
 >wins.dat</TT
-> 
+>
 		in the <TT
 CLASS="FILENAME"
 >var/locks</TT
-> directory configured under 
+> directory configured under
 		wherever Samba was configured to install itself.</P
 ><P
 >If <B
@@ -532,7 +537,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN177"
+NAME="AEN178"
 ></A
 ><H2
 >SIGNALS</H2
@@ -540,21 +545,21 @@ NAME="AEN177"
 >To shut down an <B
 CLASS="COMMAND"
 >nmbd</B
-> process it is recommended 
+> process it is recommended
 	that SIGKILL (-9) <EM
 >NOT</EM
-> be used, except as a last 
-	resort, as this may leave the name database in an inconsistent state. 
+> be used, except as a last
+	resort, as this may leave the name database in an inconsistent state.
 	The correct way to terminate <B
 CLASS="COMMAND"
 >nmbd</B
-> is to send it 
+> is to send it
 	a SIGTERM (-15) signal and wait for it to die on its own.</P
 ><P
 ><B
 CLASS="COMMAND"
 >nmbd</B
-> will accept SIGHUP, which will cause 
+> will accept SIGHUP, which will cause
 	it to dump out its namelists into the file <TT
 CLASS="FILENAME"
 >namelist.debug
@@ -562,12 +567,12 @@ CLASS="FILENAME"
 > in the <TT
 CLASS="FILENAME"
 >/usr/local/samba/var/locks</TT
-> 
+>
 	directory (or the <TT
 CLASS="FILENAME"
 >var/locks</TT
-> directory configured 
-	under wherever Samba was configured to install itself). This will also 
+> directory configured
+	under wherever Samba was configured to install itself). This will also
 	cause <B
 CLASS="COMMAND"
 >nmbd</B
@@ -593,7 +598,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN193"
+NAME="AEN194"
 ></A
 ><H2
 >VERSION</H2
@@ -604,7 +609,7 @@ NAME="AEN193"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN197"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -669,7 +674,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN213"
+NAME="AEN214"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index ee9f498a94a..d329c25d654 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -785,8 +785,9 @@ NAME="AEN236"
 	steps fail, then the connection request is rejected.  However, if one of the 
 	steps succeeds, then the following steps are not checked.</P
 ><P
->If the service is marked "guest only = yes" then
-	steps 1 to 5 are skipped.</P
+>If the service is marked "guest only = yes" and the
+	server is running with share-level security ("security = share")
+	then steps 1 to 5 are skipped.</P
 ><P
 ></P
 ><OL
@@ -1584,6 +1585,42 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin count</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LOCKSPINTIME"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin time</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#PIDDIRECTORY"
+><TT
+CLASS="PARAMETER"
+><I
+>pid directory</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#LOGFILE"
 ><TT
 CLASS="PARAMETER"
@@ -3026,7 +3063,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN979"
+NAME="AEN991"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3591,6 +3628,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#INHERITACLS"
+><TT
+CLASS="PARAMETER"
+><I
+>inherit acls</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#INHERITPERMISSIONS"
 ><TT
 CLASS="PARAMETER"
@@ -4493,7 +4542,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1467"
+NAME="AEN1483"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -8927,6 +8976,28 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="INHERITACLS"
+></A
+>inherit acls (S)</DT
+><DD
+><P
+>This parameter can be used to ensure
+		that if default acls exist on parent directories,
+		they are always honored when creating a subdirectory.
+		The default behavior is to use the mode specified
+		when creating the directory.  Enabling this option
+		sets the mode to 0777, thus guaranteeing that 
+		default directory acls are propagated.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>inherit acls = no</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="INHERITPERMISSIONS"
 ></A
 >inherit permissions (S)</DT
@@ -9945,6 +10016,56 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="LOCKSPINCOUNT"
+></A
+>lock spin count (G)</DT
+><DD
+><P
+>This parameter controls the number of times
+		that smbd should attempt to gain a byte range lock on the 
+		behalf of a client request.  Experiments have shown that
+		Windows 2k servers do not reply with a failure if the lock
+		could not be immediately granted, but try a few more times
+		in case the lock could later be aquired.  This behavior
+		is used to support PC database formats such as MS Access
+		and FoxPro.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin count = 2</B
+>
+		</P
+></DD
+><DT
+><A
+NAME="LOCKSPINTIME"
+></A
+>lock spin time (G)</DT
+><DD
+><P
+>The time in microseconds that smbd should 
+		pause before attempting to gain a failed lock.  See
+		<A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin 
+		count</I
+></TT
+></A
+> for more details.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin time = 10</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="LOCKING"
 ></A
 >locking (S)</DT
@@ -10474,8 +10595,8 @@ CLASS="COMMAND"
 		takes a printer name as its only parameter and outputs printer 
 		status information.</P
 ><P
->Currently eight styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+>Currently nine styles of printer status information 
+		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
 		This covers most UNIX systems. You control which type is expected 
 		using the <TT
 CLASS="PARAMETER"
@@ -10509,7 +10630,15 @@ CLASS="PARAMETER"
 CLASS="ENVAR"
 >$PATH
 		</TT
-> may not be available to the server.</P
+> may not be available to the server.  When compiled with
+		the CUPS libraries, no <TT
+CLASS="PARAMETER"
+><I
+>lpq command</I
+></TT
+> is
+		needed because smbd will make a library call to obtain the 
+		print queue listing.</P
 ><P
 >See also the <A
 HREF="#PRINTING"
@@ -13603,6 +13732,27 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="PIDDIRECTORY"
+></A
+>pid directory (G)</DT
+><DD
+><P
+>This option specifies the directory where pid 
+		files will be placed.  </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>pid directory = ${prefix}/var/locks</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>pid directory = /var/run/</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="POSIXLOCKING"
 ></A
 >posix locking (S)</DT
@@ -13931,34 +14081,23 @@ CLASS="COMMAND"
 		manually remove old spool files.</P
 ><P
 >The print command is simply a text string. It will be used 
-		verbatim, with two exceptions: All occurrences of <TT
-CLASS="PARAMETER"
-><I
->%s
-		</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->%f</I
-></TT
-> will be replaced by the 
-		appropriate spool file name, and all occurrences of <TT
-CLASS="PARAMETER"
-><I
->%p
-		</I
-></TT
-> will be replaced by the appropriate printer name. The 
-		spool file name is generated automatically by the server.  The 
-		<TT
-CLASS="PARAMETER"
-><I
->%J</I
-></TT
-> macro can be used to access the job 
+		verbatim after macro substitutions have been made:</P
+><P
+>s, %p - the path to the spool
+		file name</P
+><P
+>%p - the appropriate printer 
+		name</P
+><P
+>%J - the job 
 		name as transmitted by the client.</P
 ><P
+>%c - The number of printed pages
+		of the spooled job (if known).</P
+><P
+>%z - the size of the spooled
+		print job (in bytes)</P
+><P
 >The print command <EM
 >MUST</EM
 > contain at least 
@@ -14065,6 +14204,25 @@ CLASS="COMMAND"
 >print command = lp -d%p -s %s; rm %s</B
 ></P
 ><P
+>For printing = CUPS :   If SAMBA is compiled against
+		libcups, then <A
+HREF="#PRINTING"
+>printcap = cups</A
+> 
+		uses the CUPS API to
+		submit jobs, etc.  Otherwise it maps to the System V
+		commands with the -oraw option for printing, i.e. it
+		uses <B
+CLASS="COMMAND"
+>lp -c -d%p -oraw; rm %s</B
+>.   
+		With <B
+CLASS="COMMAND"
+>printing = cups</B
+>,
+		and if SAMBA is compiled against libcups, any manually 
+		set print command will be ignored.</P
+><P
 >Example: <B
 CLASS="COMMAND"
 >print command = /usr/local/samba/bin/myprintscript
@@ -14159,7 +14317,18 @@ HREF="#AEN79"
 CLASS="COMMAND"
 >printcap name = cups
 		</B
->.</P
+>. This should be supplemented by an addtional setting 
+		<A
+HREF="#PRINTING"
+>printing = cups</A
+> in the [global] 
+		section.  <B
+CLASS="COMMAND"
+>printcap name = cups</B
+> will use the  
+		"dummy" printcap created by CUPS, as specified in your CUPS
+		configuration file.
+		</P
 ><P
 >On System V systems that use <B
 CLASS="COMMAND"
@@ -18464,7 +18633,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDCACHETIME"
 ></A
->winbind cache time</DT
+>winbind cache time (G)</DT
 ><DD
 ><P
 >This parameter specifies the number of seconds the
@@ -18485,8 +18654,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMUSERS"
 ></A
->winbind enum
-		users</DT
+>winbind enum users (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18537,8 +18705,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMGROUPS"
 ></A
->winbind enum
-		groups</DT
+>winbind enum groups (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18588,7 +18755,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDGID"
 ></A
->winbind gid</DT
+>winbind gid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -18615,7 +18782,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDSEPARATOR"
 ></A
->winbind separator</DT
+>winbind separator (G)</DT
 ><DD
 ><P
 >This parameter allows an admin to define the character 
@@ -18645,21 +18812,21 @@ CLASS="FILENAME"
 		with group membership at least on glibc systems, as the character +
 		is used as a special character for NIS in /etc/group.</P
 ><P
->Example: <B
+>Default: <B
 CLASS="COMMAND"
->winbind separator = \\</B
+>winbind separator = '\'</B
 ></P
 ><P
 >Example: <B
 CLASS="COMMAND"
->winbind separator = /</B
+>winbind separator = +</B
 ></P
 ></DD
 ><DT
 ><A
 NAME="WINBINDUID"
 ></A
->winbind uid</DT
+>winbind uid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -19079,7 +19246,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6045"
+NAME="AEN6101"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19109,7 +19276,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6051"
+NAME="AEN6107"
 ></A
 ><H2
 >VERSION</H2
@@ -19120,7 +19287,7 @@ NAME="AEN6051"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6054"
+NAME="AEN6110"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19199,7 +19366,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6074"
+NAME="AEN6130"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 6c15873787d..4c770f9eb21 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -673,12 +673,12 @@ CLASS="COMMAND"
 >-W WORKGROUP</DT
 ><DD
 ><P
->Override the default workgroup specified in the 
-		workgroup parameter of the <TT
+>Override the default workgroup (domain) specified
+		in the workgroup parameter of the <TT
 CLASS="FILENAME"
 >smb.conf</TT
-> file 
-		for this connection. This may be needed to connect to some 
+>
+		file for this connection. This may be needed to connect to some
 		servers. </P
 ></DD
 ><DT
@@ -1051,6 +1051,42 @@ CLASS="REPLACEABLE"
 		</P
 ></DD
 ><DT
+>altname file</DT
+><DD
+><P
+>The client will request that the server return
+		the "alternate" name (the 8.3 name) for a file or directory.
+		</P
+></DD
+><DT
+>cancel jobid0 [jobid1] ... [jobidN]</DT
+><DD
+><P
+>The client will request that the server cancel
+		the printjobs identified by the given numeric print job ids.
+		</P
+></DD
+><DT
+>chmod file mode in octal</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX permissions to the given octal mode, in standard UNIX format.
+		</P
+></DD
+><DT
+>chown file uid gid</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX user and group ownership to the given decimal values. Note there is
+		currently no way to remotely look up the UNIX uid and gid values for a given name.
+		This may be addressed in future versions of the CIFS UNIX extensions.
+		</P
+></DD
+><DT
 >cd [directory name]</DT
 ><DD
 ><P
@@ -1139,6 +1175,16 @@ CLASS="REPLACEABLE"
 		</P
 ></DD
 ><DT
+>link source destination</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a hard link between the source and destination files. The source file
+		must not exist.
+		</P
+></DD
+><DT
 >lowercase</DT
 ><DD
 ><P
@@ -1352,6 +1398,31 @@ CLASS="REPLACEABLE"
 		privileges permitting) from the server. </P
 ></DD
 ><DT
+>setmode &#60;filename&#62; &#60;perm=[+|\-]rsha&#62;</DT
+><DD
+><P
+>A version of the DOS attrib command to set 
+		file permissions. For example: </P
+><P
+><B
+CLASS="COMMAND"
+>setmode myfile +r </B
+></P
+><P
+>would make myfile read only. </P
+></DD
+><DT
+>symlink source destination</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a symbolic hard link between the source and destination files. The source file
+		must not exist. Note that the server will not create a link to any path that lies 
+		outside the currently connected share. This is enforced by the Samba server.
+		</P
+></DD
+><DT
 >tar &#60;c|x&#62;[IXbgNa]</DT
 ><DD
 ><P
@@ -1391,27 +1462,13 @@ CLASS="REPLACEABLE"
 		tar will reset the archive bit on all files it backs up (implies 
 		read/write share). </P
 ></DD
-><DT
->setmode &#60;filename&#62; &#60;perm=[+|\-]rsha&#62;</DT
-><DD
-><P
->A version of the DOS attrib command to set 
-		file permissions. For example: </P
-><P
-><B
-CLASS="COMMAND"
->setmode myfile +r </B
-></P
-><P
->would make myfile read only. </P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN477"
+NAME="AEN501"
 ></A
 ><H2
 >NOTES</H2
@@ -1432,7 +1489,7 @@ NAME="AEN477"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN482"
+NAME="AEN506"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -1465,7 +1522,7 @@ CLASS="ENVAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN490"
+NAME="AEN514"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -1503,7 +1560,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN500"
+NAME="AEN524"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -1519,7 +1576,7 @@ NAME="AEN500"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN504"
+NAME="AEN528"
 ></A
 ><H2
 >VERSION</H2
@@ -1530,7 +1587,7 @@ NAME="AEN504"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN507"
+NAME="AEN531"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcontrol.1.html b/docs/htmldocs/smbcontrol.1.html
index c824a7cd093..5dc9854a848 100644
--- a/docs/htmldocs/smbcontrol.1.html
+++ b/docs/htmldocs/smbcontrol.1.html
@@ -24,7 +24,7 @@ NAME="AEN5"
 ></A
 ><H2
 >Name</H2
->smbcontrol&nbsp;--&nbsp;send messages to smbd or nmbd processes</DIV
+>smbcontrol&nbsp;--&nbsp;send messages to smbd, nmbd or winbindd processes</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
@@ -65,18 +65,23 @@ CLASS="COMMAND"
 HREF="smbd.8.html"
 TARGET="_top"
 >smbd(8)</A
-> or 
+>, 
 	an <A
 HREF="nmbd.8.html"
 TARGET="_top"
 >nmbd(8)</A
-> daemon running on the 
-	system.</P
+>
+	or a <A
+HREF="winbindd.8.html"
+TARGET="_top"
+>winbindd(8)</A
+> 
+	daemon running on the system.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25"
+NAME="AEN26"
 ></A
 ><H2
 >OPTIONS</H2
@@ -175,8 +180,9 @@ CLASS="CONSTANT"
 		message to smbd which will then close the client connections to
 		the named share. Note that this doesn't affect client connections
 		to any other shares. This message-type takes an argument of the
-		share name for which client connections will be close, or the
+		share name for which client connections will be closed, or the
 		"*" character which will close all currently open shares.
+		This may be useful if you made changes to the access controls on the share.
 		This message can only be sent to <TT
 CLASS="CONSTANT"
 >smbd</TT
@@ -220,7 +226,7 @@ CLASS="CONSTANT"
 		collection, "off" to turn off profile stats collection, "count"
 		to enable only collection of count stats (time stats are 
 		disabled), and "flush" to zero the current profile stats. This can 
-		be sent to any of the destinations.</P
+		be sent to any smbd or nmbd destinations.</P
 ><P
 >The <TT
 CLASS="CONSTANT"
@@ -236,7 +242,7 @@ CLASS="CONSTANT"
 > message-type sends 
 		a "request profile level" message.  The current profile level 
 		setting is returned by a  "profilelevel" message. This can be sent 
-		to any of the destinations.</P
+		to any smbd or nmbd destinations.</P
 ><P
 >The <TT
 CLASS="CONSTANT"
@@ -249,14 +255,6 @@ CLASS="CONSTANT"
 CLASS="CONSTANT"
 >smbd</TT
 >.</P
-><P
->The <TT
-CLASS="CONSTANT"
->close-share</TT
-> message-type sends a
-		message to smbd which forces smbd to close the share that was
-		specified as an argument. This may be useful if you made changes
-		to the access controls on the share.  </P
 ></DD
 ><DT
 >parameters</DT
@@ -270,7 +268,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82"
+NAME="AEN81"
 ></A
 ><H2
 >VERSION</H2
@@ -281,7 +279,7 @@ NAME="AEN82"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85"
+NAME="AEN84"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -307,7 +305,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92"
+NAME="AEN91"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 72fc10e2e42..6a4996d9387 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -272,7 +272,14 @@ TARGET="_top"
 CLASS="FILENAME"
 >		smb.conf(5)</TT
 ></A
-> file.
+> file. <EM
+>Beware:</EM
+>
+		If the directory specified does not exist, <B
+CLASS="COMMAND"
+>smbd</B
+>
+		will log to the default debug log location defined at compile time.
 		</P
 ><P
 >The default log directory is specified at
@@ -354,7 +361,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN120"
+NAME="AEN122"
 ></A
 ><H2
 >FILES</H2
@@ -466,7 +473,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN156"
+NAME="AEN158"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -485,7 +492,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN160"
+NAME="AEN162"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -516,7 +523,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN169"
+NAME="AEN171"
 ></A
 ><H2
 >PAM INTERACTION</H2
@@ -561,7 +568,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN180"
+NAME="AEN182"
 ></A
 ><H2
 >VERSION</H2
@@ -572,7 +579,7 @@ NAME="AEN180"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN183"
+NAME="AEN185"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -595,7 +602,7 @@ NAME="AEN183"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN188"
+NAME="AEN190"
 ></A
 ><H2
 >SIGNALS</H2
@@ -660,7 +667,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN205"
+NAME="AEN207"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -726,7 +733,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN222"
+NAME="AEN224"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index b7263ebf83d..9d620f1397f 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -35,7 +35,7 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->smbumount</B
+>smbmount</B
 >  {service} {mount-point} [-o options]</P
 ></DIV
 ><DIV
diff --git a/docs/htmldocs/smbsh.1.html b/docs/htmldocs/smbsh.1.html
index 66081bbe22c..ba2cc7b4928 100644
--- a/docs/htmldocs/smbsh.1.html
+++ b/docs/htmldocs/smbsh.1.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbsh</B
-> </P
+>  [-W workgroup] [-U username] [-P prefix] [-R &#60;name resolve order&#62;] [-d &#60;debug level&#62;] [-l logfile] [-L libdir]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11"
+NAME="AEN18"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -72,6 +72,223 @@ CLASS="COMMAND"
 >smbsh</B
 > 
 	to work correctly.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN28"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>-W WORKGROUP</DT
+><DD
+><P
+>Override the default workgroup specified in the 
+		workgroup parameter of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file 
+		for this session. This may be needed to connect to some 
+		servers. </P
+></DD
+><DT
+>-U username[%pass]</DT
+><DD
+><P
+>Sets the SMB username or username and password.
+		If this option is not specified, the user will be prompted for 
+		both the username and the password.  If %pass is not specified, 
+		the user will be prompted for the password.
+		</P
+></DD
+><DT
+>-P prefix</DT
+><DD
+><P
+>This option allows
+		the user to set the directory prefix for SMB access. The 
+		default value if this option is not specified is 
+		<EM
+>smb</EM
+>.
+		</P
+></DD
+><DT
+>-R &#60;name resolve order&#62;</DT
+><DD
+><P
+>This option is used to determine what naming 
+		services and in what order to resolve 
+		host names to IP addresses. The option takes a space-separated 
+		string of different name resolution options.</P
+><P
+>The options are :"lmhosts", "host", "wins" and "bcast". 
+		They cause names to be resolved as follows :</P
+><P
+></P
+><UL
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>lmhosts</TT
+> : 
+			Lookup an IP address in the Samba lmhosts file. If the 
+			line in lmhosts has no name type attached to the 
+			NetBIOS name 
+			(see the <A
+HREF="lmhosts.5.html"
+TARGET="_top"
+>lmhosts(5)</A
+>
+			for details) then any name type matches for lookup.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>host</TT
+> : 
+			Do a standard host name to IP address resolution, using
+			the system <TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+>, NIS, or DNS
+			lookups. This method of name resolution is operating 
+			system dependent, for instance on IRIX or Solaris this 
+			may be controlled by the <TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf
+			</TT
+> file).  Note that this method is only used 
+			if the NetBIOS name type being queried is the 0x20 
+			(server) name type, otherwise it is ignored.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>wins</TT
+> : 
+			Query a name with the IP address listed in the 
+			<TT
+CLASS="PARAMETER"
+><I
+>wins server</I
+></TT
+> parameter.  If no 
+			WINS server has been specified this method will be 
+			ignored.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>bcast</TT
+> : 
+			Do a broadcast on each of the known local interfaces 
+			listed in the <TT
+CLASS="PARAMETER"
+><I
+>interfaces</I
+></TT
+>
+			parameter. This is the least reliable of the name 
+			resolution methods as it depends on the target host 
+			being on a locally connected subnet.
+			</P
+></LI
+></UL
+><P
+>If this parameter is not set then the name resolve order 
+		defined in the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file parameter  
+		(name resolve order) will be used. </P
+><P
+>The default order is lmhosts, host, wins, bcast. Without 
+		this parameter or any entry in the <TT
+CLASS="PARAMETER"
+><I
+>name resolve order
+		</I
+></TT
+> parameter of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> 
+		file, the name resolution methods will be attempted in this 
+		order. </P
+></DD
+><DT
+>-d &#60;debug level&#62;</DT
+><DD
+><P
+>debug level is an integer from 0 to 10.</P
+><P
+>The default value if this parameter is not specified
+		is zero.</P
+><P
+>The higher this value, the more detail will be logged
+		about the activities of <B
+CLASS="COMMAND"
+>nmblookup</B
+>. At level
+		0, only critical errors and serious warnings will be logged.
+		</P
+></DD
+><DT
+>-l logfilename</DT
+><DD
+><P
+>If specified causes all debug messages to be
+		written to the file specified by <TT
+CLASS="REPLACEABLE"
+><I
+>logfilename
+		</I
+></TT
+>. If not specified then all messages will be 
+		written to<TT
+CLASS="REPLACEABLE"
+><I
+>stderr</I
+></TT
+>.
+		</P
+></DD
+><DT
+>-L libdir</DT
+><DD
+><P
+>This parameter specifies the location of the 
+		shared libraries used by <B
+CLASS="COMMAND"
+>smbsh</B
+>. The default
+		value is specified at compile time.
+		</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN91"
+></A
+><H2
+>EXAMPLES</H2
 ><P
 >To use the <B
 CLASS="COMMAND"
@@ -158,7 +375,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN40"
+NAME="AEN112"
 ></A
 ><H2
 >VERSION</H2
@@ -169,7 +386,7 @@ NAME="AEN40"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN43"
+NAME="AEN115"
 ></A
 ><H2
 >BUGS</H2
@@ -202,7 +419,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN52"
+NAME="AEN124"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -225,7 +442,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN58"
+NAME="AEN130"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 4cc0ef423f5..fe218a8f676 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -36,12 +36,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >wbinfo</B
->  [-u] [-g] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-a user%password] [-p]</P
+>  [-u] [-g] [-h name] [-i ip] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-r user] [-a user%password] [-A user%password]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23"
+NAME="AEN26"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -78,7 +78,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN34"
+NAME="AEN37"
 ></A
 ><H2
 >OPTIONS</H2
@@ -122,6 +122,52 @@ CLASS="COMMAND"
 >. </P
 ></DD
 ><DT
+>-h name</DT
+><DD
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>-h</I
+></TT
+> option 
+		queries <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> to query the WINS
+		server for the IP address associated with the NetBIOS name
+		specified by the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+> parameter.
+		</P
+></DD
+><DT
+>-i ip</DT
+><DD
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>-i</I
+></TT
+> option 
+		queries <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> to send a node status
+		request to get the NetBIOS name associated with the IP address
+		specified by the <TT
+CLASS="PARAMETER"
+><I
+>ip</I
+></TT
+> parameter.
+		</P
+></DD
+><DT
 >-n name</DT
 ><DD
 ><P
@@ -228,6 +274,15 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
+>-r username</DT
+><DD
+><P
+>Try to obtain the list of UNIX group ids
+		to which the user belongs.  This only works for users
+		defined on a Domain Controller.
+		</P
+></DD
+><DT
 >-a username%password</DT
 ><DD
 ><P
@@ -236,11 +291,14 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
->-p</DT
+>-A username%password</DT
 ><DD
 ><P
->Attempt a simple 'ping' check that the winbindd
-                is indeed alive.
+>Store username and password used by winbindd 
+		during session setup to a domain controller.  This enables
+		winbindd to operate in a Windows 2000 domain with Restrict
+		Anonymous turned on (a.k.a. Permissions compatiable with
+		Windows 2000 servers only).
 		</P
 ></DD
 ></DL
@@ -249,7 +307,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98"
+NAME="AEN119"
 ></A
 ><H2
 >EXIT STATUS</H2
@@ -268,7 +326,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN103"
+NAME="AEN124"
 ></A
 ><H2
 >VERSION</H2
@@ -279,7 +337,7 @@ NAME="AEN103"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN106"
+NAME="AEN127"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -297,7 +355,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN111"
+NAME="AEN132"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index 51a70042b18..1ecb08cdb4a 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -109,6 +109,22 @@ CLASS="FILENAME"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>hosts</DT
+><DD
+><P
+>User information traditionally stored in 
+		the <TT
+CLASS="FILENAME"
+>hosts(5)</TT
+> file and used by 
+		<B
+CLASS="COMMAND"
+>gethostbyname(3)</B
+> functions. Names are
+		resolved through the WINS server or by broadcast.
+		</P
+></DD
+><DT
 >passwd</DT
 ><DD
 ><P
@@ -169,11 +185,22 @@ group:          files winbind
 ></TR
 ></TABLE
 ></P
+><P
+>The following simple configuration in the
+	<TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf</TT
+> file can be used to initially
+	resolve hostnames from <TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+> and then from the
+	WINS server.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN48"
+NAME="AEN57"
 ></A
 ><H2
 >OPTIONS</H2
@@ -212,7 +239,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN61"
+NAME="AEN70"
 ></A
 ><H2
 >NAME AND ID RESOLUTION</H2
@@ -243,7 +270,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67"
+NAME="AEN76"
 ></A
 ><H2
 >CONFIGURATION</H2
@@ -532,7 +559,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN158"
+NAME="AEN167"
 ></A
 ><H2
 >EXAMPLE SETUP</H2
@@ -710,7 +737,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN197"
+NAME="AEN206"
 ></A
 ><H2
 >NOTES</H2
@@ -768,7 +795,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN213"
+NAME="AEN222"
 ></A
 ><H2
 >SIGNALS</H2
@@ -819,7 +846,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN230"
+NAME="AEN239"
 ></A
 ><H2
 >FILES</H2
@@ -895,7 +922,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN259"
+NAME="AEN268"
 ></A
 ><H2
 >VERSION</H2
@@ -906,7 +933,7 @@ NAME="AEN259"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN262"
+NAME="AEN271"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -934,7 +961,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN269"
+NAME="AEN278"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 18168220e42..875de31f42d 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NMBD" "8" "28 January 2002" "" ""
+.TH "NMBD" "8" "08 May 2002" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
@@ -126,11 +126,11 @@ parameter in the \fI smb.conf\fRfile.
 The -l parameter specifies a directory 
 into which the "log.nmbd" log file will be created
 for operational data from the running
-\fBnmbd\fR server.
-
-The default log directory is compiled into Samba
+\fBnmbd\fR server. The default log directory is compiled into Samba
 as part of the build process. Common defaults are \fI /usr/local/samba/var/log.nmb\fR, \fI /usr/samba/var/log.nmb\fR or
-\fI/var/log/log.nmb\fR.
+\fI/var/log/log.nmb\fR. \fBBeware:\fR
+If the directory specified does not exist, \fBnmbd\fR
+will log to the default debug log location defined at compile time.
 .TP
 \fB-n <primary NetBIOS name>\fR
 This option allows you to override
@@ -142,58 +142,57 @@ line setting will take precedence over settings in
 .TP
 \fB-p <UDP port number>\fR
 UDP port number is a positive integer value.
-This option changes the default UDP port number (normally 137) 
-that \fBnmbd\fR responds to name queries on. Don't 
-use this option unless you are an expert, in which case you 
+This option changes the default UDP port number (normally 137)
+that \fBnmbd\fR responds to name queries on. Don't
+use this option unless you are an expert, in which case you
 won't need help!
 .TP
 \fB-s <configuration file>\fR
-The default configuration file name 
+The default configuration file name
 is set at build time, typically as \fI /usr/local/samba/lib/smb.conf\fR, but
 this may be changed when Samba is autoconfigured.
 
-The file specified contains the configuration details 
-required by the server. See  
-\fIsmb.conf(5)\fRfor more information.
+The file specified contains the configuration details
+required by the server. See  \fIsmb.conf(5)\fRfor more information.
 .SH "FILES"
 .TP
 \fB\fI/etc/inetd.conf\fB\fR
-If the server is to be run by the 
-\fBinetd\fR meta-daemon, this file 
-must contain suitable startup information for the 
+If the server is to be run by the
+\fBinetd\fR meta-daemon, this file
+must contain suitable startup information for the
 meta-daemon. See the UNIX_INSTALL.htmldocument
 for details.
 .TP
 \fB\fI/etc/rc\fB\fR
-or whatever initialization script your 
+or whatever initialization script your
 system uses).
 
-If running the server as a daemon at startup, 
-this file will need to contain an appropriate startup 
+If running the server as a daemon at startup,
+this file will need to contain an appropriate startup
 sequence for the server. See the UNIX_INSTALL.htmldocument
 for details.
 .TP
 \fB\fI/etc/services\fB\fR
-If running the server via the 
-meta-daemon \fBinetd\fR, this file 
-must contain a mapping of service name (e.g., netbios-ssn) 
-to service port (e.g., 139) and protocol type (e.g., tcp). 
+If running the server via the
+meta-daemon \fBinetd\fR, this file
+must contain a mapping of service name (e.g., netbios-ssn)
+to service port (e.g., 139) and protocol type (e.g., tcp).
 See the UNIX_INSTALL.html
 document for details.
 .TP
 \fB\fI/usr/local/samba/lib/smb.conf\fB\fR
-This is the default location of the 
+This is the default location of the
 \fIsmb.conf\fR
-server configuration file. Other common places that systems 
-install this file are \fI/usr/samba/lib/smb.conf\fR 
+server configuration file. Other common places that systems
+install this file are \fI/usr/samba/lib/smb.conf\fR
 and \fI/etc/smb.conf\fR.
 
-When run as a WINS server (see the 
+When run as a WINS server (see the
 wins support
 parameter in the \fIsmb.conf(5)\fR man page),
 \fBnmbd\fR
-will store the WINS database in the file \fIwins.dat\fR 
-in the \fIvar/locks\fR directory configured under 
+will store the WINS database in the file \fIwins.dat\fR
+in the \fIvar/locks\fR directory configured under
 wherever Samba was configured to install itself.
 
 If \fBnmbd\fR is acting as a \fB browse master\fR (see the local master
@@ -204,17 +203,17 @@ will store the browsing database in the file \fIbrowse.dat
 configured under wherever Samba was configured to install itself.
 .SH "SIGNALS"
 .PP
-To shut down an \fBnmbd\fR process it is recommended 
-that SIGKILL (-9) \fBNOT\fR be used, except as a last 
-resort, as this may leave the name database in an inconsistent state. 
-The correct way to terminate \fBnmbd\fR is to send it 
+To shut down an \fBnmbd\fR process it is recommended
+that SIGKILL (-9) \fBNOT\fR be used, except as a last
+resort, as this may leave the name database in an inconsistent state.
+The correct way to terminate \fBnmbd\fR is to send it
 a SIGTERM (-15) signal and wait for it to die on its own.
 .PP
-\fBnmbd\fR will accept SIGHUP, which will cause 
+\fBnmbd\fR will accept SIGHUP, which will cause
 it to dump out its namelists into the file \fInamelist.debug
-\fRin the \fI/usr/local/samba/var/locks\fR 
-directory (or the \fIvar/locks\fR directory configured 
-under wherever Samba was configured to install itself). This will also 
+\fRin the \fI/usr/local/samba/var/locks\fR
+directory (or the \fIvar/locks\fR directory configured
+under wherever Samba was configured to install itself). This will also
 cause \fBnmbd\fR to dump out its server database in
 the \fIlog.nmb\fR file.
 .PP
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 4d8d0a27857..692530334be 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "24 April 2002" "" ""
+.TH "SMB.CONF" "5" "08 May 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -463,8 +463,9 @@ if it will allow a connection to a specified service. If all the
 steps fail, then the connection request is rejected. However, if one of the 
 steps succeeds, then the following steps are not checked.
 .PP
-If the service is marked "guest only = yes" then
-steps 1 to 5 are skipped.
+If the service is marked "guest only = yes" and the
+server is running with share-level security ("security = share")
+then steps 1 to 5 are skipped.
 .IP 1. 
 If the client has passed a username/password 
 pair and that username/password pair is validated by the UNIX 
@@ -686,6 +687,15 @@ each parameter for details. Note that some are synonyms.
 \fIlock directory\fR
 .TP 0.2i
 \(bu
+\fIlock spin count\fR
+.TP 0.2i
+\(bu
+\fIlock spin time\fR
+.TP 0.2i
+\(bu
+\fIpid directory\fR
+.TP 0.2i
+\(bu
 \fIlog file\fR
 .TP 0.2i
 \(bu
@@ -1188,6 +1198,9 @@ each parameter for details. Note that some are synonyms.
 \fIinclude\fR
 .TP 0.2i
 \(bu
+\fIinherit acls\fR
+.TP 0.2i
+\(bu
 \fIinherit permissions\fR
 .TP 0.2i
 \(bu
@@ -3102,6 +3115,17 @@ Default: \fBno file included\fR
 
 Example: \fBinclude = /usr/local/samba/lib/admin_smb.conf
 \fR.TP
+\fBinherit acls (S)\fR
+This parameter can be used to ensure
+that if default acls exist on parent directories,
+they are always honored when creating a subdirectory.
+The default behavior is to use the mode specified
+when creating the directory. Enabling this option
+sets the mode to 0777, thus guaranteeing that 
+default directory acls are propagated.
+
+Default: \fBinherit acls = no\fR
+.TP
 \fBinherit permissions (S)\fR
 The permissions on new files and directories 
 are normally governed by \fI create mask\fR,  \fIdirectory mask\fR, \fIforce create mode\fR
@@ -3469,6 +3493,26 @@ Default: \fBlock directory = ${prefix}/var/locks\fR
 
 Example: \fBlock directory = /var/run/samba/locks\fR
 .TP
+\fBlock spin count (G)\fR
+This parameter controls the number of times
+that smbd should attempt to gain a byte range lock on the 
+behalf of a client request. Experiments have shown that
+Windows 2k servers do not reply with a failure if the lock
+could not be immediately granted, but try a few more times
+in case the lock could later be aquired. This behavior
+is used to support PC database formats such as MS Access
+and FoxPro.
+
+Default: \fBlock spin count = 2\fR
+.TP
+\fBlock spin time (G)\fR
+The time in microseconds that smbd should 
+pause before attempting to gain a failed lock. See
+\fIlock spin 
+count\fR for more details.
+
+Default: \fBlock spin time = 10\fR
+.TP
 \fBlocking (S)\fR
 This controls whether or not locking will be 
 performed by the server in response to lock requests from the 
@@ -3712,8 +3756,8 @@ This command should be a program or script which
 takes a printer name as its only parameter and outputs printer 
 status information.
 
-Currently eight styles of printer status information 
-are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+Currently nine styles of printer status information 
+are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
 This covers most UNIX systems. You control which type is expected 
 using the \fIprinting =\fR option.
 
@@ -3729,7 +3773,10 @@ command.
 
 Note that it is good practice to include the absolute path 
 in the \fIlpq command\fR as the \fB$PATH
-\fRmay not be available to the server.
+\fRmay not be available to the server. When compiled with
+the CUPS libraries, no \fIlpq command\fR is
+needed because smbd will make a library call to obtain the 
+print queue listing.
 
 See also the \fIprinting
 \fRparameter.
@@ -5008,6 +5055,14 @@ Default: \fBnone\fR
 
 Example: \fBpath = /home/fred\fR
 .TP
+\fBpid directory (G)\fR
+This option specifies the directory where pid 
+files will be placed. 
+
+Default: \fBpid directory = ${prefix}/var/locks\fR
+
+Example: \fBpid directory = /var/run/\fR
+.TP
 \fBposix locking (S)\fR
 The \fBsmbd(8)\fR
 daemon maintains an database of file locks obtained by SMB clients.
@@ -5137,14 +5192,23 @@ spool file when it has been processed, otherwise you will need to
 manually remove old spool files.
 
 The print command is simply a text string. It will be used 
-verbatim, with two exceptions: All occurrences of \fI%s
-\fRand \fI%f\fR will be replaced by the 
-appropriate spool file name, and all occurrences of \fI%p
-\fRwill be replaced by the appropriate printer name. The 
-spool file name is generated automatically by the server. The 
-\fI%J\fR macro can be used to access the job 
+verbatim after macro substitutions have been made:
+
+s, %p - the path to the spool
+file name
+
+%p - the appropriate printer 
+name
+
+%J - the job 
 name as transmitted by the client.
 
+%c - The number of printed pages
+of the spooled job (if known).
+
+%z - the size of the spooled
+print job (in bytes)
+
 The print command \fBMUST\fR contain at least 
 one occurrence of \fI%s\fR or \fI%f
 \fR- the \fI%p\fR is optional. At the time 
@@ -5189,6 +5253,16 @@ For \fBprinting = SOFTQ :\fR
 
 \fBprint command = lp -d%p -s %s; rm %s\fR
 
+For printing = CUPS : If SAMBA is compiled against
+libcups, then printcap = cups 
+uses the CUPS API to
+submit jobs, etc. Otherwise it maps to the System V
+commands with the -oraw option for printing, i.e. it
+uses \fBlp -c -d%p -oraw; rm %s\fR. 
+With \fBprinting = cups\fR,
+and if SAMBA is compiled against libcups, any manually 
+set print command will be ignored.
+
 Example: \fBprint command = /usr/local/samba/bin/myprintscript
 %p %s\fR
 .TP
@@ -5217,7 +5291,11 @@ compiled-in default printcap name used by the server (usually \fI /etc/printcap\
 why you might want to do this.
 
 To use the CUPS printing interface set \fBprintcap name = cups
-\fR\&.
+\fR\&. This should be supplemented by an addtional setting 
+printing = cups in the [global] 
+section. \fBprintcap name = cups\fR will use the 
+"dummy" printcap created by CUPS, as specified in your CUPS
+configuration file.
 
 On System V systems that use \fBlpstat\fR to 
 list available printers you can use \fBprintcap name = lpstat
@@ -7042,7 +7120,7 @@ that Samba has to do in order to perform the link checks.
 
 Default: \fBwide links = yes\fR
 .TP
-\fBwinbind cache time\fR
+\fBwinbind cache time (G)\fR
 This parameter specifies the number of seconds the
 winbindd(8)daemon will cache 
 user and group information before querying a Windows NT server 
@@ -7050,7 +7128,7 @@ again.
 
 Default: \fBwinbind cache type = 15\fR
 .TP
-\fBwinbind enum users\fR
+\fBwinbind enum users (G)\fR
 On large installations using
 winbindd(8)it may be
 necessary to suppress the enumeration of users through the
@@ -7069,7 +7147,7 @@ usernames.
 
 Default: \fBwinbind enum users = yes \fR
 .TP
-\fBwinbind enum groups\fR
+\fBwinbind enum groups (G)\fR
 On large installations using
 winbindd(8)it may be
 necessary to suppress the enumeration of groups through the
@@ -7085,7 +7163,7 @@ enumeration may cause some programs to behave oddly.
 
 Default: \fBwinbind enum groups = yes \fR
 .TP
-\fBwinbind gid\fR
+\fBwinbind gid (G)\fR
 The winbind gid parameter specifies the range of group 
 ids that are allocated by the  winbindd(8)daemon. This range of group ids should have no 
 existing local or NIS groups within it as strange conflicts can 
@@ -7095,7 +7173,7 @@ Default: \fBwinbind gid = <empty string>
 \fR
 Example: \fBwinbind gid = 10000-20000\fR
 .TP
-\fBwinbind separator\fR
+\fBwinbind separator (G)\fR
 This parameter allows an admin to define the character 
 used when listing a username of the form of \fIDOMAIN
 \fR\\\fIuser\fR. This parameter 
@@ -7106,11 +7184,11 @@ Please note that setting this parameter to + causes problems
 with group membership at least on glibc systems, as the character +
 is used as a special character for NIS in /etc/group.
 
-Example: \fBwinbind separator = \\\\\fR
+Default: \fBwinbind separator = '\\'\fR
 
-Example: \fBwinbind separator = /\fR
+Example: \fBwinbind separator = +\fR
 .TP
-\fBwinbind uid\fR
+\fBwinbind uid (G)\fR
 The winbind gid parameter specifies the range of group 
 ids that are allocated by the  winbindd(8)daemon. This range of ids should have no 
 existing local or NIS users within it as strange conflicts can 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 8b969ce4d1a..641f2d4a9f1 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBCLIENT" "1" "28 January 2002" "" ""
+.TH "SMBCLIENT" "1" "08 May 2002" "" ""
 .SH NAME
 smbclient \- ftp-like client to access SMB/CIFS resources  on servers
 .SH SYNOPSIS
@@ -327,9 +327,9 @@ is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
 observed to speed up file transfers to and from a Win9x server. 
 .TP
 \fB-W WORKGROUP\fR
-Override the default workgroup specified in the 
-workgroup parameter of the \fIsmb.conf\fR file 
-for this connection. This may be needed to connect to some 
+Override the default workgroup (domain) specified
+in the workgroup parameter of the \fIsmb.conf\fR
+file for this connection. This may be needed to connect to some
 servers. 
 .TP
 \fB-T tar options\fR
@@ -513,6 +513,26 @@ If \fIshell command\fR is specified, the !
 command will execute a shell locally and run the specified shell 
 command. If no command is specified, a local shell will be run. 
 .TP
+\fBaltname file\fR
+The client will request that the server return
+the "alternate" name (the 8.3 name) for a file or directory.
+.TP
+\fBcancel jobid0 [jobid1] ... [jobidN]\fR
+The client will request that the server cancel
+the printjobs identified by the given numeric print job ids.
+.TP
+\fBchmod file mode in octal\fR
+This command depends on the server supporting the CIFS
+UNIX extensions and will fail if the server does not. The client requests that the server
+change the UNIX permissions to the given octal mode, in standard UNIX format.
+.TP
+\fBchown file uid gid\fR
+This command depends on the server supporting the CIFS
+UNIX extensions and will fail if the server does not. The client requests that the server
+change the UNIX user and group ownership to the given decimal values. Note there is
+currently no way to remotely look up the UNIX uid and gid values for a given name.
+This may be addressed in future versions of the CIFS UNIX extensions.
+.TP
 \fBcd [directory name]\fR
 If "directory name" is specified, the current 
 working directory on the server will be changed to the directory 
@@ -555,6 +575,12 @@ reason the specified directory is inaccessible.
 If no directory name is specified, the name of the 
 current working directory on the local machine will be reported. 
 .TP
+\fBlink source destination\fR
+This command depends on the server supporting the CIFS
+UNIX extensions and will fail if the server does not. The client requests that the server
+create a hard link between the source and destination files. The source file
+must not exist.
+.TP
 \fBlowercase\fR
 Toggle lowercasing of filenames for the get and 
 mget commands. 
@@ -674,6 +700,21 @@ working directory on the server.
 Remove the specified directory (user access 
 privileges permitting) from the server. 
 .TP
+\fBsetmode <filename> <perm=[+|\\-]rsha>\fR
+A version of the DOS attrib command to set 
+file permissions. For example: 
+
+\fBsetmode myfile +r \fR
+
+would make myfile read only. 
+.TP
+\fBsymlink source destination\fR
+This command depends on the server supporting the CIFS
+UNIX extensions and will fail if the server does not. The client requests that the server
+create a symbolic hard link between the source and destination files. The source file
+must not exist. Note that the server will not create a link to any path that lies 
+outside the currently connected share. This is enforced by the Samba server.
+.TP
 \fBtar <c|x>[IXbgNa]\fR
 Performs a tar operation - see the \fI-T
 \fRcommand line option above. Behavior may be affected 
@@ -693,14 +734,6 @@ archive bit setting (this is the default mode). In incremental mode,
 tar will only back up files with the archive bit set. In reset mode, 
 tar will reset the archive bit on all files it backs up (implies 
 read/write share). 
-.TP
-\fBsetmode <filename> <perm=[+|\\-]rsha>\fR
-A version of the DOS attrib command to set 
-file permissions. For example: 
-
-\fBsetmode myfile +r \fR
-
-would make myfile read only. 
 .SH "NOTES"
 .PP
 Some servers are fussy about the case of supplied usernames, 
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index f341b563e15..f3e6c843b59 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -3,9 +3,9 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBCONTROL" "1" "28 January 2002" "" ""
+.TH "SMBCONTROL" "1" "08 May 2002" "" ""
 .SH NAME
-smbcontrol \- send messages to smbd or nmbd processes
+smbcontrol \- send messages to smbd, nmbd or winbindd processes
 .SH SYNOPSIS
 .sp
 \fBsmbcontrol\fR [ \fB-i\fR ] 
@@ -16,9 +16,10 @@ smbcontrol \- send messages to smbd or nmbd processes
 This tool is part of the  Sambasuite.
 .PP
 \fBsmbcontrol\fR is a very small program, which 
-sends messages to an smbd(8)or 
-an nmbd(8)daemon running on the 
-system.
+sends messages to an smbd(8), 
+an nmbd(8)
+or a winbindd(8)
+daemon running on the system.
 .SH "OPTIONS"
 .TP
 \fB-i\fR
@@ -52,8 +53,9 @@ The close-share message-type sends a
 message to smbd which will then close the client connections to
 the named share. Note that this doesn't affect client connections
 to any other shares. This message-type takes an argument of the
-share name for which client connections will be close, or the
+share name for which client connections will be closed, or the
 "*" character which will close all currently open shares.
+This may be useful if you made changes to the access controls on the share.
 This message can only be sent to smbd.
 
 The debug message-type allows 
@@ -76,7 +78,7 @@ parameter. The parameter can be "on" to turn on profile stats
 collection, "off" to turn off profile stats collection, "count"
 to enable only collection of count stats (time stats are 
 disabled), and "flush" to zero the current profile stats. This can 
-be sent to any of the destinations.
+be sent to any smbd or nmbd destinations.
 
 The debuglevel message-type sends 
 a "request debug level" message. The current debug level setting 
@@ -86,18 +88,13 @@ sent to any of the destinations.
 The profilelevel message-type sends 
 a "request profile level" message. The current profile level 
 setting is returned by a "profilelevel" message. This can be sent 
-to any of the destinations.
+to any smbd or nmbd destinations.
 
 The printer-notify message-type sends a 
 message to smbd which in turn sends a printer notify message to 
 any Windows NT clients connected to a printer. This message-type 
 takes an argument of the printer name to send notify messages to. 
 This message can only be sent to smbd.
-
-The close-share message-type sends a
-message to smbd which forces smbd to close the share that was
-specified as an argument. This may be useful if you made changes
-to the access controls on the share. 
 .TP
 \fBparameters\fR
 any parameters required for the message-type
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index f534a59bf3b..83483c88350 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBD" "8" "28 January 2002" "" ""
+.TH "SMBD" "8" "08 May 2002" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
@@ -124,7 +124,9 @@ file will be created for informational and debug
 messages from the running server. The log 
 file generated is never removed by the server although 
 its size may be controlled by the max log size
-option in the \fI smb.conf(5)\fRfile.
+option in the \fI smb.conf(5)\fRfile. \fBBeware:\fR
+If the directory specified does not exist, \fBsmbd\fR
+will log to the default debug log location defined at compile time.
 
 The default log directory is specified at
 compile time.
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 1cef431e47b..0d4a7fc8708 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBMOUNT" "8" "28 January 2002" "" ""
+.TH "SMBMOUNT" "8" "08 May 2002" "" ""
 .SH NAME
 smbmount \- mount an smbfs filesystem
 .SH SYNOPSIS
 .sp
-\fBsmbumount\fR \fBservice\fR \fBmount-point\fR [ \fB-o options\fR ] 
+\fBsmbmount\fR \fBservice\fR \fBmount-point\fR [ \fB-o options\fR ] 
 .SH "DESCRIPTION"
 .PP
 \fBsmbmount\fR mounts a Linux SMB filesystem. It 
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 130df3582b0..774607c3a29 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBSH" "1" "28 January 2002" "" ""
+.TH "SMBSH" "1" "08 May 2002" "" ""
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
 .SH SYNOPSIS
 .sp
-\fBsmbsh\fR
+\fBsmbsh\fR [ \fB-W workgroup\fR ]  [ \fB-U username\fR ]  [ \fB-P prefix\fR ]  [ \fB-R <name resolve order>\fR ]  [ \fB-d <debug level>\fR ]  [ \fB-l logfile\fR ]  [ \fB-L libdir\fR ] 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
@@ -17,6 +17,104 @@ This tool is part of the  Sambasuite.
 using UNIX commands such as \fBls\fR, \fB egrep\fR, and \fBrcp\fR. You must use a 
 shell that is dynamically linked in order for \fBsmbsh\fR 
 to work correctly.
+.SH "OPTIONS"
+.TP
+\fB-W WORKGROUP\fR
+Override the default workgroup specified in the 
+workgroup parameter of the \fIsmb.conf\fR file 
+for this session. This may be needed to connect to some 
+servers. 
+.TP
+\fB-U username[%pass]\fR
+Sets the SMB username or username and password.
+If this option is not specified, the user will be prompted for 
+both the username and the password. If %pass is not specified, 
+the user will be prompted for the password.
+.TP
+\fB-P prefix\fR
+This option allows
+the user to set the directory prefix for SMB access. The 
+default value if this option is not specified is 
+\fBsmb\fR.
+.TP
+\fB-R <name resolve order>\fR
+This option is used to determine what naming 
+services and in what order to resolve 
+host names to IP addresses. The option takes a space-separated 
+string of different name resolution options.
+
+The options are :"lmhosts", "host", "wins" and "bcast". 
+They cause names to be resolved as follows :
+.RS
+.TP 0.2i
+\(bu
+lmhosts : 
+Lookup an IP address in the Samba lmhosts file. If the 
+line in lmhosts has no name type attached to the 
+NetBIOS name 
+(see the lmhosts(5)
+for details) then any name type matches for lookup.
+.TP 0.2i
+\(bu
+host : 
+Do a standard host name to IP address resolution, using
+the system \fI/etc/hosts\fR, NIS, or DNS
+lookups. This method of name resolution is operating 
+system dependent, for instance on IRIX or Solaris this 
+may be controlled by the \fI/etc/nsswitch.conf
+\fRfile). Note that this method is only used 
+if the NetBIOS name type being queried is the 0x20 
+(server) name type, otherwise it is ignored.
+.TP 0.2i
+\(bu
+wins : 
+Query a name with the IP address listed in the 
+\fIwins server\fR parameter. If no 
+WINS server has been specified this method will be 
+ignored.
+.TP 0.2i
+\(bu
+bcast : 
+Do a broadcast on each of the known local interfaces 
+listed in the \fIinterfaces\fR
+parameter. This is the least reliable of the name 
+resolution methods as it depends on the target host 
+being on a locally connected subnet.
+.RE
+.PP
+If this parameter is not set then the name resolve order 
+defined in the \fIsmb.conf\fR file parameter 
+(name resolve order) will be used. 
+.PP
+.PP
+The default order is lmhosts, host, wins, bcast. Without 
+this parameter or any entry in the \fIname resolve order
+\fRparameter of the \fIsmb.conf\fR 
+file, the name resolution methods will be attempted in this 
+order. 
+.PP
+.TP
+\fB-d <debug level>\fR
+debug level is an integer from 0 to 10.
+
+The default value if this parameter is not specified
+is zero.
+
+The higher this value, the more detail will be logged
+about the activities of \fBnmblookup\fR. At level
+0, only critical errors and serious warnings will be logged.
+.TP
+\fB-l logfilename\fR
+If specified causes all debug messages to be
+written to the file specified by \fIlogfilename
+\fR\&. If not specified then all messages will be 
+written to\fIstderr\fR.
+.TP
+\fB-L libdir\fR
+This parameter specifies the location of the 
+shared libraries used by \fBsmbsh\fR. The default
+value is specified at compile time.
+.SH "EXAMPLES"
 .PP
 To use the \fBsmbsh\fR command, execute \fB smbsh\fR from the prompt and enter the username and password 
 that authenticates you to the machine running the Windows NT 
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 9537af287b8..57aaf98b626 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WBINFO" "1" "28 January 2002" "" ""
+.TH "WBINFO" "1" "08 May 2002" "" ""
 .SH NAME
 wbinfo \- Query information from winbind daemon
 .SH SYNOPSIS
 .sp
-\fBwbinfo\fR [ \fB-u\fR ]  [ \fB-g\fR ]  [ \fB-n name\fR ]  [ \fB-s sid\fR ]  [ \fB-U uid\fR ]  [ \fB-G gid\fR ]  [ \fB-S sid\fR ]  [ \fB-Y sid\fR ]  [ \fB-t\fR ]  [ \fB-m\fR ]  [ \fB-a user%password\fR ]  [ \fB-p\fR ] 
+\fBwbinfo\fR [ \fB-u\fR ]  [ \fB-g\fR ]  [ \fB-h name\fR ]  [ \fB-i ip\fR ]  [ \fB-n name\fR ]  [ \fB-s sid\fR ]  [ \fB-U uid\fR ]  [ \fB-G gid\fR ]  [ \fB-S sid\fR ]  [ \fB-Y sid\fR ]  [ \fB-t\fR ]  [ \fB-m\fR ]  [ \fB-r user\fR ]  [ \fB-a user%password\fR ]  [ \fB-A user%password\fR ] 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
@@ -37,6 +37,18 @@ will also be listed. Note that this operation does not assign
 group ids to any groups that have not already been seen by
 \fBwinbindd(8)\fR. 
 .TP
+\fB-h name\fR
+The \fI-h\fR option 
+queries \fBwinbindd(8)\fR to query the WINS
+server for the IP address associated with the NetBIOS name
+specified by the \fIname\fR parameter.
+.TP
+\fB-i ip\fR
+The \fI-i\fR option 
+queries \fBwinbindd(8)\fR to send a node status
+request to get the NetBIOS name associated with the IP address
+specified by the \fIip\fR parameter.
+.TP
 \fB-n name\fR
 The \fI-n\fR option 
 queries \fBwinbindd(8)\fR for the SID 
@@ -83,13 +95,21 @@ Windows NT server \fBwinbindd(8)\fR contacts
 when resolving names. This list does not include the Windows 
 NT domain the server is a Primary Domain Controller for.
 .TP
+\fB-r username\fR
+Try to obtain the list of UNIX group ids
+to which the user belongs. This only works for users
+defined on a Domain Controller.
+.TP
 \fB-a username%password\fR
 Attempt to authenticate a user via winbindd. 
 This checks both authenticaion methods and reports its results.
 .TP
-\fB-p\fR
-Attempt a simple 'ping' check that the winbindd
-is indeed alive.
+\fB-A username%password\fR
+Store username and password used by winbindd 
+during session setup to a domain controller. This enables
+winbindd to operate in a Windows 2000 domain with Restrict
+Anonymous turned on (a.k.a. Permissions compatiable with
+Windows 2000 servers only).
 .SH "EXIT STATUS"
 .PP
 The wbinfo program returns 0 if the operation 
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index cca62f25e4e..ca0c87bd08c 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WINBINDD" "8" "28 January 2002" "" ""
+.TH "WINBINDD" "8" "08 May 2002" "" ""
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
 .SH SYNOPSIS
@@ -38,6 +38,12 @@ installed, this should always suceed.
 The following nsswitch databases are implemented by 
 the winbindd service: 
 .TP
+\fBhosts\fR
+User information traditionally stored in 
+the \fIhosts(5)\fR file and used by 
+\fBgethostbyname(3)\fR functions. Names are
+resolved through the WINS server or by broadcast.
+.TP
 \fBpasswd\fR
 User information traditionally stored in 
 the \fIpasswd(5)\fR file and used by 
@@ -63,6 +69,12 @@ group:          files winbind
 .sp
 .fi
 .PP
+.PP
+The following simple configuration in the
+\fI/etc/nsswitch.conf\fR file can be used to initially
+resolve hostnames from \fI/etc/hosts\fR and then from the
+WINS server.
+.PP
 .SH "OPTIONS"
 .TP
 \fB-d debuglevel\fR
diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt
index ad12d4c7220..2ca41e5624e 100644
--- a/docs/textdocs/BROWSING.txt
+++ b/docs/textdocs/BROWSING.txt
@@ -7,10 +7,14 @@ Summary: This describes how to configure Samba for improved browsing.
 
 OVERVIEW:
 =========
+
 SMB networking provides a mechanism by which clients can access a list
-of machines that are available within the network.  This list is called
-the browse list and is heavily used by all SMB clients.  Configuration
-of SMB browsing has been problematic for some Samba users, hence this
+of machines in a network, a so-called "browse list".  This list
+contains machines that are ready to offer file and/or print services
+to other machines within the network. Thus it does not include
+machines which aren't currently able to do server tasks.  The browse
+list is heavily used by all SMB clients.  Configuration of SMB
+browsing has been problematic for some Samba users, hence this
 document.
 
 Browsing will NOT work if name resolution from NetBIOS names to IP
@@ -59,9 +63,10 @@ browsing on another subnet.  It is recommended that this option is only
 used for 'unusual' purposes: announcements over the internet, for
 example.  See "remote announce" in the smb.conf man page.  
 
-If something doesn't work then hopefully the log.nmb file will
-help you track down the problem.  Try a debug level of 2 or 3 for
-finding problems.
+If something doesn't work then hopefully the log.nmb file will help
+you track down the problem.  Try a debug level of 2 or 3 for finding
+problems. Also note that the current browse list usually gets stored
+in text form in a file called browse.dat.
 
 Note that if it doesn't work for you, then you should still be able to
 type the server name as \\SERVER in filemanager then hit enter and
diff --git a/docs/textdocs/Solaris-Winbind-HOWTO.txt b/docs/textdocs/Solaris-Winbind-HOWTO.txt
new file mode 100644
index 00000000000..a81bacf4864
--- /dev/null
+++ b/docs/textdocs/Solaris-Winbind-HOWTO.txt
@@ -0,0 +1,361 @@
+!==
+!== Solaris-Winbind-HOWTO.txt
+!==
+Contributors:   Naag Mummaneni <getnag@rediffmail.com>
+Updated:        May 2, 2002
+Status:         Current
+
+Subject:        Installing and Configuring Winbind on Solaris
+=============================================================================
+
+Installation and Configuration of Winbind on Solaris.
+-----------------------------------------------------
+
+This HOWTO describes how to get winbind services up and running to control
+access and authenticate users on your Solaris box using the winbind services
+which come with SAMBA 2.2.x latest CVS Checkout.Make sure you are using the
+latest Samba 2.2.x cvs checkout as other versions come with a lots of bugs
+regarding winbind .And even the Latest Samba Stable Release is also not an
+exception to this.
+
+Introduction
+------------
+
+This HOWTO describes the procedures used to get winbind up and running on a
+Solaris system. Winbind is capable of providing access and authentication
+control for Windows Domain users through an NT or Win2K PDC for 'regular'
+services, such as telnet and ftp, as well for SAMBA services.
+
+Why should I to this? 
+
+This allows the SAMBA administrator to rely on the authentication mechanisms
+on the NT/Win2K PDC for the authentication of domain members. NT/Win2K users
+no longer need to have separate accounts on the SAMBA server.
+
+Who should be reading this document? 
+
+This HOWTO is designed for system administrators. If you are implementing
+SAMBA on a file server and wish to (fairly easily) integrate existing
+NT/Win2K users from your PDC onto the SAMBA server, this HOWTO is for you.
+
+Requirements
+------------
+
+If you have a samba configuration file that you are currently using... BACK
+IT UP! If your system already uses PAM, back up the /etc/pam.conf file ! If
+you haven't already made a boot disk, MAKEONE NOW! Messing with the pam
+configuration file can make it nearly impossible to log in to yourmachine.
+That's why you want to be able to boot back into your machine in single user
+mode and restore your /etc/pam.conf back to the original state they were in
+if you get frustrated with the way things are going. ;-) Please refer to the
+main SAMBA web page or, better yet, your closest SAMBA mirror site for
+instructions on downloading the source code of Samba 2.2.x from the SAMBA
+CVS repository. To allow Domain users the ability to access SAMBA shares and
+files, as well as potentially other services provided by your SAMBA machine,
+PAM (pluggable authentication modules) must be setup properly on your
+machine. In order to compile the winbind modules, you should have at least
+the pam libraries resident on your system. Solaris 7/8 has its pam modules
+coming with the distribution itself.
+
+Testing Things Out
+------------------
+
+Before starting, it is probably best to kill off all the SAMBA related
+daemons running on your server. Kill off all smbd, nmbd, and winbindd
+processes that may be running.
+
+
+Configure and compile SAMBA
+---------------------------
+
+The configuration and compilation of SAMBA is pretty straightforward. The
+first three steps may not be necessary depending upon whether or not you
+have previously built the Samba binaries.
+
+root# autoconf
+root# make clean
+root# rm config.cache
+root# ./configure --with-winbind --with-pam
+root# make
+root# make install
+
+This will, by default, install SAMBA in /usr/local/samba. See the main SAMBA
+documentation if you want to install SAMBA somewhere else. It will also
+build the winbindd executable and libraries.
+
+Configure nsswitch.conf and the winbind libraries
+-------------------------------------------------
+
+The libraries needed to run the winbindd daemon through nsswitch need to be
+copied to their proper locations, so
+
+root# cp ../samba/source/nsswitch/libnss_winbind.so /usr/lib
+
+I also found it necessary to make the following symbolic links:
+
+root# ln -s /usr/lib/libnss_winbind.so /usr/lib/libnss_winbind.so.1
+root# ln -s /usr/lib/libnss_winbind.so /usr/lib/libnss_winbind.so.2
+root# ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.1
+root# ln -s /usr/lib/libnss_winbind.so /usr/lib/nss_winbind.so.2
+
+Now, as root you need to edit /etc/nsswitch.conf to allow user and group
+entries to be visible from the winbindd daemon. My /etc/nsswitch.conf file
+look like this after editing:
+
+  passwd: files winbind
+  group: files winbind
+
+
+Configure smb.conf
+------------------
+
+Several parameters are needed in the smb.conf file to control the behavior
+of winbindd. Configure smb.conf These are described in more detail in the
+winbindd(8) man page. My smb.conf file was modified to include the following
+entries in the [global] section:
+
+[global]
+	<...>
+	# The previous documentation says to 
+	# as the "winbind seperator " directive also but 
+	# it is no longer supported.
+
+	# use uids from 10000 to 20000 for domain users
+	winbind uid = 10000-20000
+
+	# use gids from 10000 to 20000 for domain groups
+	winbind gid = 10000-20000
+
+	# allow enumeration of winbind users and groups
+	winbind enum users = yes
+	winbind enum groups = yes
+
+	# give winbind users a real shell (only needed if 
+	# they have telnet access)
+	template homedir = /home/winnt/%D/%U
+	template shell = /bin/bash
+
+
+Join the SAMBA server to the PDC domain
+---------------------------------------
+
+Enter the following command to make the SAMBA server join the PDC domain,
+where DOMAIN is the name of your Windows domain and Administrator is a
+domain user who has administrative privileges in the domain.
+
+root# /usr/local/samba/bin/smbpasswd -j DOMAIN -r PDC -U Administrator
+
+The proper response to the command should be: "Joined the domain DOMAIN"
+where DOMAIN is your DOMAIN name.
+
+Start up the winbindd daemon and test it!
+
+Eventually, you will want to modify your smb startup script to automatically
+invoke the winbindd daemon when the other parts of SAMBA start, but it is
+possible to test out just the winbind portion first. To start up winbind
+services, enter the following command as root:
+
+root# /usr/local/samba/bin/winbindd
+
+I'm always paranoid and like to make sure the daemon is really running...
+
+root# ps -ae | grep winbindd
+
+This command should produce output like this, if the daemon is running
+
+  3025 ? 00:00:00 winbindd
+
+Now... for the real test, try to get some information about the users on
+your PDC
+
+root# /usr/local/samba/bin/wbinfo -u
+
+This should echo back a list of users on your Windows users on your PDC. For
+example, I get the following response:
+
+CEO\Administrator
+CEO\burdell
+CEO\Guest
+CEO\jt-ad
+CEO\krbtgt
+CEO\TsInternetUser
+
+root# /usr/local/samba/bin/wbinfo -g
+
+CEO\Domain Admins
+CEO\Domain Users
+CEO\Domain Guests
+CEO\Domain Computers
+CEO\Domain Controllers
+CEO\Cert Publishers
+CEO\Schema Admins
+CEO\Enterprise Admins
+CEO\Group Policy Creator Owners
+
+The function 'getent' can now be used to get unified lists of both local and
+PDC users and groups. Try the following command:
+
+root# getent passwd
+
+You should get a list that looks like your /etc/passwd list followed by the domain users with their new
+uids, gids, home directories and default shells.
+
+The same thing can be done for groups with the command
+
+root# getent group
+
+Fix the /etc/rc.d/init.d/samba.server startup files The winbindd daemon
+needs to start up after the smbd and nmbd daemons are running. To accomplish
+this task, you need to modify the /etc/init.d/samba.server script to add
+commands to invoke this daemon in the proper sequence. My
+/etc/init.d/samba.server file starts up smbd, nmbd, and winbindd from the
+/usr/local/samba/bin directory directly.
+
+##
+## samba.server
+##
+
+if [ ! -d /usr/bin ]
+then                    # /usr not mounted
+        exit
+fi
+
+killproc() {            # kill the named process(es)
+        pid=`/usr/bin/ps -e |
+             /usr/bin/grep -w $1 |
+             /usr/bin/sed -e 's/^  *//' -e 's/ .*//'`
+        [ "$pid" != "" ] && kill $pid
+}
+ 
+# Start/stop processes required for samba server
+
+case "$1" in
+
+'start')
+#
+# Edit these lines to suit your installation (paths, workgroup, host)
+#
+echo Starting SMBD
+   /usr/local/samba/bin/smbd -D -s \
+	/usr/local/samba/smb.conf
+
+echo Starting NMBD
+   /usr/local/samba/bin/nmbd -D -l \
+	/usr/local/samba/var/log -s /usr/local/samba/smb.conf
+
+echo Starting Winbind Daemon
+   /usr/local/samba/bin/winbindd
+   ;;
+
+'stop')
+   killproc nmbd
+   killproc smbd
+   killproc winbindd
+   ;;
+
+*)
+   echo "Usage: /etc/init.d/samba.server { start | stop }"
+   ;;
+esac
+
+If you restart the smbd, nmbd, and winbindd daemons at this point, you
+should be able to connect to the samba server as a domain member just as if
+you were a local user.
+
+
+Configure Winbind and PAM
+-------------------------
+
+If you have made it this far, you know that winbindd and samba are working
+together. If you want to use winbind to provide authentication for other
+services, keep reading. The pam configuration file need to be altered in
+this step. (Did you remember to make backups of your original /etc/pam.conf
+file? If not, do it now.) You will need a pam module to use winbindd with
+these other services. This module will be compiled in the ../source/nsswitch
+directory by default when we used ./configure --with-pam option.
+
+root# make nsswitch/pam_winbind.so
+
+from the ../source directory. The pam_winbind.so file should be copied to
+the location of your other pam security modules. On my Solaris 8, this was
+the /usr/lib/security directory.
+
+root# cp ../samba/source/nsswitch/pam_winbind.so /usr/lib/security
+
+The /etc/pam.conf need to be changed. I changed this file so that my Domain
+users can logon both locally as well as telnet.The following are the changes
+that I made.You can customize the pam.conf file as per your requirements,but
+be sure of those changes because in the worst case it will leave your system
+nearly impossible to boot.
+
+#
+#ident	"@(#)pam.conf	1.14	99/09/16 SMI"
+#
+# Copyright (c) 1996-1999, Sun Microsystems, Inc.
+# All Rights Reserved.
+#
+# PAM configuration
+#
+# Authentication management
+#
+login   auth required   /usr/lib/security/pam_winbind.so
+login	auth required 	/usr/lib/security/$ISA/pam_unix.so.1 try_first_pass 
+login	auth required 	/usr/lib/security/$ISA/pam_dial_auth.so.1 try_first_pass 
+#
+rlogin  auth sufficient /usr/lib/security/pam_winbind.so
+rlogin  auth sufficient /usr/lib/security/$ISA/pam_rhosts_auth.so.1
+rlogin	auth required 	/usr/lib/security/$ISA/pam_unix.so.1 try_first_pass
+#
+dtlogin auth sufficient /usr/lib/security/pam_winbind.so
+dtlogin	auth required 	/usr/lib/security/$ISA/pam_unix.so.1 try_first_pass
+#
+rsh	auth required	/usr/lib/security/$ISA/pam_rhosts_auth.so.1
+other   auth sufficient /usr/lib/security/pam_winbind.so
+other	auth required	/usr/lib/security/$ISA/pam_unix.so.1 try_first_pass
+#
+# Account management
+#
+login   account sufficient      /usr/lib/security/pam_winbind.so
+login	account requisite	/usr/lib/security/$ISA/pam_roles.so.1 
+login	account required	/usr/lib/security/$ISA/pam_unix.so.1 
+#
+dtlogin account sufficient      /usr/lib/security/pam_winbind.so
+dtlogin	account requisite	/usr/lib/security/$ISA/pam_roles.so.1 
+dtlogin	account required	/usr/lib/security/$ISA/pam_unix.so.1 
+#
+other   account sufficient      /usr/lib/security/pam_winbind.so
+other	account requisite	/usr/lib/security/$ISA/pam_roles.so.1 
+other	account required	/usr/lib/security/$ISA/pam_unix.so.1 
+#
+# Session management
+#
+other	session required	/usr/lib/security/$ISA/pam_unix.so.1 
+#
+# Password management
+#
+#other   password sufficient     /usr/lib/security/pam_winbind.so
+other	password required	/usr/lib/security/$ISA/pam_unix.so.1 
+dtsession auth required	/usr/lib/security/$ISA/pam_unix.so.1
+#
+# Support for Kerberos V5 authentication (uncomment to use Kerberos)
+#
+#rlogin	auth optional	/usr/lib/security/$ISA/pam_krb5.so.1 try_first_pass
+#login	auth optional	/usr/lib/security/$ISA/pam_krb5.so.1 try_first_pass
+#dtlogin	auth optional	/usr/lib/security/$ISA/pam_krb5.so.1 try_first_pass
+#other	auth optional	/usr/lib/security/$ISA/pam_krb5.so.1 try_first_pass
+#dtlogin	account optional /usr/lib/security/$ISA/pam_krb5.so.1
+#other	account optional /usr/lib/security/$ISA/pam_krb5.so.1
+#other	session optional /usr/lib/security/$ISA/pam_krb5.so.1
+#other	password optional /usr/lib/security/$ISA/pam_krb5.so.1 try_first_pass
+
+I also added a try_first_pass line after the winbind.so line to get rid of
+annoying double prompts for passwords.
+
+Now restart your Samba & try connecting through your application that you
+configured in the pam.conf.
+
+
+
+!==
+!== end of Solaris-Winbind-HOWTO.txt
+!==
diff --git a/examples/LDAP/samba-schema-netscapeds4.x b/examples/LDAP/samba-schema-netscapeds4.x
new file mode 100644
index 00000000000..c5a11b8b66c
--- /dev/null
+++ b/examples/LDAP/samba-schema-netscapeds4.x
@@ -0,0 +1,54 @@
+#
+# LDAP Schema file for SAMBA attribute storage 
+# This file is suitable for usage with Netscape Directory Server 4.1x
+# Adapted by Scott Lawson with help from Ron Creamer
+#
+
+attribute       lmPassword              1.3.6.1.4.1.7165.2.1.1  cis single
+attribute       ntPassword              1.3.6.1.4.1.7165.2.1.2  cis single
+attribute       acctFlags               1.3.6.1.4.1.7165.2.1.4  cis single
+attribute       pwdLastSet              1.3.6.1.4.1.7165.2.1.3  int single
+attribute       logonTime               1.3.6.1.4.1.7165.2.1.5  int single
+attribute       logoffTime              1.3.6.1.4.1.7165.2.1.6  int single
+attribute       kickoffTime             1.3.6.1.4.1.7165.2.1.7  int single
+attribute       pwdCanChange            1.3.6.1.4.1.7165.2.1.8  int single
+attribute       pwdMustChange           1.3.6.1.4.1.7165.2.1.9  int single
+attribute       homedrive               1.3.6.1.4.1.7165.2.1.10 cis single
+attribute       scriptPath              1.3.6.1.4.1.7165.2.1.11 cis single
+attribute       profilePath             1.3.6.1.4.1.7165.2.1.12 cis single
+attribute       userWorkstations        1.3.6.1.4.1.7165.2.1.13 cis single
+attribute       rid                     1.3.6.1.4.1.7165.2.1.14 int single
+attribute       primaryGroupID          1.3.6.1.4.1.7165.2.1.15 int single
+attribute       smbHome                 1.3.6.1.4.1.7165.2.1.17 cis single
+attribute       domain                  1.3.6.1.4.1.7165.2.1.18 cis single
+
+objectclass sambaAccount
+       oid
+               1.3.1.5.1.4.1.7165.2.2.2
+       superior
+               top
+       requires
+               objectClass,
+               uid,
+               rid
+       allows
+               cn,
+               lmPassword,
+               ntPassword,
+               pwdLastSet,
+               logonTime,
+               logoffTime,
+               KickoffTime,
+               pwdCanChange,
+               pwdMustChange,
+               acctFlags,
+               displayName,
+               smbHome,
+               homeDrive,
+               scriptPath,
+               profilePath,
+               description,
+               userWorkstations,
+               primaryGroupID,
+               domain
+
diff --git a/examples/LDAP/samba-schema-netscapeds5.x b/examples/LDAP/samba-schema-netscapeds5.x
new file mode 100644
index 00000000000..0abc9d82e27
--- /dev/null
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -0,0 +1,74 @@
+##
+## submitted by Martin.Dehn@comparex.de
+##
+## Experiement sambaAccount schema file Netscape DS 5.0
+##
+## INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif
+##
+dn: cn=schema
+objectClass: top
+objectClass: ldapSubentry
+objectClass: subschema
+cn: schema
+aci: (target="ldap:///cn=schema")(targetattr !="aci")(version 3.0;acl "anonymo
+ us, no acis"; allow (read, search, compare) userdn = "ldap:///anyone";)
+aci: (targetattr = "*")(version 3.0; acl "Configuration Administrator"; allow 
+ (all) userdn = "ldap:///uid=admin,ou=Administrators, ou=TopologyManagement, 
+ o=NetscapeRoot";)
+aci: (targetattr = "*")(version 3.0; acl "Local Directory Administrators Group
+ "; allow (all) groupdn = "ldap:///cn=Directory Administrators, dc=samba,dc=org";)
+aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all)groupdn = "ld
+ ap:///cn=slapd-sambaldap, cn=iPlanet Directory Server, cn=Server Group, cn=iPlanetDirectory.samba.org, ou=samba.org, o=NetscapeRoot";)
+modifiersName: cn=directory manager
+modifyTimestamp: 20020322124844Z
+objectClasses: ( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTUR
+ AL MAY ( acctFlags $ domain $ homeDrive $ kickoffTime $ lmPassword $ logofft
+ ime $ logonTime $ ntPassword $ primaryGroupID $ profilePath $ pwdCanChange $
+  pwdLastSet $ pwdMustChange $ rid $ scriptPath $ smbHome $ userWorkstations 
+ ) X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath' DESC 'NT script pa
+ th' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined
+ ' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime' DESC 'NT logon time'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath' DESC 'NT profile 
+ path' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defin
+ ed' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange' DESC 'NT passwd c
+ an change' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user 
+ defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome' DESC 'smbHome' SYNTAX
+  1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'  SYNTAX 1.3.6.1.4.1
+ .1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.18 NAME 'domain' DESC 'Windows NT domai
+ n Samba' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user de
+ fined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive' DESC 'NT home drive
+ ' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' 
+ )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logofftime' DESC 'logoff Time' 
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID' DESC 'NT Group
+  RID' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defin
+ ed' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword' DESC 'LanManager Pa
+ sswd' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defin
+ ed' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange' DESC 'NT pwdmust
+ chnage' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user def
+ ined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags' DESC 'Account Flags'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations' DESC 'userWo
+ rkstations' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user
+  defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime' DESC 'NT kickoff T
+ ime' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user define
+ d' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid' DESC 'rid' SYNTAX 1.3.6.1
+ .4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword' DESC 'NT Passwd' SY
+ NTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )
+nsSchemaCSN: 3c9b282c000000000000
+
diff --git a/examples/LDAP/samba-schema.IBMSecureWay b/examples/LDAP/samba-schema.IBMSecureWay
new file mode 100644
index 00000000000..1fca4a749a6
--- /dev/null
+++ b/examples/LDAP/samba-schema.IBMSecureWay
@@ -0,0 +1,43 @@
+##
+## Submitted by Dirk Kastens <Dirk.Kastens@Uni-Osnabrueck.de>
+##
+## I translated the samba.schema to be used with IBM
+## SecureWay directoy server 3.2.2. You have to load
+## it in your slapd32.conf with:
+##
+## dn: cn=IBM SecureWay, cn=Schemas, cn=Configuration
+## cn: IBM SecureWay
+## ibm-slapdIncludeSchema: /etc/lapschema/samba.schema
+##
+objectClasses {
+( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' DESC 'Samba Account' SUP top MUST uid $ rid MAY ( acctFlags $ cn $ description $ displayName $ homeDrive $ kickoffTime $ lmPassword $ logoffTime $ logonTime $ ntPassword $ primaryGroupID $ profilePath $ pwdCanChange $ pwdLastSet $ pwdMustChange $ scriptPath $ smbHome $ userWorkstations ) )
+}
+
+attributeTypes {
+( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword' DESC 'LanManager Passwd' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive' DESC 'NT homeDrive' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath' DESC 'NT scriptPath' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath' DESC 'NT profilePath' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations' DESC 'userWorkstations' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid' DESC 'NT rid' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID' DESC 'NT Group RID' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome' DESC 'smbHome' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword' DESC 'NT Passwd' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet' DESC 'NT pwdLastSet' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags' DESC 'Account Flags' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime' DESC 'NT logonTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime' DESC 'NT logoffTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime' DESC 'NT kickoffTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange' DESC 'NT pwdCanChange' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange' DESC 'NT pwdMustChange' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+}
+
+IBMattributeTypes {
+}
+
+ldapSyntaxes {
+}
+
+matchingRules {
+}
+
diff --git a/examples/README b/examples/README
index 3e11ed4ad82..22226067140 100644
--- a/examples/README
+++ b/examples/README
@@ -1,11 +1,11 @@
-Copyright(C) Samba-Team 1993-1997
+Copyright(C) Samba-Team 1993-2001
 
-This directory contains example samba extensions, example config files and 
-related material for Samba. 
+This directory contains example config files and related material for
+Samba. 
 
 At a minimum please refer to the smb.conf.default file for current
 information regarding global and share parameter settings.
 
-Send additions to: samba-bugs@samba.org
+Send additions to: samba@samba.org
 
 
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index f0c86cc6eed..417417d256f 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -58,9 +58,17 @@
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
    security = user
+
 # Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
 ;   password server = <NT-Server-Name>
 
+# Note: Do NOT use the now deprecated option of "domain controller"
+# This option is no longer implemented.
+
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
@@ -102,10 +110,6 @@
 # and gives it a slightly higher chance of winning the election
 ;   preferred master = yes
 
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
 ;   domain logons = yes
diff --git a/packaging/RedHat/samba.pamd b/packaging/RedHat/samba.pamd
index 1b4a93fb19e..bf7a5b392ca 100644
--- a/packaging/RedHat/samba.pamd
+++ b/packaging/RedHat/samba.pamd
@@ -1,4 +1,4 @@
-auth		required	/lib/security/pam_pwdb.so nullok shadow
+auth		required	/lib/security/pam_pwdb.so nullok
 account		required	/lib/security/pam_pwdb.so
 session		required	/lib/security/pam_pwdb.so
-password	required	/lib/security/pam_pwdb.so
+password	required	/lib/security/pam_pwdb.so # shadow md5 nullok audit
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index c99b9123825..0766653c234 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -8,6 +8,7 @@ Source: ftp://samba.org/pub/samba/samba-%{version}.tar.gz
 Packager: John H Terpstra [Samba-Team] <jht@samba.org>
 Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
+Provides: samba = %{version}, samba-common = %{version}, samba-client = %{version}, samba-swat = %{version}
 BuildRoot: /var/tmp/samba
 Prefix: /usr
 
@@ -43,9 +44,16 @@ for Shadow passwords and quotas. Do NOT recompile with the
 SHADOW_PWD option enabled
 
 %changelog
+* Mon May 6 2002 Gerald Carter <jerry@samba.org>
+  - moved findsmb to a standard component in samba's 
+    "make install".  Removed from specfile.
+ 
+* Sun Oct 14 2001 Andrew Bartlett <abartlet@samba.org>
+ - Set SBINDIR for codepage/manpage install, cope with 
+    broken Makefile
+
 * Mon Aug 1 2001 Tim Potter <tpot@samba.org>
  - Install winbind daemon, client programs, nss and pam libraries
- - Removed codepage stuff so spec file works with current HEAD branch
 
 * Sat Mar 31 2001 Andrew Bartlett <abartlet@pcug.org.au>
  - Changed prefix/share/man for _mandir/share/man
@@ -158,11 +166,11 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
 	--with-privatedir=/etc/samba \
 	--with-fhs \
 	--with-quotas \
+	--with-msdfs \
 	--with-smbmount \
 	--with-pam \
 	--with-syslog \
 	--with-utmp \
-	--with-netatalk \
 	--with-sambabook=%{prefix}/share/swat/using_samba \
 	--with-swatdir=%{prefix}/share/swat
 make -j${NUMCPU} proto
@@ -182,8 +190,8 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
 mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
-mkdir -p $RPM_BUILD_ROOT/var/lock/samba
-mkdir -p $RPM_BUILD_ROOT/var/log/samba
+mkdir -p $RPM_BUILD_ROOT/var/cache/samba
+mkdir -p $RPM_BUILD_ROOT/var/{log,run}/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 mkdir -p $RPM_BUILD_ROOT/lib/security
 
@@ -211,19 +219,21 @@ ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
 # This allows us to get away without duplicating code that 
 #  sombody else can maintain for us.  
 cd source
-make LIBDIR=$RPM_BUILD_ROOT/etc/samba \
+make BASEDIR=$RPM_BUILD_ROOT/usr \
+	LIBDIR=$RPM_BUILD_ROOT/etc/samba \
+	SBINDIR=$RPM_BUILD_ROOT%{prefix}/sbin \
 	BINDIR=$RPM_BUILD_ROOT%{prefix}/bin \
 	MANDIR=$RPM_BUILD_ROOTMANDIR_MACRO \
 	SWATDIR=$RPM_BUILD_ROOT/usr/share/swat \
 	SAMBABOOK=$RPM_BUILD_ROOT/usr/share/swat/using_samba \
-	installman installswat
+	installman installcp installswat
 cd ..
 
 # Install the nsswitch library extension file
 install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
 
 # Make link for wins resolver
-( cd $RPM_BUILD_ROOT/lib; ln -s libnss_wins.so libnss_wins.so.2; )
+( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_wins.so libnss_wins.so.2; )
 
 # Install winbind shared libraries
 install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib
@@ -246,7 +256,6 @@ done
 # Install the miscellany
 install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
-install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
 install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
@@ -265,35 +274,74 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig smb off
 
 echo "Looking for old /etc/smb.conf..."
-if [ -f /etc/smb.conf ]; then
+if [ -f /etc/smb.conf -a ! -f /etc/samba/smb.conf ]; then
 	echo "Moving old /etc/smb.conf to /etc/samba/smb.conf"
 	mv /etc/smb.conf /etc/samba/smb.conf
 fi
 
 echo "Looking for old /etc/smbusers..."
-if [ -f /etc/smbusers ]; then
+if [ -f /etc/smbusers -a ! -f /etc/samba/smbusers ]; then
 	echo "Moving old /etc/smbusers to /etc/samba/smbusers"
 	mv /etc/smbusers /etc/samba/smbusers
 fi
 
 echo "Looking for old /etc/lmhosts..."
-if [ -f /etc/lmhosts ]; then
+if [ -f /etc/lmhosts -a ! -f /etc/samba/lmhosts ]; then
 	echo "Moving old /etc/lmhosts to /etc/samba/lmhosts"
 	mv /etc/lmhosts /etc/samba/lmhosts
 fi
 
 echo "Looking for old /etc/MACHINE.SID..."
-if [ -f /etc/MACHINE.SID ]; then
+if [ -f /etc/MACHINE.SID -a ! -f /etc/samba/MACHINE.SID ]; then
 	echo "Moving old /etc/MACHINE.SID to /etc/samba/MACHINE.SID"
 	mv /etc/MACHINE.SID /etc/samba/MACHINE.SID
 fi
 
 echo "Looking for old /etc/smbpasswd..."
-if [ -f /etc/smbpasswd ]; then
+if [ -f /etc/smbpasswd -a ! -f /etc/samba/smbpasswd ]; then
 	echo "Moving old /etc/smbpasswd to /etc/samba/smbpasswd"
 	mv /etc/smbpasswd /etc/samba/smbpasswd
 fi
 
+#
+# For 2.2.1 we move the tdb files from /var/lock/samba to /var/cache/samba
+# to preserve across reboots.
+#
+echo "Moving tdb files in /var/lock/samba/*.tdb to /var/cache/samba/*.tdb"
+for i in /var/lock/samba/*.tdb
+do
+if [ -f $i ]; then
+	newname=`echo $i | sed -e's|var\/lock\/samba|var\/cache\/samba|'`
+	echo "Moving $i to $newname"
+	mv $i $newname
+fi
+done
+
+# Remove the transient tdb files.
+if [ -e /var/cache/samba/brlock.tdb ]; then
+	rm -f /var/cache/samba/brlock.tdb
+fi
+
+if [ -e /var/cache/samba/unexpected.tdb ]; then
+	rm -f /var/cache/samba/unexpected.tdb
+fi
+
+if [ -e /var/cache/samba/connections.tdb ]; then
+	rm -f /var/cache/samba/connections.tdb
+fi
+
+if [ -e /var/cache/samba/locking.tdb ]; then
+	rm -f /var/cache/samba/locking.tdb
+fi
+
+if [ -e /var/cache/samba/messages.tdb ]; then
+	rm -f /var/cache/samba/messages.tdb
+fi
+
+if [ -d /var/lock/samba ]; then
+	rm -rf /var/lock/samba
+fi
+
 # Add swat entry to /etc/services if not already there.
 if !( grep ^[:space:]*swat /etc/services > /dev/null ) then
 	echo 'swat		901/tcp				# Add swat service used via inetd' >> /etc/services
@@ -309,7 +357,7 @@ fi
 
 # Add swat entry to xinetd.d if needed.
 if [ -d $RPM_BUILD_ROOT/etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then
-        mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
+	mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
 else
 	rm -f /etc/samba/samba.xinetd
 fi
@@ -325,39 +373,41 @@ fi
 
 # Create winbind nss client symlink
 
-ln -s /lib/libnss_winbind.so /lib/libnss_winbind.so.2
+if [ -e /lib/libnss_winbind.so ]; then
+	ln -sf /lib/libnss_winbind.so /lib/libnss_winbind.so.2
+fi
 
 %preun
 if [ $1 = 0 ] ; then
-    /sbin/chkconfig --del smb
+	/sbin/chkconfig --del smb
 
-    # We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
-    if [ -e /var/lock/samba/browse.dat ]; then
-	    rm -f /var/lock/samba/browse.dat
-    fi
-    if [ -e /var/lock/samba/wins.dat ]; then
-	    rm -f /var/lock/samba/wins.dat
-    fi
+	# We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
+	if [ -e /var/cache/samba/browse.dat ]; then
+		rm -f /var/cache/samba/browse.dat
+	fi
+	if [ -e /var/cache/samba/wins.dat ]; then
+		rm -f /var/cache/samba/wins.dat
+	fi
 
 	# Remove the transient tdb files.
-	if [ -e /var/lock/samba/brlock.tdb ]; then
-		rm -f /var/lock/samba/brlock.tdb
+	if [ -e /var/cache/samba/brlock.tdb ]; then
+		rm -f /var/cache/samba/brlock.tdb
 	fi
 
-	if [ -e /var/lock/samba/unexpected.tdb ]; then
-		rm -f /var/lock/samba/unexpected.tdb
+	if [ -e /var/cache/samba/unexpected.tdb ]; then
+		rm -f /var/cache/samba/unexpected.tdb
 	fi
 
-	if [ -e /var/lock/samba/connections.tdb ]; then
-		rm -f /var/lock/samba/connections.tdb
+	if [ -e /var/cache/samba/connections.tdb ]; then
+		rm -f /var/cache/samba/connections.tdb
 	fi
 
-	if [ -e /var/lock/samba/locking.tdb ]; then
-		rm -f /var/lock/samba/locking.tdb
+	if [ -e /var/cache/samba/locking.tdb ]; then
+		rm -f /var/cache/samba/locking.tdb
 	fi
 
-	if [ -e /var/lock/samba/messages.tdb ]; then
-		rm -f /var/lock/samba/messages.tdb
+	if [ -e /var/cache/samba/messages.tdb ]; then
+		rm -f /var/cache/samba/messages.tdb
 	fi
 
 	# Remove winbind nss client symlink
@@ -376,6 +426,9 @@ if [ $1 = 0 ] ; then
     if [ -e /var/log/samba ]; then
       rm -rf /var/log/samba
     fi
+	if [ -e /var/cache/samba ]; then
+		rm -rf /var/cache/samba
+	fi
 
     # Remove swat entries from /etc/inetd.conf and /etc/services
     cd /etc
@@ -403,56 +456,61 @@ if [ $0 != 0 ]; then
 fi
 
 %files
+%defattr(-,root,root)
 %doc README COPYING Manifest Read-Manifest-Now
 %doc WHATSNEW.txt Roadmap
 %doc docs
 %doc swat/README
 %doc examples
-%attr(-,root,root) %{prefix}/sbin/smbd
-%attr(-,root,root) %{prefix}/sbin/nmbd
-%attr(-,root,root) %{prefix}/sbin/swat
-%attr(-,root,root) %{prefix}/sbin/smbmnt
-%attr(-,root,root) %{prefix}/sbin/smbmount
-%attr(-,root,root) %{prefix}/sbin/smbumount
-%attr(-,root,root) %{prefix}/sbin/winbindd
-%attr(-,root,root) /sbin/mount.smbfs
-%attr(-,root,root) /sbin/mount.smb
-%attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh
-%attr(-,root,root) %{prefix}/bin/smbclient
-%attr(-,root,root) %{prefix}/bin/smbspool
-%attr(-,root,root) %{prefix}/bin/rpcclient
-%attr(-,root,root) %{prefix}/bin/testparm
-%attr(-,root,root) %{prefix}/bin/testprns
-%attr(-,root,root) %{prefix}/bin/findsmb
-%attr(-,root,root) %{prefix}/bin/smbstatus
-%attr(-,root,root) %{prefix}/bin/nmblookup
-%attr(-,root,root) %{prefix}/bin/make_printerdef
-%attr(-,root,root) %{prefix}/bin/smbpasswd
-%attr(-,root,root) %{prefix}/bin/smbtar
-%attr(-,root,root) %{prefix}/bin/smbprint
-%attr(-,root,root) %{prefix}/bin/smbcontrol
-%attr(-,root,root) %{prefix}/bin/smbcacls
-%attr(-,root,root) %{prefix}/bin/wbinfo
+%{prefix}/sbin/smbd
+%{prefix}/sbin/nmbd
+%{prefix}/sbin/swat
+%{prefix}/sbin/smbmnt
+%{prefix}/sbin/smbmount
+%{prefix}/sbin/smbumount
+%{prefix}/sbin/winbindd
+/sbin/mount.smbfs
+/sbin/mount.smb
+%{prefix}/bin/mksmbpasswd.sh
+%{prefix}/bin/smbclient
+%{prefix}/bin/smbspool
+%{prefix}/bin/rpcclient
+%{prefix}/bin/testparm
+%{prefix}/bin/testprns
+%{prefix}/bin/findsmb
+%{prefix}/bin/smbstatus
+%{prefix}/bin/nmblookup
+%{prefix}/bin/make_smbcodepage
+%{prefix}/bin/make_unicodemap
+%{prefix}/bin/make_printerdef
+%{prefix}/bin/smbpasswd
+%{prefix}/bin/smbtar
+%{prefix}/bin/smbprint
+%{prefix}/bin/smbcontrol
+%{prefix}/bin/smbcacls
+%{prefix}/bin/wbinfo
 %attr(755,root,root) /lib/libnss_wins.s*
-%attr(-,root,root) %{prefix}/share/swat/help/*
-%attr(-,root,root) %{prefix}/share/swat/images/*
-%attr(-,root,root) %{prefix}/share/swat/include/header.html
-%attr(-,root,root) %{prefix}/share/swat/include/footer.html
-%attr(-,root,root) %{prefix}/share/swat/using_samba/*
-%attr(-,root,root) %config(noreplace) /etc/samba/lmhosts
-%attr(-,root,root) %config(noreplace) /etc/samba/smb.conf
-%attr(-,root,root) %config(noreplace) /etc/samba/smbusers
-%attr(-,root,root) /etc/samba/samba.stack
-%attr(-,root,root) /etc/samba/samba.xinetd
-%attr(-,root,root) /etc/rc.d/init.d/smb
-%attr(-,root,root) /etc/logrotate.d/samba
-%attr(-,root,root) %config(noreplace) /etc/pam.d/samba
-%attr(-,root,root) MANDIR_MACRO/man1/*
-%attr(-,root,root) MANDIR_MACRO/man5/*
-%attr(-,root,root) MANDIR_MACRO/man7/*
-%attr(-,root,root) MANDIR_MACRO/man8/*
-%attr(755,root,root) %dir /var/lock/samba
-%attr(-,root,root) %dir /var/log/samba
+%{prefix}/share/swat/help/*
+%{prefix}/share/swat/images/*
+%{prefix}/share/swat/include/header.html
+%{prefix}/share/swat/include/footer.html
+%{prefix}/share/swat/using_samba/*
+%config(noreplace) /etc/samba/lmhosts
+%config(noreplace) /etc/samba/smb.conf
+%config(noreplace) /etc/samba/smbusers
+/etc/samba/samba.stack
+/etc/samba/samba.xinetd
+/etc/rc.d/init.d/smb
+/etc/logrotate.d/samba
+%config(noreplace) /etc/pam.d/samba
+MANDIR_MACRO/man1/*
+MANDIR_MACRO/man5/*
+MANDIR_MACRO/man7/*
+MANDIR_MACRO/man8/*
+%dir /etc/codepages/*
+%attr(755,root,root) %dir /var/cache/samba
+%dir /var/log/samba
+%dir /var/run/samba
 %attr(1777,root,root) %dir /var/spool/samba
 %attr(-,root,root) /lib/libnss_winbind.so
 %attr(-,root,root) /lib/security/pam_winbind.so
diff --git a/packaging/RedHat/smb.init b/packaging/RedHat/smb.init
index 260439281a3..c43c9a0094b 100755
--- a/packaging/RedHat/smb.init
+++ b/packaging/RedHat/smb.init
@@ -13,8 +13,10 @@
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
+CONFIG=/etc/samba/smb.conf
+
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f $CONFIG ] || exit 0
 
 # See how we were called.
 case "$1" in
@@ -22,6 +24,9 @@ case "$1" in
 	echo -n "Starting SMB services: "
 	daemon smbd -D 	
 	daemon nmbd -D 
+	if [ "`grep -i 'winbind uid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
+		daemon winbindd 
+	fi
 	echo
 	touch /var/lock/subsys/smb
 	;;
@@ -29,12 +34,16 @@ case "$1" in
 	echo -n "Shutting down SMB services: "
 	killproc smbd
 	killproc nmbd
+	if [ "`ps -ef | grep winbind | grep -v grep`" ]; then
+		killproc winbindd
+	fi
 	rm -f /var/lock/subsys/smb
 	echo ""
 	;;
   status)
 	status smbd
 	status nmbd
+	status winbindd
 	;;
   restart)
 	echo -n "Restarting SMB services: "