large set of updates from Richard Hellier <rlh@lsil.com>.

Mostly tag fixes and typos. Many Thanks! :)
author: Gerald Carter <jerry@samba.org> 2001-06-22 16:53:39 +0000
committer: Gerald Carter <jerry@samba.org> 2001-06-22 16:53:39 +0000
commit: 6c2edc0ea50bef81ac2ec08bae549deb6742234d (patch)
tree: 9e29b8bc6a845585ee0ca9711895e695fa971646 /docs
parent: d57410e0f9c28aa857c0ada934b71dbb0afec81f (diff)
download: samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.tar.gz
samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.tar.xz
samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.zip
79 files changed, 2224 insertions, 1833 deletions
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 25524bd0fdb..3173bebd3a1 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:20010621150936Z)/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:20010622165006Z)/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
@@ -133,7 +133,7 @@
 ]endobj
 96 0 obj<</S/URI/URI(smb.conf.5.html)>>endobj
 97 0 obj<</Subtype/Link/Rect[182.3 603.4 254.9 616.4]/Border[0 0 0]/A 96 0 R>>endobj
-98 0 obj<</S/URI/URI(EMCRYPTION.html)>>endobj
+98 0 obj<</S/URI/URI(ENCRYPTION.html)>>endobj
 99 0 obj<</Subtype/Link/Rect[334.9 603.4 418.9 616.4]/Border[0 0 0]/A 98 0 R>>endobj
 100 0 obj<</S/URI/URI(UNIX_INSTALL.html)>>endobj
 101 0 obj<</Subtype/Link/Rect[72.0 426.2 173.7 439.2]/Border[0 0 0]/A 100 0 R>>endobj
@@ -460,7 +460,7 @@
 314 0 obj<</Subtype/Link/Rect[108.0 182.4 332.0 195.4]/Border[0 0 0]/Dest[626 0 R/XYZ null 435 0]>>endobj
 315 0 obj<</Subtype/Link/Rect[108.0 169.2 406.2 182.2]/Border[0 0 0]/Dest[629 0 R/XYZ null 189 0]>>endobj
 316 0 obj<</Subtype/Link/Rect[108.0 156.0 431.0 169.0]/Border[0 0 0]/Dest[644 0 R/XYZ null 686 0]>>endobj
-317 0 obj<</Subtype/Link/Rect[72.0 129.6 423.1 142.6]/Border[0 0 0]/Dest[650 0 R/XYZ null 798 0]>>endobj
+317 0 obj<</Subtype/Link/Rect[72.0 129.6 426.2 142.6]/Border[0 0 0]/Dest[650 0 R/XYZ null 798 0]>>endobj
 318 0 obj<</Subtype/Link/Rect[108.0 116.4 164.5 129.4]/Border[0 0 0]/Dest[650 0 R/XYZ null 706 0]>>endobj
 319 0 obj<</Subtype/Link/Rect[108.0 103.2 181.6 116.2]/Border[0 0 0]/Dest[650 0 R/XYZ null 569 0]>>endobj
 320 0 obj<</Subtype/Link/Rect[108.0 90.0 233.6 103.0]/Border[0 0 0]/Dest[650 0 R/XYZ null 246 0]>>endobj
@@ -518,7 +518,7 @@
 329 0 obj<</Subtype/Link/Rect[108.0 618.0 259.9 631.0]/Border[0 0 0]/Dest[659 0 R/XYZ null 345 0]>>endobj
 330 0 obj<</Subtype/Link/Rect[108.0 604.8 178.0 617.8]/Border[0 0 0]/Dest[659 0 R/XYZ null 155 0]>>endobj
 331 0 obj<</Subtype/Link/Rect[108.0 591.6 177.4 604.6]/Border[0 0 0]/Dest[662 0 R/XYZ null 581 0]>>endobj
-332 0 obj<</Subtype/Link/Rect[72.0 565.2 413.9 578.2]/Border[0 0 0]/Dest[665 0 R/XYZ null 798 0]>>endobj
+332 0 obj<</Subtype/Link/Rect[72.0 565.2 412.7 578.2]/Border[0 0 0]/Dest[665 0 R/XYZ null 798 0]>>endobj
 333 0 obj<</Subtype/Link/Rect[108.0 552.0 447.4 565.0]/Border[0 0 0]/Dest[665 0 R/XYZ null 706 0]>>endobj
 334 0 obj<</Subtype/Link/Rect[108.0 538.8 319.1 551.8]/Border[0 0 0]/Dest[665 0 R/XYZ null 525 0]>>endobj
 335 0 obj<</Subtype/Link/Rect[108.0 525.6 231.1 538.6]/Border[0 0 0]/Dest[665 0 R/XYZ null 348 0]>>endobj
@@ -790,33 +790,30 @@ endobj
 495 0 obj<</Length 496 0 R/Filter/FlateDecode>>stream
 x�V]s�6|ׯ����:cS�>,�ov�N��f륏	��H��(���ޑ��4���eK{�{�5Ji���V3��PV��ÆfS���f��mN�d:�'���R5Q{J��):zoCTUE���!��ݯ�w?n��:颫s=O�*��[�nhzK��)��je�Q{�}J�~�lŻ��k(7!z�k���hb�I��QKT���]�[8��"h�����u��k	�=*%D���!L�:�w�sg�F:Xt[v{F����[��D\�ci�*sз]/`����t����*��[��f�wy����v^˺��#�_4
 &�+��%.��1�16����xL�H����mHCX���\��X��:�/N/�YN7�Ƴa��G�-ݷ�ʙw�ҽ�ʛ�Vr��L���xַ���^ս8�A�dcf��zLfǰ��숄/�΢󧄶�O�tm��j�cj3�	\�TM|6Z�/d`zr��؄��)D]'�=�T�4��
 �����y`V�\�\J}u>���s��/mx�����IW`hc1�=�Q�S��t��
-�� ��]NGk�v��xm���Z��u�ju���\g�˨E�]o��>�L��o!F����ЉP7���9%������ň`
-#�?���}�l�X����;���w�h�y�f���wɭr��R
-��N#z���KEћE���Q[>�I�w�Sف�����|-}qhW�x�������:U�r���vaK�l����h�,�R:O�y���[�Y���ԍ�QY�9���*��]�@a$�����Z蘕��]��,
-�$v`�S�=��,DS���_B�t�d�=?_���1�i:��K�D�mlj�oP���t����l:I�"%���q��@�}}�Cn5ԄC%m����agq�%)7yX�=
+�� ��]NGk�v��xm������z�Z�E,2��2j�c�; �6�d�[h�f�z@tԍ��o
+w�BL����.k)����������I��:�uv�#K|���q>*�)���oQ咾�(��^wi�"^������P��E�Ԁ��yʽ�� ��h궒�K蝎�L����
 endobj
 496 0 obj
-1092
+1091
 endobj
 497 0 obj<</Type/Page/Parent 490 0 R/Contents 498 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
 498 0 obj<</Length 499 0 R/Filter/FlateDecode>>stream
-x�W�n�8}�W���.�ȗ؎`�n[E/�8�
-�ł�(��D�$���gH)vդ� �c
-�r����є&����N��5G/7G�7G�d����-�Ǆ��e�����O���T�v�/��r�N������o�4�Ӧ@��b�,i����d�i2O���-���++���+I�I)3�Pek�WFS�j�<�|��9M������F�J"���Ͷ�u�t�,�G��4WVf��]�4W�[��2�sؔ�t�v�EE"g
-g1���I2��m]�ș`�	MNJ��]i���QițR�x��"�*�@
-�蜺�/emRQ�ӗ�p��1~�{SZ�n�wz�����O��l�}h��B���l� s�<��!F��tύcs�qW���`
-�/D�
-R��ȩ�dy���_��&��f���v���Vt��G��7�n�F�
-�S�Y��;I����,�����:pxB@�y�`�9�>@�#k�3Z��q�g�k2�(�k�l������X;��y���u���8�Z���4�4�i�����m�9oZ��Uƀ�`#������ʘ��f@�5M��{URZ�A�QB��`is��Pj|���(� Π���;i�]|�0҇;Q	�4���!�X�9�G�9?����f 	�@� �n�P��4!`�\���
-Dc鳱͒�B?v�
-oQOr�yOP���2�.1	mX�y�����U��8p%����1�q7���;
-͡�/�(��[���i��	�&~p%�x����d�Wܑ0lq������S�������W�d��p���G(֟G�@F�*endstream
+x�W�n�8}�W���.�ȗ؎`�n[E/�8�
+�ł�h��D�$���gH*vդ� �c
+�r����јF���N�T4G/WG�WG�l������ǈ��y�����O������>�_��|�̦�v�`
+��7KOi�F��l��iU��#Z�q6����-���++���7�\�Sa�ZU�^MkU����+Ni<��'�p7Xm$�	�8�lk��QGJ��{0qD��Kee��uOK�Uy�!3:�MUI�igZT$Jv�p#:�d�^ ��9��IIsB�-�sT�pa9m�(�*$�5����VT@�Xu}x<���9p�E�S\.�k��@�tgں�\�^� �����)wђ���,:�����M.���A��=��;co*k�-�N��~�x�)Oơه�_6����V-dn�O����24�h
+��a�^F��ъ噷�*�Z`�Y�Ј��Wr�9�����X}�pA�ƖQ�"G���|���P90�kLT��ձT��sQ�BJ�*�����V1-{@���~f���+R�¾H㺋*,�ր�V���d�[����_�?�V^�p�K��o|丫!�s�R�x�|��c��e
 endobj
 499 0 obj
-1451
+1450
 endobj
 500 0 obj<</Type/Page/Parent 490 0 R/Contents 501 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
 501 0 obj<</Length 502 0 R/Filter/FlateDecode>>stream
-x�W�O�H��_1p.U�'!	�'��;�+� ��R���^'�7��&�ov�$��( � ���7o�L�=���ߘF=�))�>L�>M���xL����.�{ј�>р��G��p��ߏ��
-\�%�o�ӹ:�x@�a�c|H��.M�V
-�8�{'t&.�A��eF�J��(�e�n�pԹP?��~Z7_&�~��Y�<�K�\�<���Te�4�t�2������n��I���!댚VN�d�yR��T���8b�ڽ!n�Hj�H±C!��iu�K:���L[��9씥Tf�P�^�8����,"�Ψ�n���#7�%����G��*�G=�
-F�"D�������J۶�%�ў��wA�
-������Q�J6;�U��\<I%Q��ɼ�����qo�ʑL��@{�-�t��[j��%��d����.�3wb��,Ԕ?�x�R���6K��֎:�5�\'"�XQLEg�ʎ-�`?�򠏸<
-�T
-�(�<�Ye̥�"p�@+�5Ϊ�jO�v��X�M�Z�S�ư��F�p��%����h���"w�{�	�SZH3�T��v+���������|?�T	�y�c��PA���?��VX��zen$�w-=&u��=�����xUG�,e����5�K�x��*l]=�Z~��j��H�~3k�R�z��Ft��6�p�I^�����B
-)�����yrQWͯE�`�j��	����z�0��mt`]�N�33.@_k�B>:��y~��,�>�9�y^#` �폞X��[l}I7��}u7�=5�
-1���G=|H��
-`0�F���>��~���?��endstream
+x�WaO�8�ί���ҴiK[�O�v�C�e9�i��J'7qZC�l������M[��X@
+E����޼��{S�1�z�RR}�}�u��v3�?]��1
+�#|�I����M�
+���K��>�suN�&���!��4IZq4���\Й��a�*g�]�*�K�D�ٻ��Q�j@q�{#�i�|�|��&sd��\/y�R�9M%�*ˤ��#��uE��ts}O����4YgԴr2%+͓J��B,l�'v����8�O�I8�c(d}6��tI���<�VD�u�}�R*3\(�(m���K]gTj7������˒D�
+�c#�r�U܏z�6ًpb���&g�7Uڶ�-�>�yz{��P�0�P�u�t�a�s]�)�œ$Q5k���'���t���r$S�?��A�
+�)��Y��2P_J,.���
+뫱k�6�Hlh�	���I�	��	�S�	bMz��v!�����[�#�m����aYE��v�#��j��j�S���j�Fi�P10_��T��:zD-ђ��Ӟ-�D
+�a7�@�`��8� ]r�����L���a�ت�^�L<nx��]�O;yY�l3:e�����pӚ�T��Fr||�������w|��Lo�7$�I"H�h�ΈF���3l�.����pP{hE$Ԡ����g�XWv�j�z�e��"�YU@����`��od��ԯ��ԙ���a
+��^H�o�[4�n�X��?����������J��EB�}�;0���8U"j�s�F�CGT0�'��E���m�ޛ��]K�I]��`O���#�)��Q)K���v~�R/b�
+sWӖ�0\�R��͚�T���]�M)�z���2���!�B�|�9����0j��`�v�����͈���m�k
+�=1�̘�p|��{���_��km���^��qh���-�pCo���޲�S�ٻ�Xw��K÷
 endobj
 502 0 obj
 1365
@@ -841,11 +838,10 @@ x�W�n�8|�W4�`+��\�=�\�'3��X /�DٜP�G���﷚�r(���E������{��g@�C::��ػ��
 �m�i�֭J[m���������z|uwM�-)�G����f�X
 ZGK	Ƞ$M�sy��;���2#�ɯm���c��ҵ�":۪Lv�Y*�n���-�5��v2�Y��wI��.�,B��>�2�jR>���Aj+�	��*��$�E+*#�»TZ
 p���d@�;'���]�ES�\=��L�����59	y'A�&H:��e6�
-i��ʲ\���U�J
-�8�>cSQ��&S��h�yr�P��p
-�g�ѭh��I6l���=� ��F����%t��Q�2�6��n�������b�����Y\�S(�e�N����*�(\����;:���}��˷�n�{��K����x:h�?��@O烶�7�=����-�B!�UQ��p
-�ˎɽ�
-�����s�ڕ/"G�G=[�+����<���L��?��nK�w/��db��L��v�`�q��ha��@r[Վf$�
-�e̔2��V�����Y���� � ��:�XVpm�A�!=c�����Ċpc�:�xaޛ���5z׊[J�ZÝ �'��X��0��"�@�,�)a�.�`��wv�E�X�����	��NX�!�z*k��0�Q�F�]F�yNA}�A�����jc�@���
-I[v\��(��V�u#8�Ü��O���n�E���9�T�=?�kN�ps=��x�h:ꡃU�k*���ʌ�`��R;�)h�ڳ�R��T��ⳏ4TrS�����������{By�
-�1��U��� ��n�1���wG-y�O�_�J���[ZbO�VBf?nM+r�v�#�κ�X�U!��7���V��Û��v089M�.���Ř-�;<�7W(�׋�{�C|K��׷��Y?9�7,?�#p����7�8�5endstream
+i��ʲ\���U�J
+�g�Ѯ耶K6l���=���W�f����%t��Q�:�6��n�������b�����Y\�S(�e�N����*�(\����;:������˷�n�{��K����x:h�?��@O烶�;�?����-�B!�UQ��p
+�ώɽ�
+�����s�ڕ/"G�G=\�+����<���L��?��nK�w/��db��L��v0��q��h���Ar[Ֆf$
+�e̔2��V�����Y���� � ��:�X�V�m�A�!=c�����Ċpc�:�xaޛ���5z׊[J[Ý �'��X��0��"�@�,�1a�.����w��E�X�����	��NX�!�z*k�0�Q�F�]F�yNA}�A�����jc�@��
+I[vܒ�(��V�u#8�à��O���n�E���9�T�=?�{N�ps?��x�h:ꡃU�k*���ʌ�`���R;�).��h�ڳ�R��T��ⳏ4TrS�	����������{By�
+�1��U��� ��n�1����G-y�O�_�J���kZbO�WBf?nM+r�v�$�κ�X�U!��7���V��Û��v089M�n���Ř-�;<7�7w(�׋�{�C|M���ׄ�Y?9�W,?�#p����7���endstream
 endobj
 508 0 obj
 1513
@@ -856,20 +852,17 @@ x�W]o�6}ϯ���R �l'q҇>8��K�,v�P���H������\Rr\�0���{��׃	��oB�S:�QZ
 x�/�B�6
 ��&e��M9,��[�z$�/�
 Ӕ��D�3����.�@A�\�1�ֲƐ{ 6�|jP�@��h��uk,�@�Y15�� H�I��Hjf���dO�8M�@Q¶��܅m��U�9�p�&�@N�LB� a�M%�e/�Qz(�ޣ��-�^5[
 I���
-��D��.[�d.��T1�s������sX�¹��\Ř����0H�:�(�.�w�F�fA�q�x�:�ۗk��?e�C��.c�J�\�pУq�t0,.�Z�	��ʄ�l�"�I*��n�1ԯ��_���z{ r|(}<Dgܯi�]�=��4�a` \�b� @䜕��Ac��
-��'T��W��Y�	�y�
+��D��.[�d.��T1�s������sX�¹��\Ř����0H�:�(�.�w�F�fA�q�x�:�ۗk��?e�C��.c�J�\�pУq�t0,.�Z�	��ʄ�l�"�I*��n�1ԯ��_���z{ r|(}<Dgܯi�]�=��4�a` \�b� @䜕��Ac��
+��'T��W��Y�	�y�
 endobj
 511 0 obj
 1666
 endobj
 512 0 obj<</Type/Page/Parent 490 0 R/Contents 513 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 513 0 obj<</Length 514 0 R/Filter/FlateDecode>>stream
-x��_o�0���)��J�!���֩�:����5��lf;Y��w
-��E[U!,[�?��s�1I��X ˡ��E9�x�A�DY�|͛
-�H����"MD.p#�^�|���ȟ����D����E�����v�F��krd��,X��n/=��0�F?�#��#� �Z��C��X�짱y�y��Elj�����h��ݽP��l��Bm*
-R�^����gD�e�.��~G�"Ym6C�(��W���e#�T�w[
-���;{�R�KDZ����C�##f���=��ݬ��&"�B����+&�Xwe��6���Z:����5�l�u�ZD��B~����L?F��&��Fe��I��7���x�j%g=ɮoɳ]�2�������Z�X/���v}������9n�}��d՞g2�$�v>f�Ǵ�]�\'bÿ�x�η�/����endstream
+x��_O�0���)��T��K�6i���4�fo�熘&vf�|�]'t�JC(�e+�������H�IQ,��P�䢜|�� ]���K��M�D$I�R�R�&"��}��~zrFv���GN\"M�������u�g�G#�J�592�c�Ah���T{���r��rG�h��A�!fz,�N���<�<��"6�}��`K4D��^(kj6�����[/b��r�3"�2^�����#O��6���	�B�;��ᲑN���-��p靽o��%"�uKR�֡�T���Q��z���n�jf~#��}�V
+�;��UXy���_-�����V�눥���!~����D?F��"�Fe����I���
+��8,��EEƑ@O��[���K����>�l�}�/�K�BD;�[_�v{~sq�[g�&�X����6���Y�1�}�/׉���>+^��c�p��endstream
 endobj
 514 0 obj
-451
+452
 endobj
 515 0 obj<</Type/Page/Parent 490 0 R/Contents 516 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F4 7 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 516 0 obj<</Length 517 0 R/Filter/FlateDecode>>stream
@@ -1036,18 +1029,16 @@ endobj
 endobj
 548 0 obj<</Type/Page/Parent 490 0 R/Contents 549 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>>>endobj
 549 0 obj<</Length 550 0 R/Filter/FlateDecode>>stream
-x�WMo�F��Wr�X�%9��Ka��!N�0����7"w�ݥe����%E�q�
-�
-�ѣ(�I��gnME�|B��3�O��� ��x:=�����A\o�v�����ek��Y��q�tj�pJo
-L��-';�3'� �*���q�ڿH��P*4���pn;ex㼠�Ꜹ4����4eF5��
-�Y�qNf��h���d*W����
-=��C��BOn�p����&���2~,Ҭʨ�B:���]�%�J�TP�f�Bo"�㙋�������%�
-X
-Ѱ��&�k��0����Ӓ�[�Ъ���h��҃��@�b�á�c�A�ػ���x��~e�/�����5��lRGDG���wn�(5u��E�[�k��ɿ�s�S��?P}Gu��iɟ̿�JÖY濕�X�o�
-[E9�)�����'ɖ��[���D���-6S��h�H�w��֚�&�b���/�_	o2l���.���
+x�WMo�F��Wr�X�%9��Ka��!N�0����r)nL�2�K+��}�KJ2�Z�l�ܙy���㷓	��߄S��I�'7����4�Ъ����V9�g��紒�[�R|(Z�z-�+��ş��n=YG>X�|�MVJ���"[�oZ<��S#��Z�Ә��>�9��zԫ�דsOf�	�J�K�Ӄ�Z�+��g�lM�CFו�d%w��������$�J�'��u�f�>.ۨ���u([O�H���f(d�t�e|̻�	p���UvI��>�D*�W4��`FZ�0ϲYF�ƺ L F���ڶ��]�pܩ�;5Z!����$LNˏ7���5A[CA���o�W�&�k]	����+�T�J�[�U�EڟRi����R�T;��ڠ;��G�D��R�`ͮ�RT|�2����Z�
+q�oKe�*��0�ڤ����Z�)&�|Tj<�3�
+S�G���^n(��ә����4 �̵��D~�	��+w?Ӎ�C���(ٓ�))�E�� ���jL�2�EFؖ�0�7��n���qA	�)qi�mGҶUN
+f���Y�otG'� hms]h\|P��|���c�-2Nr�U���;��Hk����u�$�Q4*�op�JQP�Apn�A�{�al
+D�B�
+�{��R��iE;�:��yl
+y�$)P��<�h�����*J W��	���m�e	��� >�����q�&
+�_l�#�C2l��a��=���E��י$~����7!���lc�	G��)�����t��)�4��Ҏ�
+�y(nl�<Ls�{'.
+kE{�)����|H�=Fw�`?�|$Y;��$�ə�N�`�_�7M��Ps_E��d����@2���`Yj�Mp���fU�K�l�)%�L��$���Z�l�쑱;���<H�l<-n�:z;��t=4
+8W�#��ٮͮ2~�:�j��6�����~�)�d�����E�@���Ǜk��ٯ(��v[+.�H���8=6��W���E���+>9�v�78��endstream
 endobj
 550 0 obj
-1779
+1777
 endobj
 551 0 obj<</Type/Page/Parent 490 0 R/Contents 552 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/F6 9 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>>>endobj
 552 0 obj<</Length 553 0 R/Filter/FlateDecode>>stream
@@ -1158,13 +1149,15 @@ endobj
 575 0 obj<</Type/Page/Parent 490 0 R/Contents 576 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 62 0 R>>endobj
 576 0 obj<</Length 577 0 R/Filter/FlateDecode>>stream
 x�XkO�H�ί�B�ڴD��' �JiAϰ����WJ�CaW�gl����_���#q2A��fh5J�����s���D�_D��	��ɧ����$�c��j��i0�����>�I����+؅��/�?�|IѐfK�O������fi�"��A@�u]��%A�h�%U��I6��T7y��F��rr�yHQd����+I��kI�J���D�kYQ���g|-)�/�Pu)��j�,x*�'Aq�9UI�Q�H;[�&�
 ��T��� �~4�h^���0���Z}�^����eMw3�<|c5Z�r�v������'ތ�"�-��.�T&��HU�7i�a�8��?�D�(�(�/����h�ܪ���%���x�p"H��[KI�a2�c�֮T�Hg5��An��l��mj�¥Й��:M��Bd�l]RU���ج]m�OF��������)[�#�Vi.Zi$��
 ۔n�vE��W�E	��2C-UQ�
 g�����SI+��|��u��v���	]���VnH�\���t
-�o�;���T�gE���(��]˴����N%���OM
-m��Pb4�\�\nL�e��'��쮱{1�+��vט%B����!���v�����M��I��)���'L��l[�[�M�Yo;��3=;Y�vx'��p��^d�Cpn4#0%
-#�]����t��Ǻ��-�����S�+<��.��:d��E�
-׹�!.��i�k�ô�1�:�v�ב(;��f�\�ɢ��`-H�]x%X&f4�!���ʵ�W�����Q��4f���܈�VJ�J��3�y�����R��V���lcy8�4�l�ss3�A�q��ڱ���h���L{���.@.	�"͛!����m�'�n��RX6�D�0}83�0��jހ5�8��Tk��Y�'uFl3/荒g�҃��:�{��H�7����B��|W"����h��m��C�.spY�HP�Y_Q�R�0�T��Z�*�
-�W|�����v�m���y��V�Ď���9��7�e����P�x�,���^�ڂ�oƙ�oK&�8�,wjkV���,��
-���Ĵ�����0]�@�cc
+�o�;���T�gE���(��]˴����N%���OM
+����<{(c�3o7y�����h���5�,J.
+ւ�؅W�eb&�����\k~� :[z�McF��Qύ(i�ԯd�.6���W�I/��ne��6�G�N���6=77SQ�w�����>i���h����H��㒀<�ѼN�n�L�Vx���y.�e�JD���g@3�
+����
+V�h�J�_ϜE~Pg�6��:{.=�q��þ�z�$�	��)t;�w%r(Y�����}?���u���*��M�Ϋ5��
+�2)e�z	v
+p(�1�˦A��f<���kY�2;e�ǐ�n���6�Pt��x�	OyLp%j}߽k̓�P
+��2(
 endobj
 577 0 obj
-1829
+1828
 endobj
 578 0 obj<</Type/Page/Parent 490 0 R/Contents 579 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 5 0 R/F4 7 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>/Annots 69 0 R>>endobj
 579 0 obj<</Length 580 0 R/Filter/FlateDecode>>stream
@@ -1192,23 +1185,26 @@ x�WMo�F��WrRЈe[�s)'N��MZ+H��ȕ�5�ev������ov��L(P�%sw>޼y3�y���)M�t6��:
 Ft6=���l��tt���HZ�<���Ο�\RzN�%�OfxS��#�烋�,9Oh��t[['�R8�k�.�����_'�7甦��p<�����3U/���i#W��^�cCUcT�,�Y̽E"eIl�*Ţd#|#�A"���	�Qgi�~��c�5i�Ӹ�T�V^��,h�����@�nM.���XɄ��h8�$��'�})�\W��!���Y[oU��d�#�$��D]P�jIߤ)��F5@#��,��ee��x2�;��ٰA����_h!,r[ѬU.J��Y
 ��4�t��n����x��y16/A�
 ���xnd��' ����B�[?T
 +��y�C�q)��s��҂;�>KА��
 �DH�k�#~�EeTX��a`�Ed��V��@��Q�P�i��zҞތ蒻9E�/B
-�EW�n5��Pf+#��z!�V�&m�Q��t�R�~a��
-��b�=���|�����c��U#�y�z��(%�����'D{5�5�������"t���)4"���AȽz�p<"~ ֬>�7j��bZ搯�n9�^⾟����/%�o�'�,~}���������@kGF������1��YDyИ��zƣ�S5��s������F������Ü�5:TauC��P��d��6�z��7�1�u{�����^e��hH=�4�S�����FW����<2 �d�<�уp3��f�яXp,�X]}��(W��
-�g��D��26X��F:��>F�n$3T�7Tu���C[�#���	�o���4�,�)�DE�5�-B��F��d]`��#��9^�B4�O@>��'OGH*��}Xnx���à��
+�EW�n5��Pf+#��z!�V�&m�Q��t�R�~a��
+K�_�����*V��Gd���G>zPnf�_�?���������ע^!�l��(tU�
+�7��lB���GÈ�Ӎd�J���.��|�`�|D�r9��m�<�f�%8e��h�F���M�c���}���̟]`D�1���R���	�'v���l
 endobj
 583 0 obj
-1629
+1630
 endobj
 584 0 obj<</Type/Page/Parent 490 0 R/Contents 585 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/F6 9 0 R/F8 10 0 R/Fc 12 0 R>>>>/Annots 72 0 R>>endobj
 585 0 obj<</Length 586 0 R/Filter/FlateDecode>>stream
-x�W]o�6|ϯ���bŲ;��I�+�吞
-E]�DۼH�J����w�e[w���8�H���ή�9Ii����CM(+On�'�ǔ�4_aer5�yN�d0�<��D���֑�4L�T�gi�n�ZG+m�a���j�*��5��Z�,�9-���m$}�SV(Y9ک� �����,���g�'�#\0�{��/Joq�t|fҬ'ɘ��+�&筚��E���h#9��J�Ң���*�Ik�y%��W�%�	ĄC�V�@+�é�	ub[m��)]�B9T��hqvN�,��!c#��:��,_-	ku���9
-��G&�pR$���A�Z����*��+PÐ��m�w�^J���"np�r�l���o�9u�f�x���y�XЯ᭴I�:�?5�'���)7P˨Ҧ��f�P�4@v�!2�+/=~�E~��6�H/���{t+)F���9���s�w���5���ZWt�]�
-���G�[�tge�)t
-��9'��y��<��eB�����։�@Y�m󷷾I����)4�Js�7h��%v@&��&l-zހA��
-tbH�Je���:ju�4�tp�6�!�@�Z�	誙��4��< |W�y���G����ahɶ%Z_ge?��m��d�������;�E�7��c�ᇐQ����ɿ�ۂendstream
+x�W]O#9|�W��Ȑ	!�}8	�/tˊ["���trf����x�v����Cv�{8!A������?9���lL'S*�����	�9�WX���h^�(�F4/w�^
+�h��igc�Ń�d�m����6ts����Z���5��Z���-���m$}�SQ)�8ک�"���������o��F4�Op���F>*��5��Y\O�	�_7�M�[5�գ$����Er(�FZ%i1�M�D�,���<�Zѓ����)[+}����X�ѫ�b~�mS8�Q)���-�Q)+�dH�ȵ�7=�'K�Z](�d	��_��D��7�qB5XW
+_|�,EN:X��������{���L�����N:<
+��[f�pRbw����V�
+��ݪ��P��n��*{�/%X�m�
+
+)3����=��V�͔@TWVʕW20��Ȇ+�眬[�1�JB��|/��j��['*eŷ��]�&�
+��0��*-aޠe����0���9D�xi{@��g�ob��W�?$���w�
+�����
 endobj
 586 0 obj
-1661
+1663
 endobj
 587 0 obj<</Type/Page/Parent 490 0 R/Contents 588 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F1 4 0 R/F2 5 0 R/F4 7 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 79 0 R>>endobj
 588 0 obj<</Length 589 0 R/Filter/FlateDecode>>stream
@@ -1253,16 +1249,15 @@ endobj
 endobj
 596 0 obj<</Type/Page/Parent 490 0 R/Contents 597 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 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 104 0 R>>endobj
 597 0 obj<</Length 598 0 R/Filter/FlateDecode>>stream
-x�W�n�F}�W�[e �D�f�͗�1�8N�4}P�ȕ�
-�e��U�}��r%JN�40`�&w.gΜ~�i���f���7ˋ�bNѐ�<�ήh��0�w�����f��;�5��b�����$�(�HT$.�_��q��hT.̞�t.T�gj��L~���x���G!���,z4�ȯ��T-��*��Ę°=����шa��a]�$�N�a���b�+*3)*I��"����\����]�sت�:��Su�m��NkQ���-�X7*�U�<��W��O�(JP���?"�U����U���i��"6��V�`΀h��
-V�f�o�\[
-���a8F4�^c�)���y{���t��9vKY�R�(���@'�N%��N��-
- ����[�&��6�hz���(��m֢/��<FԨ(�VZ}h��k���	�Y����w����� ���`{�7�Go�^���ߘ��B��U0���,��� m|Oy�O�qp�U� 
-�F�_�F7E���I�6���8��k��Vg���Z\7u��/�Sz��z\{`����eQ��{�
-ay�I݉g��}Q�v�m�xwk���g�K�)��po>,}[/�?��7-�=:~UM)M,e���E]H\��7����!M��GT�xi�6,3F��eyIEb�-��(�X�LՊ�D��k�?�Y���%�Q�S	:��(H��!��%'"�ষ*p&��8��(��[���D�+��K�AK:��9�Ȩ�����ic����hct�9fSX����)==NW��)|�����8S({eUDUg���UǺ�3U0z�iU˲�BB�*Vl����,a
-�d�?�C$[9k����>�^9�2Xĭ��g�f�:IoMg��z9�g-,3s��Ц�چ��0�2�,�2n�Z���������[�Ł�@^��<5дV2D+S�=��Nl���I�?����zF�1[�M�u���"구Ul'����S�3�*D����F3,!���"ԛ��r�=b�RD�N(ٸS�vòǆ��� &h77��9.��v�,<A"�F����<
-Bn{���ź�B�h�Jf�$Z�yt�c�p��.&\�1!�!�"]
-;��R��3�NT֎5�VU�Y���
-Y�)l{�;�}�\9?�j�T��ˣw�^O���D�ݦbgp�*��s�"�@�
+x�W�n�F}�W�[e �D�f�͗�1�8N�4}P�ȕ�
+�e��U�}��r%RN�40`�&w.gΜ~�i���f��g7ˋ�bNѐ�<�ήh��0�w�E%
+�z��Ti���Fmk#�IdkAQ�(I\.��R?�|�ѨL���L���TF��4�����B�ǉY�h��_kU�J�G)�o݉1�as"���7r��A�ú�kIƝ x�v������T�RR&�H*9t<�=,p��*�N%�U�c�6G���(U�$�\��ʒJi�U��+�u��H�	�R2��?"�T�JF�e��&!�ylE�t�,��r'Kج����Y^p-lA(䫏�^��0�dz�)��*
+��]JO\�!n�xخd��N6�g��8�$��N̖��b��ɭz��eU4=y�h���YG�6k�Wч|#*�b+-��΅���l<}��љ��||�.ޜ@o��M��#�q,z����=(��\��T�L��)��f��0i�[�S|��nS͂(��]�	�,&
+�h˾�����k[��b�kq]W;m~)���kw���{��D�u&�p-��k��3N�N<���\�s��ǻ[��=�]�L`.�{�a�zq�|��h���iJ��b�Q���ַ�M-7{�-f?�r���a�1�u,��N$���"��bQ��JU��G4����C�U��=`Y���
+�YZ'9�UY�.9	9w���.���AIԶ@����:�%BߨX!0�\@CBҊ��1GFeu��$NS��yI���1�ªW��o����������2by>��7B��
+U/����̷0���X�U�rF%�"%�*V�^s�m�seq(X���:�
+�d�?�C#9k�N�q
+l�[�,�FN�3H3������Fk�����9Bql��?M�qh5N�|�P�n��WFVF�g�-�������bhZ+��)�tb+��ò���G�m$���K�:c�m����z-k��by�$eT��
+���~p��;H?���m��ܪF��ѭJ6�Y�,ñ`�/�	�͍�p�K�]�O���Q���^��A�mo�Y޴XW_(�w��Å�D9�Nb~��"p�ń��1&�;�M��a��*�<3���v����<Nk�؍d�"6S��\{n�`�r~�U�.���G��^O���@�ݢbgp�*��c�$�@�
 endobj
 598 0 obj
-1736
+1733
 endobj
 599 0 obj<</Type/Page/Parent 490 0 R/Contents 600 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>>>>/Annots 145 0 R>>endobj
 600 0 obj<</Length 601 0 R/Filter/FlateDecode>>stream
@@ -1281,88 +1276,89 @@ endobj
 endobj
 602 0 obj<</Type/Page/Parent 490 0 R/Contents 603 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>>>>/Annots 158 0 R>>endobj
 603 0 obj<</Length 604 0 R/Filter/FlateDecode>>stream
-x�XMs�6��W�-ʌ%��,ɝ����&��Iu�N�DBcP@Ҋ���vP+��NS���~�}�v��'	
-�_B��O(-O^�O^�O��ٌv?�.�4�^F4�M��h4��ӴlOai�	����	ޘ�D^.i6��rQ�g>#������.i�d�|rF�LLi��R�U��T�������b�{�#
-'�!?E
-��t��K��ᯉ\<�>���}�Y�tZ[��/�S���vLI�i��b�!̳�|�����)�ͺ�d�����+�-�r�RU����P��k���Y��Suǹ�C��蘍�6�ۮk��ZU�ƺ����jZh�F-
-�
-�n����s�k�YC+�!v�Y8˫Ss����'\�d?%%��D��qM�D�ڕ�����?>��~���x�t�g�i�n
-v%����d�Gh�q���J�'D/�W�zm]��J(�`ME�d
-<b.Vk�������
-�j��J-+�$�<aB�xD�1`+�|ȡ���wY���{�b���{י*+`FU��t��Dˣ٣�N_���kZ�-ݷ������x:�
-���[�2W��!ʮ��Z��nbcFk���*4ө�r��^n���w�%�����K�C&h�%����z9W)tj.*-St�i�
-�{�T��>"�тTLf"3�]�)�^�5B�1���}�q�D�}�v
-;��G���K���
-�5���[h�}��ōk���e���Slh��j<kY��t�U�h�����r��
-�B�/�
-�Љ�P9�Ly�:�S���Y$���`���zv�.$�0z�C)���2�S�ϕ߇2Uܮ�z,vR���ʀA���s�[H�*��A;o;y���I��N
-le�"��׶�C�B�=���b����G �6� ceX��p�� ��7,ɘ���/I2�|>�*��0�.�<����I��v�ϑ�2w�4��Xs+�v��<�W,a@
+x�X�r�F��+�f�J��"�T堇+eɊ�T��rXK���(���3���\Rqd�������QD}��x@�#����ч�Q�7����]�O��Yo@����	YM��D�z��/?����&>/=�yw{
+[!�\ʬX�$e
+�ph}���W(�C�U��RʑeӢ��{]� �t�nS�@4q�ÇPQ�Y��I�Z
+'(I�ʦ������\z6,^ ��� Ӏ�g� ��G��
+p7)tI����F����S�{-Zga�E��Պ��!;�
+5
+ʹ*�l)��p<w�
+�8ĂU��o��b0�~C�8��X�Q3��V�D&EȆ���gߌ5��Ұ���a��F�	1�[u5M _
+�@0�M��	�ClK�<U6�Ѕ~�k�"G�G�
+n��4�9F�Y���g��k�6ե[JX���<m�olA�0��pW��{M�|w��j���
+D=�
+2�/�5�[L�W����(�����h��M��ra?�P�*ߒ�h܋h4�E�y�����[|ſ`����S]�rw<����q�b/ſ�p�cv��r��-a&endstream
 endobj
 604 0 obj
-1936
+1935
 endobj
 605 0 obj<</Type/Page/Parent 490 0 R/Contents 606 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 163 0 R>>endobj
 606 0 obj<</Length 607 0 R/Filter/FlateDecode>>stream
-x�Wko���_q뺰D#��6Pq��ؤ۵m5CYLfH-9cE��=����i7[h��}�{��/9
-��|D��������0[,��Ox���I6��bοGxXIk���f��^�@��{@���sZ��w��Ӳ��CZ=kL�{z��t1���]�A������iEYR��r��4(��@�UE�"��s�(6J�iU|֢�gb�_S�р�E��z:��8��^'襐+�����ˍ�f$'{���pnW�[ uc��S0�R����2b�	k͆]��n�.e��vF_7��A.>���-Z����q�u�K҆hc �TV�����%�E�ۊE&
-QU����l��k�m�2���>ү9yfT�>Kx�݆���#��I������t8�7���CNN���n;\ܞ�7��Ϻf!�oV�Y����)��"��TJWX�m���FH9�ۂT&3�N�H�[So�Fڌ����o��3DT{�[`xMZ6+e\Po�I{c��%�C��6��Jg�&��ե�s��
-U�2�|�_at� (���<>k�ӄ���Zo2��6��a�����hI��rX�'��y9�O�9Y�
-���ۨb�$�3�C)�2<�x���?��Q�'�
-����R�'�Fʆ���Hd	���)���
-��3�	�W�:?Ξi<�]���	�ߴ 
-��}��'+�i��#�p�T�F!Epʵr����4m诞�v�jY��C<p
-��y7d-�	�
+x�W�o�6�=�-��e��	0M֮۬k2l�D�j%�%���_�w��m�ۺ��I���ݻwǏG)
+�/����3ʪ�����7G�d��ݏ����M�	Ms�{�#i��C����٣/���p������S�Y��l1���}�M�3Z�_ӓ��G��IX�4��]���4"ϩO)��s��a����~���Jd�B�?T�}P���ԯ�oi������{���8!�^k豑6�����қ�a�C���ka�&�F Um��)~Yؚj�Έ#&|�W$��z-U.��괦�x�����%���BD1x�]I|*'��V���Ȭ�f�Х6$?�j]��@&�R�t���z{
+�M��{F��Cv�*��-,�{L�tƌH���#�ܞ�:������#�p����3�����FZ����'�ٝ~�O�+2����-��f�X�������uFE"�VVH�s]��Z�����F8wV�0Qn�j�D�<�����O�޽^F�v1��o�)ו(TB�;;�y���aЊ�Nx�)]C2}��?Cf��#��2ݨ:x���Fo�Bx�����7
+��3�����HQ3�9r%?�dk�&0����mu狁|U�:wΗiU�B�;�.�Jo�e]�F
+�r���l���k%���;q�5/e�{������l�h6sJ�%]����ѭw9m5rr6t,ݩd{������;Y+�Ζ��ޣLW�>T��C���m�E1nE�*L�W��N�;�����#�ܓ�
+;��=�g$>$���>͓`)b�Nf�U��
+�.��nV��!���*��V�}�6bL�p�,bg��
+��T5��2d		����s$�~1�@�uѠR�{(��7�����P�J�R�C� {�,��n|u·F��+Gq�)4N�퐵�F*��4���f�\e\�Q���g�ќ��st�L�QB�9�a����t���e�=fv����΍=� Ԭ4��tr?@���B�=��߸:�u8�X���l��	��;�N��h<�o��'��e��
+U�v@x��P1?szi�6��eD�� BW�WDw�yzr���6��y p(ӟ������nG�y�y������i��q�o{�v]�]i{�$l���o/^�8�x�����ڥz�Jz�c<4�g_)Ԧ����!V��"
 endobj
 607 0 obj
-1767
+1760
 endobj
 608 0 obj<</Type/Page/Parent 490 0 R/Contents 609 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/Fc 12 0 R>>>>>>endobj
 609 0 obj<</Length 610 0 R/Filter/FlateDecode>>stream
-x�Wao�F��_15D9Ȕ%����p�gq�F�Q@�aI���I�����of�2�$
-���ޙy�ޛٿ��t��S���삊����hrsN�)-V����9-J:�NOOiQ�M[g�J�d<٦ړi(��k�jj�.)X�գ��	n?Ʒ�&<-��L��u���ڭt�}F,N��_->�����,�!�H�v&ll�ȗ/^�jJ�7��On���=��.>��q:�DP�3����4�޻���nc���D�{9q2+�ۖ*󈒤\�:-�8/���W��5%���Hy��Ev���Z#7[�t�'Tp(��QO|Ja���$wmke������+�46�G�^��r,��U�!���n+�V��Ue
-t
-���7
-m\������<g�A����__eD����*�cP
-[�Bȝ��AT�kˍ�*jt`��x����H�H�ǎ���ˇۻ��r�����|�H�_4)���7�C��[I]���:pM��Z�9tf��s�l�}�_Q�X쌀W����Q�Ad۠bVC�|dt��\�dJ��%�d�(��	Pk��Zի�j��6(I!�Cg��u
-fx:}�f��%q�����r�-�?���a�D�#��(�Ū��9�N���vg��m�O���l
-h�Y�RS2��V���q���9��J+�`G����*0,�^����|p*X�|�So�^�R�jS+��;l�lQ��G��a����<�rH$���f��d�0C&�������q����Q'���
-aZ	�ݠ�I���N1W�|9���L`�:�u>�߈T`�����d����<�	���N�R�F���U�(!V����>4��k��Yv��Ǵ��%�I����5�N5�=�#f���Q�)u	�F���{��o�
-��qb�>Z洠/��άM�������=��̚&�{-}��:Ͳ��:;KF�ڊ�-KFc�����P����_��6������"�"÷�Ӄ;{������p��e:���`x ���f���t��^3%�Z���7k�&"�`k�>�1��{�۸�0s[�_����f��aX����g�!~��H6v+kc��r!S��/ڶ�-V$ӔU�!����`10<04�����P{���CbKq�L6/��GT������I��\�$*H�5HK���E��#��
-���r�d���5��%"��;@��βLJ�lCrW!�+%	4R��&�7���]�����ŕ��j	���v�=�(�%�子+������`*����A@)���B�N�6�N"�nrc�\�7�zJ���(IZ&��?���?����8h�&�@�8���f�%��-�߉�$A&��y��ݟ�)Hf�-�E��[X5BC���$f ��os��j�q��̜+������-��h���$W�BR�wx�����{I��H��p�4���M^��7�!��
-�Q)�k�xD�Wt�8�<�~���
-�Rb�Z�tbCf�W��`�����̧�z��)�q���=v[�@b���E��o|}&�$0��;�W�x�HsQ�[���&7�e�]az6ͦt��������\ҽ�yz_ۢ�̏�5�s||2�Ɏ:��Q]�r�Hw��5����8YǪ��)��s\�䄳�����跣��+�endstream
+x�W�o�6�����;8r�dq�Ҥ邢I�xh���H�KRq���ݑr\�?��@SH
+���{��t��C����j��dopqL�!M�����&f���4�{������RWd<ٺܐ�)���*j�.(X�Խ��n�Ƿ�&<-t�L��u��V��u�MF��r�U�/&���`x�����HGk��	r��g�I�������{f����:z��.��L騢0��=-�k�<[/m����|�NN�̜6���ܣ$)�7N�3�K!��|n45��_R�')O6:Ɏ��KZh�f˂�����ņ��O�m]#c�����m�L���>�u�����dыB^��C
+��KS#�<�M��v�
+;g/���tt2N�����G��.}���j�ҵo�[��H���h�l%�m1��r.���N�v���t��pBT8�/�z��~���i�^ޜ=�s�ԹU�L���YF�J�۲�k%�U%�\���Du���Ȳ�Z�}���X�:�1��v�q�z:�����L��G��T��D�Ҡ��Z�w�h�wP�\�h��Ֆk��W��Ag@�:�6������xUi��D�u*fU0��GFgڛ��L��䗌E�3*��Zh�z�T�"�%)�x茷�`ނt�u����'VB�B`�@�}rzf-~r��\j������~�<.����.$qa�;�_���`	Fܿb?���}����gx�+.�H��s`1oJ��f��\F����]E��z���y64�����m�)��&����S�ϊ��M�M�#�Mb�MG	�NKTQ�
+<$0���K�"������Xjo��Ɛ�R\*������D��vZ�N5���y�},\��$�����"Ј�S��_V9Nr���5��%"���A��βLJ�lCrW!�+%	4R�I��aK+����Ƶ��t�ŕ��j�����=�(�%�子+�����`J��o��N@)��iC�N�6�V"W:������?��$�?�eL�����|سND6�	����>�0[,���b��d�, �Ǫ������g�-�E��+X��=���)�	����k����V���ɍ;&��Ư&�q4Mi}�!i�'���|A�;I��H��p�3����&�K���n�������\;��+���F��-/@=���6d��"�{�f|��6�V���i�Wa<�P�-�n���]�k�7������R`�Z�pbCFOW��ॼ���͗�x��!q��:�
+6[�8b�ךE�y�|y&�$0��;��x�HSQf��e��
+.pǒ���h�
+����ޜҍ��xv�ۼ�ď��oO���`<�
+u��:�Մ�nu+$u��~2�y���S��Ǹ��	G������_{��+endstream
 endobj
 610 0 obj
-1870
+1867
 endobj
 611 0 obj<</Type/Page/Parent 490 0 R/Contents 612 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 166 0 R>>endobj
 612 0 obj<</Length 613 0 R/Filter/FlateDecode>>stream
-x�W�n�F}�W�K����u�K�4qk�qR[AЂ@�"W��$W�]F����.)Qt�E��\Μ93�r1��i6����������b��t�0����������F񜌤5?2��s�����	
-��\���|F���0�eIc�!U�AW�l���\o��v��l�߉����5��-�TW�K��t��Ho�_ӧ�w�>��ۇ����OV����\�7�#8�~���T�:���덣�2��J�,m�$��7���m+����Z�+����WuF"����$Q��NNIG���,�_�M!�e����
-���/dؾt)W)��V+ѵ�V�RX&���^���`F��U���A�/�22k~���)���>�҃�1�*�[3�h/J��Y���^�I�MN�T�܁o�!�A�̵>Ҍ���:E]�{eI�!.Pö��Vy���g��D1-�4�ou!iUm����3>�o��@�R=���0�ӥ��֊��yyN~F�S���#S	(�Jc��ցc\�@K��,� 
-���@���
-�jkH�d:��xj�Y<���`��Q�*Ux���f�������tb��&Z�@Q^�h�%U����<<诪�x�8z��ذ��S�=���,
+x�W�n�H}�W�� ��E]��_�$�12q2��`-�%��dk�����s���(:�� �ɺ�:u���Ր�;�و�SJ���˫�˫A<����lp��fOh2��4�s2���� ������'4�r�v��-3À�i$�цTIG]��*�s��%�	k�U'
+��������*]����g�|��<~x�����?=}z�5�}�������j@��8�a�S�����_�����V�di+$�4��U�o[I�T���^���п��3�1ǷϨ'��vrN:��%e	�Jm
+��G�t)�;�ң@���I%՞cﴇl��J�&����k�B�
+.���?t��*�ƒ�C8\��n;m��$�?6��V�2�bZn%x(���BҪڀ<!-g|��3ɁV�:���0�ӥ��֊��y}�~F�s��h#S	(�Ic��ցc\�@K/�,n�
+���@�$��
+�kkh�d:��x��Y<���h��Y�*Ux�ȟ�f�������tb��&z�@Q^�h�%U����<<�o��x�8y��ܰ��S�=��ì
  ����
-�����&n��&��P=6�Y��O�K�
-ʢ�10��Յ�L�*�D����h\����Ԏ;�3��u^:N�yAh���<T��<�f��:�|�ݎM�U�Vʅ�9?��R�H��h��e��A��K�l}�6�[\Q'����cv
-�́������������94P�A~W2\L�#7���y����k�R��n�6�U�ð�X`���Kp�W �,��;�/O�1������$Y2�\�lφY6y�u�ڢ/>E��XdEv���f����,�7���
-o������������tܤ�I�]%	FW7�@}p� 6
-V�=s�*5DD���rۂ��8l��+���6�J����ƔD<҉)a����<e
-{�+���p�>���	+
-��o�R�b��M֞9�k�o_L�
-�8��*��J,����Y�թ�y���o��*�/����
-?{��h�!��+Ok.�Ԕ�׻�p<Ħ:���=޼}Û�?�Pz�ӊ�2�KFo8����l�ׯ��3�M�um2�����q�/�:/endstream
+�N��&n��&��P=6�U��O�K�
+�`���msj~��AD�P��k���R��^����
+]�"+:��v�5+M�We�soL�
+�'�b�T�#̓�k��G
+�n��O.��D}>��@v1�}�A������\)�Y�*����z�\�a?c^�K{��4��B�,1����5RH�W�N~�i�����b�lP�L�W�<+J/�>�
+޹v
+�[�2G�5�/
+��=��p+6\��7nc�����wh���F�Z�&��:�Ib�}Q.IJ��]���
+�6���ڊ��k?����ܫ٪�홮����q�r�&�(���k���4Y{氯
+��1}*��L r���|+���kv�fW�ʗ�#�/��D�`R�wk�Pe��\s�<w����
+�n~���fCW��\ ��)5�ש�x�eu:�5;z�������?���N��h����p:�����o`�5g2�4�d��aQ���/�;endstream
 endobj
 613 0 obj
-1958
+1963
 endobj
 614 0 obj<</Type/Page/Parent 490 0 R/Contents 615 0 R/Resources<</ProcSet[/PDF/Text]/Font<</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 173 0 R>>endobj
 615 0 obj<</Length 616 0 R/Filter/FlateDecode>>stream
 x�W]o�F|���7)�D}Z��$����6R>
 ��H)&�{w�l���=RE�@Z�%�ڛ���]�q1�1~&���lAQq�f{1���dBۄ?Z����i��c�F���R���J�gQ&-�Z����FZI2���Y�U�J��t.S)�������1�}�H��_���uT
 �<�D�ۯcNf�
 �/��.�ͳ~������-����a!��ʵ����0�.{@m�,�[�p�R?q�����P� ��h�Y8���^�ܮ7�w�/7������@-q55�����\;��T�����RA:"�E�{E���b�h>_�_��l,�w
 o��|~���O�
-vQԍz��z��%�`&94��Ї�=�,0�QU@�>@@컞�S���`@MI�}�v>�E(N�NiD�����Z�$���>���4�{����*ڑ��sC�Y
-n$�	A~Tb������C�@�?���aD*��Ph��V8�Z����Z�G��4B��/���N��}��DT�Òȓ1��	��ç�;Ll�_�KC��^�S?&UN�t;��:aD]P���X���5��l��>�QDô3����"�Y"�>�Ԍ�NVu9��jz:̔0��q�bFc�x��L8'P�4����SЗD�6���+�Oz
-5���¼֫
-�XXz)U�Ň�.q�B|��$
-}(���ՠn�L>��2�ƇTS�Wx:�k�8ԏ�-b�$�u����RX7`�M����`L�W���됵����wk�ZU��T�~�ä�{*���I�7�vҝ#y�cs�¡Y�w�&���0���&���9����"Mk��V�p�9���n�՝w2��`z창7!�Rft��C=��J���X�+���|Ej�"rG����JƄ8�`�u�
-<��,�F�\Z��䳮ܰ�ÿ�#�~C���b�r��i�B�*}雭= ���RQ�_���������l�;=��M�?ʽ���4���3mI	��E�������q0�����jqx�=q6�c���V~lJ�+T|��Ee\%��i	�v�Eq\�������}���e�M::������k�N�s�U�Tb�����l�T����k����k�������Lk���
-'�%n.�~����h��U��>�#
+vQԍz��z��%�`&94��Ї�=�,0�QU@�>@@컞�S���`@MI�}�v>�E(N�NiD�����Z�$���>���4�{����*ڑ��sC�Y
+�vP/�u* 8��d/��_�B=3kt}��}J���ig��)�E�D�}�5������r��մt�)ax'��ň�.�1
+Υ�n�:�Ω5R��5�����1�!k5N��S�֊�������ćA��T,����/j��;G�:��ȅC�Jo�M��!`	j=M���r��UE��VE�@�:rb;���;�d
+z���ayoBf1��<芛�6z��#�n/�lWj�e��ԀE�*���-�=��	q���/�x��\Y��Z��<52U�g]�a[�}sG����������,�
 endobj
 616 0 obj
-1734
+1733
 endobj
 617 0 obj<</Type/Page/Parent 490 0 R/Contents 618 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F6 9 0 R/F8 10 0 R/Fc 12 0 R>>>>/Annots 180 0 R>>endobj
 618 0 obj<</Length 619 0 R/Filter/FlateDecode>>stream
-x�X�n�F}�WL9�E���KaK���4R��ˊ\Y�\f�����%%S�}h��dr�眙�.u�K���g糃���N������?��?���k��e4����)�)�u�n@�.͖lhx2�Y�,th�h�P!�[i���r)
-���W���Vy�G�ҥ-�(9-$%z��Z$2�����}oFfn�pem���x��DҮ��"�b�=~�%�OG��{�h� �!kD���+�,I����K]���LIW�#��v��-]�\Y�K�Cq+"ʥ�t>I�$q'T*��\,��������;���̎'-T���z��4wxH�iJ㉫9���c���f+�p�wJ�l��B|0,Ѓ�*J�(�r��$g�I�Y����*���2��B�D�l���������*�d��P*��KK�O��x��%e:��>p�C����=��F�iá��r�ÜkG�	W����RŔ(#c,Y����X��(-�����
-v-�4A��@#`a�ф�����ܯ�K��G�	8�{�Q��.��fƅGs�Onl���k��8�@��/�,(�7��p�f���Q]�Ɏ�@w����6+�v��!���>C�����L�ό� ��,KpD�ӄu�T��Ks��`�vb8f#|X���
-�^��_����^���\GD:����n?~dO�.�n<Ѓ^�t���&�h�u�NB��ndn[�e��\&���X�>�3�5�O�0����Z����:�F��Y�2��Z��)s�Pr|{�$�5Z1SX_w`ůjI���vU���8=�S�rv�O��**��۱3��:�{��?5��KT�u~f;
-��z��Q���SV;B^��x����;H�ٳ�I禢W�f��w8}�m"�68
-��2Æ�]t�)o�n�A�����}���j.Lj��˅v"�L�nꎅw؆�)y(��	��Y7+�
-�u��/)Kzuh�|�&�I�Y�J��r���/���׬T���F����b�Q�N{�<��O�Ǻ{�).������VK�X�"[(�q��H��,��H��ַ�΍y-i%
+x�X�n�F}�WL9�E���KaK���4R��ˊ\Y�\f�����%%S�}h��dr�眙�.u�K���g糃���N������?��?���k��e4����)�)�u�n@�.͖lhx2�Y�,th�h�P!�[i���r)
+-���W���Vy�G�ҥ-�(9-$%z��Z$2�����}oFfn�pem���x��DҮ��"�b�=~�%�OG��{�h� �!kD���+�,I����K]���LIW�#��v��-]�\Y�K�Cq+"ʥ�t>I�$q'T*��\,��������;���̎'-T���z��4wxH�iJ㉫9���c���f+�p�wJ�l��B|0,Ѓ�*J�(�r��$g�I�Y����*���2��B�D�l�����U$���"�*)٣�����R��S�N�2^�uI�N������X}�fO$�Qi�p���\0�:��sƕ{4w�T1%���LV��:)ZJ}�ʹ0
+�ix,��F���F�k�6`ϡ L�͍Q�U�W8�cX�T�gl���00��E����ny�H�]�cO�5�\X�4������='���/�Qt����pB��˿��q���EƜA�[�4���쁎u�s�K+��J��c;\.�Y@2�jTi��?��?8=��J�+�<x�n��O�w�a�=��3�G��{�@h,�$��4a!*U:{����-XA��������u�#�uD�0� �$q?���~�ۏٓ��A����(]����	+�i�������z� $�I38�������{
+�S+��62�-.�߱έ�)}�L�<~��)�ߞ%I
+�3۽����;4���m�9P�IV�
+y�J�z�������b�m:{{��ӧً�|�
+C
+=~=�8a��J�r�*�Kʒ^]Z3_�	�lR7E���i�\����G�|�5+U�m�����8Y��AԧӞ�O{�����y�S����:��Ւ7֩���yl�|<R�5K~2��/����sd^KZ	@OP��Xs����K3�g.8\=?t�s�0\���S�Tt.^���������bF?�
+wD�p�f]`w�8A�3�C��%L&wE2���E�
+0�p"��vw�j��{OnsT������.�1��b_�`?��|2�j�+�x\�@�.ѡ�)��z�A���;
+0:�(���b��	�*��+�1���?.�EqY�l�Oѧ����O�����p8��|�M�.�����y���>:J��vw8���Q�mţh�5���1L$w�^�
+�՝~"\|��@�~?��q�endstream
 endobj
 619 0 obj
-1795
+1796
 endobj
 620 0 obj<</Type/Page/Parent 490 0 R/Contents 621 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/Fc 12 0 R>>>>/Annots 197 0 R>>endobj
 621 0 obj<</Length 622 0 R/Filter/FlateDecode>>stream
@@ -1371,62 +1367,71 @@ x�XM�����蜖J��7��k%e�=��di�\���-��1��!�=�{
 )�5����O`z
 ���e��d�&VƵ�Y�r�
 �s[��D���վ��I�J1ܽv��� �4B�D{�`CR���8���9�2�)�oU��s�E1Q�l��%6���A83Π��������א��R]R��&�}'�&�{�~�.�2mln�9�k8
-»�C�($V?��8��h_X΄6k<��Z�U�J�EE��Γ�+#@��ŉ�F�/[��B��'2hJAB�VZ�/�x�#tp�4����*]B
-8{�[v*L�,�.�H���a�u�)M��裂�Uڂ���[�{)��wM���,����^/�P���kn�xh�<�tv�;Z�ߡ�
-�.�f 	?��&��H@�څ�o��d�C]B\������� `�I��RfQ0e�A�!��
-�J>i��:%x
-����s��7(2�o�M�®
-{IB=�3�V��Ͻc����u��++S1�w���
-�|���W�����=
-���N��~���s�yt;�j��a�ZgMIm�Vy�i	:�4\e�^��fAA�ޡ�D�T�A�	����^ď��@���ئ�.@md"Z���,p.Ym��hӠ�;�
-!����a܁!(N8j(5���S�vR��P�Q��A�g)�oQؾ���?�:�?�lXx��_1lCƃء�\Y4�`�8R���[8)c�j;����-|��^U��dr�ڠ"*,w ���Vc�XLq�2�eB��0#\��hq1ʹ&��
-(�(�s����8~o��I�|��mCG�8݅ꆻ�A%�Y�Υ�
-g�%��[��a6��op&���@sF�ӳ���~D����A��
-
-[&�3�����9��-g �z̦������$7%endstream
+»�C�($V?��8��h_X΄6k<��Z�U�J�EE��Γ�+#@��ŉ�F�/[��B��'2hJAB�VZ�/�x�#tp�4����*]BM��jp��|C��n���p�0�:ٔ&QyD�QA�*mAR��-�k��&vImb�ԋ�X���\)�p&6wL<���l;{
+����P^�����`ʏ��%�q����W���:V(ދC��ʇ�܉���X{��Z����
+��G䎮Q
+$1�
 endobj
 622 0 obj
-2310
+2312
 endobj
 623 0 obj<</Type/Page/Parent 490 0 R/Contents 624 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 624 0 obj<</Length 625 0 R/Filter/FlateDecode>>stream
-x�W]O9}�W\�eA��P�Gy����
-�M��зz/3�o���a��h��T�*����Af`s.uq�_���`�a�7��ʛE$}
-c�e���fa5[��
-е��vM@�v-Gi_����Nx1�~��T�9�����ၯ9��_��R2�Uha-8�=6�"')�
-�aٙ�5��gI��ESJ�H/T�_��X��`^�$R[�=�xn�>��ԗ��a��C���I�X
-�B�Ð�O�$<���
+x�W]o9}ﯸ�e��M)��O��<����<TZ93Nb�ۓ���؞���B������sϽ��3����ɡ�<��ݹ��y��L&Gr;�/ǧ���Aupp ���IuZ��*�ɟ���Y�9/w�k�:�ُWo��~��W2����������_�ʯ��
+ֺ���t�뤆m����B�L"�9o�SV��ǫ��U�ef����+��`7�~ ����!]���}�Y����NU%rU�&����X5A�*�,��*�ZwQL]:7u�An���Yz��r�1{O�fQ���~6�B�Fn��R�?O� ��ݽ�&���F����{�/Ey-�����$�A�h�#�6�NGޑ�������f����*25B�1!z3���@��.�Z%����o�r������
+����:TFT]�
+.���s���U�wX�̒�\]Jm
+)�Ȁ֜<KP
+,`���X�uH��H`3���I`�3w�����H\�XK��Xl0ӡmA}|��z�"��]�CeM��Y����JIQ�0�j��"�N�=�Ƣ0�%�q����͇��l�J>Dɑ������TȜ��"Z�/XN|b��#ǥ@c�?�УP^�D`\N�
+&O��Q��YF� �֐-G�
+���nU����2�o�z�u�.�*�s�CG�P[�c��Y����O1�*������;pCC2�/S$ff<ι��F�x�Dw�5��on�s^�NP85�i	aA����@�%ӥ���΄6]�p��5�*ze䑝���Mb
+�t!
+��.$NR��/Ms��)�^����΅��?0</�4��W;K�j*]����
+�C�4�x,f��� �hR��mW
+5젆#���f}�,�X!9�;��H���4Ժ�J	�3�n
+�+�L��Dj�G%�
+:���
+��7�=C(��?���:�Cr��<����W{
+?`���:`�\q��ag)0��e�X��k�GQg��RG�8VRvJ!/�Ll��EI���C.�ִ�0�����Ga�@����cr�ﲔ؞�{���#��}�M�R���_y��wx���`�%ٸ>?�Wڬfev0�Q��,7iI{�ޱ���B��O@s���;�yǕh
+�M�>�E
+	f�V�_�;H�;7�z�'�ųzH$~�����\���c�`��4�Џ�Gq䋿%]~
+!Upt��u	Z2�U���e-��hw���B��Q�.e�J���e�ay�<n�*B���p�-&7�"�D�Ռ��˵�X�xL��:���!:��p}�'
 endobj
 625 0 obj
-1853
+1855
 endobj
 626 0 obj<</Type/Page/Parent 490 0 R/Contents 627 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 627 0 obj<</Length 628 0 R/Filter/FlateDecode>>stream
-x�W�n�F}�W�C���DK�n6�v�Kc�	�"�&cjW�%���{f�i�@�:H�{9s�̙���!
-�gH��N)�].��.��|N�?�o���S&����U�ɛ����j<�$�p� ���?8��jL�!-\<��h��-��K����RGi�(Ӆ�"U�d�
-��h<v�-#���QVP�hgl���,�~cywXPjvҧL�}�(ϔ.h�,nٸߗߎ��#�8����s~.��)���%��w��	�(t���qlqG��ƱUΑI�+�Z�����w�U��@��R�"�e
-�Y�c��%�s���?�����bq��`�'����$���C������K2�
-��
-��`R1R�"�=)�
-.����"Ჽ�E�UG)��S�IY\�A����$�W�����0�)+|�#<�OF���Ī�V� ��y�3�5�j���D�N��3�uL��{��
-e�~��m�z�v��Z%VūUp�A1���Bdt��-F�G��'�=�c7�7��6֬v�b���o�j�鳂����v�`�����Z��n��Bݚ<�2�	�8@�8Q��Q�nȆ��Xk��Xe"��1����3�"#�e�x`9�:�!z5O�n��D1�:��g�â5>�s�cvx$1����?��x��Zl6����@U�J+_бZ��f����P���������E�-���@q�%�YHPRM	ސ]j��l��A�k�<pP"U
-�D.M�ˠ��'�\bE��q���bz�X?a�|�uY�LR�����%]ěLg�����䢒ߪ	�AP8�)��}��y�f�{�L'@δT���R�0&w�����h3;�Sg�GhAi�$��K?�����h���F#5*��P�6'zE'qX�'�q'��^Z|�=v�C���x@%�xX�TF�1M}�^X����x��+?�ʭ�mn�l��3ڽ�p�
-ڇ�b2@�+��Y�9oRD-E�y�~�kԂ١���nL���|^�X���r
-IU���ӈŧ�^隶���9����{� �|�j��F�/9
-/��ɷ�
-��3?�7Fq��=WCe��Q#��V����Q��]����u(���ռ���!Mg�a���/�//�Κo
+x�W�n�F}�W�C���D�.�h
+�N�/��&@��\���]e�����YR�i-� AL��̙3g�?���ß>M4�P�9�X�[��ٌ���=�	�z�����*J��M|zx5#�W8��p���tr5�~�	.�̦���}���Jv��BGi�(ӹ�<U�d�
+��h<v�-"���P�S�hgl���l���<��0���(�ϙ>�B�:S:����e�~_|?�Q�?
+J�����%"�ym�X�q�\�vkMs�g:R �/�S�.�y
+��K��*�օ��a�S_�Y].H��������qd��
+����#��kt��a�0��Bq��L��Y���
+�H�lf�����r���9�e8+5�DP
+\���y�"j(����͵t�Z0;��׍��������YN!��#��b������+]�V~$@Yz��
 endobj
 628 0 obj
-1625
+1624
 endobj
 629 0 obj<</Type/Page/Parent 490 0 R/Contents 630 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 630 0 obj<</Length 631 0 R/Filter/FlateDecode>>stream
-x�W�n�F}�WL]U
-�Xh$ȇٍ"�S�ұo�[�|C|KPb��L��/�]��.wVΦ5�c/�p�.Sp�.͗
-#5�Y���zH��Ԅ�����4�1pĪ���N>K�b ��Ih6���r�5C��a_n_UnR��([)�>r���k�(X��M�0�K�L%��C�Xp���&�7��)����7�&���[�M���[E���U����xD�����ne
-�#
+x�W�n�H}�W�z�X�$˶`��c{������f�E6��)���iE��s��ԅɼM.þTթS������}����ˣ����䨗�F����XMzt1$C�Γ1�qDNS�GzI�l`��ݐ�}��|���&�l��$�L�҅5�&��L�tA�)4�oR[9�O�ZQ���UB|D�웦����hn�NV^;R��J9��}�'ߎz��%��(O׼{��)
+����댭�qrY��0V�T���(6Ѿ�G>�2S.�w�T���lH޶��~�.K諭(U%6�jqa�G���;���Yf�N�u�mpܔs"�-a���y��
+���h����;8GZ`a�$�:�
+�K���w/	,�SMZ�|�9Ĺ�i����� W��^�R�k��dʄ��31��վ�W �����%��f��FM"`$��� M����
+o�g��=��n���L*uL"�T9�W�����32��RwZ�
+0� %�
+���+Pᙆ,,+hw�Q��`'�E/�}%-��U+P�@�(�ɾ�=�J3g
+?��L�Wt�Sm�-
+�����q��/�*�i�W{
+�T���jvbdK���Bb� �HP�rm�+e�Q���^��������G���߮�n[�b�C�_zz������}����H'���Q��Xa��%�}��q�ޔ3h���y�t-%K�~���mO���P���0��(Q��2n�l#[&H���4َy]�+�w���ϱ��.;�r�΂����JcH�:�D���~���X鷙B�0��>J��T�h�K��3���sQ"��X�b�Ȣ�Ҩ�X֖2�JS�&3��(�U^�
+0���'5�U���f-�&ӊi�-�aq���Ѕ�r�H��3t7Qx@��9��
+7If�?�3z���-�x�K��(���-S�;c��
+l��0�`�F4eM�6ss�21�ic� �ZL�Pޘ�ya-����/�ک��{�I���1���
+���-��$����w<���,e�
+�m6�M�e�'1��3�E���=���j�8�N�i
+Ck����7�����^-i��D'P���|d�
+�v}f��������V���s'zp"�j-'�X��Uw�eV�Z�o@X6Y��Iw�s	��#���)d0�ᕛ�(}��̀2�����<����K��K`7�\&�d�p��9 ����WE��@�:��	<Y���_�Z>;+S5�������*�|Q��~�Q�����P��j��'���f�����q���je��������2F��a����3�<0e�53��%f�����p{��t}�|�``bJ+�>v�ۗS�x��7�<��	��/jP?��3endstream
 endobj
 631 0 obj
-1953
+1961
 endobj
 632 0 obj<</Type/Page/Parent 490 0 R/Contents 633 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
 633 0 obj<</Length 634 0 R/Filter/FlateDecode>>stream
 x�W�o�6����V h
-؊e;�S`�nYtY׺؆�(h���H�+Ru���)J��b���%����޻�瓘&��rJ�%��������$Z���S��0��<Z�|��S��$e؊��<�7+�/ڕ�j�G�[�%8���?���zNqL�-VKZ�n}B���Jf6Se��U�h��d5%��Ԯ�Z�E��Jg*�fDʒ2T��9�5R�c���OeJ�u��$W������Ʉ��,���3UrY`��^D*��=&j�M�����YA7Ҿ3��Eڗe���ϵ4���6U_d�O;�̳��c��N�N�U���>Jl����p�K��ji�Ԗ��'B�t�
-#�V�C˔)��#�e~�b�S����dD�=�WHQlvp���3�#���J%V��Vr=TٚG��~�*�X]�}#�]=z�|���Wz�Kz��yH戎{��V(�X���G����$�Sv��3�f%��t�w8�)�a>�ԇ����u�ƈKU�Ɋ��U�ͅ�6���$ZBր�ח-.f�`Z��hM�8b˩>Bʞ74p����d�����g��2
-���J�w�ފ�r�0�8��FL3��`�t��#�vs�ʯ���y���<�KfqL���H�wvO?��B��G�]���7��w�M�7'�����|��sv�:�2u�so���"�/�����l써�x͈b+<97����8H��攍@�U"I�
-B�P�;�u�����w�'� ���ɹ�#@<�bLx(/3'/�F��1��0��0��<�jtiϷ#2�0��Q����CsY�/UaY��$���'eX����x��u�}~�jZ]�XD1-.��s��3z]�Oh?��Nj�
-'i���*gq���;���
-��S�endstream
+8�e;�S`�nYtY׺؆�(h���P�+Ru����_�[l�Z �$�x��޻�瓘���bB�9%��������8Z.��Snq1��,Z�l����,%eX���,��O�	n�Of�9.�;�l�װs�;\��(�i�!��rA��?�*9���A�T٤�V[ڙ9C�)2���4"���dJK;"�HY���*�k����?Tq�'�"%��]Q��,�}��t2��xM�����Z�x@n'-*��a��&s��u!Z{ ��[��YY�"��"3��s%-"�E�Y��V��d�ض��6�p��0��#~q�!�ٛ��FZ*�����@��
+R�a-�IG95K��y��.����+����vHC+E8��[m6B
+$��tI�ۊ��e��1C���t)�v��G�p#B�����7����<�����A̰�/�U:]�]���J�3t�^�
+�tE��/�k5b���ׄ��?
+��tz��K���2���<;�M�
+h��E�����J�ɯ+G��{`��2�6u�eGLEjuxlsu��9B�%u����<}�(j�Ͱu��w6
 endobj
 634 0 obj
-1501
+1500
 endobj
 635 0 obj<</Type/Page/Parent 490 0 R/Contents 636 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 636 0 obj<</Length 637 0 R/Filter/FlateDecode>>stream
@@ -1448,25 +1453,30 @@ endobj
 638 0 obj<</Type/Page/Parent 490 0 R/Contents 639 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 639 0 obj<</Length 640 0 R/Filter/FlateDecode>>stream
 x�W�O�F��_1�T5H�IBH�~�8��wiQ��؛x��������];?L��wB���̼�����Q�z�ߧ�NGeG�&G'�C��i2�G��1Mb��^�&Q[嶐"&=�T��*��ʩ�ci�H$��V�-��km��:*�X	�-������Rt<y?�".��}�;~��O�?2e��5r.cU��
 znD�!���B/����M��M�Q0䛾�v������W�oW�_�o��Y�^�0�.��y�4V�<����T�+[��{ԭ����*Mi��H�p�l:4ӆ���
-h5q��0	���3R�>0J�J��
-�l�M!��^��	�h�@eP�]zI�U����U��-�)(�y	���hּ+�������$h*�E��$95���j�7�2�qx�)�~:�F���]#�܃	����̈́���s#3��yJu$R�Ҡ߻:�4���
-h�\6᱗��	��Ph$X�uG3)H��shbժ
-��U�gԭ�x%�r�Z�X��v
-1����SG�a}8�A��E���tៗ�>*���,j�p�|鬢u"��7����U�;�-�3d%R�ٓ��w	�L��.�io����
-S�<���ݛ�/.�W���U�С����r]��*5a9˙�����= 
-H�v!"p76
-�X�O�{����łY�|;oS5�43:s9H�թ���xK䁻p
-7gE�G�Xb�S�%[cX7�S��]�F��-�9��.Ә��>�B[�e�QheZ5`I��U_o�"�۪��{�{Z����u�9i�J���v>����dEw�#����m��7�^
+h5q��0	���3R�>0J�J��
+�l�M!��^��	�h�@eP�]zI�U����U��-�)(�y	���hּ+�������$h*�E��$95���j�7�2�qx�)�~:�F���]#�܃	����̈́���s#3��yJu$R�Ҡ߻:�4���
+h�\6᱗��	��Ph$X�uG3)H��shbժ
+}�8~��x��ȉ�C��X.�)��JI-�D�I�%5�jIL�������ҦA����գGd;�˿�6�]Au���������dP.S��@� .�nE6 (��r΃�R��'�k	՝:��=O�	7!�ʣ��emgC�2[B,�h�ْ�B`��y���ᚹݤ1|�d?�AuY=
+9{�<�.���:�`A��1~��g~������,8�M���qp�D5�9�gm0����A�S�M���fЅk�
+{�j]k�����qU��h���M�:1�`��\1�@���eASX�^�]�H��.��y�L�Q��Im|��ܞ�v����+�_lv��_�E�R�'���#Vz��u;{�(C�s�����Dg�8T�8���Fp�|��p
+��"|�%O�9J���*����򖎁�c�0e���(ݽy��2y%�8]%
+k��-���R#�����J�L����m"wc�����t�W�:A�^,(�5ͷ�6U�N3�3���d_�ʻX��DA��psV�z���!Vp<1E_��0�u#>U��em�Q+�r��a��2�YX�#(��\��V��Q�>^���,��
+�����e�ʹ\ױ��֮��j�C�~��Vt':�n
+���v�yC�0�	[5$2�cbU���Ba`Bb�(4�d|S����
+���o�@�Լ�Wq��\�g;S��t(+a�κ�FaQ^J�)�\��Ly#����>n��\�'�%dg���`A�ر3�9U{Uz��5�oh$��Ե�ċ�O�&v�6����Ġ�8��^H*�,�O���%6�s�I[f�ʹ��4�3�����ҏ
+��CZ��UI��w�/��տ�8�ka�q匁�!\�9�
 endobj
 640 0 obj
-1858
+1861
 endobj
 641 0 obj<</Type/Page/Parent 490 0 R/Contents 642 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 642 0 obj<</Length 643 0 R/Filter/FlateDecode>>stream
-x�W�o�H�=���D��B���6�]��TUu���^���uw�!���f��6�F%,;3o�{3�~ң.�z4��`Hq~�~v���9�z4[���f	u�n�K���V�[K*�^���$52v���4�Ql�p�R�����i,�E㋈���O���"Kc�R��F8�"�Ҹ��6	K[�e�~6�vҥNo���i�Fڍ�E�M��tk��q�qt'U�i��2"�-���:+�%��,��	���R&��J�\ϢF�	�JՊDQH�iZȣ���fz�W�`T���Vrĸ4F*���T�����F�\�W]R���y��N��A+gtF�BɌ�Ǻ�!�L�"�w�4�hE���4O����Jɍ�Cf�m�
-�5�D�"��\b���%`1\vY�lb��c����:���Y.���.�g�ui�ӈ�P���`9�>��~����+
-�� ��W�v�tD������E�eлS#���+�\?�'�����\�Gԡ��vi̽�Q���ƺ�Yz��՛��'�i�E�R��(tit�m����Tm��v
-"�[ ��kD�J��&�n,�l�<���Y��V�tU����%��ć!��t5�ڡ�\l �FQ����c8��9C�RH���5��9����H��'���dw����W,�C��I������FU�e#�^R��@TMa�|�&�I����VMt�>�z��@�u�uR�LZK-+�����[y�T��M��ڭ6��᝴�Jl��'��ɇ����ۿ&�{v�3��q� �*D}Y��J��(-"�$��Ffe��l�
-
-=���,���ۅ�7�NWO6�-d�0�*@�X�t�|���D�9����*l'̣�j>ߦJ90�?����t��e���)ե����s�Ŋ��Q<�����ί�u?�Ҫ'^ɾj�;dv�O1G�/1r`���f<?FU��g�������Ԋ����UU�e5�z�Q��ip������k��~㧒�<��p8���ܚ�7�g�þL��:S�~G���t���|������mN�|t��7^x��}�}��gendstream
+x�Wko�8��_�0P\ت�致i�\|��EQ�-ѱj�TI*���͒�j�kP�a��;;3��~ң.�z4��`Hq~�~v���9�z4[���f	u�n�K���V�[I*�^���$52v�l�4�Ql�p�R�����i,�E㋈���N���"Kc�R��F8�"�Ҹ��6	K�e�~6�vҥNo���i�Fڵ�E�M��t+��q�qt'U�i��dDn[;;�7uVfKJ-Yd-J	�Lf��&���E�����'E!W�i!.`@����!\
+�QQ�B[����\��R��ި:N�sq_uI1�B���:������%3�b��3�l�	������<KC�S+%7������+��(	���rQ�:����p�e᳉5ҏ�����f�Ԇ����U��9x�9N#z`@�G�I�z������zB�48,��F_}���J��O�A�N�4:*��s�s���lg���i<����Kc�p��m���:�D��L78AO3-ϕ:�F�K�snS�7��j
+|6+��,_#bW�4atcae�������p�jD��Z�O��Iq�΁XRkK|b�JW�����Bm��<_?��3�)�����QS.����,��:{�ɿMvx�;xŒ?���O���b��*�*��E	/)U�J *��0Z�r�ˤ���w�&:�	`�rg ���:)U&�����h��·����m��K!��h�X�J۪�ƨy��|x�z?��k�7?��Bԗ5J�d���"IllaFP���v7�@)�>�h��"��ڤl����̚TA%{j�G��G�RZ��� �&�І
+
+m@���ػWݐ�y4����G���hS
+
+E4]	?G���dQ��H�����[ZÅϣnhY=�z��w��aM����v�h�c<p�HU=��Rip�w0h�/Q�,{������n��T
+t�����x
+�S�78*���l��,��B?���Z�g�ӓ�IN/u�!��E�)���ˬ0�w��/d1��:,����Qtp
+7/E��:�ċ
+�Cq�o&���7�^�`�Uy���U�j��6h��ۼ�uc�s�7v��^���T
+ƚ������ ��	t���Ta;a�W��&Uʁ��1`����O��#.C�ϩ.���#._R,Vl���1&��p~���a�V=�J�U[�!����x�9
 endobj
 643 0 obj
-1794
+1795
 endobj
 644 0 obj<</Type/Page/Parent 490 0 R/Contents 645 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 7 0 R/F5 8 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 645 0 obj<</Length 646 0 R/Filter/FlateDecode>>stream
@@ -1488,29 +1498,30 @@ endobj
 endobj
 647 0 obj<</Type/Page/Parent 490 0 R/Contents 648 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F8 10 0 R>>>>>>endobj
 648 0 obj<</Length 649 0 R/Filter/FlateDecode>>stream
-xmV�N�H}�W��n��IB �[����$���h%�Uۮ�=�ݞ�6Y���n;73�tթS�N�s0�1�&4���5���>\�1�Ʉ�5�\��)�h��c���6�\�
-Yv�k\h�tt��i4��fx�Lߥ����2��-ʄ��L���[����t�T>$nm�u��(Υ�JdX�<�T+'���n����.��2��Ԗ��H��+'ג�9�dʤ��iӜ��躢�˄��ee�	`>���2z->'�2P���=}�i�˳�u\��p�͇u�I�H�6.
-�0q����F.>�������#������ޓ"SY	��u	6�mW����.�8Pζm˅	GS]��9�u��Ai��{|z�B!Y��C9Z�(c׭C��W���@�����Ѫh{Fl�Y/�S�@�(
-�B��/`y_�"M�ZzJl���w8
-�d���+����&jp��_Z�>EyR96#/���w�}(���+[����2�~��I
-T�Q���ʢi��dY\zm{����&�0��5��/ޑ�ay�������^�����7~��n�=�����n����Qh����
-��$���L���G	����;$x�ɵ�@�YD��Zj�	f��|m�|�W#K���=�P����4J�Ώ',W�ݨ�HsxFp4��6�����A1݋�6��<�!O�x+@�!�\����ﶏ���Z��m/�T��_CZ��Y��������J
-o����|g�a����0]^�b��n��{��̺]�7�Ҟ\�#�б��7j�_�5�:����=���<jO��c�yt���e���a������|�W2�{Z<�v��|���㫩�
-��F�endstream
+xmV�N�H}�W��N��IB 0o�Ғ��W���Vm��`w{��d��{�m�bF@����s��)~
+&4�ׄ�S�����Ń�?g4�P�Ɠ�9����xLq:���yG���2��?cM����9�w�2�����ˆ2�D",�(�&�Vfli+].��[i��E��R%2�OQ��R�p�F�/�M=���>��6��ᕓk��r]2e�p�ٝ��躢�˄��ee�	ż;]Qe�Z|NBe�B��{�`�;�gw�qIoí6��	'�"l\�7�đ�3�ō\|0IgIo��#�^��}`�S�I����CE���a������٦m�0�h��e��d�ܡ��\�=>}�B!Y��C9Z׀�u됤�4�>��#60ZM���g���T+�A*�������3Xޣ]�)[K�B�M�� 1�G!����@r��0=l�'I��e���S��ʱy��Ľ�oCq�����r�z�L��=m�*�,,8�U3���ؔ����)$�A:~, �fP���f7l��~��(A�E٨
+
+0YV�^�^c�������53�I�i�,��`4p����Uc,�5��ӈ����ϻ�U�����Z'
+����؁��Ա�i�)aVx�x�/8���8�����(5Z������Z>ҋ���C���wE����=$JOΏ',W����HsxFp4��5�	�h�b��;l�wy�B�6��VB���Bp�O���>^{k�J�j{������5�u`	�E�P�rPܸ��VX�~�;�
+-x���tyu�;����)~`3�fiߴK{r=��BǾ>Z��p�@k�O4���W{�H_�95j�
+��mD��������2���+��׽�!�S���aNf�Yt������><��{�?Dz�endstream
 endobj
 649 0 obj
-1017
+1019
 endobj
 650 0 obj<</Type/Page/Parent 490 0 R/Contents 651 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F6 9 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>>>endobj
 651 0 obj<</Length 652 0 R/Filter/FlateDecode>>stream
-x�WMo�F��WzrP��dGRzK�0�8n� =�"���$��b�_��v��B���-���|�y�f��l&����r.7I��w볫�72��u�7��J֙\'��x���/T��VV�|�M�3��nm�d��A�Z>�:�������?g�r9���sUg����o革�<��A�������,���*�%�v�V�]8u+�Y<5_��}��m�:ck�y�N7L�Zg��$����BDI��
-/���#�Y�L�x��{�uS��݄��h@`��ֶw��U�wLK�;�ں�u�$�-,��;S�D>kiZ��RBJ��������L��h�ּ�$�B˓�6j��M�y�A\��� -%�l�Ȑfg�]�~�G7��W��;�K�L�j�^�0=�xD�������t�X�ۭ�Uy�#Ժ3i���f}�q�b��"O�ݙ)
-�K	;v7q����V
-@���ǛF+���� �"��4B�1�J���Q�ua�4
-�%�.m�y3�X��[�w��.DkJ8g�y8��Ъ�t{1�߁@H�@
-x
-��[	H����@�	UVa(qS�����pF�,	�HGXg��^{4�c�=��a��g��pp^��^a��U���%# F&��,�w�02�t���,��&�l1MOW�Ur��S,�V)�q���@��-���Ԝ	j�!�`D =;�"���o���h�*��r�T��
-�
-Kq�`�Xc�,X�a�;�V�9��;HP,!�׀_
-�g����0
-�ly�>�'Ć�u�R_l#Y��Y"�N�
-�x[ d��s/���B1`��t)��|g�������!n��OJ���8K�D�Ki6�j�_^�@���_	�q�,β�1�5�+Н�5��u��{u�:~Q��ߙ~�[�c��D=6+��]ގ���
-`a���?l<��endstream
+x�WMo�F��WrrP��dGVzK�0�8n� =�"���$��b�_��v��B�¶
+%}�d�R(Ǝ�Sda2�"%%/
+[��M�"�1�
+�����nt�m�7������u���In[X*-�w�҉|�Ҵ�᥄�1��!�����к�y	Iv��GU��$(כN�@��ZU9AZJ���!��������RW�,���5_(S5x�a��<����;IUY�3y(��F����lݙ4�o���8�1�{Ui�G�nM��ӥÄ;�����_If+� ����M���U�h�F�{�!��R���ԨĪ0N��i��f��T,�ĭ۹NWg��6%���<��uJpUi�����oA!$Y <��*7��:C`�2�l��Ā�-���>�X������5>��7��㯅��3�V�^��|<��2�'��h����/nG6�C���]��T��(T���)��f&�� �be3]��:����,�r��� Y�D�@$x��f�Ӣ��J�b�y������p94���T*�ę���/;0b�S%�/Y7X	�$���C8�m�ثk��R�E��C�م���@A����!�o�j�A�����T�"6ij{���mƃH���QCWz)��!f��U@��=B�4�ܠ
+	t�Ai�j�Q�i����
+�A>d�b����V���5������k*�X :)��Оc�N3������OJͤXia�uo�W*�k�s���_zC�����PHG���Rj�a���_�o�tQ����1c)F����k��f�
+z�6����b:���
+��.2��^����4��d�Q��y�����;yp��(�ę�W��C,����7���?����@w���rzD׀����4�&�\l_fQvG��Z[��c�Q����	�b�,�ry��w���}_y�*�
+��{	-&H�����	�UVa*qY�����pH�,	�HG�h �^|4�c�=
+�~��g��p!p^��^a��QԖ�=# F&�,����?�}�׋d��7[����t�\a����Y�C�Ł�φ�x,�BtDC��SAm�*$k	�g_� �k��b4
+`�}YN��t��
+�5�^��
+��>9�	E�hb.�����X:1��|�?�%p����>a�x6g�X�U�Vr<�y_z�5���-�4��D�tt���-������kQ�S��#YОY"�V�
+��y[ d��sϲ��R1`�mu)��tk������o!n��OJ���;8K�D�Ii֭jw�_�@��&�_	�q�,β�1�5�+��5��u��{q�<|Y��ߛ~嫣d���=v+ӹ���׫+>��������:endstream
 endobj
 652 0 obj
-1673
+1667
 endobj
 653 0 obj<</Type/Page/Parent 490 0 R/Contents 654 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 654 0 obj<</Length 655 0 R/Filter/FlateDecode>>stream
@@ -1527,29 +1538,34 @@ endobj
 endobj
 656 0 obj<</Type/Page/Parent 490 0 R/Contents 657 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
 657 0 obj<</Length 658 0 R/Filter/FlateDecode>>stream
-x�X�r�6��+v|rgl�R���q�캕2���Ę$
-&4�һʛ�O��ˇ4��E�onn�CAW���-���:�f��Msm_��n*��Y|��k�L�ɋ�'�k�����Xz��ϩr�����V�_+ϟPg��-~n�Q햾>}��L���U�"�u^7.�/�T]����Wt1y�M9lx�p�4��!Ӓ��5)Gk�|��9�j\P)��F[P�=8D��R�1��.�����Җ�s���vY���U����9��UmZM����/�P�j�v�<Vu^��
-m+dhJ��DeU룒��H�z`^�\Մ����՞�q|@��u�HL;��r�+���Kr:'��RnZ�׸���̩P^-�1���3E���\�+����&��p��d������T��U��YY�4̒��ږ
-
-�M�.+t�K�1�;]���,�d�lI�c2m�ʈ��2{�Y¥�5}�ҷ_;�~�2^L���IL���j�)��
-H���
-kW�@��`I��Ԃ��mx�[h���'4���'p�>,ߏv^T�p�c���C䱬��br�}?7U]GY��B�Ԙ��x��v�k�;��/���q�=��|�����6�'\yx�h������V��Z�y�E/!�u�a����^`��Z��X�<�A~�seא��os^�hs
-+.�/j�L��%
-���跖�,��w��
-/!h�s4t�����`�j���]��V���U�JV {t<<5����p����=���`O|?K�'Q�I�=��+�l�`���T\��|&
-�$l@��k�ͅ���2�:a
-�+H�����,"��[��,\��%��'�zMӄ��_��H���n����̲	~!�_=�w���@%����x����O]��/fS�֤x�&׳k,y��{>���ɿ���Uendstream
+x�XMs�6��W����ش�8����439�u+e�["A	1I�
+�4��X&��|��Q�\�%~��vFoo�lO>.N.>���kZԸss�]����(O��bVГj5͵{5%�nL(׿,���5]]œ�[�<]����>#��i>?#�IQ�U���V��P��>wԪnK_���I��Nӭ�o}Э/�K �4v���%�_�-f�6>@8_[����嚔����C��MFy�0�����!
+����m^uE��-U���C|�W;�R#���N��ھ�gH��V��4�L6ֽࢄժ�h>�u�8�	�b�5Qݨ�qm���:��T���R5��R���Ӂ㑩aK�q��j8��"�r���/���{G�����&=}�S��Z�ʄv�}z�s��h�<5�iZ�"9���ˈ���T�7����]9ն���j�F���tK�>s�;������2K�̱lY�S8m8�T'�%e��M+g�p�o�-n{��E�z1�&�3�v��F�)�U����5x��8����Mo��ӳ��B���f��*K;`�t7�2O��:N�W1Q�P,I�1K��6:��̥�vfxx��6NR̝���@��5!7t��;���Zvl
+t
+n
+��9
+��5���u���7L�-�Y�
+�ʵ�VI��A�ãa��*��<�g��H�2`~
 endobj
 658 0 obj
-1868
+1862
 endobj
 659 0 obj<</Type/Page/Parent 490 0 R/Contents 660 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
 660 0 obj<</Length 661 0 R/Filter/FlateDecode>>stream
-x�W�o9�޿b�]*�4	i�[��tq'UB��ɚz���M�olo��V脐 kϏ7oތ�Mi�?SZ��傊������휦SZo�e�Z�Z�d<�Lh]���ʏi]�@�6�oE���*��R�� �$ڦT�хh����k�:O_��h+i������PS�W�D���:_?�Ћ���A�����7��q��o~vT���!��>v���r�5��@�j�$�X�4zsT�z�/�Bf��C�a�m�A�ȊO���ʨ��M�8���Z�&�F��
-
-�د)W@�n4��o�W��D�
-g�����#�jP6]���� �Q��U?����z���c��#�b�j�
-R]��M���{�����T�
-܏��P�s�=��
-�N���H������D�A�ı/9����kəOg1��haɹӧ�<�E��9��<�"s�����**�����CA��q����d�w�s�m
-J���- �98���R�����]G�@=�=K�(<0��0���g�wP?Ze�(�
-�6���9�JW�'�'�A���_�E�Tixմ��!���M����S�\a8t�M�S]D
-���	���0�rV��v�8�-�Tr�o�Kqc	��t��4%zY1�4\F���6<`i`W?k��]�؞��3� GO�*fG�*H$����ò1�Y�O.u�Y{�p@Eɂ�(QQ�5�-�K�K'u(�,ă�0v�z�6
+x�W�o9�޿b�]*�4	i�[��tq'UB�ڛ5��{�nC��{c{��¡B��=?޼y3��lN3����������^n�._/i>�M�/��5m$ͦ�ٌ6��y���6��m�|)
+E�xP�����Y�'ѵ���.D���������y���V[I��H�p� a��hqU�@�:ڪ��׳=�?�.�D:�~�9'�~���`'�����ip�c�Ʉj';��
+��J����K���A����rlA dv?���P�
+RGV|z�WF=
+�����k�h�kd��
+-!-�;���S`�b��X���Eĳ�Do[�]�p��
+R���vM�;��{�Gy��W�
+ܕ��R��t����*�(�s�=;���"��C��8�g�\A�.<��"&|0,<WS���W���3Wa8���� �"�C8
+ai����dk\$|��7Y��q�k@ɍҲC$"�{�В`_j�0��|����'��`)���^F��	�NY8J�C��4Doo,���B���1����Uբ[�4�j;oᐍ	z�*JB�o��g�0��©>����0�qgf�0�rRާ�}>ਸ਼�yS��%���K�$�#�?̊i� ��Q<2ʰXX�շF��1�>�AL�a=�0r�`1?
+WC$qP�P��Qղ�r��0P�Ԕ,X�"�XLp!�#�҃rr�����x�/����|�;��
+����e8��B˜�'��d����o,1r��-[�#�����أXL����@��ȧ]2�C�D�:�Jp|J�c��l\í���b�b���fP0��˛/��o�]�l�X�
+�pRx��;D˨�Y���/�9y?Yߟ�o�]�7�P�������Q��qiJ�vX���ưD�
+�p�2�����
+?���y|�
+G�jJ��Z�GJ8���_iϳ�3Ǜ�Zh�bq}�C�O���ɴ��۸�ۑ�h�~�8��Yc�s����:i������}�kW�-���+d�n�O.��,~v��[XN��iy���*޸Z�H�g� +��endstream
 endobj
 661 0 obj
-1744
+1749
 endobj
 662 0 obj<</Type/Page/Parent 490 0 R/Contents 663 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F8 10 0 R/F9 11 0 R/Fc 12 0 R>>>>>>endobj
 663 0 obj<</Length 664 0 R/Filter/FlateDecode>>stream
@@ -1565,50 +1581,59 @@ endobj
 endobj
 665 0 obj<</Type/Page/Parent 490 0 R/Contents 666 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>>>>/Annots 200 0 R>>endobj
 666 0 obj<</Length 667 0 R/Filter/FlateDecode>>stream
-x�X�n�H��+
-91�MK�"Y{s{�� �ƞ�|i�-�7d7�IZ���W�l��,Q$��U�zU����4�ߜ��ZQV�}~:����bFO;�Y���)�Y:��,�-T�jO������o��}e��8K�Mې�9�x���7������ft�X�Fr�e�i���ֻ�~7M���n�'����<]�Ût�ҟF�}�Y��_��zp�P���m�ᐨ�Y�M{�]�W)Hr�J���[�|��[����'c�ƣ����,]�ץV�&��-�5%,��y�aF���F[`ob����dUk^�>�-��s~p��h������n�r�;����ڗ����1�+D�8\��U�:����zוd�9�\U{��i1k�vr-I.\�R�,��Z���s�0��Ѵ�,�m�n�˱3��c�`�ԜI��z����X0��Y͔�D	���3f�P�����og��,]�rs��V�ج�yU�#sw�ˍ�����{Ue���Cq8�\�TW����NG�T+�*�Dg�e쪢��U�i�x|����d�����E�i6Y�)+�����V>��Ԉ�H�
-��VkK�+:�J̯]ޣŅ���@��*9�?N�JZ�M�:�|��5uW��
--/����t�'�������o�5O5�B�'���l�:�/��$endstream
+x�X]o��}���lZ���cؽ�$7v�>�eE�̽!w�%iU�����R��(�H��9gf��ٜf���zAW+ʪ���g��Z��q�;��5=�4Kg3|�%���[�i���ϟ����W�i���Ѵ
+)����n�������;���b	�M�馡[g[�J��4m���9�`wW�t�o�yJ��7�Y�f���|!n��mC]�_���C�Fg�7��w=_��@�U���ߒ����b�w?�=+6T�U�Hg钼.�j4�Fn��)a�v�9�Ϭ4�"��!͏OV��E��C�"N�
+�*�еVm�
+.�5�1���Ռ&�p�d�0R����)�J]�,�\������F3�=���5�S�_�c�'ɫG��
+��YO&!�[��ԓ�_��U?�&�N�Q�@�X{ U��Y�
+x�W�@�j�
+ŷ(�����%�L�8G�Pu��'���sx�Ȥ���9�XEX�����1�rf*f(�POߔ[��!�/��b�a��
+�NLI������b�ٌ�K�����Ģ"�Fx�5���n�-�Q�d
+;���"GoB�#𞴓ۂ��#K�ח�J�Ev��J�
+6�O��i��ƣn?~�� �
+z�v�h�f0���Ę�*�F5�mM�F�����rges�F~��O|�ɼ��J�� ���Q�3��W0��x���[�$�_�nQ��a)���z�4{�s��������E�u[:�4�~B�#������Q�#
+�ۯ�Aؤm\LLL����u?�����z��~O�����\�T�/y��SÑ��g��@$Dendstream
 endobj
 667 0 obj
-1804
+1799
 endobj
 668 0 obj<</Type/Page/Parent 490 0 R/Contents 669 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>>>>>>endobj
 669 0 obj<</Length 670 0 R/Filter/FlateDecode>>stream
 x�X�r�6��+vx3�В��v/۱;�$N�I�@$h�&	�,�_߷
 �h�OnE�\
-���DQ�
-	Z[i��eV�JYg�ӆj�^�e�$�,�>����I2��q��J�NfDN�p�,�$���^p��d�v���D�$�$'�]��tN��BZ�-5T�T���!,m��%i3���R;I�^W�ߏ]M��	-V��ay��BrD�0�o�P����yl� �B-�߶p�����(�%�a���ON"�� ��Q�rK�E�,������B�r�	'7��˥PU�'w5Y�d��,�Pe��̓9����3&T;����iC��,9���"9M諒U=y0�LTM#�Z�RY�tem�(�	ƼBt�d�\;�l���w-l���IQ����fBׅJ�9�3--
-~���Q�L�B?��X]-���p
-e����5�ȕ,���>�ZXA�(N,�E|�t��M��
-��M��;�ԯ+�c�mց��5��������ݚg��K�1�֪ʘǑ�"���(��A�bJ��OGb"�R�5�g�m�_U~�����d!K��l���@a23�#3�h��8��눖���0�
-�n"�!r>�S������;k�@����B/��&W@�;Tn��/A<F���`��9+K?�{W7{ ˡ@>�N���3�8:j�;�G8tbpJ���Nc��0&����W�]�����Mf.���R�S7m�ڠ\��;(0R;���|���d:T۰uL���j�.�[�ep�ȏ)�c�B
-S�0�he[�8����C
-4j�(����<%����䩋Nd6���	�$߭6�]���H�L�����AtH��s�'�2p�^�����[��Qt� �_i���Q�Z��	}�,3���4�j���F5V�@�C����	��KP��
-)�w�
-�!���0�q��&��Ϡ���ƨN�g�+`/�����ǫK�l��G�^�k6��۰���R����v<=;�������w�G���7#endstream
+���DQ�
+	Z[i��eV�JYg�ӆj�^T!����Gz;=If�<NuU��Ɍ�i|?9K&�)��&,���+Q=I�"	�IcW�&��8ے�h���B��@�aik�,I���F��I*����~�j���Lh�$�ʋP�X�#��q|3���\��j���E;fD�L�F�-a���
+~rQo���J�[�,
+e���7tR��N8�ѥ_.���=���*'>�fq�"��d�������0��y��MONLf�y��iB_�ܨ�Ƀ�
+�����NK�3C�;��0�����̤M��Z� "\s��ʩ|˟��
+�C~�@~��B1�vs
+0r%����O��B�2ʄKaQ�1��B�����
+���� ��km�w���kWX�{��sQXOɽ"ǜUC"O;�����
+^��=�;�d_��Z]�n �[]���׻�.�ށ��5��ZW��"²@�
+��"Sy����iD��ꇒvLV��W��#
+Np#PPF�sɠ��o�\�rwrq����ܝ���$v� ��4�[���H��2=v�f(.��]S?���A,�
+ܭyf��>�T#m���y)�hL���+�>�$�p$&
+F�c�ݯ�����	���\���&�nڐ�A�z�wP`�vT�1���
+~�t��a��,�%���1] ���`�S�Ǆ���a��ʶ�q`�A!�
+����
+�U��7��w&��T��B4����ג���4%���W���4�ƿG�#^� �7H���
+x,��1i
+-��u�藨�J�B<K����X�����'J��x�R�QD)E�]@�)���Gd$O]t"s��ͿM�� �n���J��Fe�G���@2���Ø����,��;O��X.��@��Zh����A�J���$0��׺EN�f���
+��aT3��=6��R(����5��y�.�԰;
+�{1�٘��=�Ȇ�
+Y��ގ�g�x{�/�����n���?.6�endstream
 endobj
 670 0 obj
-1790
+1783
 endobj
 671 0 obj<</Type/Page/Parent 490 0 R/Contents 672 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>>>>>>endobj
 672 0 obj<</Length 673 0 R/Filter/FlateDecode>>stream
 x�W�r�6��+vtRf�Rl��ͩ�i&��6�_ ������}��$
 r:���ֈ�������gS��ϔ3z7��:��<��xE�)-<��,h�������x���uf��Z���鬵nK�v������Fy�-9�J���M�&25��������֕9)�t�q���o���.����d
-Sj�
-�
-�=h�{��bQ�N͙��j���-E�ۘ��į\�	#��<�H
-?(!��IU�]y�v���!$R�+'4(?��p[���p�
+Sj�
+��l
+g+�#y�qt*���͊7����%%��s�T�*�w��F�5M	����p!��P'9C
+�M�'���	����
+��4Aj�bR'��?fQ?K+'~���IZ'Y�Z�=q7k���t��R+��-�^W��3vq���&^��I���u��ƍB�q�0��Y2UrnTEf���H2UѭN�G��y���F�H�o�2��i����p�,6���7��.�ߥ#��N��kD��1���2�wO؎���2��:<��"�	$!$�QG;�~i�s(�t��8T6����9�Y��s���p����y���
+��[P5&���\�+q
+E�r��f�|��.������!ʖ�#��l�L{�`T���`�]�m4��S���1}d�:L	�/pw.��9��D�Ǳ��腽�iL�p�ݠ���)1�{Q�a�-so�],Jѩ9�^�A-R��h�ޔ��0a䰓'I�%��:�J�*���N�9�D*|��G��n����m`}�Kvc��3����%����/�΅�8cOofxc��{zu#/��*�ܐ�a&K��0���4H���
+s�~��!@.?�s�5ǆ��"
+������,���+�2�yuB0��}�S(�n8�Q{���5��� t��a�r�����q.>�ęr:_L�4_,&7�zv���-���7X�٬��$2�s��a���o������\-�p�l�_r<��ٿ�C�mendstream
 endobj
 673 0 obj
-1614
+1612
 endobj
 674 0 obj<</Type/Page/Parent 490 0 R/Contents 675 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>>>>/Annots 213 0 R>>endobj
 675 0 obj<</Length 676 0 R/Filter/FlateDecode>>stream
 x�XM��6��������zHФ�4m�c.\�^3+��$����}3�$Jv��E�$���|�y��oW	����bL�9��������1%	�6�2_.h��8��V�hc�T�ڔ:�my�J����G��Z�^}��i��v<���>�T`��}�KJ3�>U�����ѫO���oQmI�vّ�&��27UelQ�g�?(�ծ�o��Y����l0��d��>������ٚ��;ܽP]�]�J}C�X�ɂ&�(���I�H��x���!�����f��LQղ���[#S��VW�>�!%���~�J��i>a�rZ�ۇ�>s	���T��R�Y���
 9%�2�{[���y�#u5�'��TՓd�5"��#کR��eDo�#I��V�D]jd��K^)�(l-9A]��k��2Ug�xQ�75}+N��S�-�
-IYk�"*��]i��c�[g�ETj�̓ɘ���zNG1(�[�Ch�;>۴Q�߇��4�]�S��h���6TwRd���yQ[�!�&[�sˍ�}�[8�x�X�9�j>�!���랺��L3!���_j�0�cӦuCg���N"�.�Ax~NS�cߛ���8@(d�+�����0@��R�.��=�1O�����)��E܆�@n�ܖڲ������L�[�<�	�I,gH
-Kh!���u'�ӧ;f�86��+�
-
-9t�b���Tv��Z&x�ɖ^�C_���M;~�w�+��t!�ѕ��(ȵun
-"S�S�7�d2]gW[��S�UC��j�p�|��*k�Z)�"8'r��2	\��h��	�N�w|�aw��-�V��͞����m&�.��NN�@�pΔ"V�N�zP��F�W���Uq]{I�p}D��&�g���*H)�B�n�
-�*���͗���k���Zh�)��r�ө٘��Y�~�$u}�Q���c+�~�,2��s����UM��_i~`���^o���ҧ)�/p���O����7߾�?J���/6�縁˴b�p��ŷ�1~BZ��YD�&�5�d�_��;�W�}��B
+IYk�"*��]i��c�[g�ETj�̓ɘ���zNG1(�[�Ch�;>۴Q�߇��4�]�S��h���6TwRd���yQ[�!�&[�sˍ�}�[8�x�X�9�j>�!���랺��L3!���_j�0�cӦuCg���N"�.�Ax~NS�cߛ���8@(d�+�����0@��R�.��=�1O�����)��E܆�@n�ܖڲ������L�[�<�	�I,gH
+"S�S�7�d2]gW[��S�UC��j�o�z��*K�Y)��8'r��0	\��h���N�w|�aw��-�V��͞o��um&�.G�NN�@�pΔ�U�N�zP��F�W���Uq]{E�p{D��&�g��w*()�B"n�
 endobj
 676 0 obj
-1656
+1658
 endobj
 677 0 obj<</Type/Page/Parent 490 0 R/Contents 678 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>>>endobj
 678 0 obj<</Length 679 0 R/Filter/FlateDecode>>stream
@@ -1646,22 +1671,25 @@ x�Vao�6��_q�'ph�q�4H3$�����,�0�m��DU����~��Qrb;�!�![�ݻw����
 ��ڿQ5���~��17��Ԓ��iL_f�G��c tt�
 �I�҅'z҃r��Eו];U���4��B�28r�]S]
 N>�;\l��"~z�����	��c1�D
 ���fhΔ��
 E�o�غ�XѴ���¨����(
 �-+���bE��[�*dފ� �]|S�Gd�)��j�?��G[�U���3�"�������d�8:={���&h���<������G�>B،Vʣ����)�}]+SZWFK�/ȼ����vot�|��J�a��2�4�Ơ���fw�/�,��!����X�J�F������k1��1!��Y1�e�����Gy�<9�
-©RV����௠�B3�5���J�@@�x��VXI
-_z�< �m�SK�b�Lc6#�s���V�;��
-֓�
+©RV����௠�B3�5���J�@@�x��VXI
+�<��-�i�]!*� :D
+|��t^%i�c(d|���d��L-y��3�ٌ�ϡ�[U�0�7XO���5X�ZE���.
+;7���/�W8�-Oy�`�:�A/=�
 endobj
 685 0 obj
 1117
 endobj
 686 0 obj<</Type/Page/Parent 490 0 R/Contents 687 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 232 0 R>>endobj
 687 0 obj<</Length 688 0 R/Filter/FlateDecode>>stream
-x�WQo�6~��8�)�ȶ��N��uK[�h��m0�/4E٬%R#)k�����l��ТhmYG��w�ww�g4�	�Li���d9�m5��R:�U�77�%�2�$�	~�����
-��t��ۏ�������{z�Z���������շф��9�_�_�7�}�����4I�=�Å�Lp6�e�ִ�s8�L��n��L�Ua+��6$�!e��YcJeBB�{g�<�^q
-}�N�r(��h����O���u+7�j�
-+����3��lr�,��t�4��Z�v�#x��"��l⌆�c&	"c]���.��nGF��F���PY�-�4��q� ˪�Wh�g<�,5:l�ϝ!+�D�u�fk�0�ЂS�U�S��kJ��`3�ş��<3�@<�i
->�Ai^Qe5�
-[1�z�F�X���I��@��&#�h������6'��H���6�Ἔ���$�t�a�8�S�"�[�I��WX���c�n��x\#>��|�J��M��1����l>��ή2���U�Ͽ��;n�΢U`���	����+�{�@�GL?�?���:��s�I�\s��;���p�endstream
+x�WQo�6~ϯ8�)P˶��N��uK[�h��m0�/4E٬%R#)k�������ТhmYG��w�ww��bJ���2�قdy���b|wC��9�,�+Zg4I&�"�^�D���4����W)��t/ʍ ok'I����o�s��:hA����o|�?����4I�=�Å�Lp6�e�ִ�s8�L�%�n��LTa+��6$�!e�YS*��;�����׫����9X��<<i��������������.�Nɽ6�8+
+oiol���Rڲ��ǌj���y􅧃p��>z�8ap�'��7�D�)
+<�!�=�JZ�_��,[m2}�Y-
+�!&����6�!C��;k����䠹��w�6[�]�ۈ����A�Oyss~�2��0T���\��
+�B����	΃��X$�Mo�oI)S�{:	}�N�r(��蒜��O����u+�z�ц��U�I��v6�IV?�m�|TT-t;�<��D�v2qFC�1����D�q�B�#rh�`S�����b�8[�e��+t�3e�v��ΐ�q��:P��h]h�)x���+U�5%����	p��nC>�� �|����ʩ\a�eT���7�N:�ip��Y�N��[�^H�Y���3j;K�dFӛkp�����Ӊ[��qȭ5���,��bp���~P�WTY�1�]�W�ϰ�i�DQO�@���i��L�Jb�l�?��Ӌ��a�*F�:4�vt
+^u�sx����Y�
 endobj
 688 0 obj
-1478
+1480
 endobj
 689 0 obj<</Type/Page/Parent 490 0 R/Contents 690 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F1 4 0 R/F2 5 0 R/F4 7 0 R/F5 8 0 R/F8 10 0 R>>>>>>endobj
 690 0 obj<</Length 691 0 R/Filter/FlateDecode>>stream
@@ -1690,52 +1718,55 @@ endobj
 endobj
 695 0 obj<</Type/Page/Parent 490 0 R/Contents 696 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 323 0 R>>endobj
 696 0 obj<</Length 697 0 R/Filter/FlateDecode>>stream
-x͜k�[����WE�~��sӥ@Q8�4bǵ7p��(�Z�����H����}�����\lx�I�d��G<����{u5ƿu5m�vR-7��:�w�ɼj���yU��Q]M�]urV�G�1>]~y�8�ZU����n{\m�����p���=)JU�������h\M�9����~���U�J��	���']U��ըͤ������~T�wlSM{�e�%��Nr�JrRl�����m������9}�8ޞ%
-��v��b���<�m6��<I׍�h���/Gw�OSk3F��h�
-.��(2sf�83�~6�>�a@x�:�ۋԌ�C+�4���}_��7	�P��<�>G*����E���n����r�e���5���������7��1sH����<��o�g���b�O(5�z[�T��o���o���68�����i��
-����e22���E���
-1�:�}H��d�z���*M��裭��[%��q�O0�h �ىJ ��)J�V N�6
-+�!�fv��~�a5z%�J�د�&!i�$�����1��8LB��(Lm@����a�%
-�$�L%,1%������������ �c�g۹���9n��/6A��VES٧�v-NG"L�ey�3Ao{�[��N���9S���<گ^�i2�B	�3�cR�9��u�$R�|UR�x�3fv�"X72ͳ���0<Upx����f���am(��\�(���e
-�P�C��zc̛*�����[
-Fi0��9��*�Q�'��p��_��@���l=�)���iY���Y=x%{rkj����[�zD�<ɛ����Ѩ�o�JHH�.ț���h�~�I	sI+uL��4`<8;�~H2�=�!L���+�|�6�=��@.�ȈD��ԓ3��
-d��Le��gK֓Up&�bc�P�g�^o�vos�e%8�̻L]P
-w�L�{������`�z���FCT�)e�f�a��s��t�w�o�k�<%p������4�g�|:k �ȎC�Ⴌ��p�v0�����YТLP�g��\��(�Мȹb|a����u1i� �.6���d��Q:I~�(f����ʙY�2d�Fr��,n=�)!.��"�]��WZ���'�}m|�"%L4�����$)��:�P\[�
-X@Εג^�e�̾';�m/�Ot�%^���x�5���M;���I+l�!t�C6^��t�uQ���a��ޯ���H@>�a����=�Y
-x��n����"�O�0J�B���l��x���g��ehO�}�w�LcV��eĈ�ɨ�K�6\d����GZ�4��d=F?%a^���$��	���[N������E�����*�3p=�#JʂE�Pr4�"����_�P�J�g�<���x��d�*$|]����d��I��4UI<�RFN����I�83����p��m�6��#��Cգ��QY�p@0�E*�B�,7�/{\�ʐH|�G�j$�g��+���!�p�9@��D$'����2Z�C�C��͝l����a�ι�6\���U:4:�M����r�̨�m�}��6R� 0y���%g�#I �#9#����xY
-ԭ��
-�GW�pÐH5���$�Y'�,c��(�Sd$ҠĪ�ɖ�X�X�b��(�`,��H�T	ր�=��#(��7�,�9ȱ��<Gўc�9,��H��i]u��1�N�~wu78L�q���BjBl֩l��}�����2���l"�8��c�J��u$/������a},�Kjx�P�d���y�Z��8ޝ��iq0��k�	Am��f��<�u	I��T/����4�
-��*i�R��A3(�$�;&
-8*6u�F�f�6Ԓ$A�M��eظ�2�'ĕ�A�k!.�H*���֜�j0��k��I�Յĝ���d�.L���
-	������0�����D,��� ��(y�9�_���`=�1�0Ǖ�ʃ��H�e��W��R�
-x�B{`0��t[�ӹ�-�1�&\�+ �e㼸B�XDS+!����AY)� ��'� oARJ���)�=�X�u�r�R�)ɂy�@R�Э1�puۃ��נH%�$��,CxEV���DS�z����/�����Ddk4J�>'�y"6:l�'��@�z��b�
-����A^.-M2�A�4�9�7@�����&2���CI��а�*0�\G��I<��~������8��i�nM){99�/�)q���_�!�:�:u0����I��sj����
-/vW��zU�H:q�CX��bB�^X��ot�̯d(nk�ɂ�Ygv��i|{!�z� +�e|[{�IgG�c���z%z!#Z0�,iz�#v�{��Eg��z$��\��ʻ���$�����1���#YRF�N*0�&k]E��g<Mc	k@��v�4�ISO�X�⠨���`���x��ν�h~FA��2k��.�k��u��Q��
-X�TY
-�Xg�T�R��}��ㄐ�7�=B�]A���f6ҧ�S�7����U|:�I;��i�ZAa��Aa�z@���Y�K�.��|;��_��v}^~���dj$y��x�⨓L@* �
-�� ��g�����j�!E���\�z��E^��X�~Q$��4�6�6���V����jj�Bo{��ϟ�;��t����9p;�mO�>P�'��9&���h�S����w��7'����d�;��U�Ou�IO�BdV��c�M/p��Y,�{]�#g�>�����/|n����Y�[�H~[ο����*�?���x����?�a���P���0���xw��*���d�9Nsz��P��A�B��֌��LQG�S��z.�$�	z�"0U�y}�i�ɇ�E��e��m}�9�
-D���>��6u$��Vi*Ǡ�W�I�h����@�^��ky��T`�7u}0a
-Y7,��0ݽ7�^L2r�#�]���X%ZwVq8
-?���O�!�Z�|���22!�<��A�.��jy�����2aT����pd���Z>��Q���z�+endstream
+x͜�o�ƿ��8E�~(�{�K��pl�q;������(Jb"�I���gvgw��S�ؐ�$@������������u5ƿu5m�vR-7�:y���yՌ����磺�L�����c|���dqz��v�������:���ӓR ��j������Ѹ�ts�wS���ы��|��/��_wU]�W�6�_G�ێ�Q��E�M5����k�o;���*�I���f6·�>�w������pxw�(,fڍ:����x��,�g�$]7���Oξ��?M��
+���Y6P��f#��̙a�̠��\��h����x\o/R3��8n�$���}=��&
+S�񁧬s�`	
+�R�(��x2��ĔT�b��V���#��|���m�fb��
+���ZMe�Fڵ8��0���g���7�#�4k+9S���<ٯ^�)c���X�1�����<�U�g�*��g<}���]��֍�y�2Z�����
+�����L�:�
+e�������A}
+odD�zF��DR���8w -�A?��c�
+�$����h�8�UOV��0��C���f�=۽�����w���
+�����5���,��A�F*�꺙CJ�ܱx��h���q���r�fn�Q�=	�4��]� ��ޠe`#�n4�޶z��bJ��}�h���?ۄ���Ě3OI\5v����(��ٓOg
+��q��!\�5�n��y����-�ezƛ�E^%�k�_��=b]B1�,B�zD����(�,�f���o�rf�*U�
+�$�6^�:�!/I��`�к(�W�Z^����|$�`=�a����5�Y
+�$b.K8�OX(Ccb�q"�ar��
+�������IaXi�h��L�Z>^� ��Y^���i9^��ei���,/�BNfX!�B�%Jb���?���E�����i��
+�m(�y��T������tX���nR
+(�=�u։3˘f)
+��4(�*y�e(�3yA1�jI0���H�T	ր�=��#(��n�Y�s�c%8�ky��=��9,��H��i]u��1�N�~wunp���V�Zs�	�YS�x������2��T6�j��s%�H�:�����~�����>�%5�{(P2K���Z-d�S�^��49��5񄎠6�B��Y3�Oq]BRh8���1B3
+;@|�֋��:�I���i�2x�[��5NO���	�8��>M}��d��,W��PI3(��5�1�RK�cҀ��bSGh�nVoC-i@�"("����WX����R;�r-�EY�����5g��p��xA��"������G2��
+�[~C��hu����0�����D,��� ��(y�9�_���`=�1�0Ǖ�ʣ��H�e��W��R�
+�!K�)+Na$dJ<E�}�kS����y+��X�30'�?:JR�fC��끤��§�����Qz �@A��'���``y��s�[�cdM� W�ʗ���
+%���VB�76��!>��R\AN*�Aނ��:��)�=�X�u�r�R�)ɂy�@R�Э1�puۃ��נH%�$��,CxEV���DS�z��Շ/��tu'��9�(��y�1^�'b��.��ĕ�U��]�U�B�1��5���$��A��x����jo� �:�@ٝ1�T�?
+���uD~�T�3����x�>q���M��5�����xQL���f���2�î�QCz�}�Dh��S�޷Ux��Z/׫bF҉3��
+���B؄��o�Z��M�x�3���
+�]
+7YP>�̎}=�o/�VdE��ok�8��z���Y�DO�#d$B��%
+B�{�q��r@��s[������Uy���d�ҕ6�8�|�!KZх��
+��ZW-���X�p�K�ܤ��'\�hrPT`�_S��zF<Lw��4?� sb�Z����G�Z��Μ?�+�X�b�=�ΌI����6��!z�Ctf�
+IB`���$��Wi$�����N\�����EJIPd��r�����?|�4$���&w��]Z��沖���xAN���>_�>Pv���&�����!i��(�c�V���)�)�+qx������C��iYZ��^���v�����%n�ӷ�}��0��[ԝY-�[:�/ȆXw��N9*Am��
+�_�a��FfX��_���l�!g0,���so�6Ė9�:sR�)?��" �͌�� ���v�
+-j�R�L�;��=�{l&�d An*���G�\��Oqwf��n�%�xA��x��g����eKUW*����珞�����^�������}���A ���W�,��E�'�62�D�6jZ�����`��XJ*`)��K
+X�TY����YRq�*�@���
+X����z���#��GX{�A�G��ߧ�F�v���u�[��O'bqҦ77m[+(�13(lZ�ɞ����ő�����|]~¦�$7�Q��G�a'ـT@���� ��g��Ż�j�!E���@����3�����D�B�H�G��m�VU�����4ұ$�������g�J�@"�Ur0�"���I%]BFlF�m�@S��]Ɛ����aoN"!������3hW?�e�>N�BdV��c�M/t��Y,�{]�#g��o~}K��6���e�𷶑���/����*�?���x���?�a����ߥazK���U
+_��ts�rz��P�����������8��&u\I����E U�y}��F���n�+G��1�7����Xn�KG��n��rZx���a�6
 endobj
 697 0 obj
-4801
+4795
 endobj
 698 0 obj<</Type/Page/Parent 490 0 R/Contents 699 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 7 0 R/F5 8 0 R/F8 10 0 R/F9 11 0 R>>>>/Annots 353 0 R>>endobj
 699 0 obj<</Length 700 0 R/Filter/FlateDecode>>stream
-x͜[s�F���+��T��č��-�^'�J�$R�}�MQ�Ђ����==��n0�d_⪔ ��8�����ߋ<��_�͋��e��ų닧/�Y1ͮo��^N�l6���l:�N��������&ko�������]�t���iZe������l2�f���e�rR��6��r��.{����\>����8��Ť��L?�p�,�.'�ORx��_5�=���Da!0��c���|�ٵ�M! �r��}Q��|ӵ��ͩ8��eE>�Ll�8�W�m�A1�,���'���_]�����.��C4Y��X8/*aYH�0!:q��z��F"ؾXLJ����W��]��),�^�צ'�������b|��CX��k�ڸ�(��%�\R���V�\��<��A}2�|�=�̠݅=i�R�t��kA������x��ҬWǦ����
-VN��g���uz�
-���Z�����6���|�2@Buf!��
-,�a*�vR���H" ��e-BxĪ�`haWyϘDx��j����N��\�SRO9ܯ���x�5�"��?��0*<����h爤���� ��	�璊E��&I��]j�HXi���p�<��C��XY��ES.�'a狗LH?�'���c}�Ɉp�'
-Q�1E�R�r?��$1
-)'̓$����NUN"I-s$I��q�t�����i��2�eQaI
-�$��C��J���H�����jV���G/(fbXv��PƅM�D@��2C�۞�<����+gz�#��K��kz��r���ή�SU��k=��0�G��>�J��޷���$�ķ��`�rƖ-?�e�AK)�S�
-dP�ym����Z����<��������W*�Y
-��<�����wƤ.�I��Ϊ�M�z�.1�c"��1N]���%��%iOr������fS��
-�XO�.(��}]��*Ջǐ��a�x���n�6�D$�x�M
-�Jt����E!�
-��	�"G_�xH����БZ���'��
-	B�'����i@�r��"A=amr=��{~n�s;8�U�;���=��@����P6��C]�B�^	'\P��A��0C���A��#$M��4�=Є����F�q��!�0"Q���4�1�XB�z�o��D��Đ�I<$5M)D�(�CxH���H0	ijd�2�V@���^��o���!͑��D��hO�t���"1Ff��Ci�2�u�`Q�S�?���=Sa��R�f��(w���*0�y���x��*9�<�6��b�K�*���{~�Q�&W
-*�p�f��X�0������T���3�p�܆�*K$�Q�9�
-�B�2#$S���K�jH^�3z��;����` x[H�-�>���j? ��0ຑ���t$��uRNɫ�5F��x��'\�apc]���1��P�~�l�����Η,+����C�<!ò��(�ROy�}�����H�1���?��\�eMoYր��#�͒����~��e� ՋKɶ���pI5��@�+������G4�
-��XR�B�MtCmf�
-� ���������,���a ���ط7Y�\NW,��7G1�ʬB����-C��+���
-�c��4&5�u{�ﺰ�j���C�5�+H���;'�g<��J��ؑ��O�g�Ki�JmX�ʎd����3�f�V�x7�ða�P9��rˊ�G�t�X8+����t�����7�rv�.Ux�#�)\�i��V\��%���p��a��h�!�F(i0�r9c6��;��'�d��Y��$��o;�H��Z�R=� ��M�.��H�����/{��G_��Y�b��hR�T��`����i
-,�
-҈C��܆��B��5  �#$�)RK@L=nކ
-2Ym|x'D/:W`�	_Uf
-�J��Ueh��T0D4,3�#�Ywh7�r�P�3vHb`��F��~�tP�~�/:��ɀ�S�
+x͜[s�F���+��T��č��-�^'�J�$R�}�MQ�Ђ����==��n0�d_⪔ ��8������ߋ<��_�͋��e��ų닧/�Y1ͮo��^N�l6���l:�N��������&ko�������]�t���iZe������l2�f���e�rR��6��r��.{����\>����8��Ť��L?�p�,�.'�ORx��_5�=���Da!0��c���|�ٵ�M! �r��}Q��|ӵ��ͩ8��eE>�Ll�8�W�m�b:Y`4�o�L��u�cǷ��i|Å��!�,F�X�QT²aB���ծ7�`�b1)-B��n\m�wͺ���z�^���#�cs\ߋ=���a��C[�fH�~��$\А%n��U�!QB�OŠ��c2�|�=�݅Ƞ=i�R�t��kA������x��ҬWǦ����
+�d�M%FJl0��z�#H�r.�i��q�ݶљ�5�
+������z�3�^�0)tfƋ�j<R1�����DX�K2C�0f|�9����G2L����}G������N�Y����ʜ�s�/�]eH2����u�g�`S��9��������Xtm|"-H�V2��(�h��v������6w�.�Fh��rc1[�� �.\�X�%I��Ϭ�p��hH�X3 �!�lv�1<�H�O�C{_u�%��e�Y������3��%�"0@�YoO,�!�}j֙k��v �KIvY���5�ӗ�n
+�U������qX�HC���=d9z��2D�������_�'-V$�'��������ͦ�5�b-Hؑ!B�aR�z�=�dZS�u�C8<�
+	b��
+�gF��f�>�=a(X��qRߓ���ð䅮#��G\�כ���2_H�f�&��ȶ�k��;�������es�{g���ߴ�^��A��� ��.��C�:��������e-3�91�8����A2��ky%��o���F�x	g�����_��,����q?R��I�"q�R\� �j�$��� aM��2)�-	A{�+��X�'5�l��Ȱ�:-�A�^(�������1R����k������yX�GіsӬ��]��M�L�	\*љ���S	I��,'C��$�l.����z��hӓ�f�-C�`����c��$��N�
+�ak�@I����Rc�¤8�-(5�1��d��R`5�I\��E" �rZd��#ơ���$մ$m�I.t�Y����lj�V!���
+Ⴜ�����W�^Fq��F�W8��VksXDb�f�A%��N�����d��T�Ճ�.~���b
+�1A������f�
+g0$�7�dx麢
+<�槤��T6���S��f5w��y.N�vI
+<f�:����2�
+��+�_�^�;�BïuKp$�	�x�����ra���y"�U�J�JR�E��5MmR�x�c�LG�����*����pЅ��}��m��@B�
+�8Fj`!_����u��c �J^O��
+�s�xя(�t˹�cFd(�c"Ub�������d�?���l��;�t��c��^�u�2\��Dq�v0hP�.'�^��-q�T�#�8�T��^�{�z5��HR�6�D��W��f�;Bl�	k=A�{�)�-Ix�뫧�<f��,�,D����_a ������G��f�R@��@��$&����3d�,�I8���MX'Y�l�lG�)l�	d���@R��=X:B�#5��U��"A���"�:B�� 
+��8[$�'�M�g!0x��M���cn��e��"�Gc�zFHP�%�:�
+�Wr��v���B�	��&��0C��
+ĠJa��F�Q��h@a}S#�8L��Q���A|�J�I,!B=��T"�pbH
+�$������@��!<%Y�����05�k��+�%i�W��ě'�vs�e!�j)��S4\���}�H�Y��h�P���L�c(("���'�W��`���2@j)fZ�rǐ޾��S7>��gP� �B3ͳh�(&�$��
+���E��abՠB�
+�l�����e]�
+ld�!愋4l�D���!��q.$*3B"�q9�O
+Ɇ��>����ؾ�����߲@�s���^���i@���	���JGҰ�N�)yU�����Y��6���2Ln���`S7�<�U������#5�O��e�`��F65�7OȰ�e9r���Sޡ��|�?i1��E��Z�s���-���cf�YRߗ�a�W�XB�)�65�N��u�;��"ق5 ���wB��S��Ƞ��Gj3�=�2�AL�"\P��/�wyBZ3�^�`����0@�����K�h���s����
+V�P��^8
+�	�����a���x��aK�����By\���G�ߙ��-g'T���R���R���k��[q�7�L�:
+��
+��qF�@�����«Ѯz�w��O��4��ӏ���mG���@�P�G佼I��S	�:���Qu㉅�O��p��*�Y�|�`oR�T��`ȏ<�
+id@�k݆���XX�<\��"5�����m(��n��BE7Xq�7��Y�
+^�w)2�hr
+*"�2#����n�嘡�f< ���#�0�(��w�LI�'��� �ѿ~
+`7
+@�cb�Ļ'W�_=����������]�v8���V�m�?�!{�4�x�4���?��Gendstream
 endobj
 700 0 obj
-3705
+3714
 endobj
 701 0 obj<</Count 12/First 702 0 R/Last 816 0 R>>endobj
 702 0 obj<</Parent 701 0 R/Title(Table of Contents)/Dest[692 0 R/XYZ null 756 null]/Next 703 0 R>>endobj
@@ -1822,7 +1853,7 @@ endobj
 783 0 obj<</Parent 772 0 R/Title(7.8.1. Configuration Instructions: Network Logons)/Dest[626 0 R/XYZ null 431 null]/Prev 782 0 R/Next 784 0 R>>endobj
 784 0 obj<</Parent 772 0 R/Title(7.8.2. Configuration Instructions: Setting up Roaming User Profiles)/Dest[629 0 R/XYZ null 185 null]/Prev 783 0 R/Next 785 0 R>>endobj
 785 0 obj<</Parent 772 0 R/Title(7.9. DOMAIN_CONTROL.txt : Windows NT Domain Control & Samba)/Dest[644 0 R/XYZ null 682 null]/Prev 784 0 R>>endobj
-786 0 obj<</Parent 701 0 R/Count -13/First 787 0 R/Last 799 0 R/Title(Chapter 8. Unifed Logons between Windows NT and UNIX using Winbind)/Dest[650 0 R/XYZ null 750 null]/Prev 772 0 R/Next 800 0 R>>endobj
+786 0 obj<</Parent 701 0 R/Count -13/First 787 0 R/Last 799 0 R/Title(Chapter 8. Unified Logons between Windows NT and UNIX using Winbind)/Dest[650 0 R/XYZ null 750 null]/Prev 772 0 R/Next 800 0 R>>endobj
 787 0 obj<</Parent 786 0 R/Title(8.1. Abstract)/Dest[650 0 R/XYZ null 702 null]/Next 788 0 R>>endobj
 788 0 obj<</Parent 786 0 R/Title(8.2. Introduction)/Dest[650 0 R/XYZ null 565 null]/Prev 787 0 R/Next 789 0 R>>endobj
 789 0 obj<</Parent 786 0 R/Title(8.3. What Winbind Provides)/Dest[650 0 R/XYZ null 242 null]/Prev 788 0 R/Next 790 0 R>>endobj
@@ -1836,7 +1867,7 @@ endobj
 797 0 obj<</Parent 786 0 R/Title(8.5. Installation and Configuration)/Dest[659 0 R/XYZ null 341 null]/Prev 796 0 R/Next 798 0 R>>endobj
 798 0 obj<</Parent 786 0 R/Title(8.6. Limitations)/Dest[659 0 R/XYZ null 151 null]/Prev 797 0 R/Next 799 0 R>>endobj
 799 0 obj<</Parent 786 0 R/Title(8.7. Conclusion)/Dest[662 0 R/XYZ null 577 null]/Prev 798 0 R>>endobj
-800 0 obj<</Parent 701 0 R/Count -9/First 801 0 R/Last 809 0 R/Title(Chapter 9. UNIX Permission Bits and WIndows NT Access Control Lists)/Dest[665 0 R/XYZ null 750 null]/Prev 786 0 R/Next 810 0 R>>endobj
+800 0 obj<</Parent 701 0 R/Count -9/First 801 0 R/Last 809 0 R/Title(Chapter 9. UNIX Permission Bits and Windows NT Access Control Lists)/Dest[665 0 R/XYZ null 750 null]/Prev 786 0 R/Next 810 0 R>>endobj
 801 0 obj<</Parent 800 0 R/Title(9.1. Viewing and changing UNIX permissions using the NT  security dialogs)/Dest[665 0 R/XYZ null 702 null]/Next 802 0 R>>endobj
 802 0 obj<</Parent 800 0 R/Title(9.2. How to view file security on a Samba share)/Dest[665 0 R/XYZ null 521 null]/Prev 801 0 R/Next 803 0 R>>endobj
 803 0 obj<</Parent 800 0 R/Title(9.3. Viewing file ownership)/Dest[665 0 R/XYZ null 344 null]/Prev 802 0 R/Next 804 0 R>>endobj
@@ -2356,334 +2387,334 @@ xref
 0000040903 00000 n 
 0000040924 00000 n 
 0000041098 00000 n 
-0000042261 00000 n 
-0000042283 00000 n 
-0000042434 00000 n 
-0000043956 00000 n 
-0000043978 00000 n 
-0000044138 00000 n 
-0000045574 00000 n 
-0000045596 00000 n 
-0000045774 00000 n 
-0000047034 00000 n 
-0000047056 00000 n 
-0000047198 00000 n 
-0000048782 00000 n 
-0000048804 00000 n 
-0000048937 00000 n 
-0000050674 00000 n 
-0000050696 00000 n 
-0000050829 00000 n 
-0000051351 00000 n 
-0000051372 00000 n 
-0000051523 00000 n 
-0000053000 00000 n 
-0000053022 00000 n 
-0000053183 00000 n 
-0000054801 00000 n 
-0000054823 00000 n 
-0000054974 00000 n 
-0000056729 00000 n 
-0000056751 00000 n 
-0000056893 00000 n 
-0000059043 00000 n 
-0000059065 00000 n 
-0000059207 00000 n 
-0000061010 00000 n 
-0000061032 00000 n 
-0000061183 00000 n 
-0000062901 00000 n 
-0000062923 00000 n 
-0000063074 00000 n 
-0000065007 00000 n 
-0000065029 00000 n 
-0000065181 00000 n 
-0000066866 00000 n 
-0000066888 00000 n 
-0000067049 00000 n 
-0000068439 00000 n 
-0000068461 00000 n 
-0000068622 00000 n 
-0000069863 00000 n 
-0000069885 00000 n 
-0000070027 00000 n 
-0000071698 00000 n 
-0000071720 00000 n 
-0000071881 00000 n 
-0000073731 00000 n 
-0000073753 00000 n 
-0000073941 00000 n 
-0000075558 00000 n 
-0000075580 00000 n 
-0000075759 00000 n 
-0000077583 00000 n 
-0000077605 00000 n 
-0000077779 00000 n 
-0000078997 00000 n 
-0000079019 00000 n 
-0000079193 00000 n 
-0000080798 00000 n 
-0000080820 00000 n 
-0000080963 00000 n 
-0000081721 00000 n 
-0000081742 00000 n 
-0000081926 00000 n 
-0000083751 00000 n 
-0000083773 00000 n 
-0000083947 00000 n 
-0000086143 00000 n 
-0000086165 00000 n 
-0000086358 00000 n 
-0000088301 00000 n 
-0000088323 00000 n 
-0000088507 00000 n 
-0000090407 00000 n 
-0000090429 00000 n 
-0000090613 00000 n 
-0000092283 00000 n 
-0000092305 00000 n 
-0000092466 00000 n 
-0000094166 00000 n 
-0000094188 00000 n 
-0000094380 00000 n 
-0000096112 00000 n 
-0000096134 00000 n 
-0000096317 00000 n 
-0000097946 00000 n 
-0000097968 00000 n 
-0000098142 00000 n 
-0000099746 00000 n 
-0000099768 00000 n 
-0000099942 00000 n 
-0000101684 00000 n 
-0000101706 00000 n 
-0000101891 00000 n 
-0000103698 00000 n 
-0000103720 00000 n 
-0000103886 00000 n 
-0000105589 00000 n 
-0000105611 00000 n 
-0000105787 00000 n 
-0000107794 00000 n 
-0000107816 00000 n 
-0000108010 00000 n 
-0000109848 00000 n 
-0000109870 00000 n 
-0000110039 00000 n 
-0000111980 00000 n 
-0000112002 00000 n 
-0000112196 00000 n 
-0000114225 00000 n 
-0000114247 00000 n 
-0000114423 00000 n 
-0000116228 00000 n 
-0000116250 00000 n 
-0000116416 00000 n 
-0000118282 00000 n 
-0000118304 00000 n 
-0000118470 00000 n 
-0000120851 00000 n 
-0000120873 00000 n 
-0000121015 00000 n 
-0000122939 00000 n 
-0000122961 00000 n 
-0000123103 00000 n 
-0000124799 00000 n 
-0000124821 00000 n 
-0000124981 00000 n 
-0000127005 00000 n 
-0000127027 00000 n 
-0000127178 00000 n 
+0000042260 00000 n 
+0000042282 00000 n 
+0000042433 00000 n 
+0000043954 00000 n 
+0000043976 00000 n 
+0000044136 00000 n 
+0000045572 00000 n 
+0000045594 00000 n 
+0000045772 00000 n 
+0000047032 00000 n 
+0000047054 00000 n 
+0000047196 00000 n 
+0000048780 00000 n 
+0000048802 00000 n 
+0000048935 00000 n 
+0000050672 00000 n 
+0000050694 00000 n 
+0000050827 00000 n 
+0000051350 00000 n 
+0000051371 00000 n 
+0000051522 00000 n 
+0000052999 00000 n 
+0000053021 00000 n 
+0000053182 00000 n 
+0000054800 00000 n 
+0000054822 00000 n 
+0000054973 00000 n 
+0000056728 00000 n 
+0000056750 00000 n 
+0000056892 00000 n 
+0000059042 00000 n 
+0000059064 00000 n 
+0000059206 00000 n 
+0000061009 00000 n 
+0000061031 00000 n 
+0000061182 00000 n 
+0000062900 00000 n 
+0000062922 00000 n 
+0000063073 00000 n 
+0000065006 00000 n 
+0000065028 00000 n 
+0000065180 00000 n 
+0000066865 00000 n 
+0000066887 00000 n 
+0000067048 00000 n 
+0000068438 00000 n 
+0000068460 00000 n 
+0000068621 00000 n 
+0000069862 00000 n 
+0000069884 00000 n 
+0000070026 00000 n 
+0000071697 00000 n 
+0000071719 00000 n 
+0000071880 00000 n 
+0000073728 00000 n 
+0000073750 00000 n 
+0000073938 00000 n 
+0000075555 00000 n 
+0000075577 00000 n 
+0000075756 00000 n 
+0000077580 00000 n 
+0000077602 00000 n 
+0000077776 00000 n 
+0000078994 00000 n 
+0000079016 00000 n 
+0000079190 00000 n 
+0000080795 00000 n 
+0000080817 00000 n 
+0000080960 00000 n 
+0000081718 00000 n 
+0000081739 00000 n 
+0000081923 00000 n 
+0000083748 00000 n 
+0000083770 00000 n 
+0000083944 00000 n 
+0000086140 00000 n 
+0000086162 00000 n 
+0000086355 00000 n 
+0000088298 00000 n 
+0000088320 00000 n 
+0000088504 00000 n 
+0000090403 00000 n 
+0000090425 00000 n 
+0000090609 00000 n 
+0000092279 00000 n 
+0000092301 00000 n 
+0000092462 00000 n 
+0000094163 00000 n 
+0000094185 00000 n 
+0000094377 00000 n 
+0000096111 00000 n 
+0000096133 00000 n 
+0000096316 00000 n 
+0000097945 00000 n 
+0000097967 00000 n 
+0000098141 00000 n 
+0000099745 00000 n 
+0000099767 00000 n 
+0000099941 00000 n 
+0000101683 00000 n 
+0000101705 00000 n 
+0000101890 00000 n 
+0000103694 00000 n 
+0000103716 00000 n 
+0000103882 00000 n 
+0000105585 00000 n 
+0000105607 00000 n 
+0000105783 00000 n 
+0000107789 00000 n 
+0000107811 00000 n 
+0000108005 00000 n 
+0000109836 00000 n 
+0000109858 00000 n 
+0000110027 00000 n 
+0000111965 00000 n 
+0000111987 00000 n 
+0000112181 00000 n 
+0000114215 00000 n 
+0000114237 00000 n 
+0000114413 00000 n 
+0000116217 00000 n 
+0000116239 00000 n 
+0000116405 00000 n 
+0000118272 00000 n 
+0000118294 00000 n 
+0000118460 00000 n 
+0000120843 00000 n 
+0000120865 00000 n 
+0000121007 00000 n 
+0000122933 00000 n 
+0000122955 00000 n 
+0000123097 00000 n 
+0000124792 00000 n 
+0000124814 00000 n 
+0000124974 00000 n 
+0000127006 00000 n 
+0000127028 00000 n 
+0000127179 00000 n 
 0000128750 00000 n 
 0000128772 00000 n 
 0000128914 00000 n 
 0000130887 00000 n 
 0000130909 00000 n 
 0000131060 00000 n 
-0000132989 00000 n 
-0000133011 00000 n 
-0000133153 00000 n 
-0000135018 00000 n 
-0000135040 00000 n 
-0000135200 00000 n 
-0000137035 00000 n 
-0000137057 00000 n 
-0000137180 00000 n 
-0000138268 00000 n 
-0000138290 00000 n 
-0000138442 00000 n 
+0000132992 00000 n 
+0000133014 00000 n 
+0000133156 00000 n 
+0000135022 00000 n 
+0000135044 00000 n 
+0000135204 00000 n 
+0000137039 00000 n 
+0000137061 00000 n 
+0000137184 00000 n 
+0000138274 00000 n 
+0000138296 00000 n 
+0000138448 00000 n 
 0000140186 00000 n 
 0000140208 00000 n 
 0000140350 00000 n 
 0000142104 00000 n 
 0000142126 00000 n 
 0000142277 00000 n 
-0000144216 00000 n 
-0000144238 00000 n 
-0000144389 00000 n 
-0000146204 00000 n 
-0000146226 00000 n 
-0000146369 00000 n 
-0000147450 00000 n 
-0000147472 00000 n 
-0000147656 00000 n 
-0000149531 00000 n 
-0000149553 00000 n 
-0000149722 00000 n 
-0000151583 00000 n 
-0000151605 00000 n 
-0000151765 00000 n 
-0000153450 00000 n 
-0000153472 00000 n 
-0000153646 00000 n 
-0000155373 00000 n 
-0000155395 00000 n 
-0000155546 00000 n 
-0000156470 00000 n 
-0000156491 00000 n 
-0000156658 00000 n 
-0000158325 00000 n 
-0000158347 00000 n 
-0000158504 00000 n 
-0000159692 00000 n 
-0000159714 00000 n 
-0000159871 00000 n 
-0000161420 00000 n 
-0000161442 00000 n 
-0000161592 00000 n 
-0000162305 00000 n 
-0000162326 00000 n 
-0000162483 00000 n 
-0000167966 00000 n 
-0000167988 00000 n 
-0000168145 00000 n 
-0000173017 00000 n 
-0000173039 00000 n 
-0000173196 00000 n 
-0000176972 00000 n 
-0000176994 00000 n 
-0000177050 00000 n 
-0000177155 00000 n 
-0000177333 00000 n 
-0000177452 00000 n 
-0000177587 00000 n 
-0000177723 00000 n 
-0000177871 00000 n 
-0000178021 00000 n 
-0000178161 00000 n 
-0000178302 00000 n 
-0000178455 00000 n 
-0000178617 00000 n 
-0000178766 00000 n 
-0000178954 00000 n 
-0000179087 00000 n 
-0000179215 00000 n 
-0000179333 00000 n 
-0000179469 00000 n 
-0000179611 00000 n 
-0000179727 00000 n 
-0000179853 00000 n 
-0000179969 00000 n 
-0000180160 00000 n 
-0000180259 00000 n 
-0000180407 00000 n 
-0000180525 00000 n 
-0000180649 00000 n 
-0000180771 00000 n 
-0000180897 00000 n 
-0000181055 00000 n 
-0000181185 00000 n 
-0000181309 00000 n 
-0000181427 00000 n 
-0000181545 00000 n 
-0000181664 00000 n 
-0000181854 00000 n 
-0000182040 00000 n 
-0000182193 00000 n 
-0000182356 00000 n 
-0000182507 00000 n 
-0000182629 00000 n 
-0000182823 00000 n 
-0000182928 00000 n 
-0000183051 00000 n 
-0000183187 00000 n 
-0000183323 00000 n 
-0000183468 00000 n 
-0000183592 00000 n 
-0000183719 00000 n 
-0000183861 00000 n 
-0000184066 00000 n 
-0000184171 00000 n 
-0000184271 00000 n 
-0000184451 00000 n 
-0000184556 00000 n 
-0000184675 00000 n 
-0000184800 00000 n 
-0000184945 00000 n 
-0000185087 00000 n 
-0000185237 00000 n 
-0000185368 00000 n 
-0000185494 00000 n 
-0000185619 00000 n 
-0000185759 00000 n 
-0000185886 00000 n 
-0000186017 00000 n 
-0000186148 00000 n 
-0000186326 00000 n 
-0000186454 00000 n 
-0000186590 00000 n 
-0000186725 00000 n 
-0000186931 00000 n 
-0000187044 00000 n 
-0000187160 00000 n 
-0000187305 00000 n 
-0000187477 00000 n 
-0000187625 00000 n 
-0000187777 00000 n 
-0000187909 00000 n 
-0000188043 00000 n 
-0000188176 00000 n 
-0000188314 00000 n 
-0000188464 00000 n 
-0000188632 00000 n 
-0000188779 00000 n 
-0000188983 00000 n 
-0000189084 00000 n 
-0000189202 00000 n 
-0000189329 00000 n 
-0000189448 00000 n 
-0000189571 00000 n 
-0000189711 00000 n 
-0000189838 00000 n 
-0000189978 00000 n 
-0000190114 00000 n 
-0000190236 00000 n 
-0000190372 00000 n 
-0000190489 00000 n 
-0000190592 00000 n 
-0000190796 00000 n 
-0000190957 00000 n 
-0000191105 00000 n 
-0000191233 00000 n 
-0000191376 00000 n 
-0000191500 00000 n 
-0000191629 00000 n 
-0000191774 00000 n 
-0000191939 00000 n 
-0000192091 00000 n 
-0000192256 00000 n 
-0000192354 00000 n 
-0000192539 00000 n 
-0000192729 00000 n 
-0000192912 00000 n 
-0000193071 00000 n 
-0000193245 00000 n 
-0000193351 00000 n 
-0000193481 00000 n 
-0000193607 00000 n 
-0000193717 00000 n 
+0000144210 00000 n 
+0000144232 00000 n 
+0000144383 00000 n 
+0000146203 00000 n 
+0000146225 00000 n 
+0000146368 00000 n 
+0000147449 00000 n 
+0000147471 00000 n 
+0000147655 00000 n 
+0000149525 00000 n 
+0000149547 00000 n 
+0000149716 00000 n 
+0000151570 00000 n 
+0000151592 00000 n 
+0000151752 00000 n 
+0000153435 00000 n 
+0000153457 00000 n 
+0000153631 00000 n 
+0000155360 00000 n 
+0000155382 00000 n 
+0000155533 00000 n 
+0000156457 00000 n 
+0000156478 00000 n 
+0000156645 00000 n 
+0000158312 00000 n 
+0000158334 00000 n 
+0000158491 00000 n 
+0000159679 00000 n 
+0000159701 00000 n 
+0000159858 00000 n 
+0000161409 00000 n 
+0000161431 00000 n 
+0000161581 00000 n 
+0000162294 00000 n 
+0000162315 00000 n 
+0000162472 00000 n 
+0000167955 00000 n 
+0000167977 00000 n 
+0000168134 00000 n 
+0000173000 00000 n 
+0000173022 00000 n 
+0000173179 00000 n 
+0000176964 00000 n 
+0000176986 00000 n 
+0000177042 00000 n 
+0000177147 00000 n 
+0000177325 00000 n 
+0000177444 00000 n 
+0000177579 00000 n 
+0000177715 00000 n 
+0000177863 00000 n 
+0000178013 00000 n 
+0000178153 00000 n 
+0000178294 00000 n 
+0000178447 00000 n 
+0000178609 00000 n 
+0000178758 00000 n 
+0000178946 00000 n 
+0000179079 00000 n 
+0000179207 00000 n 
+0000179325 00000 n 
+0000179461 00000 n 
+0000179603 00000 n 
+0000179719 00000 n 
+0000179845 00000 n 
+0000179961 00000 n 
+0000180152 00000 n 
+0000180251 00000 n 
+0000180399 00000 n 
+0000180517 00000 n 
+0000180641 00000 n 
+0000180763 00000 n 
+0000180889 00000 n 
+0000181047 00000 n 
+0000181177 00000 n 
+0000181301 00000 n 
+0000181419 00000 n 
+0000181537 00000 n 
+0000181656 00000 n 
+0000181846 00000 n 
+0000182032 00000 n 
+0000182185 00000 n 
+0000182348 00000 n 
+0000182499 00000 n 
+0000182621 00000 n 
+0000182815 00000 n 
+0000182920 00000 n 
+0000183043 00000 n 
+0000183179 00000 n 
+0000183315 00000 n 
+0000183460 00000 n 
+0000183584 00000 n 
+0000183711 00000 n 
+0000183853 00000 n 
+0000184058 00000 n 
+0000184163 00000 n 
+0000184263 00000 n 
+0000184443 00000 n 
+0000184548 00000 n 
+0000184667 00000 n 
+0000184792 00000 n 
+0000184937 00000 n 
+0000185079 00000 n 
+0000185229 00000 n 
+0000185360 00000 n 
+0000185486 00000 n 
+0000185611 00000 n 
+0000185751 00000 n 
+0000185878 00000 n 
+0000186009 00000 n 
+0000186140 00000 n 
+0000186318 00000 n 
+0000186446 00000 n 
+0000186582 00000 n 
+0000186717 00000 n 
+0000186923 00000 n 
+0000187036 00000 n 
+0000187152 00000 n 
+0000187297 00000 n 
+0000187469 00000 n 
+0000187617 00000 n 
+0000187769 00000 n 
+0000187901 00000 n 
+0000188035 00000 n 
+0000188168 00000 n 
+0000188306 00000 n 
+0000188456 00000 n 
+0000188624 00000 n 
+0000188771 00000 n 
+0000188976 00000 n 
+0000189077 00000 n 
+0000189195 00000 n 
+0000189322 00000 n 
+0000189441 00000 n 
+0000189564 00000 n 
+0000189704 00000 n 
+0000189831 00000 n 
+0000189971 00000 n 
+0000190107 00000 n 
+0000190229 00000 n 
+0000190365 00000 n 
+0000190482 00000 n 
+0000190585 00000 n 
+0000190789 00000 n 
+0000190950 00000 n 
+0000191098 00000 n 
+0000191226 00000 n 
+0000191369 00000 n 
+0000191493 00000 n 
+0000191622 00000 n 
+0000191767 00000 n 
+0000191932 00000 n 
+0000192084 00000 n 
+0000192249 00000 n 
+0000192347 00000 n 
+0000192532 00000 n 
+0000192722 00000 n 
+0000192905 00000 n 
+0000193064 00000 n 
+0000193238 00000 n 
+0000193344 00000 n 
+0000193474 00000 n 
+0000193600 00000 n 
+0000193710 00000 n 
 trailer
-<</Size 822/Root 821 0 R/Info 1 0 R/ID[<50065aa1e32cb902988d6a44412cb742><50065aa1e32cb902988d6a44412cb742>]>>
+<</Size 822/Root 821 0 R/Info 1 0 R/ID[<686147082bb917194de800da649a4e8c><686147082bb917194de800da649a4e8c>]>>
 startxref
-193931
+193924
 %%EOF
diff --git a/docs/docbook/faq/samba-pdc-faq.sgml b/docs/docbook/faq/samba-pdc-faq.sgml
index d3021b7a337..d27bdb63f42 100644
--- a/docs/docbook/faq/samba-pdc-faq.sgml
+++ b/docs/docbook/faq/samba-pdc-faq.sgml
@@ -17,9 +17,9 @@
 
 	<para>
 	This is the FAQ for Samba 2.2 as an NTDomain controller. 
-	This document is derived from the origional FAQ that was built and 
+	This document is derived from the original FAQ that was built and 
 	maintained by Gerald Carter from the early days of Samba NTDomain development 
-	up until recently.  It is now being updated as significent changes are 
+	up until recently.  It is now being updated as significant changes are 
 	made to 2.2.0.
 	</para> 
 
@@ -48,13 +48,13 @@
 <title id=stateofplay>State of Play</title>
 
 	<para>Much of the related code does work. For example, if an NT is removed from the 
-	domain and then rejoins, the <filename>Create a Computer Account in the Domain</> dialog
+	domain and then rejoins, the <filename>Create a Computer Account in the Domain</filename> dialog
 	will let you reset the smbpasswd. That is you don't need to do it from
 	the unix box. However, at the present, you do need to have root as an 
-	administrator and use the root user name and password.</para> 
+	administrator and use the root username and password.</para> 
 
     <para><command>Policies</command> do work on a W2K machine. MS says that recent 
-	builds of W2K dont observe an NT policy but it appears it does in 'legacy' 
+	builds of W2K don't observe an NT policy but it appears it does in 'legacy' 
 	mode.</para>
   
 </sect1>
@@ -63,7 +63,7 @@
 <title>Introduction</title>
 
 	<para>
-	This FAQ was origionally compiled by Jerry Carter (gc) chiefly dealing 
+	This FAQ was originally compiled by Jerry Carter (gc) chiefly dealing 
 	with the 'old HEAD' version of Samba and its NTDomain facilities. It is 
 	being rewritten by David Bannon (drb) so that it addresses more 
 	accurately the Samba 2.2.x release. 
@@ -78,7 +78,7 @@
 	</para> 
 
 	<para>Hopefully, as we all become familiar with the Samba 2.2 as a 
-	PDC this document will become much more usefull.</para>
+	PDC this document will become much more useful.</para>
 
 </sect1>
 
@@ -133,7 +133,7 @@
 
 
 	<para>
-	These things are note expected to work in the forseeable future:
+	These things are not expected to work in the foreseeable future:
 	</para>
 	
 	<itemizedlist>
@@ -148,7 +148,7 @@ controlled domain?</title>
 
 	<para>
 	The 2.2 release branch of Samba  supports Windows 2000 domain 
-	clients in legacy mode, ie as if the PDC is a NTServer, not a
+	clients in legacy mode, i.e. as if the PDC is a NTServer, not a
 	W2K server.
 	</para>
 </sect2>
@@ -159,7 +159,7 @@ controlled domain?</title>
 <title>CVS</title>
 
 	<para>
-	CVS is a programme (publically available) that the Samba developers 
+	CVS is a program (publicly available) that the Samba developers 
 	use to maintain the central source code. Non developers can get 
 	access to the source in a read only capacity. Many flavours of unix 
 	now arrive with cvs installed.</>
@@ -181,7 +181,7 @@ controlled domain?</title>
 		<term>HEAD</term> 
 		<listitem><para>Samba 3.0 ? This code boasts all the main 
 		development work in Samba. Due to its developmental
-		nature, its not really suitable for production work.
+		nature, it's not really suitable for production work.
 		</para></listitem></varlistentry>
 		
 		<varlistentry>
@@ -235,7 +235,7 @@ controlled Domain?</>
 
 	<para>
 	There is a comprehensive Samba PDC <ulink
-	url="samba-pdc-howto.html">HOWTO</ulink> accessable from the samba web 
+	url="samba-pdc-howto.html">HOWTO</ulink> accessible from the samba web 
 	site under 'Documentation'. Read it.
 	</para>
 </sect2>
@@ -257,11 +257,11 @@ controlled Domain?</>
 
 <sect2>
 <title>"The machine account for this computer either does not 
-exist or is not accessable."</>
+exist or is not accessible."</>
 
 	<para>
 	When I try to join the domain I get the message "The machine account 
-	for this computer either does not exist or is not accessable". Whats 
+	for this computer either does not exist or is not accessible". Whats 
 	wrong ?
 	</para>
 
@@ -315,7 +315,7 @@ exist or is not accessable."</>
 
 	<para>
 	Then you need to add that entry to smbpasswd, assuming you have a suitable
-	path to the <command>smbpasswd</> programme, do this :
+	path to the <command>smbpasswd</> program, do this :
 	</para>
 
 	<para>
@@ -324,7 +324,7 @@ exist or is not accessable."</>
 
 	<para>
 	The entry will be created with a well known password, so any machine that 
-	says its doppy could join the domain as long as it gets in first. So 
+	says it's doppy could join the domain as long as it gets in first. So 
 	don't create the accounts any earlier than you need them.
 	</para>
 </sect2> 
@@ -353,7 +353,7 @@ when creating a machine account.</title>
 	<para>
 	This happens if you try to create a machine account from the 
 	machine itself and use a user	name that does not work (for whatever 
-	reason) and then try another (possibly valid) user name.
+	reason) and then try another (possibly valid) username.
 	Exit out of the network applet to close the initial connection 
 	and try again.
 	</para>
@@ -380,7 +380,7 @@ conflict with an existing set.."</title>
 
 	<para>I joined the domain successfully but after upgrading 
 	to a newer version of the Samba code I get the message, "The system 
-	can not log you on (C000019B), Please try a gain or consult your 
+	can not log you on (C000019B), Please try again or consult your 
 	system administrator" when attempting to logon.
 	</para>
 
@@ -483,15 +483,15 @@ server.</title>
 	</para>
 
 	<para>
-	Make sure that the "logon path" is writeable by the user and make sure 
+	Make sure that the "logon path" is writable by the user and make sure 
 	that the connection to the logon path location is by the current user.   
-	Sometimes Windows client do not drop the connection immediately upon 
+	Sometimes Windows clients do not drop the connection immediately upon 
 	logoff.
 	</para> 
 
     <para>
 	Some people have reported that the logon path location should 
-	also be browseable.  I (GC) have yet to emperically verify this, 
+	also be browseable.  I (GC) have yet to empirically verify this, 
 	but you can try.</para> 
 </sect2>
 </sect1>
@@ -499,13 +499,13 @@ server.</title>
 <sect1><title>Policies</title>
 
 <sect2>
-<title>What are 'Policies' ?.</title>
+<title>What are 'Policies' ?</title>
 
     <para>
 	When a user logs onto the domain via a client machine, the PDC 
 	sends the client machine a list of things contained in the 
 	'policy' (if it exists).  This list may do things like suppress 
-	a splach screen, format the dates the way you like them or perhaps 
+	a splash screen, format the dates the way you like them or perhaps 
 	remove locally stored profiles.
 	</para>
 
@@ -513,7 +513,7 @@ server.</title>
 	On a samba PDC this list is obtained from a file called 
 	<filename>ntconfig.pol</filename> and located in the [netlogon] 
 	share. The file is created with a policy editor and must be readable 
-	by anyone and writeable by only root. See <link linkend=policyeditor>
+	by anyone and writable by only root. See <link linkend=policyeditor>
     below</link> for how  to get a suitable editor.
 	</para>  
 </sect2>
@@ -538,7 +538,7 @@ server.</title>
 
     <para>
 	A policy file must be in the [netlogon] share and must be 
-    readable by everyone and writeable by only root. The file 
+    readable by everyone and writable by only root. The file 
 	must be created by an NTServer <link linkend=policyeditor>Policy 
 	Editor</link>.
 	</para>
@@ -572,7 +572,7 @@ server.</title>
     but it is not suitable for creating <emphasis>Domain Policies</emphasis>. 
     Further, although the Windows 95 
 	Policy Editor can be installed on an NT Workstation/Server, it will not
-	work with NT policies because the registry key that are set by the policy templates. 
+	work with NT policies because of the registry keys that are set by the policy templates. 
 	However, the files from the NT Server will run happily enough on an NTws. 
 	You need <filename>poledit.exe, common.adm</> and <filename>winnt.adm</>. It is convenient
     to put the two *.adm files in <filename>c:\winnt\inf</> which is where
@@ -582,10 +582,10 @@ server.</title>
 
 	<para>The Windows NT policy editor is also included with the 
 	Service Pack 3 (and later) for Windows NT 4.0. Extract the files using 
-    <command>servicepackname /x</command>, ie thats <command>Nt4sp6ai.exe 
+    <command>servicepackname /x</command>, i.e. that's <command>Nt4sp6ai.exe 
 	/x</command> for service pack 6a.  The policy editor, <command>poledt.exe</command> and the 
 	associated template files (*.adm) should
-	be extracted as well.  It is also possible to downloaded the policy template 
+	be extracted as well.  It is also possible to download the policy template 
 	files for Office97 and get a copy of the policy editor.  Another possible 
 	location is with the Zero Administration Kit available for download from Microsoft.
     </para>
@@ -624,7 +624,7 @@ server.</title>
 	NTws users can change their domain password by pressing Ctrl-Alt-Del 
 	and choosing 'Change Password'. By default however, this does not change the unix password 
     (typically in <filename>/etc/passwd</filename> or <filename>/etc/shadow</filename>). 
-	In lots of situations thats OK, for example :
+	In lots of situations that's OK, for example :
 	</para>
 
 	<itemizedlist>
@@ -636,10 +636,10 @@ server.</title>
     </itemizedlist>
 
     <para>
-	But sometimes you really do need to maintain two seperate password 
+	But sometimes you really do need to maintain two separate password 
 	databases and there are good reasons to keep then in sync.  Trying 
 	to explain to users that they need to change their passwords in two 
-	seperate places or use two seperate passwords is not fun.
+	separate places or use two separate passwords is not fun.
 	</para>
 
     <para>
@@ -699,10 +699,10 @@ server.</title>
 
 <sect2>
 <title>What editor can I use in DOS/Windows that won't 
-mess with my unix EOF</title>
+mess with my unix EOF ?</title>
 
     <para>There are a number of Windows or DOS based editors that will 
-	understand, and leave intact, the unix eof (as opposed to a DOS CL/LF). 
+	understand, and leave intact, the unix eof (as opposed to a DOS CR/LF). 
 	List members suggested :
 	</para>
 
@@ -713,7 +713,7 @@ mess with my unix EOF</title>
         home.snafu.de/ramo/WinViEn.htm</ulink></para></listitem>
 
 		<listitem><para>The author prefers PFE at <ulink url="http://www.lancs.ac.uk/people/cpaap/pfe/">
-		www.lancs.ac.uk/people/cpaap/pfe/</ulink> but its no longer being developed...</para></listitem>
+		www.lancs.ac.uk/people/cpaap/pfe/</ulink> but it's no longer being developed...</para></listitem>
     </itemizedlist>
 </sect2>
 
@@ -721,7 +721,7 @@ mess with my unix EOF</title>
 
 
 <sect2>
-<title>How do I get 'User Manager' and 'Server Manager'</title>
+<title>How do I get 'User Manager' and 'Server Manager' ?</title>
 
 	<para>
 	Since I don't need to buy an NT Server CD now, how do I get 
@@ -731,7 +731,7 @@ mess with my unix EOF</title>
 	<para>
 	Microsoft distributes a version of 
 	these tools called nexus for installation on Windows 95 systems.  The 
-	tools set includes
+	tool set includes
 	</para>
 	
 	<itemizedlist>
@@ -774,7 +774,7 @@ mess with my unix EOF</title>
 
 </sect2>
 
-<sect2><title>How do I get my samba server to become a member ( not PDC ) of an NT domain?</title>
+<sect2><title>How do I get my samba server to become a member ( not PDC ) of an NT domain ?</title>
 
 
 	<para>
@@ -796,11 +796,11 @@ mess with my unix EOF</title>
 <sect1><title>Diagnostic tools</title>
 
 <sect2><title>What are some diagnostics tools I can use to debug the domain logon process and where can I
-	find them? </title>
+	find them ?</title>
 
     <para>
 	One of the best diagnostic tools for debugging problems is Samba itself.  
-	You can use the -d option for both smbd and nmbd to specifiy what 
+	You can use the -d option for both smbd and nmbd to specify what 
 	'debug level' at which to run.  See the man pages on smbd, nmbd  and 
 	smb.conf for more information on debugging options.  The debug 
 	level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -809,20 +809,20 @@ mess with my unix EOF</title>
 	<para>
 	Another helpful method of debugging is to compile samba using the 
 	<command>gcc -g </command> flag.   This will include debug 
-	information in the binaries and allow you to attch gdb to the 
+	information in the binaries and allow you to attach gdb to the 
 	running smbd / nmbd process.  In order to attach gdb to an smbd 
 	process for an NT workstation, first get the workstation to make the 
-	connection. Pressing ctrl-alt-delete and going down to the domain box 
+	connection. Pressing Ctrl-Alt-Del and going down to the domain box 
 	is sufficient (at least, on the first time you join the domain) to 
 	generate a 'LsaEnumTrustedDomains'. Thereafter, the workstation 
 	maintains an open connection, and therefore there will be an smbd 
 	process running (assuming that you haven't set a really short smbd 
-	idle timeout)  So, in between pressing ctrl alt delete, and actually 
+	idle timeout)  So, in between pressing Ctrl-Alt-Del, and actually 
 	typing in your password, you can gdb attach and continue.
 	</para>
 
 	<para>
-	Some usefull samba commands worth investigating:
+	Some useful samba commands worth investigating:
 	</para>
 	
 	<itemizedlist>
@@ -832,18 +832,18 @@ mess with my unix EOF</title>
     
     <para>
 	An SMB enabled version of tcpdump is available from 
-    <ulink url="http://www.tcpdump.org/">http://www.tcpdup.org/</ulink>.
+    <ulink url="http://www.tcpdump.org/">http://www.tcpdump.org/</ulink>.
 	Ethereal, another good packet sniffer for UNIX and Win32
 	hosts, can be downloaded from <ulink 
 	url="http://www.ethereal.com/">http://www.ethereal.com</ulink>.
 	</para>
 	
 	<para>
-	For tracing things on the Microsoft Windows NT, Network Monitor 
+	For tracing things on Microsoft Windows NT, Network Monitor 
 	(aka. netmon) is available on the Microsoft Developer Network CD's, 
 	the Windows NT Server install CD and the SMS CD's.  The version of 
 	netmon that ships with SMS allows for dumping packets between any two 
-	computers (ie. placing the network interface in promiscuous mode).  
+	computers (i.e. placing the network interface in promiscuous mode).  
 	The version on the NT Server install CD will only allow monitoring 
 	of network traffic directed to the local NT box and broadcasts on the 
 	local subnet.  Be aware that Ethereal can read and write netmon 
@@ -854,7 +854,7 @@ mess with my unix EOF</title>
 
 <sect2>
 <title>How do I install 'Network Monitor' on an NT Workstation 
-or a Windows 9x box?</title>
+or a Windows 9x box ?</title>
 
 	<para>
 	Installing netmon on an NT workstation requires a couple 
@@ -953,10 +953,10 @@ or a Windows 9x box?</title>
 		on the Samba mirrors might mention your problem. If so,
 		it might mean that the developers are working on it.</para></listitem>
  
-	<listitem><para> Ignacio Coupeau has a very comprehesive look at LDAP with Samba at 
+	<listitem><para> Ignacio Coupeau has a very comprehensive look at LDAP with Samba at 
 		<ulink url="http://www.unav.es/cti/ldap-smb-howto.html">
 		http://www.unav.es/cti/ldap-smb-howto.html</ulink> 
-		Be a little carefull however, I suspect that it does not specificly 
+		Be a little careful however, I suspect that it does not specifically 
 		address samba 2.2.x. The HEAD pre-2.1 may possibly be the best
 		stream to look at.</para></listitem>
 
@@ -964,7 +964,7 @@ or a Windows 9x box?</title>
         Samba-TNG</ulink> at 
 		<ulink url="http://www.kneschke.de/projekte/samba_tng">
 		http://www.kneschke.de/projekte/samba_tng</ulink>, but again, a 
-		lot of it does not apply to the main stream Samba.</para></listitem>
+		lot of it does not apply to the mainstream Samba.</para></listitem>
 
     <listitem><para>See how Scott Merrill simulates a BDC behaviour at 
         <ulink url="http://www.skippy.net/linux/smb-howto.html">
@@ -1006,7 +1006,7 @@ or a Windows 9x box?</title>
     <para>For questions relating to Samba TNG go to
         <ulink url="http://www.samba-tng.org/">http://www.samba-tng.org/</ulink> 
 	    It has been requested that you don't post questions about Samba-TNG to the
-        main stream Samba lists.</para>
+        mainstream Samba lists.</para>
 	 
 <itemizedlist><title>If you post a message to one of the lists please
 	 observe the following guide lines :</title>
@@ -1027,14 +1027,14 @@ or a Windows 9x box?</title>
 	<listitem><para> Try and make your question clear and brief, lots of long, 
 		convoluted questions get deleted before	they are completely read ! 
 		Don't post html encoded messages (if you can select colour or font 
-		size its html).</para></listitem>
+		size it's html).</para></listitem>
 
-	<listitem><para> If you run one of those niffy 'I'm on holidays' things when 
+	<listitem><para> If you run one of those nifty 'I'm on holidays' things when 
 		you are away, make sure its configured	to not answer mailing lists.
 		</para></listitem> 
 
 	<listitem><para> Don't cross post. Work out which is the best list to post to 
-		and see what happens, ie don't post to both samba-ntdom and samba-technical.
+		and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
         Many people active on the lists subscribe to more 
 		than one list and get annoyed to see the same message two or more times. 
 		Often someone will see a message and thinking it would be better dealt 
@@ -1069,7 +1069,7 @@ or a Windows 9x box?</title>
 
     <para>
 	Please don't post messages to the list asking to be removed, you will just
-        be refered to the above address (unless that process failed in some way...)
+        be referred to the above address (unless that process failed in some way...)
     </para>
 </sect2>
       
diff --git a/docs/docbook/howto/samba-pdc-howto.sgml b/docs/docbook/howto/samba-pdc-howto.sgml
index 4b8380dd9e5..c707b542017 100644
--- a/docs/docbook/howto/samba-pdc-howto.sgml
+++ b/docs/docbook/howto/samba-pdc-howto.sgml
@@ -1,4 +1,3 @@
-	
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 <book id="samba-pdc-howto">
 
@@ -74,7 +73,7 @@ developmental versions of Samba, particularly
 
 
 <para>Note that <ulink url="http://bioserve.latrobe.edu.au/samba">Samba 2.0.7</>
-    supports significently less of the NT Domain facilities compared with 2.2.0
+    supports significantly less of the NT Domain facilities compared with 2.2.0
     </para>
 
 <para>
@@ -130,7 +129,7 @@ developmental versions of Samba, particularly
 
 <sect1><title>Start Up Script</title>
 	<para>Skip this section if you have a working Samba already. 
-	Everyone has their own favourite startup script. Here is mine, offered with no warrantee
+	Everyone has their own favourite startup script. Here is mine, offered with no warranty
 	at all !</para>
 
 <programlisting> 
@@ -221,7 +220,7 @@ developmental versions of Samba, particularly
     
 </programlisting>
 
-<para>	Use this script, or some other one, you will need to ensure its used while the machine
+<para>	Use this script, or some other one, you will need to ensure it's used while the machine
 	is booting. (This typically involves <filename>/etc/rc.d</filename>, we'll be 
 	assuming that there is a script called
 	samba in <filename>/etc/rc.d/init.d</filename> further down in this document.)
@@ -288,7 +287,7 @@ developmental versions of Samba, particularly
 	This is probably not very nice and may change. But it does work !</para>
 
     <para>For this example, I have a group called 'machines', entries can be added to
-    <filename>/etc/passwd</> using a programme called <filename>/usr/adduser</> and 
+    <filename>/etc/passwd</> using a program called <filename>/usr/adduser</> and 
     the other parameters are chosen as suitable for a machine account. Works for
     RH Linux, your system may require changes.</para>
 	</listitem>
@@ -303,9 +302,9 @@ developmental versions of Samba, particularly
 	</listitem>
 </varlistentry>
 
-<varlistentry><term>domain admin users = user1 users2</term>
-	<listitem><para>It appears that this parameter does not funtion correctly at present.
-    Use the 'domain admin group' instread. This parameter specifies a unix user who will 
+<varlistentry><term>domain admin users = user1 user2</term>
+	<listitem><para>It appears that this parameter does not function correctly at present.
+    Use the 'domain admin group' instead. This parameter specifies a unix user who will 
     be granted admin privileges 
 	on a NT workstation when
 	logged onto that workstation. See the section called <link linkend=domainadmin>
@@ -330,7 +329,7 @@ developmental versions of Samba, particularly
 </varlistentry>
 
 <varlistentry><term>logon path</term>
-	<listitem><para>Lets you specify where you would like users profiles kept. The default, that is in the users
+	<listitem><para>Lets you specify where you would like users' profiles kept. The default, that is in the user's
 	home directory, does encourage a bit of fiddling.</para>
 	</listitem>
 </varlistentry>
@@ -343,7 +342,7 @@ developmental versions of Samba, particularly
 </sect1>
 
 <sect1><title>Special directories</title>
-	<para>You need to create a couple of special files and directories. Its nice 
+	<para>You need to create a couple of special files and directories. It's nice 
 	to have some of the binaries handy too, so I create links to them. Assuming 
 	you have used the default samba location and have not
 	changed the locations mentioned in the sample config file, do the following :</para>
@@ -369,10 +368,10 @@ developmental versions of Samba, particularly
 	<para><command>samba start</command></para>
 
 	<para>Instead, you might like to reboot the machine to make sure that you 
-	got the init stuff right. Any way, a quick look in the logs 
+	got the init stuff right. Anyway, a quick look in the logs 
 	<filename>/usr/local/samba/var/log.smbd</filename> and <filename>
 	/usr/local/samba/var/log/nmbd</filename>
-	will give you an idea of what's happening. Assuming all is well, lets create 
+	will give you an idea of what's happening. Assuming all is well, let's create 
 	some accounts...</para> 
 </sect1>
 </chapter>
@@ -398,7 +397,7 @@ developmental versions of Samba, particularly
 	(Note that win95/98 machines don't need an account as they don't do 
 	any security aware things.)</para>
 
-	<para>Samba 2.2 will now create these entries for us. Carefull set up is required
+	<para>Samba 2.2 will now create these entries for us. Careful set up is required
 	and there may well be some changes to this system before its released. 
 	</para>
 </sect1>
@@ -479,7 +478,7 @@ developmental versions of Samba, particularly
     <listitem><para>Wait for the confirmation, reboot when prompted.</para></listitem>
 </itemizedlist>
     <para>To remove a W2K machine from the domain, follow the first two steps then 
-    choose <command>Workgroup</>, enter a work group name (or just WORKGROUP) and follow 
+    choose <command>Workgroup</>, enter a workgroup name (or just WORKGROUP) and follow 
     the prompts.</para>
 </listitem></varlistentry>
 
@@ -522,7 +521,7 @@ developmental versions of Samba, particularly
 	domain admins and tells the NTws when it thinks that it has got one logged on. 
 	In the smb.conf file we declare
 	that the <filename>Domain Admin group = @adm</filename>. 
-	Any user who is a menber of the unix group 'adm' is treated as a Domain Admin by a NTws when 
+	Any user who is a member of the unix group 'adm' is treated as a Domain Admin by a NTws when 
 	logged onto the Domain. They will have full Administrator rights 
 	including the rights to change permissions on files and run the system 
 	utilities such as Disk Administrator. Add users to the group by editing <filename>
@@ -530,7 +529,7 @@ developmental versions of Samba, particularly
 
 	<para>Further, and this is very new, they will be allowed to create a 
 	new machine account when first connecting a new NT or W2K machine to 
-	the domain. <emphasis>However, at present, ie pre-release, only a Domain Admin who
+	the domain. <emphasis>However, at present, i.e. pre-release, only a Domain Admin who
 	also happens to be root can do so. </emphasis></para>
 </sect1>
 </chapter>
@@ -549,7 +548,7 @@ developmental versions of Samba, particularly
 	on the server and is downloaded again when they logon on again, possibly 
 	on another client machine.</para> 
 
-	<para>Sounds great but can be a bit of a bug bear sometimes. Users let 
+	<para>Sounds great but can be a bit of a bugbear sometimes. Users let 
 	their profiles get too big and then complain about how long it takes 
 	to log on each time. This sample setup only supports NT profiles, 
 	rumor has it that it is also possible to do the same on Win95, my 
@@ -564,7 +563,7 @@ developmental versions of Samba, particularly
 	<para>Policies are an easy way to make or enforce specific characteristics across your network. You create a ntconfig.pol
 	file and every time someone logs on with their NTws, the settings you put in ntconfig.pol are applied to the NTws.
 	Typical setting are things like making the date appear the way you want it (none of these 2 figure years here) or
-	maybe suppressing one of the splash screens. Perhaps you want to set the NTws so it does not keep users profiles
+	maybe suppressing one of the splash screens. Perhaps you want to set the NTws so it does not keep users' profiles
 	on the local machine. Cool. The only problem is making the ntconfig.pol file itself. You cannot use the policy editor
 	that comes with NTws.</para> 
 
@@ -602,25 +601,25 @@ developmental versions of Samba, particularly
 
     <para>You could use a line like this <filename>logon script = default.bat</> and samba
     will supply <filename>/usr/local/samba/netlogon/default.bat</> for any client and every
-    user. Maybe you could use %m and get a client machine dependant logon script.
+    user. Maybe you could use %m and get a client machine dependent logon script.
     You get the idea...</para>
 
 	<para>Note that the file is a dos batch file not a Unix script. It runs dos commands on the client 
 	computer with the logon	user's permissions. It must be a dos file with each line ending with 
 	the dos cr/lf not a nice clean newline. Generally,
-	its best to create the initial file on a DOS system and copy it across.</para>
+	it's best to create the initial file on a DOS system and copy it across.</para>
 
-	<para>There is lots of very clever uses of the Samba replaceable variables such 
+	<para>There are lots of very clever uses of the Samba replaceable variables such 
 	( %U = user, %G = primary group, %H = client machine, see the 'man 5 smb.conf') to 
 	give you control over which script runs when a particular person logs
 	on. (Gee, it would be nice to have a default.bat run when nothing else is available.)</para>
 
 	<para>Again, it is vitally important that ordinary users don't have write 
-	permission to other peoples, or even probably their own, logon script files.</para>
+	permission to other people's, or even probably their own, logon script files.</para>
 
 	<para>A typical logon script is reproduced below. Note that it runs separate 
 	commands for win95 and NT, that's because NT has slightly different behaviour 
-	when using the <filename>net use ..</filename> command. Its useful for lots of 
+	when using the <filename>net use ..</filename> command. It's useful for lots of 
 	other situations too. I	don't know what syntax to use for win98, I don't use it 
 	here.</para>
 
@@ -652,7 +651,7 @@ developmental versions of Samba, particularly
 	to the <link linkend=useraccount><filename>adduser</></> line above would allow unix logon 
 	but it would be with passwords that may 
 	be different from the NT logon. Clearly that won't suit everyone. Trying to explain to users
-	that they need to change their passwords in two seperate places is not fun. 
+	that they need to change their passwords in two separate places is not fun. 
 	Further, even if they cannot do a unix logon there are other processes that 
 	might require authentication. We have a nice securely encrypted password in 
 	<filename>/usr/local/samba/private/smbpasswd</filename>, why not use it ?</para>
@@ -703,30 +702,30 @@ developmental versions of Samba, particularly
 	<para>For many years the Samba team have been developing Samba, some time ago 
 	a number of people, possibly lead by Luke Leighton started contributing NT 
 	PDC stuff. This was added to the 'head' stream (that would eventually
-	become the next version) and later to a seperate stream (NTDom). They did so 
+	become the next version) and later to a separate stream (NTDom). They did so 
 	much that eventually this development stream was so mutated that it could not 
 	be merged back into the main stream and was abandoned towards the end of 1999. 
 	And that was very sad because many users, myself include had become heavily
-	dependant on the NTController facilities it offered. Oh well...</para>
+	dependent on the NTController facilities it offered. Oh well...</para>
 
 	<para>The NTDom team continued on with their new found knowledge however and 
 	built the TNG stream. Intended to be carefully controlled so that it can be 
 	merged back into the main stream and benefiting from what they learnt, it is 
-	a very different product to the origional NTDom product. However, for a 
+	a very different product to the original NTDom product. However, for a 
     number of reasons, the merge did not take place and now TNG is being developed 
     at <ulink url="http://www.samba-tng.org">http://www.samba-tng.org</>.</para>
 
-	<para>Now, the NTDom things that the main strean 2.0.x version does is based more 
+	<para>Now, the NTDom things that the main stream 2.0.x version does is based more 
 	on the old (initial version) abandoned code than on the TNG ideas. It appears 
 	that version 2.2.0 will also include an improved version of the 2.0.7 domain 
-	controller charactistics, not the TNG ways. The developers have indicated 
+	controller characteristics, not the TNG ways. The developers have indicated 
 	that 2.2.0 will be further developed incrementally and the ideas from TNG 
 	incorporated into it.</para>
 
 	<para>One more little wriggle is worth mentioning. At one stage the NTDom 
 	stream was called Samba 2.1.0-prealpha and similar names. This is most 
 	unfortunate because at least one book published advises people who want to 
-	use NTDom Samba to get version 2.1.0 or later. As main stream Samba will soon 
+	use NTDom Samba to get version 2.1.0 or later. As mainstream Samba will soon 
 	be called 2.2.0  and NOT officially supporting NTDom Controlling functions, 
 	the potential for confusion is certainly there.</para>
 </sect2>
@@ -737,8 +736,8 @@ developmental versions of Samba, particularly
 	</emphasis>. It offers the 'best guess'	of what is planned for future releases 
 	of Samba.</para>
 
-	<para>The future of Samba as a Primary Domain Controller appears rosie, however 
-	be aware that its the future, not the present. The developers are strongly committed 
+	<para>The future of Samba as a Primary Domain Controller appears rosy, however 
+	be aware that it's the future, not the present. The developers are strongly committed 
 	to building a full featured PDC into Samba but it will	take time. If this 
 	version does not meet your requirements then you should consider (in no particular 
 	order) :</para>
@@ -755,8 +754,8 @@ developmental versions of Samba, particularly
 
 <sect2><title>Getting further help</title>
 
-	<para>This document cannot possibly answer all your questions. Please understand that its very
-	likely that someone has been confrounted by the same problem that you have. The 
+	<para>This document cannot possibly answer all your questions. Please understand that it's very
+	likely that someone has been confronted by the same problem that you have. The 
     <ulink url="samba-pdc-faq.html">FAQ</>
     discusses a number of possible paths to take to get further help :</para>
 
diff --git a/docs/docbook/manpages/make_unicodemap.1.sgml b/docs/docbook/manpages/make_unicodemap.1.sgml
index 50a5446d60b..5e7292341b0 100644
--- a/docs/docbook/manpages/make_unicodemap.1.sgml
+++ b/docs/docbook/manpages/make_unicodemap.1.sgml
@@ -33,7 +33,7 @@
 
 	<para>
 	<command>make_unicodemap</command> compiles text unicode map 
-	files into binary unicodef map files for use with the 
+	files into binary unicode map files for use with the 
 	internationalization features of Samba 2.2.
 	</para>
 </refsect1>
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index 8db2749bfa5..f52e38bb776 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -287,11 +287,11 @@
 	a SIGTERM (-15) signal and wait for it to die on its own.</para>
 
 	<para><command>nmbd</command> will accept SIGHUP, which will cause 
-	it to dump out it's namelists into the file <filename>namelist.debug
+	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 
-	cause <command>nmbd</command> to dump out it's server database in
+	cause <command>nmbd</command> to dump out its server database in
 	the <filename>log.nmb</filename> file. In addition, the debug log level 
 	of nmbd may be raised by sending it a SIGUSR1 (<command>kill -USR1
 	&lt;nmbd-pid&gt;</command>) and lowered by sending it a
diff --git a/docs/docbook/manpages/nmblookup.1.sgml b/docs/docbook/manpages/nmblookup.1.sgml
index 6fcf5cf70c6..67efac56343 100644
--- a/docs/docbook/manpages/nmblookup.1.sgml
+++ b/docs/docbook/manpages/nmblookup.1.sgml
@@ -84,7 +84,7 @@
 		datagrams. The reason for this option is a bug in Windows 95 
 		where it ignores the source port of the requesting packet 
 	 	and only replies to UDP port 137. Unfortunately, on most UNIX 
-		systems root privilage is needed to bind to this port, and 
+		systems root privilege is needed to bind to this port, and 
 		in addition, if the <ulink url="nmbd.8.html">nmbd(8)</ulink> 
 		daemon is running on this machine it also binds to this port.
 		</para></listitem>
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index 0d45a5dc203..6093d6dc42e 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -89,7 +89,7 @@
 		<term>-d debuglevel</term>
 		<listitem><para>set the debuglevel. Debug level 0 is the lowest 
 		and 100 being the highest. This should be set to 100 if you are
-		planning on submitting a bug report to the Samba team (see BUGS.txt). 
+		planning on submitting a bug report to the Samba team (see <filename>BUGS.txt</filename>). 
 		</para></listitem>
 		</varlistentry>
 		
@@ -108,7 +108,7 @@
 		<varlistentry>
 		<term>-l logbasename</term>
 		<listitem><para>File name for log/debug files. The extension 
-		'.client' will be appended. The log file is never removed  
+		<constant>'.client'</constant> will be appended. The log file is never removed  
 		by the client.
 		</para></listitem>
 		</varlistentry>
@@ -137,7 +137,7 @@
 		
 		<para>If %password is not specified, The user will be prompted. The 
 		client will first check the <envar>USER</envar> environment variable, then the 
-		<envar>LOGNAME</envar> variable and if either exist, the 
+		<envar>LOGNAME</envar> variable and if either exists, the 
 		string is uppercased. If these environmental variables are not 
 		found, the username <constant>GUEST</constant> is used. </para>
 
@@ -384,7 +384,7 @@
 	available from the original creators  (Microsoft) on how MSRPC over 
 	SMB works, or how the individual MSRPC services  work. Microsoft's 
 	implementation of these services has been demonstrated  (and reported) 
-	to be... a bit flakey in places. </para>
+	to be... a bit flaky in places. </para>
 
 	<para>The development of Samba's implementation is also a bit rough, 
 	and as more  of the services are understood, it can even result in 
@@ -412,7 +412,7 @@
 	to the way the Linux kernel is developed.</para>
 	
 	<para>The original rpcclient man page was written by Matthew 
-	Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter.  
+	Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter.  
 	The conversion to DocBook for Samba 2.2 was done by Gerald 
 	Carter.</para>
 </refsect1>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 70b4cc1c8ee..f337d9cba16 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -519,7 +519,7 @@
 		upper case, or if they are forced to be the "default" 
 		case. This option can be use with "preserve case = yes" 
 		to permit long filenames to retain their case, while short names 
-		are lowered. Default <emphasis>yes</emphasis>.</para></listitem>
+		are lowercased. Default <emphasis>yes</emphasis>.</para></listitem>
 		</varlistentry> 
 	</variablelist>
 	
@@ -552,7 +552,7 @@
 		with the system and now supplies a correct password for that 
 		username then the connection is allowed.</para></listitem>
 		
-		<listitem><para>The client's netbios name and any previously 
+		<listitem><para>The client's NetBIOS name and any previously 
 		used user names are checked against the supplied password, if 
 		they match then the connection is allowed as the corresponding 
 		user.</para></listitem>
@@ -894,7 +894,7 @@
 		NT/2000 print server.</para>
 		
 		<para>For a Samba host this means that the printer must be 
-		physically added to underlying printing system.  The <parameter>add 
+		physically added to the underlying printing system.  The <parameter>add 
 		printer command</parameter> defines a script to be run which 
 		will perform the necessary operations for adding the printer
 		to the print system and to add the appropriate service definition 
@@ -1081,7 +1081,7 @@
 		linkend="SECURITY"><parameter>security</parameter></link> option is set to 
 		<constant>server</constant> or <constant>domain</constant>.  
 		If it is set to no, then attempts to connect to a resource from 
-		a domain or workgroup other than the one which smbd is running 
+		a domain or workgroup other than the one which <ulink url="smbd.8.html">smbd</ulink> is running 
 		in will fail, even if that domain is trusted by the remote server 
 		doing the authentication.</para>
 		
@@ -1124,7 +1124,7 @@
 
 
 		<varlistentry>
-		<term><anchor id="ANNOUNCEVERSION">annouce version (G)</term>
+		<term><anchor id="ANNOUNCEVERSION">announce version (G)</term>
 		<listitem><para>This specifies the major and minor version numbers 
 		that nmbd will use when announcing itself as a server. The default 
 		is 4.2.  Do not change this parameter unless you have a specific 
@@ -1164,7 +1164,7 @@
 		<varlistentry>
 		<term><anchor id="BINDINTERFACESONLY">bind interfaces only (G)</term>
 		<listitem><para>This global parameter allows the Samba admin 
-		to limit what interfaces on a machine will serve smb requests. If 
+		to limit what interfaces on a machine will serve SMB requests. If 
 		affects file service <ulink url="smbd.8.html">smbd(8)</ulink> and 
 		name service <ulink url="nmbd.8.html">nmbd(8)</ulink> in slightly 
 		different ways.</para>
@@ -1243,7 +1243,7 @@
 		queue the lock request, and periodically attempt to obtain 
 		the lock until the timeout period expires.</para>
 
-		<para>If this parameter is set to <constant>False</constant>, then 
+		<para>If this parameter is set to <constant>false</constant>, then 
 		Samba 2.2 will behave as previous versions of Samba would and 
 		will fail the lock request immediately if the lock range 
 		cannot be obtained.</para>
@@ -1379,7 +1379,7 @@
 		
 		<varlistentry>
 		<term><anchor id="CHARACTERSET">character set (G)</term>
-		<listitem><para>This allows a smbd to map incoming filenames 
+		<listitem><para>This allows <ulink url="smbd.8.html">smbd</ulink> to map incoming filenames 
 		from a DOS Code page (see the <link linkend="CLIENTCODEPAGE">client 
 		code page</link> parameter) to several built in UNIX character sets. 
 		The built in code page translations are:</para>
@@ -1721,7 +1721,7 @@
 		<varlistentry>
 		<term><anchor id="DEBUGPID">debug pid (G)</term>
 		<listitem><para>When using only one log file for more then one 
-		forked smbd-process there may be hard to follow which process 
+		forked <ulink url="smbd.8.html">smbd</ulink>-process there may be hard to follow which process 
 		outputs which message. This boolean parameter is adds the process-id 
 		to the timestamp message headers in the logfile when turned on.</para>
 
@@ -2002,11 +2002,11 @@
 		<listitem><para>This option is used when Samba is attempting to 
 		delete a directory that contains one or more vetoed directories 
 		(see the <link linkend="VETOFILES"><parameter>veto files</parameter></link>
-		option).  If this option is set to False (the default) then if a vetoed 
+		option).  If this option is set to <constant>false</constant> (the default) then if a vetoed 
 		directory contains any non-vetoed files or directories then the 
 		directory delete will fail. This is usually what you want.</para>
 
-		<para>If this option is set to <constant>True</constant>, then Samba 
+		<para>If this option is set to <constant>true</constant>, then Samba 
 		will attempt to recursively delete any files and directories within 
 		the vetoed directory. This can be useful for integration with file 
 		serving systems such as NetAtalk which create meta-files within 
@@ -2174,7 +2174,7 @@
 		Samba server through other means can easily bypass this restriction, 
 		so it is primarily useful for standalone "appliance" systems.  
 		Administrators of most normal systems will probably want to leave
-		it as the default of 0777.</para>
+		it as the default of <constant>0777</constant>.</para>
 
 		<para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE"><parameter>
 		force directory security mode</parameter></link>, <link
@@ -2261,7 +2261,7 @@
 
 		<varlistentry>
 		<term><anchor id="DOMAINLOGONS">domain logons (G)</term>
-		<listitem><para>If set to true, the Samba server will serve 
+		<listitem><para>If set to <constant>true</constant>, the Samba server will serve 
 		Windows 95/98 Domain logons for the <link linkend="WORKGROUP">
 		<parameter>workgroup</parameter></link> it is in. Samba 2.2 also 
 		has limited capability to act as a domain controller for Windows 
@@ -2336,7 +2336,7 @@
 		<varlistentry>
 		<term><anchor id="DOSFILEMODE">dos filemode (S)</term>
 		<listitem><para> The default behavior in Samba is to provide 
-		UNIX-like behavor where only the owner of a file/directory is 
+		UNIX-like behavior where only the owner of a file/directory is 
 		able to change the permissions on it.  However, this behavior
 		is often confusing to  DOS/Windows users.  Enabling this parameter 
 		allows a user who has write access to the file (by whatever 
@@ -2386,7 +2386,7 @@
 		default, Samba runs with POSIX semantics and refuses to change the 
 		timestamp on a file if the user <command>smbd</command> is acting 
 		on behalf of is not the file owner. Setting this option to <constant>
-		True</constant> allows DOS semantics and smbd will change the file 
+		true</constant> allows DOS semantics and <ulink url="smbd.8.html">smbd</ulink> will change the file 
 		timestamp as DOS requires.</para>
 
 		<para>Default: <command>dos filetimes = no</command></para></listitem>
@@ -2409,7 +2409,7 @@
 		</filename></ulink> file (see the <ulink url="smbpasswd.8.html"><command>
 		smbpasswd(8)</command></ulink> program for information on how to set up 
  		and maintain this file), or set the <link
-		linkend="SECURITY">security=[serve|domain]</link> parameter which 
+		linkend="SECURITY">security=[server|domain]</link> parameter which 
 		causes <command>smbd</command> to authenticate against another 
 		server.</para>
 		
@@ -2420,16 +2420,16 @@
 		<varlistentry>
 		<term><anchor id="ENHANCEDBROWSING">enhanced browsing (G)</term>
 		<listitem><para>This option enables a couple of enhancements to 
-		cross-subnet browse propogation that have been added in Samba 
+		cross-subnet browse propagation that have been added in Samba 
 		but which are not standard in Microsoft implementations.  
 		<emphasis>These enhancements are currently only available in
 		the HEAD Samba CVS tree (not Samba 2.2.x).</emphasis></para>
 
-		<para>The first enhancement to browse propogation consists of a regular
+		<para>The first enhancement to browse propagation consists of a regular
 		wildcard query to a Samba WINS server for all Domain Master Browsers,
-		followed by a browse synchronisation with each of the returned
+		followed by a browse synchronization with each of the returned
 		DMBs. The second enhancement consists of a regular randomised browse
-		synchronisation with all currently known DMBs.</para>
+		synchronization with all currently known DMBs.</para>
 
 		<para>You may wish to disable this option if you have a problem with empty
 		workgroups not disappearing from browse lists. Due to the restrictions
@@ -2437,7 +2437,7 @@
 		to stay around forever which can be annoying.</para>
 
 		<para>In general you should leave this option enabled as it makes
-		cross-subnet browse propogation much more reliable.</para>
+		cross-subnet browse propagation much more reliable.</para>
 
 		<para>Default: <command>enhanced browsing = yes</command></para>
 		</listitem>
@@ -2497,7 +2497,7 @@
 		reported by Samba will be updated whenever a file is created or 
 		or deleted in the directory.  NMAKE finds all object files in 
 		the object directory.  The timestamp of the last one built is then 
-		compared to the timestamp of the object dircetory.  If the 
+		compared to the timestamp of the object directory.  If the 
 		directory's timestamp if newer, then all object files
 		will be rebuilt.  Enabling this option 
 		ensures directories always predate their contents and an NMAKE build 
@@ -2576,7 +2576,7 @@
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
 		this mask on access control lists also, they need to set the <link 
 		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
-		mask</parameter></link> to true.</para>
+		mask</parameter></link> to <constant>true</constant>.</para>
 
 		<para>See also the parameter <link linkend="CREATEMASK"><parameter>create 
 		mask</parameter></link> for details on masking mode bits on files.</para>
@@ -2610,7 +2610,7 @@
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
 		this mask on access control lists also, they need to set the <link 
 		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
-		mask</parameter></link> to true.</para>
+		mask</parameter></link> to <constant>true</constant>.</para>
 
 		<para>See also the parameter <link linkend="DIRECTORYMASK"><parameter>
 		directory mask</parameter></link> for details on masking mode bits 
@@ -2792,7 +2792,7 @@
 		caching algorithm will be used to reduce the time taken for getwd() 
 		calls. This can have a significant impact on performance, especially 
 		when the <link linkend="WIDELINKS"><parameter>wide links</parameter>
-		</link>parameter is set to <constant>False</constant>.</para>
+		</link>parameter is set to <constant>false</constant>.</para>
 
 		<para>Default: <command>getwd cache = yes</command></para>
 		</listitem>
@@ -2927,7 +2927,7 @@
 		<varlistentry>
 		<term><anchor id="HOMEDIRMAP">homedir map (G)</term>
 		<listitem><para>If<link linkend="NISHOMEDIR"><parameter>nis homedir
-		</parameter></link> is <constant>True</constant>, and <ulink 
+		</parameter></link> is <constant>true</constant>, and <ulink 
 		url="smbd.8.html"><command>smbd(8)</command></ulink> is also acting 
 		as a Win95/98 <parameter>logon server</parameter> then this parameter 
 		specifies the NIS (or YP) map from which the server for the user's 
@@ -3068,7 +3068,7 @@
 		<parameter>hosts allow</parameter></link> which is about hosts 
 		access to services and is more useful for guest services. <parameter>
 		hosts equiv</parameter> may be useful for NT clients which will 
-		not supply passwords to samba.</para>
+		not supply passwords to Samba.</para>
 
 		<para><emphasis>NOTE :</emphasis> The use of <parameter>hosts equiv
 		</parameter> can be a major security hole. This is because you are 
@@ -3128,7 +3128,7 @@
 		inheritance (the code explicitly prohibits this).</para>
 
 		<para>This can be particularly useful on large systems with 
-		many users, perhaps several thousand,to allow a single [homes] 
+		many users, perhaps several thousand, to allow a single [homes] 
 		share to be used flexibly by each user.</para>
 		
 		<para>See also <link linkend="CREATEMASK"><parameter>create mask
@@ -3283,8 +3283,8 @@
 
 		<varlistentry>
 		<term><anchor id="LANMANAUTH">lanman auth (G)</term>
-		<listitem><para>This parameter determines whether or not smbd will
-		attempt to authentication users using the LANMAN password hash.
+		<listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink> will
+		attempt to authenticate users using the LANMAN password hash.
 		If disabled, only clients which support NT password hashes (e.g. Windows 
 		NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS 
 		network client) will be able to connect to the Samba host.</para>
@@ -3325,7 +3325,7 @@
 		oplocks</parameter></link> are supported then level2 oplocks are 
 		not granted (even if this parameter is set to <constant>yes</constant>). 
 		Note also, the <link linkend="OPLOCKS"><parameter>oplocks</parameter>
-		</link> parameter must be set to "true" on this share in order for 
+		</link> parameter must be set to <constant>true</constant> on this share in order for 
 		this parameter to have any effect.</para>
 
 		<para>See also the <link linkend="OPLOCKS"><parameter>oplocks</parameter>
@@ -3404,15 +3404,15 @@
 		<term><anchor id="LOCALMASTER">local master (G)</term>
 		<listitem><para>This option allows <ulink url="nmbd.8.html"><command>
 		nmbd(8)</command></ulink> to try and become a local master browser 
-		on a subnet. If set to <constant>False</constant> then <command>
+		on a subnet. If set to <constant>false</constant> then <command>
 		nmbd</command> will not attempt to become a local master browser 
 		on a subnet and will also lose in all browsing elections. By
-		default this value is set to true. Setting this value to true doesn't
+		default this value is set to <constant>true</constant>. Setting this value to <constant>true</constant> doesn't
 		mean that Samba will <emphasis>become</emphasis> the local master 
 		browser on a subnet, just that <command>nmbd</command> will <emphasis>
 		participate</emphasis> in elections for local master browser.</para>
 
-		<para>Setting this value to False will cause <command>nmbd</command>
+		<para>Setting this value to <constant>false</constant> will cause <command>nmbd</command>
 		<emphasis>never</emphasis> to become a local master browser.</para>
 
   		<para>Default: <command>local master = yes</command></para>
@@ -3458,7 +3458,7 @@
 
 		<para>This option <emphasis>may</emphasis> be useful for read-only 
 		filesystems which <emphasis>may</emphasis> not need locking (such as 
-		cdrom drives), although setting this parameter of <constant>no</constant> 
+		CDROM drives), although setting this parameter of <constant>no</constant> 
 		is not really recommended even in this case.</para>
 
 		<para>Be careful about disabling locking either globally or in a 
@@ -3578,7 +3578,7 @@
 		
 		<para>The share and the path must be readable by the user for 
 		the preferences and directories to be loaded onto the Windows NT
-		client.  The share must be writeable when the logs in for the first
+		client.  The share must be writeable when the user logs in for the first
 		time, in order that the Windows NT client can create the NTuser.dat
 		and other directories.</para>
 
@@ -3612,7 +3612,7 @@
 		<listitem><para>This parameter specifies the batch file (.bat) or 
 		NT command file (.cmd) to be downloaded and run on a machine when 
 		a user successfully logs in.  The file must contain the DOS 
-		style cr/lf line endings. Using a DOS-style editor to create the 
+		style CR/LF line endings. Using a DOS-style editor to create the 
 		file is recommended.</para>
 		
 		<para>The script must be a relative path to the [netlogon] 
@@ -3623,7 +3623,7 @@
 
 		<para><filename>/usr/local/samba/netlogon/STARTUP.BAT</filename></para>
 
-		<para>The contents of the batch file is entirely your choice.  A 
+		<para>The contents of the batch file are entirely your choice.  A 
 		suggested command would be to add <command>NET TIME \\SERVER /SET 
 		/YES</command>, to force every machine to synchronize clocks with 
 		the same time server.  Another use would be to add <command>NET USE 
@@ -3660,7 +3660,7 @@
 		of implementing this is by using job priorities, where jobs 
 		having a too low priority won't be sent to the printer.</para>
 
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. A <parameter>%j</parameter> is replaced with 
 		the job number (an integer).  On HPUX (see <parameter>printing=hpux
 		</parameter>), if the <parameter>-p%p</parameter> option is added 
@@ -3743,7 +3743,7 @@
 		server reports on the first printer service connected to by the 
 		client. This only happens if the connection number sent is invalid.</para>
 
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the 
 		command.</para>
 
@@ -3774,7 +3774,7 @@
 		also the <link linkend="LPPAUSECOMMAND"><parameter>lppause command
 		</parameter></link> parameter.</para>
 
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. A <parameter>%j</parameter> is replaced with 
 		the job number (an integer).</para>
 		
@@ -3811,7 +3811,7 @@
 		<para>This command should be a program or script which takes 
 		a printer name and job number, and deletes the print job.</para>
 
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. A <parameter>%j</parameter> is replaced with 
 		the job number (an integer).</para>
 
@@ -3835,7 +3835,7 @@
 
 		<varlistentry>
 		<term><anchor id="MACHINEPASSWORDTIMEOUT">machine password timeout (G)</term>
-		<listitem><para>If a Samba server is a member of an Windows 
+		<listitem><para>If a Samba server is a member of a Windows 
 		NT Domain (see the <link linkend="SECURITYEQUALSDOMAIN">security=domain</link>) 
 		parameter) then periodically a running <ulink url="smbd.8.html">
 		smbd(8)</ulink> process will try and change the MACHINE ACCOUNT 
@@ -3881,8 +3881,8 @@
 		executed on behalf of the connected user.</para>
 
 		<para>Scripts executed in this way will be deleted upon 
-		completion assuming that the user has the appripriate level 
-		of priviledge and the ile permissions allow the deletion.</para>
+		completion assuming that the user has the appropriate level 
+		of privilege and the file permissions allow the deletion.</para>
 
 		<para>If the script generates output, output will be sent to 
 		the file specified by the <link linkend="MAGICOUTPUT"><parameter>
@@ -3917,7 +3917,7 @@
 		<varlistentry>
 		<term><anchor id="MANGLEDMAP">mangled map (S)</term>
 		<listitem><para>This is for those who want to directly map UNIX 
-		file names which can not be represented on Windows/DOS.  The mangling 
+		file names which cannot be represented on Windows/DOS.  The mangling 
 		of names is not always what is needed.  In particular you may have 
 		documents with file extensions that differ between DOS and UNIX. 
 		For example, under UNIX it is common to use <filename>.html</filename> 
@@ -3930,7 +3930,7 @@
 		<para><command>mangled map = (*.html *.htm)</command></para>
 
 		<para>One very useful case is to remove the annoying <filename>;1
-		</filename> off the ends of filenames on some CDROMS (only visible 
+		</filename> off the ends of filenames on some CDROMs (only visible 
 		under some UNIXes). To do this use a map of (*;1 *;).</para>
 
 		<para>Default: <emphasis>no mangled map</emphasis></para>
@@ -4012,12 +4012,12 @@
 
 		<para>The larger this value, the more likely it is that mangled 
 		names can be successfully converted to correct long UNIX names. 
-		However, large stack sizes will slow most directory access. Smaller 
+		However, large stack sizes will slow most directory accesses. Smaller 
 		stacks save memory in the server (each stack element costs 256 bytes).
 		</para>
 
 		<para>It is not possible to absolutely guarantee correct long 
-		file names, so be prepared for some surprises!</para>
+		filenames, so be prepared for some surprises!</para>
 
 		<para>Default: <command>mangled stack = 50</command></para>
   		<para>Example: <command>mangled stack = 100</command></para>
@@ -4215,7 +4215,7 @@
 		<varlistentry>
 		<term><anchor id="MAXMUX">max mux (G)</term>
 		<listitem><para>This option controls the maximum number of 
-		outstanding simultaneous SMB operations that samba tells the client 
+		outstanding simultaneous SMB operations that Samba tells the client 
 		it will allow. You should never need to set this parameter.</para>
 
 		<para>Default: <command>max mux = 50</command></para>
@@ -4301,10 +4301,10 @@
 		<listitem><para>This parameter limits the maximum number of 
 		<ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
 		processes concurrently running on a system and is intended
-		as a stop gap to prevent degrading service to clients in the event
+		as a stopgap to prevent degrading service to clients in the event
 		that the server has insufficient resources to handle more than this
 		number of connections.  Remember that under normal operating
-		conditions, each user will have an smbd associated with him or her
+		conditions, each user will have an <ulink url="smbd.8.html">smbd</ulink> associated with him or her
 		to handle connections to all shares from a given host.
 		</para>
 
@@ -4382,7 +4382,7 @@
 		THAT THIS COMMAND RETURN IMMEDIATELY</emphasis>. That's why I 
 		have the '&' on the end. If it doesn't return immediately then 
 		your PCs may freeze when sending messages (they should recover 
-		after 30secs, hopefully).</para>
+		after 30 seconds, hopefully).</para>
 
 		<para>All messages are delivered as the global guest user. 
 		The command takes the standard substitutions, although <parameter>
@@ -4817,7 +4817,7 @@
 		improve the efficiency of the granting of oplocks under multiple 
 		client contention for the same file.</para>
 		
-		<para>In brief it specifies a number, which causes smbd not to 
+		<para>In brief it specifies a number, which causes <ulink url="smbd.8.html">smbd</ulink> not to 
 		grant an oplock even when requested if the approximate number of 
 		clients contending for an oplock on the same file goes over this 
 		limit. This causes <command>smbd</command> to behave in a similar 
@@ -4836,7 +4836,7 @@
 
 		<varlistentry>
 		<term><anchor id="OPLOCKS">oplocks (S)</term>
-		<listitem><para>This boolean option tells smbd whether to 
+		<listitem><para>This boolean option tells <command>smbd</command> whether to 
 		issue oplocks (opportunistic locks) to file open requests on this 
 		share. The oplock code can dramatically (approx. 30% or more) improve 
 	 	the speed of access to files on Samba servers. It allows the clients 
@@ -4897,7 +4897,7 @@
 		name&gt;.&lt;device name&gt;</para>
 		
 		<para>For example, a valid entry using the HP LaserJet 5
-		printer driver woudl appear as <command>HP LaserJet 5L = LASERJET.HP 
+		printer driver would appear as <command>HP LaserJet 5L = LASERJET.HP 
 		LaserJet 5L</command>.</para>
 		
 		<para>The need for the file is due to the printer driver namespace 
@@ -4919,7 +4919,7 @@
 		flag for Samba.  If enabled, then PAM will be used for password
 		changes when requested by an SMB client, and  the <link 
 		linkend="PASSWDCHAT"><parameter>passwd chat</parameter></link> must be
-		be changed to work with the pam prompts.
+		be changed to work with the PAM prompts.
 		</para>
 		
 		<para>Default: <command>pam password change = no</command></para>
@@ -4947,7 +4947,7 @@
 		<listitem><para>This string controls the <emphasis>"chat"</emphasis> 
 		conversation that takes places between <ulink 
 		url="smbd.8.html">smbd</ulink> and the local password changing
-		program to change the users password. The string describes a 
+		program to change the user's password. The string describes a 
 		sequence of response-receive pairs that <ulink url="smbd.8.html">
 		smbd(8)</ulink> uses to determine what to send to the 
 		<link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter>
@@ -4972,23 +4972,23 @@
 		in them into a single string.</para>
 
 		<para>If the send string in any part of the chat sequence 
-		is a fullstop ".",  then no string is sent. Similarly, 
-		if the expect string is a fullstop then no string is expected.</para>
+		is a full stop ".",  then no string is sent. Similarly, 
+		if the expect string is a full stop then no string is expected.</para>
 
 		<para>Note that if the <link linkend="UNIXPASSWORDSYNC"><parameter>unix 
-		password sync</parameter></link> parameter is set to true, then this 
+		password sync</parameter></link> parameter is set to <constant>true</constant>, then this 
 		sequence is called <emphasis>AS ROOT</emphasis> when the SMB password 
 		in the smbpasswd file is being changed, without access to the old 
 		password cleartext. In this case the old password cleartext is set 
 		to "" (the empty string).</para>
 
 		<para>Also, if the <link linkend="PAMPASSWORDCHANGE"><parameter>pam
-		password change</parameter></link> parameter is set to true, then the
+		password change</parameter></link> parameter is set to <constant>true</constant>, then the
 		chat sequence should consist of three elements. The first element should
-		match the pam prompt for the old password, the second element should match
-		the pam prompt for the first request for the new password, and the final
-		element should match the pam prompt for the second request for the new password.
-		These matches are done case insentively. Under most conditions this change
+		match the PAM prompt for the old password, the second element should match
+		the PAM prompt for the first request for the new password, and the final
+		element should match the PAM prompt for the second request for the new password.
+		These matches are done case insensitively. Under most conditions this change
 		is done as root so the prompt for the old password will never be matched.
 		</para>
 
@@ -5046,7 +5046,7 @@
 		it.</para>
 
 		<para><emphasis>Note</emphasis> that if the <parameter>unix 
-		password sync</parameter> parameter is set to <constant>True
+		password sync</parameter> parameter is set to <constant>true
 		</constant> then this program is called <emphasis>AS ROOT</emphasis> 
 		before the SMB password in the <ulink url="smbpasswd.5.html">smbpasswd(5)
 		</ulink> file is changed. If this UNIX password change fails, then 
@@ -5057,7 +5057,7 @@
 		is set this parameter <emphasis>MUST USE ABSOLUTE PATHS</emphasis> 
 		for <emphasis>ALL</emphasis> programs called, and must be examined 
 		for security implications. Note that by default <parameter>unix 
-		password sync</parameter> is set to <constant>False</constant>.</para>
+		password sync</parameter> is set to <constant>false</constant>.</para>
 
 		<para>See also <link linkend="UNIXPASSWORDSYNC"><parameter>unix 
 		password sync</parameter></link>.</para>
@@ -5186,7 +5186,7 @@
 			password server then you will have to ensure that your users 
 			are able to login from the Samba server, as when in <command>
 			security=server</command>  mode the network logon will appear to 
-			come from there rather than from the users workstation.</para></listitem>
+			come from there rather than from the user's workstation.</para></listitem>
 		</itemizedlist>
 
 		<para>See also the <link linkend="SECURITY"><parameter>security
@@ -5257,7 +5257,7 @@
 		substitutions. The command may be run as the root on some 
 		systems.</para>
 
-		<para>An interesting example may be do unmount server 
+		<para>An interesting example may be to unmount server 
 		resources:</para>
 
 		<para><command>postexec = /etc/umount /cdrom</command></para>
@@ -5278,7 +5278,7 @@
 		<varlistentry>
 		<term><anchor id="POSTSCRIPT">postscript (S)</term>
 		<listitem><para>This parameter forces a printer to interpret 
-		the print files as postscript. This is done by adding a <constant>%!
+		the print files as PostScript. This is done by adding a <constant>%!
 		</constant> to the start of print output.</para>
 
 		<para>This is most useful when you have lots of PCs that persist 
@@ -5334,7 +5334,7 @@
 		url="nmbd.8.html">nmbd(8)</ulink> is a preferred master browser 
 		for its workgroup.</para>
 
-		<para>If this is set to true, on startup, <command>nmbd</command> 
+		<para>If this is set to <constant>true</constant>, on startup, <command>nmbd</command> 
 		will force an election, and it will have a slight advantage in 
 		winning the election.  It is recommended that this parameter is 
 		used in conjunction with <command><link linkend="DOMAINMASTER"><parameter>
@@ -5571,7 +5571,7 @@
 		
 		<varlistentry>
 		<term><anchor id="PRINTERDRIVER">printer driver (S)</term>
-		<listitem><para><emphasis>Note :</emphasis>This is a depreciated 
+		<listitem><para><emphasis>Note :</emphasis>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs
@@ -5604,7 +5604,7 @@
 
 		<varlistentry>
 		<term><anchor id="PRINTERDRIVERFILE">printer driver file (G)</term>
-		<listitem><para><emphasis>Note :</emphasis>This is a depreciated 
+		<listitem><para><emphasis>Note :</emphasis>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs
@@ -5640,7 +5640,7 @@
 
 		<varlistentry>
 		<term><anchor id="PRINTERDRIVERLOCATION">printer driver location (S)</term>
-		<listitem><para><emphasis>Note :</emphasis>This is a depreciated 
+		<listitem><para><emphasis>Note :</emphasis>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs
@@ -5706,7 +5706,7 @@
 		<parameter>lpq command</parameter>, <parameter>lppause command
 		</parameter>, <parameter>lpresume command</parameter>, and 
 		<parameter>lprm command</parameter> if specified in the 
-		[global]f> section.</para>
+		[global] section.</para>
 
 		<para>Currently eight printing styles are supported. They are
 		<constant>BSD</constant>, <constant>AIX</constant>, 
@@ -5750,17 +5750,17 @@
 		<varlistentry>
 		<term><anchor id="QUEUEPAUSECOMMAND">queuepause command (S)</term>
 		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to pause the printerqueue.</para>
+		executed on the server host in order to pause the printer queue.</para>
 
 		<para>This command should be a program or script which takes 
-		a printer name as its only parameter and stops the printerqueue, 
+		a printer name as its only parameter and stops the printer queue, 
 		such that no longer jobs are submitted to the printer.</para>
 
 		<para>This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printer's window under Windows 95 
+		but can be issued from the Printers window under Windows 95 
 		and NT.</para>
 		
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the command.
 		</para>
 
@@ -5779,20 +5779,20 @@
 		<varlistentry>
 		<term><anchor id="QUEUERESUMECOMMAND">queueresume command (S)</term>
 		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to resume the printerqueue. It 
+		executed on the server host in order to resume the printer queue. It 
  		is the command to undo the behavior that is caused by the 
 		previous parameter (<link linkend="QUEUEPAUSECOMMAND"><parameter>
 		queuepause command</parameter></link>).</para>
  
 		<para>This command should be a program or script which takes 
-		a printer name as its only parameter and resumes the printerqueue, 
+		a printer name as its only parameter and resumes the printer queue, 
 		such that queued jobs are resubmitted to the printer.</para>
 
 		<para>This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printer's window under Windows 95 
+		but can be issued from the Printers window under Windows 95 
 		and NT.</para>
 
-		<para>If a <parameter>%p</parameter> is given then the printername 
+		<para>If a <parameter>%p</parameter> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the 
 		command.</para>
 
@@ -5924,7 +5924,7 @@
 		<para><command>remote announce = 192.168.2.255/SERVERS 
 		192.168.4.255/STAFF</command></para>
 
-		<para>the above line would cause nmbd to announce itself 
+		<para>the above line would cause <command>nmbd</command> to announce itself 
 		to the two given IP addresses using the given workgroup names. 
 		If you leave out the workgroup name then the one given in 
 		the <link linkend="WORKGROUP"><parameter>workgroup</parameter></link> 
@@ -5948,10 +5948,10 @@
 		<term><anchor id="REMOTEBROWSESYNC">remote browse sync (G)</term>
 		<listitem><para>This option allows you to setup <ulink 
 		url="nmbd.8.html">nmbd(8)</ulink> to periodically request 
-		synchronization of browse lists with the master browser of a samba 
+		synchronization of browse lists with the master browser of a Samba 
 		server that is on a remote segment. This option will allow you to 
 		gain browse lists for multiple workgroups across routed networks. This 
-		is done in a manner that does not work with any non-samba servers.</para>
+		is done in a manner that does not work with any non-Samba servers.</para>
 
 		<para>This is useful if you want your Samba server and all local 
 		clients to appear in a remote workgroup for which the normal browse 
@@ -5972,7 +5972,7 @@
 		of known browse masters if your network config is that stable. If 
 		a machine IP address is given Samba makes NO attempt to validate 
 		that the remote machine is available, is listening, nor that it 
-		is in fact the browse master on it's segment.</para>
+		is in fact the browse master on its segment.</para>
 
 		<para>Default: <command>remote browse sync = &lt;empty string&gt;
 		</command></para>
@@ -5983,12 +5983,12 @@
 
 		<varlistentry>
 		<term><anchor id="RESTRICTACLWITHMASK">restrict acl with mask (S)</term>
-		<listitem><para>This is a boolean parameter.  If set to false (default), then 
-		Creation of files with access control lists (ACLS) and modification of ACLs
+		<listitem><para>This is a boolean parameter.  If set to <constant>false</constant> (default), then 
+		creation of files with access control lists (ACLS) and modification of ACLs
 		using the Windows NT/2000 ACL editor will be applied directly to the file
 		or directory.</para>
 
-		<para>If set to True, then all requests to set an ACL on a file will have the
+		<para>If set to <constant>true</constant>, then all requests to set an ACL on a file will have the
 		parameters <link linkend="CREATEMASK"><parameter>create mask</parameter></link>,
 		<link linkend="FORCECREATEMODE"><parameter>force create mode</parameter></link>
 		applied before setting the ACL, and all requests to set an ACL on a directory will
@@ -6012,10 +6012,10 @@
 
 		<varlistentry>
 		<term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term>
-		<listitem><para>This is a boolean parameter.  If it is true, then 
+		<listitem><para>This is a boolean parameter.  If it is <constant>true</constant>, then 
 		anonymous access to the server will be restricted, namely in the 
 		case where the server is expecting the client to send a username, 
-		but it doesn't.  Setting it to true will force these anonymous 
+		but it doesn't.  Setting it to <constant>true</constant> will force these anonymous 
  		connections to be denied, and the client will be required to always 
 		supply a username and password when connecting. Use of this parameter 
 		is only recommended for homogeneous NT client environments.</para>
@@ -6025,10 +6025,10 @@
 		likes to use anonymous connections when refreshing the share list, 
 		and this is a way to work around that.</para>
 
-		<para>When restrict anonymous is true, all anonymous connections 
+		<para>When restrict anonymous is <constant>true</constant>, all anonymous connections 
 		are denied no matter what they are for.  This can effect the ability 
-		of a machine to access the samba Primary Domain Controller to revalidate 
-		it's machine account after someone else has logged on the client 
+		of a machine to access the Samba Primary Domain Controller to revalidate 
+		its machine account after someone else has logged on the client 
 		interactively.  The NT client will display a message saying that 
 		the machine's account in  the domain doesn't exist or the password is 
 		bad.  The best way to deal  with this is to reboot NT client machines 
@@ -6061,7 +6061,7 @@
 		<varlistentry>
 		<term><anchor id="ROOTDIRECTORY">root directory (G)</term>
 		<listitem><para>The server will <command>chroot()</command> (i.e. 
-		Change it's root directory) to this directory on startup. This is 
+		Change its root directory) to this directory on startup. This is 
 		not strictly necessary for secure operation. Even without it the 
 		server will deny access to files not in one of the service entries. 
 		It may also check for, and deny access to, soft links to other 
@@ -6095,7 +6095,7 @@
 		<listitem><para>This is the same as the <parameter>postexec</parameter>
 		parameter except that the command is run as root. This 
 		is useful for unmounting filesystems 
-		(such as cdroms) after a connection is closed.</para>
+		(such as CDROMs) after a connection is closed.</para>
 
 		<para>See also <link linkend="POSTEXEC"><parameter>
 		postexec</parameter></link>.</para>
@@ -6109,8 +6109,8 @@
 		<term><anchor id="ROOTPREEXEC">root preexec (S)</term>
 		<listitem><para>This is the same as the <parameter>preexec</parameter>
 		parameter except that the command is run as root. This 
-		is useful for mounting filesystems (such as cdroms) after a 
-		connection is closed.</para>
+		is useful for mounting filesystems (such as CDROMs) when a 
+		connection is opened.</para>
 
 		<para>See also <link linkend="PREEXEC"><parameter>
 		preexec</parameter></link> and <link linkend="PREEXECCLOSE">
@@ -6193,7 +6193,7 @@
 		<para><anchor id="SECURITYEQUALSSHARE"><emphasis>SECURITY = SHARE
 		</emphasis></para> 
 		
-		<para>When clients connect to a share level security server then 
+		<para>When clients connect to a share level security server they 
 		need not log onto the server with a valid username and password before 
 		attempting to connect to a shared resource (although modern clients 
 		such as Windows 95/98 and Windows NT will send a logon request with 
@@ -6299,7 +6299,7 @@
 		<filename>ENCRYPTION.txt</filename> for details on how to set this 
 		up.</para>
 
-		<para><emphasis>Note</emphasis> that from the clients point of 
+		<para><emphasis>Note</emphasis> that from the client's point of 
 		view <command>security = server</command> is the same as <command>
 		security = user</command>.  It only affects how the server deals 
 		with the authentication, it does not in any way affect what the 
@@ -6338,7 +6338,7 @@
 		exist as well as the account on the Domain Controller to allow 
 		Samba to have a valid UNIX account to map file access to.</para>
 
-		<para><emphasis>Note</emphasis> that from the clients point 
+		<para><emphasis>Note</emphasis> that from the client's point 
 		of view <command>security = domain</command> is the same as <command>security = user
 		</command>. It only affects how the server deals with the authentication, 
 		it does not in any way affect what the client sees.</para>
@@ -6396,7 +6396,7 @@
 		Samba server through other means can easily bypass this 
 		restriction, so it is primarily useful for standalone 
 		"appliance" systems.  Administrators of most normal systems will 
-		probably want to leave it set to 0777.</para>
+		probably want to leave it set to <constant>0777</constant>.</para>
 		
 		<para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE">
 		<parameter>force directory security mode</parameter></link>, 
@@ -6414,7 +6414,7 @@
 		<term><anchor id="SERVERSTRING">server string (G)</term>
 		<listitem><para>This controls what string will show up in the 
 		printer comment box in print manager and next to the IPC connection 
-		in <command>net view"</command>. It can be any string that you wish 
+		in <command>net view</command>. It can be any string that you wish 
 		to show to your users.</para>
 		
 		<para>It also sets what will appear in browse lists next 
@@ -6481,7 +6481,6 @@
 
 
 
-
 		<varlistentry>
 		<term><anchor id="SHORTPRESERVECASE">short preserve case (S)</term>
 		<listitem><para>This boolean parameter controls if new files 
@@ -6516,7 +6515,7 @@
 		Administrator privileges.  If the user does not have administrative
 		access on the print server (i.e is not root or a member of the 
 		<parameter>printer admin</parameter> group), the OpenPrinterEx() 
-		call fails and the clients another open call with a request for 
+		call fails and the client makes another open call with a request for 
 		a lower privilege level.  This should succeed, however the APW 
 		icon will not be displayed.</para>
 		
@@ -6562,7 +6561,7 @@
 		support multiple virtual interfaces on the one server, each 
 		with a different configuration.</para>
 		
-		<para>By default samba will accept connections on any 
+		<para>By default Samba will accept connections on any 
 		address.</para>
 
 		<para>Example: <command>socket address = 192.168.2.20</command>
@@ -6683,8 +6682,8 @@
 		current binary version of Samba.</para>
 
 		<para>This variable enables or disables the entire SSL mode. If 
-		it is set to <constant>no</constant>, the SSL enabled samba behaves 
-		exactly like the non-SSL samba. If set to <constant>yes</constant>, 
+		it is set to <constant>no</constant>, the SSL-enabled Samba behaves 
+		exactly like the non-SSL Samba. If set to <constant>yes</constant>, 
 		it depends on the variables <link linkend="SSLHOSTS"><parameter>
 		ssl hosts</parameter></link> and <link linkend="SSLHOSTSRESIGN">
 		<parameter>ssl hosts resign</parameter></link> whether an SSL 
@@ -6709,7 +6708,7 @@
 
 		<para>This variable defines where to look up the Certification
 		Authorities. The given directory should contain one file for 
-		each CA that samba will trust.  The file name must be the hash 
+		each CA that Samba will trust.  The file name must be the hash 
 		value over the "Distinguished Name" of the CA. How this directory 
 		is set up is explained later in this document. All files within the 
 		directory that don't fit into this naming scheme are ignored. You 
@@ -6851,14 +6850,14 @@
 		this code is <emphasis>NOT</emphasis> enabled by default in any 
 		current binary version of Samba.</para>
 
-		<para>These two variables define whether samba will go 
-		into SSL mode or not. If none of them is defined, samba will 
+		<para>These two variables define whether Samba will go 
+		into SSL mode or not. If none of them is defined, Samba will 
 		allow only SSL connections. If the <link linkend="SSLHOSTS">
 		<parameter>ssl hosts</parameter></link> variable lists
 		hosts (by IP-address, IP-address range, net group or name), 
 		only these hosts will be forced into SSL mode. If the <parameter>
 		ssl hosts resign</parameter> variable lists hosts, only these 
-		hosts will NOT be forced into SSL mode. The syntax for these two 
+		hosts will <emphasis>NOT</emphasis> be forced into SSL mode. The syntax for these two 
 		variables is the same as for the <link linkend="HOSTSALLOW"><parameter>
 		hosts allow</parameter></link> and <link linkend="HOSTSDENY">
 		<parameter>hosts deny</parameter></link> pair of variables, only 
@@ -7050,7 +7049,7 @@
 		<para>When strict locking is <constant>no</constant> the server does file 
 		lock checks only when the client explicitly asks for them.</para>
 
-		<para>Well behaved clients always ask for lock checks when it 
+		<para>Well-behaved clients always ask for lock checks when it 
 		is important, so in the vast majority of cases <command>strict 
 		locking = no</command> is preferable.</para>
 
@@ -7069,7 +7068,7 @@
 		all outstanding data in kernel disk buffers has been safely stored 
 		onto stable storage. This is very slow and should only be done 
 		rarely. Setting this parameter to <constant>no</constant> (the 
-		default) means that smbd ignores the Windows applications requests for
+		default) means that <ulink url="smbd.8.html">smbd</ulink> ignores the Windows applications requests for
 		a sync call. There is only a possibility of losing data if the
 		operating system itself that Samba is running on crashes, so there is
 		little danger in this default setting. In addition, this fixes many
@@ -7100,10 +7099,10 @@
 		<term><anchor id="SYNCALWAYS">sync always (S)</term>
 		<listitem><para>This is a boolean parameter that controls 
 		whether writes will always be written to stable storage before 
-		the write call returns. If this is false then the server will be 
+		the write call returns. If this is <constant>false</constant> then the server will be 
 		guided by the client's request in each write call (clients can 
 		set a bit indicating that a particular write should be synchronous). 
-		If this is true then every write will be followed by a <command>fsync()
+		If this is <constant>true</constant> then every write will be followed by a <command>fsync()
 		</command> call to ensure the data is written to disk. Note that 
 		the <parameter>strict sync</parameter> parameter must be set to
 		<constant>yes</constant> in order for this parameter to have 
@@ -7225,7 +7224,7 @@
 		<listitem><para>This parameter accepts an integer value which defines
 		a limit on the maximum number of print jobs that will be accepted 
 		system wide at any given time.  If a print job is submitted
-		by a client which will exceed this number, then smbd will return an 
+		by a client which will exceed this number, then <ulink url="smbd.8.html">smbd</ulink> will return an 
 		error indicating that no space is available on the server.  The 
 		default value of 0 means that no such limit exists.  This parameter
 		can be used to prevent a server from exceeding its capacity and is
@@ -7246,10 +7245,10 @@
 		<listitem><para>This boolean parameter controls whether Samba 
 		attempts to synchronize the UNIX password with the SMB password 
 		when the encrypted SMB password in the smbpasswd file is changed. 
-		If this is set to true the program specified in the <parameter>passwd
+		If this is set to <constant>true</constant> the program specified in the <parameter>passwd
 		program</parameter>parameter is called <emphasis>AS ROOT</emphasis> - 
 		to allow the new UNIX password to be set without access to the 
-		old UNIX password (as the SMB password has change code has no 
+		old UNIX password (as the SMB password change code has no 
 		access to the old password cleartext, only the new).</para>
 
 		<para>See also <link linkend="PASSWDPROGRAM"><parameter>passwd 
@@ -7296,8 +7295,8 @@
 
 		<varlistentry>
 		<term><anchor id="USERHOSTS">use rhosts (G)</term>
-		<listitem><para>If this global parameter is a true, it specifies 
-		that the UNIX users <filename>.rhosts</filename> file in their home directory 
+		<listitem><para>If this global parameter is <constant>true</constant>, it specifies 
+		that the UNIX user's <filename>.rhosts</filename> file in their home directory 
 		will be read to find the names of hosts and users who will be allowed 
 		access without specifying a password.</para>
 
@@ -7364,7 +7363,7 @@
 		</parameter></link> parameter.</para>
 
 		<para>If any of the usernames begin with a '@' then the name 
-		will be looked up first in the yp netgroups list (if Samba 
+		will be looked up first in the NIS netgroups list (if Samba 
 		is compiled with netgroup support), followed by a lookup in 
 		the UNIX groups database and will expand to a list of all users 
 		in the group of that name.</para>
@@ -7374,7 +7373,7 @@
 		expand to a list of all users in the group of that name.</para>
 
 		<para>If any of the usernames begin with a '&'then the name 
-		will be looked up only in the yp netgroups database (if Samba 
+		will be looked up only in the NIS netgroups database (if Samba 
 		is compiled with netgroup support) and will expand to a list 
 		of all users in the netgroup group of that name.</para>
 
@@ -7516,7 +7515,7 @@
 		<term><anchor id="UTMP">utmp (S)</term>
 		<listitem><para>This boolean parameter is only available if 
 		Samba has been configured and compiled  with the option <command>
-		--with-utmp</command>. If set to True then Samba will attempt
+		--with-utmp</command>. If set to <constant>true</constant> then Samba will attempt
 		to add utmp or utmpx records (depending on the UNIX system) whenever a
 		connection is made to a Samba server. Sites may use this to record the
 		user connecting to a Samba share.</para>
@@ -7730,7 +7729,7 @@
 		<varlistentry>
 		<term><anchor id="VFSOPTIONS">vfs options (S)</term>
 		<listitem><para>This parameter allows parameters to be passed 
-		to the vfs layer at initialisation time.  The Samba VFS layer 
+		to the vfs layer at initialization time.  The Samba VFS layer 
 		is new to Samba 2.2 and must be enabled at compile time 
 		with --with-vfs.  See also <link linkend="VFSOBJECT"><parameter>
 		vfs object</parameter></link>.</para>
@@ -7797,7 +7796,7 @@
 		<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 
-		existing local or nis groups within it as strange conflicts can 
+		existing local or NIS groups within it as strange conflicts can 
 		occur otherwise.</para>
 
 		<para>Default: <command>winbind gid = &lt;empty string&gt;
@@ -7836,7 +7835,7 @@
 		<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 
-		existing local or nis users within it as strange conflicts can 
+		existing local or NIS users within it as strange conflicts can 
 		occur otherwise.</para>
 
 		<para>Default: <command>winbind uid = &lt;empty string&gt;
@@ -7872,12 +7871,12 @@
 			name has not previously been added, in that case it should be treated 
 			as an add.</para></listitem>
 
-			<listitem><para>The second argument is the netbios name. If the 
+			<listitem><para>The second argument is the NetBIOS name. If the 
 			name is not a legal name then the wins hook is not called. 
 			Legal names contain only  letters, digits, hyphens, underscores 
 			and periods.</para></listitem>
 
-			<listitem><para>The third argument is the netbios name 
+			<listitem><para>The third argument is the NetBIOS name 
 			type as a 2 digit hexadecimal number. </para></listitem>
 
 			<listitem><para>The fourth argument is the TTL (time to live) 
@@ -7940,9 +7939,9 @@
 		<term><anchor id="WINSSUPPORT">wins support (G)</term>
 		<listitem><para>This boolean controls if the <ulink url="nmbd.8.html"> 		
 		nmbd(8)</ulink> process in Samba will act as a WINS server. You should 
-		not set this to true unless you have a multi-subnetted network and 
+		not set this to <constant>true</constant> unless you have a multi-subnetted network and 
 		you wish a particular <command>nmbd</command> to be your WINS server. 
-		Note that you should <emphasis>NEVER</emphasis> set this to true 
+		Note that you should <emphasis>NEVER</emphasis> set this to <constant>true</constant>
 		on more than one machine in your network.</para>
 
 		<para>Default: <command>wins support = no</command></para>
@@ -7989,7 +7988,7 @@
 		within it.</para>
 
 		<para>This cache allows Samba to batch client writes into a more 
-		efficient write size for RAID disks (ie. writes may be tuned to 
+		efficient write size for RAID disks (i.e. writes may be tuned to 
 		be the RAID stripe size) and can improve performance on systems 
 		where the disk subsystem is a bottleneck but there is free 
 		memory for userspace programs.</para>
@@ -8047,7 +8046,7 @@
 		<varlistentry>
 		<term><anchor id="WRITERAW">write raw (G)</term>
 		<listitem><para>This parameter controls whether or not the server 
-		will support raw writes SMB's when transferring data from clients. 
+		will support raw write SMB's when transferring data from clients. 
 		You should never need to change this parameter.</para>
 
 		<para>Default: <command>write raw = yes</command></para>
diff --git a/docs/docbook/manpages/smbcacls.1.sgml b/docs/docbook/manpages/smbcacls.1.sgml
index 3aa99202543..69aa9674928 100644
--- a/docs/docbook/manpages/smbcacls.1.sgml
+++ b/docs/docbook/manpages/smbcacls.1.sgml
@@ -35,7 +35,7 @@
 	<para>This tool is part of the <ulink url="samba.7.html">
 	Samba</ulink> suite.</para>
 	
-	<para>The smbcacls program manipulates NT Access Control Lists 
+	<para>The <command>smbcacls</command> program manipulates NT Access Control Lists 
 	(ACLs) on SMB file shares. </para>
 </refsect1>
 
@@ -43,7 +43,7 @@
 <refsect1>
 	<title>OPTIONS</title>
 
-	<para>The following options are available to the smbcacls program.  
+	<para>The following options are available to the <command>smbcacls</command> program.  
 	The format of ACLs is described in the section ACL FORMAT </para>
 
 
@@ -68,7 +68,7 @@
 		
 		<varlistentry>
 		<term>-D acls</term>
-		<listitem><para>Delete any ACLs specfied on the command line.  
+		<listitem><para>Delete any ACLs specified on the command line.  
 		An error will be printed for each ACL specified that was not 
 		already present in the ACL list. </para></listitem>
 		</varlistentry>
@@ -223,8 +223,8 @@ ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
 	depending on the success or otherwise of the operations performed.  
 	The exit status may be one of the following values. </para>
 
-	<para>If the operation succeded, smbcacls returns and exit 
-	status of 0.  If smbcacls couldn't connect to the specified server, 
+	<para>If the operation succeeded, smbcacls returns and exit 
+	status of 0.  If <command>smbcacls</command> couldn't connect to the specified server, 
 	or there was an error getting or setting the ACLs, an exit status 
 	of 1 is returned.  If there was an error parsing any command line 
 	arguments, an exit status of 2 is returned. </para>
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index f82d59d29c1..54c42fcaa1e 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -81,8 +81,8 @@
 		</para>
 
 		<para>The server name is looked up according to either 
-		the <parameter>-R</parameter> parameter to smbclient or 
-		using the name resolve order parameter in the smb.conf file, 
+		the <parameter>-R</parameter> parameter to <command>smbclient</command> or 
+		using the name resolve order parameter in the <filename>smb.conf</filename> file, 
 		allowing an administrator to change the order and methods 
 		by which server names are looked up. </para></listitem>
 		</varlistentry>
@@ -131,7 +131,7 @@
 		<term>-R &lt;name resolve order&gt;</term> 
 		<listitem><para>This option is used by the programs in the Samba 
 		suite to determine what naming services and in what order to resolve 
-		host names to IP addresses. The option takes a space separated 
+		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 
@@ -147,7 +147,7 @@
 			<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 depended for instance on IRIX or Solaris this 
+			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 
@@ -172,7 +172,7 @@
 
 		<para>The default order is lmhosts, host, wins, bcast and without 
 		this parameter or any entry in the <parameter>name resolve order
-		</parameter> parameter of the smb.conf file the name resolution
+		</parameter> parameter of the <filename>smb.conf</filename> file the name resolution
 		methods will be attempted in this order. </para></listitem>
 		</varlistentry>
 		
@@ -216,7 +216,7 @@
 		<term>-i scope</term>
 		<listitem><para>This specifies a NetBIOS scope that smbclient will 
 		use to communicate with when generating NetBIOS names. For details 
-		on the use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt.
+		on the use of NetBIOS scopes, see <filename>rfc1001.txt</filename> and <filename>rfc1002.txt</filename>.
 		NetBIOS scopes are <emphasis>very</emphasis> rarely used, only set 
 		this parameter if you are the system administrator in charge of all 
 		the NetBIOS systems you communicate with. </para></listitem>
@@ -247,7 +247,7 @@
 		
 		<varlistentry>
 		<term>-d debuglevel</term>
-		<listitem><para>debuglevel is an integer from 0 to 10, or 
+		<listitem><para><replaceable>debuglevel</replaceable> is an integer from 0 to 10, or 
 		the letter 'A'. </para>
 		
 		<para>The default value if this parameter is not specified 
@@ -264,13 +264,13 @@
 		data, and should only be used when investigating a problem.
 		Levels above 3 are designed for use only by developers and 
 		generate HUGE amounts of log data, most of which is extremely 
-		cryptic. If debuglevel is set to the letter 'A', then <emphasis>all
+		cryptic. If <replaceable>debuglevel</replaceable> is set to the letter 'A', then <emphasis>all
 		</emphasis>  debug messages will be printed. This setting
 		is for developers only (and people who <emphasis>really</emphasis> want 
 		to know how the code works internally). </para>
 
 		<para>Note that specifying this parameter here will override
-		the log level parameter in the <command>smb.conf (5)</command> 
+		the log level parameter in the <filename>smb.conf (5)</filename> 
 		file. </para></listitem>
 		</varlistentry>
 		
@@ -286,7 +286,7 @@
 		
 		<varlistentry>
 		<term>-l logfilename</term>
-		<listitem><para>If specified, logfilename specifies a base filename 
+		<listitem><para>If specified, <replaceable>logfilename</replaceable> specifies a base filename 
 		into which operational data from the running client will be 
 		logged. </para>
 
@@ -311,7 +311,7 @@
 		
 		<varlistentry>
 		<term>-I IP-address</term>
-		<listitem><para>IP address is the address of the server to connect to. 
+		<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. 
 		It should be specified in standard "a.b.c.d" notation. </para>
 
 		<para>Normally the client would attempt to locate a named 
@@ -344,28 +344,28 @@
 		<term>-U username[%pass]</term>
 		<listitem><para>Sets the SMB username or username and password. 
 		If %pass is not specified, The user will be prompted. The client 
-		will first check the USER environment variable, then the 
-		<parameter>$LOGNAME</parameter> variable and if either exist, the 
+		will first check the <envar>USER</envar> environment variable, then the 
+		<envar>LOGNAME</envar> variable and if either exists, the 
 		string is uppercased. Anything in these variables following a '%' 
-		sign will be treated as the password. If these environmental 
+		sign will be treated as the password. If these environment 
 		variables are not found, the username <constant>GUEST</constant> 
 		is used. </para>
 
-		<para>If the password is not included in these environment 
-		variables (using the %pass syntax), rpcclient will look for 
-		a <parameter>$PASSWD</parameter> environment variable from which 
+		<para>If the password is not included in these environment
+		variables (using the %pass syntax), <command>rpcclient</command> will look for 
+		a <envar>PASSWD</envar> environment variable from which 
 		to read the password. </para>
 		
 		<para>A third option is to use a credentials file which 
 		contains the plaintext of the username and password.  This 
 		option is mainly provided for scripts where the admin doesn't 
-		desire to pass the credentials on the command line or via environment 
+		wish to pass the credentials on the command line or via environment 
 		variables. If this method is used, make certain that the permissions 
 		on the file restrict access from unwanted users.  See the 
 		<parameter>-A</parameter> for more details. </para>
 		
 		<para>Be cautious about including passwords in scripts or in 
-		the <parameter>$PASSWD</parameter> environment variable. Also, on 
+		the <envar>PASSWD</envar> environment variable. Also, on 
 		many systems the command line of a running process may be seen 
 		via the <command>ps</command> command to be safe always allow 
 		<command>rpcclient</command> to prompt for a password and type 
@@ -397,14 +397,14 @@ password = &lt;value&gt;
 		are available on a server. You use it as <command>smbclient -L 
 		host</command> and a list should appear.  The <parameter>-I
 		</parameter> option may be useful if your NetBIOS names don't 
-		match your tcp/ip dns host names or if you are trying to reach a 
+		match your TCP/IP DNS host names or if you are trying to reach a 
 		host on another network. </para></listitem>
 		</varlistentry>
 		
 		
 		<varlistentry>
 		<term>-t terminal code</term>
-		<listitem><para>This option tells smbclient how to interpret 
+		<listitem><para>This option tells <command>smbclient</command> how to interpret 
 		filenames coming from the remote server. Usually Asian language 
 		multibyte UNIX implementations use different character sets than 
 		SMB/CIFS servers (<emphasis>EUC</emphasis> instead of <emphasis>
@@ -488,7 +488,7 @@ password = &lt;value&gt;
 			</para></listitem>
 			
 			<listitem><para><parameter>r</parameter> - Regular expression include
-			or exclude.  Uses regular  regular expression matching for 
+			or exclude.  Uses regular  expression matching for 
 			excluding or excluding files if  compiled with HAVE_REGEX_H. 
 			However this mode can be very slow. If  not compiled with 
 			HAVE_REGEX_H, does a limited wildcard match on '*' and  '?'. 
@@ -511,7 +511,7 @@ password = &lt;value&gt;
 		<para><command>smbclient</command>'s tar option now supports long 
 		file names both on backup and restore. However, the full path 
 		name of the file must be less than 1024 bytes.  Also, when
-		a tar archive is created, smbclient's tar option places all 
+		a tar archive is created, <command>smbclient</command>'s tar option places all 
 		files in the archive with relative names, not absolute names. 
 		</para>
 			
@@ -523,10 +523,10 @@ password = &lt;value&gt;
 			
 		<para><emphasis>Examples</emphasis></para>
 		
-		<para>Restore from tar file backup.tar into myshare on mypc 
+		<para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc 
 		(no password on share). </para>
 		
-		<para><command>smbclient //mypc/myshare "" -N -Tx backup.tar
+		<para><command>smbclient //mypc/yshare "" -N -Tx backup.tar
 		</command></para>
 		
 		<para>Restore everything except <filename>users/docs</filename>
@@ -566,7 +566,7 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>-c command string</term>
-		<listitem><para>command string is a semicolon separated list of 
+		<listitem><para>command string is a semicolon-separated list of 
 		commands to be executed instead of prompting from stdin. <parameter>
 		-N</parameter> is implied by <parameter>-c</parameter>.</para>
 
@@ -616,7 +616,7 @@ password = &lt;value&gt;
 	<variablelist>
 		<varlistentry>
 		<term>? [command]</term>
-		<listitem><para>If "command" is specified, the ? command will display 
+		<listitem><para>If <replaceable>command</replaceable> is specified, the ? command will display 
 		a brief informative message about the specified command.  If no 
 		command is specified, a list of available commands will
 		be displayed. </para></listitem>
@@ -625,7 +625,7 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>! [shell command]</term>
-		<listitem><para>If "shell command" is specified, the !  
+		<listitem><para>If <replaceable>shell command</replaceable> 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. 
 		</para></listitem>
@@ -648,14 +648,14 @@ password = &lt;value&gt;
 		<varlistentry>
 		<term>del &lt;mask&gt;</term>
 		<listitem><para>The client will request that the server attempt 
-		to delete all files matching "mask" from the current working 
+		to delete all files matching <replaceable>mask</replaceable> from the current working 
 		directory on the server. </para></listitem>
 		</varlistentry>
 		
 		
 		<varlistentry>
 		<term>dir &lt;mask&gt;</term>
-		<listitem><para>A list of the files matching "mask" in the current 
+		<listitem><para>A list of the files matching <replaceable>mask</replaceable> in the current 
 		working directory on the server will be retrieved from the server 
 		and displayed. </para></listitem>
 		</varlistentry>
@@ -670,9 +670,9 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>get &lt;remote file name&gt; [local file name]</term>
-		<listitem><para>Copy the file called "remote file name" from 
+		<listitem><para>Copy the file called <filename>remote file name</filename> from 
 		the server to the machine running the client. If specified, name 
-		the local copy "local file name".  Note that all transfers in 
+		the local copy <filename>local file name</filename>.  Note that all transfers in 
 		<command>smbclient</command> are binary. See also the 
 		lowercase command. </para></listitem>
 		</varlistentry>
@@ -687,7 +687,7 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>lcd [directory name]</term>
-		<listitem><para>If "directory name" is specified, the current 
+		<listitem><para>If <replaceable>directory name</replaceable> is specified, the current 
 		working directory on the local machine will be changed to 
 		the directory specified. This operation will fail if for any 
 		reason the specified directory is inaccessible. </para>
@@ -751,13 +751,13 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>mget &lt;mask&gt;</term>
-		<listitem><para>Copy all files matching mask from the server to 
+		<listitem><para>Copy all files matching <replaceable>mask</replaceable> from the server to 
 		the machine running the client. </para>
 
-		<para>Note that mask is interpreted differently during recursive 
+		<para>Note that <replaceable>mask</replaceable> is interpreted differently during recursive 
 		operation and non-recursive operation - refer to the recurse and 
 		mask commands for more information. Note that all transfers in 
-		smbclient are binary. See also the lowercase command. </para></listitem>
+		<command>smbclient</command> are binary. See also the lowercase command. </para></listitem>
 		</varlistentry>
 		
 		
@@ -770,13 +770,13 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>mput &lt;mask&gt;</term>
-		<listitem><para>Copy all files matching mask in the current working 
+		<listitem><para>Copy all files matching <replaceable>mask</replaceable> in the current working 
 		directory on the local machine to the current working directory on 
 		the server. </para>
 		
-		<para>Note that mask is interpreted differently during recursive 
+		<para>Note that <replaceable>mask</replaceable> is interpreted differently during recursive 
 		operation and non-recursive operation - refer to the recurse and mask 
-		commands for more information. Note that all transfers in smbclient 
+		commands for more information. Note that all transfers in <command>smbclient</command> 
 		are binary. </para></listitem>
 		</varlistentry>
 		
@@ -813,10 +813,10 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>put &lt;local file name&gt; [remote file name]</term>
-		<listitem><para>Copy the file called "local file name" from the 
+		<listitem><para>Copy the file called <filename>local file name</filename> from the 
 		machine running the client to the server. If specified,
-		name the remote copy "remote file name". Note that all transfers 
-		in smbclient are binary. See also the lowercase command. 
+		name the remote copy <filename>remote file name</filename>. Note that all transfers 
+		in <command>smbclient</command> are binary. See also the lowercase command. 
 		</para></listitem>
 		</varlistentry>
 		
@@ -863,7 +863,7 @@ password = &lt;value&gt;
 		
 		<varlistentry>
 		<term>rm &lt;mask&gt;</term>
-		<listitem><para>Remove all files matching mask from the current 
+		<listitem><para>Remove all files matching <replaceable>mask</replaceable> from the current 
 		working directory on the server. </para></listitem>
 		</varlistentry>
 		
@@ -890,7 +890,7 @@ password = &lt;value&gt;
 		<term>blocksize &lt;blocksize&gt;</term>
 		<listitem><para>Blocksize. Must be followed by a valid (greater 
 		than zero) blocksize. Causes tar file to be written out in 
-		blocksize*TBLOCK (usually 512 byte) blocks. </para></listitem>
+		<replaceable>blocksize</replaceable>*TBLOCK (usually 512 byte) blocks. </para></listitem>
 		</varlistentry>
 		
 		
@@ -938,13 +938,13 @@ password = &lt;value&gt;
 <refsect1>
 	<title>ENVIRONMENT VARIABLES</title>
 
-	<para>The variable <parameter>$USER</parameter> may contain the 
+	<para>The variable <envar>USER</envar> may contain the 
 	username of the person  using the client. This information is 
 	used only if the protocol  level is high enough to support 
 	session-level passwords.</para>
 
 
-	<para>The variable <parameter>$PASSWD</parameter> may contain 
+	<para>The variable <envar>PASSWD</envar> may contain 
 	the password of the person using the client.  This information is 
 	used only if the protocol level is high enough to support 
 	session-level passwords. </para>
@@ -970,7 +970,7 @@ password = &lt;value&gt;
 
 	<para>To test the client, you will need to know the name of a 
 	running SMB/CIFS server. It is possible to run <command>smbd(8)
-	</command> an ordinary user - running that server as a daemon 
+	</command> as an ordinary user - running that server as a daemon 
 	on a user-accessible port (typically any port number over 1024)
 	would provide a suitable test server. </para>
 </refsect1>
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 2d01fd7d496..da32b6a4e78 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -67,7 +67,7 @@
 	can force a reload by sending a SIGHUP to the server.  Reloading 
 	the configuration file will not affect connections to any service 
 	that is already established.  Either the user will have to 
-	disconnect from the service, or smbd killed and restarted.</para>
+	disconnect from the service, or <command>smbd</command> killed and restarted.</para>
 </refsect1>
 
 <refsect1>
@@ -80,9 +80,9 @@
 		the server to operate as a daemon. That is, it detaches 
 		itself and runs in the background, fielding requests 
 		on the appropriate port. Operating the server as a
-		daemon is the recommended way of running smbd for 
+		daemon is the recommended way of running <command>smbd</command> for 
 		servers that provide more than casual use file and 
-		print services.  This switch is assumed is <command>smbd
+		print services.  This switch is assumed if <command>smbd
 		</command> is executed on the command line of a shell.
 		</para></listitem>
 		</varlistentry>
@@ -104,7 +104,7 @@
 		
 		<varlistentry>
 		<term>-P</term>
-		<listitem><para>Passive option. Causes smbd not to 
+		<listitem><para>Passive option. Causes <command>smbd</command> not to 
 		send any network traffic out. Used for debugging by 
 		the developers only.</para></listitem>
 		</varlistentry>
@@ -123,7 +123,7 @@
 		
 		<varlistentry>
 		<term>-d &lt;debug level&gt;</term>
-		<listitem><para>debuglevel is an integer 
+		<listitem><para><replaceable>debuglevel</replaceable> is an integer 
 		from 0 to 10.  The default value if this parameter is 
 		not specified is zero.</para>
 		
@@ -149,7 +149,7 @@
 		
 		<varlistentry>
 		<term>-l &lt;log file&gt;</term>
-		<listitem><para>If specified, <emphasis>log file</emphasis> 
+		<listitem><para>If specified, <replaceable>log file</replaceable> 
 		specifies a log filename into which informational and debug 
 		messages from the running server will be logged. The log 
 		file generated is never removed by the server although 
@@ -170,7 +170,7 @@
 		
 		<varlistentry>
 		<term>-p &lt;port number&gt;</term>
-		<listitem><para>port number is a positive integer 
+		<listitem><para><replaceable>port number</replaceable> is a positive integer 
 		value.  The default value if this parameter is not 
 		specified is 139.</para>
 		
@@ -273,10 +273,10 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>PRINTER</term>
+		<term><envar>PRINTER</envar></term>
 		<listitem><para>If no printer name is specified to 
 		printable services, most systems will use the value of 
-		this variable (or lp if this variable is 
+		this variable (or <constant>lp</constant> if this variable is 
 		not defined) as the name of the printer to use. This 
 		is not specific to the server, however.</para></listitem>
 		</varlistentry>
@@ -296,10 +296,10 @@
 	program itself should be executable by all, as users may wish to 
 	run the server themselves (in which case it will of course run 
 	with their privileges).  The server should NOT be setuid. On some 
-	systems it may be worthwhile to make smbd setgid to an empty group. 
+	systems it may be worthwhile to make <command>smbd</command> setgid to an empty group. 
 	This is because some systems may have a security hole where daemon 
 	processes that become a user can be attached to with a debugger. 
-	Making the smbd file setgid to an empty group may prevent
+	Making the <command>smbd</command> file setgid to an empty group may prevent
 	this hole from being exploited. This security hole and the suggested
 	fix has only been confirmed on old versions (pre-kernel 2.0) of Linux
 	at the time this was written. It is possible that this hole only
@@ -395,7 +395,7 @@
 	<title>RUNNING THE SERVER ON REQUEST</title>
 
 	<para>If your system uses a meta-daemon such as <command>inetd
-	</command>, you can arrange to have the smbd server started 
+	</command>, you can arrange to have the <command>smbd</command> server started 
 	whenever a process attempts to connect to it. This requires several 
 	changes to the startup files on the host machine. If you are 
 	experimenting as an ordinary user rather than as root, you will 
@@ -471,8 +471,8 @@
 	<command>inetd</command> will reread their configuration
 	tables if they receive a HUP signal.</para>
 
-	<para>If your machine's name is fred and your 
-	name is mary, you should now be able to connect 
+	<para>If your machine's name is <replaceable>fred</replaceable> and your 
+	name is <replaceable>mary</replaceable>, you should now be able to connect 
 	to the service <filename>\\fred\mary</filename>.
 	</para>
 
@@ -513,26 +513,26 @@
 <refsect1>
 	<title>SIGNALS</title>
 
-	<para>Sending the smbd a SIGHUP will cause it to 
-	re-load its <filename>smb.conf</filename> configuration 
+	<para>Sending the <command>smbd</command> a SIGHUP will cause it to 
+	reload its <filename>smb.conf</filename> configuration 
 	file within a short period of time.</para>
 
-	<para>To shut down a users smbd process it is recommended 
+	<para>To shut down a user's <command>smbd</command> process it is recommended 
 	that <command>SIGKILL (-9)</command> <emphasis>NOT</emphasis> 
 	be used, except as a last resort, as this may leave the shared
 	memory area in an inconsistent state. The safe way to terminate 
-	an smbd is to send it a SIGTERM (-15) signal and wait for 
+	an <command>smbd</command> is to send it a SIGTERM (-15) signal and wait for 
 	it to die on its own.</para>
 
-	<para>The debug log level of smbd may be raised by sending 
+	<para>The debug log level of <command>smbd</command> may be raised by sending 
 	it a SIGUSR1 (<command>kill -USR1 &lt;smbd-pid&gt;</command>)
 	and lowered by sending it a SIGUSR2 (<command>kill -USR2 &lt;smbd-pid&gt;
 	</command>). This is to allow transient problems to be diagnosed, 
 	whilst still running at a normally low log level.</para>
 
 	<para>Note that as the signal handlers send a debug write, 
-	they are not re-entrant in smbd. This you should wait until 
-	smbd is in a state of waiting for an incoming smb before 
+	they are not re-entrant in <command>smbd</command>. This you should wait until 
+	<command>smbd</command> is in a state of waiting for an incoming SMB before 
 	issuing them. It is possible to make the signal handlers safe 
 	by un-blocking the signals before the select call and re-blocking 
 	them after, however this would affect performance.</para>
diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml
index 9527a191440..859f8f441c2 100644
--- a/docs/docbook/manpages/smbmnt.8.sgml
+++ b/docs/docbook/manpages/smbmnt.8.sgml
@@ -32,7 +32,7 @@
 	<para><command>smbmnt</command> is a helper application used 
 	by the smbmount program to do the actual mounting of SMB shares. 
 	<command>smbmnt</command> is meant to be installed setuid root 
-	so that normal users can mount their smb shares. It checks 
+	so that normal users can mount their SMB shares. It checks 
 	whether the user has write permissions on the mount point and 
 	then mounts the directory.</para>
 
@@ -79,7 +79,7 @@
 		<term>-o options</term>
 		<listitem><para>
 		list of options that are passed as-is to smbfs, if this
-		command is run on a 2.4 or higher linux kernel.
+		command is run on a 2.4 or higher Linux kernel.
 		</para></listitem>
 		</varlistentry>
 
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index e44f96e9068..462512185d7 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -29,17 +29,17 @@
 	the <command>mount(8)</command> command when using the 
 	"-t smb" option. The kernel must support the smbfs filesystem. </para>
 
-	<para>Options to smbmount are specified as a comma separated
+	<para>Options to <command>smbmount</command> are specified as a comma-separated
 	list of key=value pairs. It is possible to send options other
 	than those listed here, assuming that smbfs supports them. If
 	you get mount failures, check your kernel log for errors on
 	unknown options.</para>
 
-	<para>smbmount is a daemon. After mounting it keeps running until
+	<para><command>smbmount</command> is a daemon. After mounting it keeps running until
 	the mounted smbfs is umounted. It will log things that happen
 	when in daemon mode using the "machine name" smbmount, so
-	typically this output will end up in log.smbmount. The
-	smbmount process may also be called mount.smbfs.</para>
+	typically this output will end up in <filename>log.smbmount</filename>. The
+	<command>smbmount</command> process may also be called mount.smbfs.</para>
 
 	<para><emphasis>NOTE:</emphasis> <command>smbmount</command> 
 	calls <command>smbmnt(8)</command> to do the actual mount. You 
@@ -94,7 +94,7 @@
 		</para>
 
 		<para>This is preferred over having passwords in plaintext in a
-		shared file, such as /etc/fstab. Be sure to protect any
+		shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
 		credentials file properly.
 		</para></listitem>
 		</varlistentry>
@@ -140,7 +140,7 @@
 
 		<varlistentry>
 		<term>dmask=&lt;arg&gt;</term>
-		<listitem><para>sets the directory mask. This deterines the 
+		<listitem><para>sets the directory mask. This determines the 
 		permissions that remote directories have in the local filesystem. 
 		The default is based on the current umask. </para></listitem>
 		</varlistentry>
@@ -200,7 +200,7 @@
 		<varlistentry>
 		<term>iocharset=&lt;arg&gt;</term>
 		<listitem><para>
-		sets the charset used by the linux side for codepage
+		sets the charset used by the Linux side for codepage
 		to charset translations (NLS). Argument should be the
 		name of a charset, like iso8859-1. (Note: only kernel
 		2.4.0 or later)
@@ -252,7 +252,7 @@
 
 	<para>The variable <envar>PASSWD_FILE</envar> may contain the pathname of
 	a file to read the password from. A single line of input is
-	read and used as password.</para>
+	read and used as the password.</para>
 </refsect1>
 
 
@@ -272,7 +272,7 @@
 
 	</itemizedlist>
 
-	<para>Note that the typical response to a bugreport is suggestion
+	<para>Note that the typical response to a bug report is suggestion
 	to try the latest version first. So please try doing that first,
 	and always include which versions you use of relevant software
 	when reporting bugs (minimum: samba, kernel, distribution)</para>
diff --git a/docs/docbook/manpages/smbpasswd.5.sgml b/docs/docbook/manpages/smbpasswd.5.sgml
index 0e8a704c503..be751078192 100644
--- a/docs/docbook/manpages/smbpasswd.5.sgml
+++ b/docs/docbook/manpages/smbpasswd.5.sgml
@@ -59,9 +59,9 @@
 		 
 		<varlistentry>
 		<term>Lanman Password Hash</term>
-		<listitem><para>This is the LANMAN hash of the users password, 
+		<listitem><para>This is the LANMAN hash of the user's password, 
 		encoded as 32 hex digits.  The LANMAN hash is created by DES 
-		encrypting a well known string with the users password as the 
+		encrypting a well known string with the user's password as the 
 		DES key. This is the same password used by Windows 95/98 machines. 
 		Note that this password hash is regarded as weak as it is
 		vulnerable to dictionary attacks and if two users choose the 
@@ -69,7 +69,7 @@
 		is not "salted" as the UNIX password is). If the user has a 
 		null password this field will contain the characters "NO PASSWORD" 
 		as the start of the hex string. If the hex string is equal to 
-		32 'X' characters then the users account is marked as 
+		32 'X' characters then the user's account is marked as 
 		<constant>disabled</constant> and the user will not be able to 
 		log onto the Samba server. </para>
 		
@@ -89,14 +89,14 @@
 		
 		<varlistentry>
 		<term>NT Password Hash</term>
-		<listitem><para>This is the Windows NT hash of the users 
+		<listitem><para>This is the Windows NT hash of the user's 
 		password, encoded as 32 hex digits.  The Windows NT hash is 
-		created by taking the users password as represented in 
+		created by taking the user's password as represented in 
 		16-bit, little-endian UNICODE and then applying the MD4 
 		(internet rfc1321) hashing algorithm to it. </para>
 		
 		<para>This password hash is considered more secure than
-		the Lanman Password Hash as it preserves the case of the 
+		the LANMAN Password Hash as it preserves the case of the 
 		password and uses a much higher quality hashing algorithm. 
 		However, it is still the case that if two users choose the same 
 		password this entry will be identical (i.e. the password is 
@@ -132,7 +132,7 @@
 			in the smbpasswd file. </para></listitem>
 			
 			<listitem><para><emphasis>N</emphasis> - This means the
-			account has no password (the passwords in the fields Lanman 
+			account has no password (the passwords in the fields LANMAN 
 			Password Hash and NT Password Hash are ignored). Note that this 
 			will only allow users to log on with no password if the <parameter>
 			null passwords</parameter> parameter is set in the <ulink
diff --git a/docs/docbook/manpages/smbpasswd.8.sgml b/docs/docbook/manpages/smbpasswd.8.sgml
index 8233234d352..c07b329c5e1 100644
--- a/docs/docbook/manpages/smbpasswd.8.sgml
+++ b/docs/docbook/manpages/smbpasswd.8.sgml
@@ -9,7 +9,7 @@
 
 <refnamediv>
 	<refname>smbpasswd</refname>
-	<refpurpose>change a users SMB password</refpurpose>
+	<refpurpose>change a user's SMB password</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -45,7 +45,7 @@
 	SMB passwords. </para>
 
 	<para>By default (when run with no arguments) it will attempt to 
-	change the current users SMB password on the local machine. This is 
+	change the current user's SMB password on the local machine. This is 
 	similar to the way the <command>passwd(1)</command> program works. 
 	<command>smbpasswd</command> differs from how the passwd program works 
 	however in that it is not <emphasis>setuid root</emphasis> but works in 
@@ -56,10 +56,10 @@
 	the <filename>smbpasswd(5)</filename> file. </para>
 
 	<para>When run by an ordinary user with no options. smbpasswd 
-	will prompt them for their old smb password and then ask them 
+	will prompt them for their old SMB password and then ask them 
 	for their new password twice, to ensure that the new password
 	was typed correctly. No passwords will be echoed on the screen 
-	whilst being typed. If you have a blank smb password (specified by 
+	whilst being typed. If you have a blank SMB password (specified by 
 	the string "NO PASSWORD" in the smbpasswd file) then just press 
 	the &lt;Enter&gt; key when asked for your old password. </para>
 
@@ -117,7 +117,7 @@
 		will fail. </para>
 		
 		<para>If the smbpasswd file is in the 'old' format (pre-Samba 2.0 
-		format) there is no space in the users password entry to write
+		format) there is no space in the user's password entry to write
 		this information and so the user is disabled by writing 'X' characters 
 		into the password space in the smbpasswd file. See <command>smbpasswd(5)
 		</command> for details on the 'old' and new password file formats.
@@ -151,7 +151,7 @@
 
 		<varlistentry>
 		<term>-D debuglevel</term>
-		<listitem><para><parameter>debuglevel</parameter> is an integer 
+		<listitem><para><replaceable>debuglevel</replaceable> is an integer 
 		from 0 to 10.  The default value if this parameter is not specified 
 		is zero. </para>
 
@@ -335,7 +335,7 @@
 		<varlistentry>
 		<term>-s</term>
 		<listitem><para>This option causes smbpasswd to be silent (i.e. 
-		not issue prompts) and to read it's old and new passwords from 
+		not issue prompts) and to read its old and new passwords from 
 		standard  input, rather than from <filename>/dev/tty</filename> 
 		(like the <command>passwd(1)</command> program does). This option 
 		is to aid people writing scripts to drive smbpasswd</para>
diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index 3a95f116d92..7bec3c2cb2e 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -28,7 +28,7 @@
 	<para><command>smbsh</command> allows you to access an NT filesystem 
 	using UNIX commands such as <command>ls</command>, <command>
 	egrep</command>, and <command>rcp</command>. You must use a 
-	shell that is dynmanically linked in order for <command>smbsh</command> 
+	shell that is dynamically linked in order for <command>smbsh</command> 
 	to work correctly.</para>
 
 	<para>To use the <command>smbsh</command> command, execute <command>
diff --git a/docs/docbook/manpages/smbspool.8.sgml b/docs/docbook/manpages/smbspool.8.sgml
index 5b409bb9de9..d5c9c0a1148 100644
--- a/docs/docbook/manpages/smbspool.8.sgml
+++ b/docs/docbook/manpages/smbspool.8.sgml
@@ -52,12 +52,12 @@
 	</itemizedlist>
 
 	<para>smbspool tries to get the URI from argv[0]. If argv[0] 
-	contains the name of the program then it looks in the <parameter>
-	DEVICE_URI</parameter> environment variable.</para>
+	contains the name of the program then it looks in the <envar>
+	DEVICE_URI</envar> environment variable.</para>
 
 	<para>Programs using the <command>exec(2)</command> functions can 
 	pass the URI in argv[0], while shell scripts must set the 
-	<parameter>DEVICE_URI</parameter> environment variable prior to
+	<envar>DEVICE_URI</envar> environment variable prior to
 	running smbspool.</para>
 </refsect1>
 
diff --git a/docs/docbook/manpages/smbumount.8.sgml b/docs/docbook/manpages/smbumount.8.sgml
index 15e20a2e709..d6a1b65b578 100644
--- a/docs/docbook/manpages/smbumount.8.sgml
+++ b/docs/docbook/manpages/smbumount.8.sgml
@@ -24,7 +24,7 @@
 
 	<para>With this program, normal users can unmount smb-filesystems, 
 	provided that it is suid root.  <command>smbumount</command> has 
-	been written to give normal linux-users more control over their 
+	been written to give normal Linux users more control over their 
 	resources. It is safe to install this program suid root, because only 
 	the user who has mounted a filesystem is allowed to unmount it again.  
 	For root it is not necessary to use smbumount. The normal umount 
diff --git a/docs/docbook/manpages/swat.8.sgml b/docs/docbook/manpages/swat.8.sgml
index 7a362ee3ce3..dc6989d5663 100644
--- a/docs/docbook/manpages/swat.8.sgml
+++ b/docs/docbook/manpages/swat.8.sgml
@@ -31,10 +31,10 @@
 	configure the complex <ulink url="smb.conf.5.html"><filename>
 	smb.conf(5)</filename></ulink> file via a Web browser. In addition, 
 	a <command>swat</command> configuration page has help links 
-	to all the configurable options in the smb.conf file allowing an 
+	to all the configurable options in the <filename>smb.conf</filename> file allowing an 
 	administrator to easily look up the effects of any change. </para>
 
-	<para>swat is run from inetd </para>
+	<para><command>swat</command> is run from <command>inetd</command> </para>
 </refsect1>
 
 
@@ -47,7 +47,7 @@
 		<listitem><para>The default configuration file path is 
 		determined at compile time.  The file specified contains 
 		the configuration details required by the <command>smbd
-		</command> server. This is the file that swat will modify. 
+		</command> server. This is the file that <command>swat</command> will modify. 
 		The information in this file includes server-specific 
 		information such as what printcap file to use, as well as 
 		descriptions of all the services that the server is to provide.
@@ -59,8 +59,8 @@
 		<varlistentry>
 		<term>-a</term>
 		<listitem><para>This option disables authentication and puts 
-		swat in demo mode. In that mode anyone will be able to modify 
-		the smb.conf file. </para>
+		<command>swat</command> in demo mode. In that mode anyone will be able to modify 
+		the <filename>smb.conf</filename> file. </para>
 		
 		<para><emphasis>Do NOT enable this option on a production 
 		server. </emphasis></para></listitem>
@@ -89,7 +89,7 @@
 
 		<para>You need to edit your <filename>/etc/inetd.conf
 		</filename> and <filename>/etc/services</filename>
-		to enable SWAT to be launched via inetd.</para>
+		to enable SWAT to be launched via <command>inetd</command>.</para>
 
 		<para>In <filename>/etc/services</filename> you need to 
 		add a line like this: </para>
@@ -123,10 +123,10 @@
 	<refsect2>
 		<title>Launching</title>
 
-		<para>To launch swat just run your favorite web browser and 
+		<para>To launch SWAT just run your favorite web browser and 
 		point it at "http://localhost:901/".</para>
 
-		<para>Note that you can attach to swat from any IP connected 
+		<para>Note that you can attach to SWAT from any IP connected 
 		machine but connecting from a remote machine leaves your 
 		connection open to password sniffing as passwords will be sent 
 		in the clear over the wire. </para>
diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml
index da90dc6e6c6..320e39e6f58 100644
--- a/docs/docbook/manpages/testparm.1.sgml
+++ b/docs/docbook/manpages/testparm.1.sgml
@@ -72,7 +72,7 @@
 		
 		<varlistentry>
 		<term>-L servername</term>
-		<listitem><para>Sets the value of the %L macro to servername.
+		<listitem><para>Sets the value of the %L macro to <replaceable>servername</replaceable>.
 		This is useful for testing include files specified with the 
 		%L macro. </para></listitem>
 		</varlistentry>
@@ -90,7 +90,7 @@
 		<varlistentry>
 		<term>hostname</term>
 		<listitem><para>If this parameter and the following are 
-		specified, then testparm will examine the <parameter>hosts
+		specified, then <command>testparm</command> will examine the <parameter>hosts
 		allow</parameter> and <parameter>hosts deny</parameter> 
 		parameters in the <filename>smb.conf</filename> file to 
 		determine if the hostname with this IP address would be
@@ -126,7 +126,7 @@
 	<title>DIAGNOSTICS</title>
 
 	<para>The program will issue a message saying whether the 
-	configuration file loaded OK or not. This message may be preceeded by 
+	configuration file loaded OK or not. This message may be preceded by 
 	errors and warnings if the file did not load. If the file was 
 	loaded OK, the program then dumps all known service details 
 	to stdout. </para>
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 3a2e6c31859..7a1e738401d 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -149,7 +149,7 @@
 
 	<para>The wbinfo program returns 0 if the operation 
 	succeeded, or 1 if the operation failed.  If the <command>winbindd(8)
-	</command> daemon is not working wbinfo will always return 
+	</command> daemon is not working <command>wbinfo</command> will always return 
 	failure. </para>
 </refsect1>
 
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index 602db43e113..a215c3d1af2 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -49,7 +49,7 @@
 	of user and group ids specified by the administrator of the 
 	Samba system.</para>
 
-	<para>The service provided by winbindd is called `winbind' and 
+	<para>The service provided by <command>winbindd</command> is called `winbind' and 
 	can be used to resolve user and group information from a 
 	Windows NT server. The service can also provide authentication
 	services via an associated PAM module. </para>
@@ -154,7 +154,7 @@ group:          files winbind
 		DOMAIN\username. In some cases this separator character may 
 		cause problems as the '\' character has special meaning in 
 		unix shells.  In that case you can use the winbind separator 
-		option to specify an alternative sepataror character. Good 
+		option to specify an alternative separator character. Good 
 		alternatives may be '/' (although that conflicts
 		with the unix directory separator) or a '+ 'character. 
 		The '+' character appears to be the best choice for 100% 
@@ -171,7 +171,7 @@ group:          files winbind
 		<term>winbind uid</term>
 		<listitem><para>The winbind uid parameter specifies the 
 		range of user ids that are allocated by the winbindd daemon.  
-		This range of ids should have no existing local or nis users 
+		This range of ids should have no existing local or NIS users 
 		within it as strange conflicts can occur otherwise. </para>
 
 		<para>Default: <command>winbind uid = &lt;empty string&gt; 
@@ -185,7 +185,7 @@ group:          files winbind
 		<term>winbind gid</term>
 		<listitem><para>The winbind gid parameter specifies the 
 		range of group ids that are allocated by the winbindd daemon.  
-		This range of group ids should have no existing local or nis 
+		This range of group ids should have no existing local or NIS 
 		groups within it as strange conflicts can occur otherwise.</para> 
 
 		<para>Default: <command>winbind gid = &lt;empty string&gt;
@@ -201,7 +201,7 @@ group:          files winbind
 		seconds the winbindd daemon will cache user and group information 
 		before querying a Windows NT server again. When a item in the 
 		cache is older than this time winbindd will ask the domain 
-		controller for the sequence number of the servers account database. 
+		controller for the sequence number of the server's account database. 
 		If the sequence number has not changed then the cached item is 
 		marked as valid for a further <parameter>winbind cache time
 		</parameter> seconds.  Otherwise the item is fetched from the 
@@ -225,7 +225,7 @@ group:          files winbind
 		return any data. </para>
 
 		<para><emphasis>Warning:</emphasis> Turning off user enumeration 
-		may cause some programs to behave oddly.  For example, the finger 
+		may cause some programs to behave oddly.  For example, the <command>finger</command> 
 		program relies on having access to the full user list when 
 		searching  for matching usernames. </para>
 
@@ -323,7 +323,7 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	<para><command>samedit -S '*' -W DOMAIN -UAdministrator</command></para>
  
 	<para>The username after the <parameter>-U</parameter> can be any Domain 
-	user that has administrator priviliges on the machine. Next from 
+	user that has administrator privileges on the machine. Next from 
 	within <command>samedit</command>, run the command: </para>
 
 	<para><command>createuser MACHINE$ -j DOMAIN -L</command></para>
@@ -339,7 +339,7 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 	older version of glibc then the target of the link should be
 	<filename>/lib/libnss_winbind.so.1</filename>.</para>
 
-	<para>Finally, setup a smb.conf containing directives like the 
+	<para>Finally, setup a <filename>smb.conf</filename> containing directives like the 
 	following:  </para> 
 
 	<para><programlisting>
@@ -476,7 +476,7 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
 
 	<para>This man page is correct for version 2.2 of 
 	the Samba suite.  winbindd is however not available in
-	stable release of Samba as of yet.</para>
+	the stable release of Samba as of yet.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs/docbook/projdoc/CVS-Access.sgml b/docs/docbook/projdoc/CVS-Access.sgml
index aea146b66a1..23bde92b56e 100644
--- a/docs/docbook/projdoc/CVS-Access.sgml
+++ b/docs/docbook/projdoc/CVS-Access.sgml
@@ -18,10 +18,10 @@
 <title>Introduction</title>
 
 <para>
-Samba is developed in an open environnment.  Developers use CVS
+Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
 "commit") new source code.  Samba's various CVS branches can
-be accessed via anonymouns CVS using the instructions
+be accessed via anonymous CVS using the instructions
 detailed in this chapter.
 </para>
 
@@ -67,7 +67,7 @@ url="http://samba.org/cgi-bin/cvsweb">http://samba.org/cgi-bin/cvsweb</ulink>
 You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
 do with the repository and allows you to checkout whole source trees 
-and keep them uptodate via normal cvs commands. This is the 
+and keep them up to date via normal cvs commands. This is the 
 preferred method of access if you are a developer and not
 just a casual browser.
 </para>
diff --git a/docs/docbook/projdoc/ENCRYPTION.sgml b/docs/docbook/projdoc/ENCRYPTION.sgml
index 8b624bad1a5..fbe7fbe3a18 100644
--- a/docs/docbook/projdoc/ENCRYPTION.sgml
+++ b/docs/docbook/projdoc/ENCRYPTION.sgml
@@ -96,7 +96,7 @@
 	
 	<para>The unix and SMB password encryption techniques seem similar 
 	on the surface. This similarity is, however, only skin deep. The unix 
-	scheme typically sends clear text passwords over the nextwork when 
+	scheme typically sends clear text passwords over the network when 
 	logging in. This is bad. The SMB encryption scheme never sends the 
 	cleartext password over the network but it does store the 16 byte 
 	hashed values on disk. This is also bad. Why? Because the 16 byte hashed 
@@ -141,7 +141,7 @@
 		Microsoft SMB/CIFS clients support authentication via the
 		SMB Challenge/Response mechanism described here.  Enabling
 		clear text authentication does not disable the ability
-		of the client to particpate in encrypted authentication.</para>
+		of the client to participate in encrypted authentication.</para>
 	</warning>
 
 	<sect2>
diff --git a/docs/docbook/projdoc/NT_Security.sgml b/docs/docbook/projdoc/NT_Security.sgml
index 28dcb5160df..a9532822938 100644
--- a/docs/docbook/projdoc/NT_Security.sgml
+++ b/docs/docbook/projdoc/NT_Security.sgml
@@ -16,7 +16,7 @@
 </chapterinfo>
 
 
-<title>UNIX Permission Bits and WIndows NT Access Control Lists</title>
+<title>UNIX Permission Bits and Windows NT Access Control Lists</title>
 
 <sect1>
 	<title>Viewing and changing UNIX permissions using the NT 
@@ -75,7 +75,7 @@
 	<para>Where <replaceable>SERVER</replaceable> is the NetBIOS name of 
 	the Samba server, <replaceable>user</replaceable> is the user name of 
 	the UNIX user who owns the file, and <replaceable>(Long name)</replaceable>
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database). Click on the <command>Close
 	</command> button to remove this dialog.</para>
 
@@ -87,14 +87,14 @@
 	you to change the ownership of this file to yourself (clicking on 
 	it will display a dialog box complaining that the user you are 
 	currently logged onto the NT client cannot be found). The reason 
-	for this is that changing the ownership of a file is a privilaged 
+	for this is that changing the ownership of a file is a privileged 
 	operation in UNIX, available only to the <emphasis>root</emphasis> 
 	user. As clicking on this button causes NT to attempt to change 
 	the ownership of a file to the current user logged into the NT 
 	client this will not work with Samba at this time.</para>
 
 	<para>There is an NT chown command that will work with Samba 
-	and allow a user with Administrator privillage connected 
+	and allow a user with Administrator privilege connected 
 	to a Samba 2.0.4 server as root to change the ownership of 
 	files on both a local NTFS filesystem or remote mounted NTFS 
 	or Samba drive. This is available as part of the <emphasis>Seclib
@@ -116,7 +116,7 @@
 	<para>Where <replaceable>SERVER</replaceable> is the NetBIOS name of 
 	the Samba server, <replaceable>user</replaceable> is the user name of 
 	the UNIX user who owns the file, and <replaceable>(Long name)</replaceable>
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database).</para>
 
 	<para>If the parameter <parameter>nt acl support</parameter>
@@ -133,7 +133,7 @@
 		<title>File Permissions</title>
 
 		<para>The standard UNIX user/group/world triple and 
-		the correspinding "read", "write", "execute" permissions 
+		the corresponding "read", "write", "execute" permissions 
 		triples are mapped by Samba into a three element NT ACL 
 		with the 'r', 'w', and 'x' bits mapped into the corresponding 
 		NT permissions. The UNIX world permissions are mapped into 
@@ -200,7 +200,7 @@
 
 	<para>The first thing to note is that the <command>"Add"</command> 
 	button will not return a list of users in Samba 2.0.4 (it will give 
-	an error message of <command>"The remote proceedure call failed 
+	an error message of <command>"The remote procedure call failed 
 	and did not execute"</command>). This means that you can only 
 	manipulate the current user/group/world permissions listed in 
 	the dialog box. This actually works quite well as these are the 
@@ -231,7 +231,7 @@
 	user/group/world  component then you may either highlight the 
 	component and click the <command>"Remove"</command> button, 
 	or set the component to only have the special <command>"Take
-	Ownership"</command> permission (dsplayed as <command>"O"
+	Ownership"</command> permission (displayed as <command>"O"
 	</command>) highlighted.</para>
 </sect1>
 
@@ -281,7 +281,7 @@
 	as the <ulink url="smb.conf.5.html#FORCECREATEMODE"><parameter>force 
 	create mode</parameter></ulink> parameter to provide compatibility
 	with Samba 2.0.4 where the permission change facility was introduced.
-	To allow a user to modify all the user/group/world permissions on a file,
+	To allow a user to modify all the user/group/world permissions on a file
 	with no restrictions set this parameter to 000.</para>
 
 	<para>The <parameter>security mask</parameter> and <parameter>force 
diff --git a/docs/docbook/projdoc/OS2-Client-HOWTO.sgml b/docs/docbook/projdoc/OS2-Client-HOWTO.sgml
index 5db80cda3d7..387bf9151e0 100644
--- a/docs/docbook/projdoc/OS2-Client-HOWTO.sgml
+++ b/docs/docbook/projdoc/OS2-Client-HOWTO.sgml
@@ -116,7 +116,7 @@
 		driver from an OS/2 system.</para>
 		
 		<para>Install the NT driver first for that printer.  Then, 
-		add to your smb.conf a paramater, "os2 driver map = 
+		add to your smb.conf a parameter, "os2 driver map = 
 		<replaceable>filename</replaceable>".  Then, in the file 
 		specified by <replaceable>filename</replaceable>, map the 
 		name of the NT driver name to the OS/2 driver name as 
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index 0b86bcba634..765a707b47b 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -32,12 +32,12 @@ How to Configure Samba 2.2 as a Primary Domain Controller
 <title>Prerequisite Reading</title>
 
 <para>
-Before you continue readingin this chapter, please make sure 
+Before you continue reading in this chapter, please make sure 
 that you are comfortable with configuring basic files services
-in smb.conf and how to enable and administrate password 
+in smb.conf and how to enable and administer password 
 encryption in Samba.  Theses two topics are covered in the
 <ulink url="smb.conf.5.html"><filename>smb.conf(5)</filename></ulink> 
-manpage and the <ulink url="EMCRYPTION.html">Encryption chapter</ulink> 
+manpage and the <ulink url="ENCRYPTION.html">Encryption chapter</ulink> 
 of this HOWTO Collection.
 </para>
 
@@ -60,7 +60,7 @@ Background
 <para>
 <emphasis>Author's Note :</emphasis> This document is a combination 
 of David Bannon's Samba 2.2 PDC HOWTO and the Samba NT Domain FAQ. 
-Both documents are superceeded by this one.
+Both documents are superseded by this one.
 </para>
 </note>
 
@@ -281,7 +281,7 @@ to the Domain</title>
 A machine trust account is a samba user account owned by a computer.  
 The account password acts as the shared secret for secure 
 communication with the Domain Controller.  This is a security feature
-to prevent an unauthorized machine with the same netbios name from 
+to prevent an unauthorized machine with the same NetBIOS name from 
 joining the domain and gaining access to domain user/group accounts.  
 Hence a Windows 9x host is never a true member of a domain because it does 
 not posses a machine trust account, and thus has no shared secret with the DC.
@@ -310,7 +310,7 @@ There are two means of creating machine trust accounts.
 	<listitem><para>
 	Manual creation before joining the client to the domain.  In this case, 
 	the password is set to a known value -- the lower case of the 
-	machine's netbios name.
+	machine's NetBIOS name.
 	</para></listitem>
 	
 	<listitem><para>
@@ -351,7 +351,7 @@ doppy$:x:505:501:<replaceable>machine_nickname</replaceable>:/dev/null:/bin/fals
 <para>
 Above, <replaceable>machine_nickname</replaceable> can be any descriptive name for the
 pc i.e. BasementComputer. The <replaceable>machine_name</replaceable> absolutely must be 
-the netbios name of the pc to be added to the domain.  The "$" must append the netbios
+the NetBIOS name of the pc to be added to the domain.  The "$" must append the NetBIOS
 name of the pc or samba will not recognize this as a machine account
 </para>
 
@@ -369,7 +369,7 @@ as shown here:
 </para>
 
 <para>
-where <replaceable>machine_name</replaceable> is the machine's netbios
+where <replaceable>machine_name</replaceable> is the machine's NetBIOS
 name. 
 </para>
 
@@ -382,7 +382,7 @@ name.
 	the "Server Manager".  From the time at which the account is created
 	to the time which th client joins the domain and changes the password,
 	your domain is vulnerable to an intruder joining your domain using a
-	a machine with the same netbios name.  A PDC inherently trusts
+	a machine with the same NetBIOS name.  A PDC inherently trusts
 	members of the domain and will serve out a large degree of user 
 	information to such clients.  You have been warned!
 	</para>
@@ -519,8 +519,8 @@ associated <filename>/etc/passwd</filename> entry for security reasons.
 	have not been created correctly. Make sure that you have the entry 
 	correct for the machine account in smbpasswd file on the Samba PDC. 
 	If you added the account using an editor rather than using the smbpasswd 
-	utility, make sure that the account name is the machine netbios name 
-	with a '$' appended to it ( ie. computer_name$ ). There must be an entry 
+	utility, make sure that the account name is the machine NetBIOS name 
+	with a '$' appended to it ( i.e. computer_name$ ). There must be an entry 
 	in both /etc/passwd and the smbpasswd file. Some people have reported 
 	that inconsistent subnet masks between the Samba server and the NT 
 	client have caused this problem.   Make sure that these are consistent 
@@ -543,7 +543,7 @@ associated <filename>/etc/passwd</filename> entry for security reasons.
  
 	<para>
 	At first be ensure to enable the useraccounts with <command>smbpasswd -e 
-	%user%</command>, this is normaly done, when you create an account.
+	%user%</command>, this is normally done, when you create an account.
 	</para>
 
 	<para>
@@ -619,7 +619,7 @@ Here are some additional details:
 	<para>
 	The Windows NT policy editor is also included with the Service Pack 3 (and 
 	later) for Windows NT 4.0. Extract the files using <command>servicepackname /x</command>, 
-	ie thats <command>Nt4sp6ai.exe /x</command> for service pack 6a.  The policy editor, 
+	i.e. that's <command>Nt4sp6ai.exe /x</command> for service pack 6a.  The policy editor, 
 	<command>poledit.exe</command> and the associated template files (*.adm) should
 	be extracted as well.  It is also possible to downloaded the policy template 
 	files for Office97 and get a copy of the policy editor.  Another possible 
@@ -715,7 +715,7 @@ general SMB topics such as browsing.</para>
 
    <para>
 	One of the best diagnostic tools for debugging problems is Samba itself.  
-	You can use the -d option for both smbd and nmbd to specifiy what 
+	You can use the -d option for both smbd and nmbd to specify what 
 	'debug level' at which to run.  See the man pages on smbd, nmbd  and 
 	smb.conf for more information on debugging options.  The debug 
 	level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -758,7 +758,7 @@ general SMB topics such as browsing.</para>
 	(aka. netmon) is available on the Microsoft Developer Network CD's, 
 	the Windows NT Server install CD and the SMS CD's.  The version of 
 	netmon that ships with SMS allows for dumping packets between any two 
-	computers (ie. placing the network interface in promiscuous mode).  
+	computers (i.e. placing the network interface in promiscuous mode).  
 	The version on the NT Server install CD will only allow monitoring 
 	of network traffic directed to the local NT box and broadcasts on the 
 	local subnet.  Be aware that Ethereal can read and write netmon 
@@ -934,7 +934,7 @@ general SMB topics such as browsing.</para>
 		</para></listitem> 
 
 	<listitem><para> Don't cross post. Work out which is the best list to post to 
-		and see what happens, ie don't post to both samba-ntdom and samba-technical.
+		and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
         Many people active on the lists subscribe to more 
 		than one list and get annoyed to see the same message two or more times. 
 		Often someone will see a message and thinking it would be better dealt 
@@ -1026,7 +1026,7 @@ When an SMB client in a domain wishes to logon it broadcast requests for a
 logon server.  The first one to reply gets the job, and validates its
 password using whatever mechanism the Samba administrator has installed.
 It is possible (but very stupid) to create a domain where the user
-database is not shared between servers, ie they are effectively workgroup
+database is not shared between servers, i.e. they are effectively workgroup
 servers advertising themselves as participating in a domain.  This
 demonstrates how authentication is quite different from but closely
 involved with domains.
@@ -1124,7 +1124,7 @@ at how a Win9X client performs a logon:
 <listitem>
 	<para>
 	The client then connects to the user's home share and searches for the 
-	user's profile. As it turns out, you can specify the users home share as
+	user's profile. As it turns out, you can specify the user's home share as
 	a sharename and path. For example, \\server\fred\.profile.
 	If the profiles are found, they are implemented.
 	</para>
@@ -1229,7 +1229,7 @@ logon script = scripts\%U.bat
 
 <listitem>
 	<para>
-	you will probabaly find that your clients automatically mount the
+	you will probably find that your clients automatically mount the
 	\\SERVER\NETLOGON share as drive z: while logging in. You can put
 	some useful programs there to execute from the batch files.
 	</para>
@@ -1255,7 +1255,7 @@ or not Samba must be the domain master browser for its workgroup
 when operating as a DC.  While it may technically be possible
 to configure a server as such (after all, browsing and domain logons
 are two distinctly different functions), it is not a good idea to
-so.  You should remember that the DC must register the DOMAIN#1b netbios 
+so.  You should remember that the DC must register the DOMAIN#1b NetBIOS 
 name.  This is the name used by Windows clients to locate the DC.
 Windows clients do not distinguish between the DC and the DMB.
 For this reason, it is very wise to configure the Samba DC as the DMB.
@@ -1302,7 +1302,7 @@ Win9X and WinNT clients implement these features.
 <para>
 Win9X clients send a NetUserGetInfo request to the server to get the user's
 profiles location. However, the response does not have room for a separate 
-profiles location field, only the users home share. This means that Win9X 
+profiles location field, only the user's home share. This means that Win9X 
 profiles are restricted to being in the user's home directory.
 </para>
 
@@ -1551,7 +1551,7 @@ they will be told that they are logging in "for the first time".
 
 <listitem>
 	<para>
-	search for the user's .PWL password-cacheing file in the c:\windows
+	search for the user's .PWL password-caching file in the c:\windows
 	directory, and delete it.
 	</para>
 </listitem>
@@ -1654,11 +1654,11 @@ matter to be resolved].
 </para>
 
 <para>
-[lkcl 20aug97 - after samba digest correspondance, one user found, and
+[lkcl 20aug97 - after samba digest correspondence, one user found, and
 another confirmed, that profiles cannot be loaded from a samba server
 unless "security = user" and "encrypt passwords = yes" (see the file
 ENCRYPTION.txt) or "security = server" and "password server = ip.address.
-of.yourNTserver" are used.  either of these options will allow the NT
+of.yourNTserver" are used.  Either of these options will allow the NT
 workstation to access the samba server using LAN manager encrypted
 passwords, without the user intervention normally required by NT
 workstation for clear-text passwords].
@@ -1843,7 +1843,7 @@ plain Servers.
 <para>
 The User database is called the SAM (Security Access Manager) database and
 is used for all user authentication as well as for authentication of inter-
-process authentication (ie: to ensure that the service action a user has
+process authentication (i.e. to ensure that the service action a user has
 requested is permitted within the limits of that user's privileges).
 </para>
 
@@ -1858,7 +1858,7 @@ to Samba systems.
 <para>
 Windows for Workgroups, Windows 95, and Windows NT Workstations and Servers
 can participate in a Domain security system that is controlled by Windows NT
-servers that have been correctly configured. At most every domain will have
+servers that have been correctly configured. Almost every domain will have
 ONE Primary Domain Controller (PDC). It is desirable that each domain will
 have at least one Backup Domain Controller (BDC).
 </para>
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.sgml
index 41eb7a478cc..91b1602312e 100644
--- a/docs/docbook/projdoc/UNIX_INSTALL.sgml
+++ b/docs/docbook/projdoc/UNIX_INSTALL.sgml
@@ -30,7 +30,7 @@
 	</userinput></para>
 	
 	<para>first to see what special options you can enable.
-	Then exectuting</para>
+	Then executing</para>
 	
 	<para><prompt>root# </prompt><userinput>make</userinput></para>
 	
@@ -96,7 +96,7 @@
 	<para>which would allow connections by anyone with an 
 	account on the server, using either their login name or 
 	"homes" as the service name. (Note that I also set the 
-	workgroup that Samba is part of. See BROWSING.txt for defails)</para>
+	workgroup that Samba is part of. See BROWSING.txt for details)</para>
 	
 	<para>Note that <command>make install</command> will not install 
 	a <filename>smb.conf</filename> file. You need to create it 
@@ -120,7 +120,7 @@
 	not it will give an error message.</para>
 
 	<para>Make sure it runs OK and that the services look 
-	resonable before proceeding. </para>
+	reasonable before proceeding. </para>
 
 </sect1>
 
@@ -174,14 +174,14 @@
 		<para>NOTE: Some unixes already have entries like netbios_ns 
 		(note the underscore) in <filename>/etc/services</filename>. 
 		You must either edit <filename>/etc/services</filename> or
-		<filename>/etc/inetd.conf</filename> to make them consistant.</para>
+		<filename>/etc/inetd.conf</filename> to make them consistent.</para>
 
 		<para>NOTE: On many systems you may need to use the 
 		"interfaces" option in smb.conf to specify the IP address 
 		and netmask of your interfaces. Run <command>ifconfig</command> 
 		as root if you don't know what the broadcast is for your
 		net. <command>nmbd</command> tries to determine it at run 
-		time, but fails on somunixes. See the section on "testing nmbd" 
+		time, but fails on some unixes. See the section on "testing nmbd" 
 		for a method of finding if you need to do this.</para>
 
 		<para>!!!WARNING!!! Many unixes only accept around 5 
@@ -305,7 +305,7 @@
 	<sect2>
 		<title>Diagnosing Problems</title>
 
-		<para>If you have instalation problems then go to 
+		<para>If you have installation problems then go to 
 		<filename>DIAGNOSIS.txt</filename> to try to find the 
 		problem.</para>
 	</sect2>
@@ -414,7 +414,7 @@
 		are set by an application when it opens a file to determine 
 		what types of access should be allowed simultaneously with 
 		its open. A client may ask for DENY_NONE, DENY_READ, DENY_WRITE 
-		or DENY_ALL. There are also special compatability modes called 
+		or DENY_ALL. There are also special compatibility modes called 
 		DENY_FCB and  DENY_DOS.</para>
 
 		<para>You can disable share modes using "share modes = no". 
@@ -437,7 +437,7 @@
 
 		<para>If you have problems using filenames with accented 
 		characters in them (like the German, French or Scandinavian 
-		character sets) then I recommmend you look at the "valid chars" 
+		character sets) then I recommend you look at the "valid chars" 
 		option in smb.conf and also take a look at the validchars 
 		package in the examples directory.</para>
 	</sect2>
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.sgml
index 51471ae6900..e6cc8cd92d0 100644
--- a/docs/docbook/projdoc/printer_driver2.sgml
+++ b/docs/docbook/projdoc/printer_driver2.sgml
@@ -345,7 +345,7 @@ Add Printer Wizard icon.  The APW will be show only if
 <itemizedlist>
 	<listitem><para>The connected user is able to successfully
 	execute an OpenPrinterEx(\\server) with administrative
-	priviledges (i.e. root or <parameter>printer admin</parameter>).
+	privileges (i.e. root or <parameter>printer admin</parameter>).
 	</para></listitem>
 	
 	<listitem><para><ulink url="smb.conf.5.html#SHOWADDPRINTERWIZARD"><parameter>show 
@@ -513,7 +513,7 @@ foreach (supported architecture for a given driver)
 		the Imprints tool set was the name space issues between 
 		various supported client architectures.  For example, Windows 
 		NT includes a driver named "Apple LaserWriter II NTX v51.8" 
-		and Windows 95 callsits version of this driver "Apple 
+		and Windows 95 calls its version of this driver "Apple 
 		LaserWriter II NTX"</para>
 		
 		<para>The problem is how to know what client drivers have 
@@ -559,7 +559,7 @@ the NT client will still remember the previous setting.
 </para>
 
 <para>
-In order to give an NT client printing "amesia" (only necessary if you 
+In order to give an NT client printing "amnesia" (only necessary if you 
 want to use the newer MSRPC printing functionality in Samba), delete 
 the registry keys associated with the print server contained in 
 <constant>[HKLM\SYSTEM\CurrentControlSet\Control\Print]</constant>.  The 
@@ -686,8 +686,8 @@ Here are the possible scenarios for supporting migration:
                  * NT4:
                  * 
                  * On NT4, you only have a global devicemode. This global devicemode can be changed
-                 * by the administrator (or by a user with enough privs). Everytime a user
-                 * wants to print, the devicemode is resetted to the default. In Word, everytime
+                 * by the administrator (or by a user with enough privs). Every time a user
+                 * wants to print, the devicemode is reset to the default. In Word, every time
                  * you print, the printer's characteristics are always reset to the global devicemode.
                  *
                  * NT 2000:
@@ -695,7 +695,7 @@ Here are the possible scenarios for supporting migration:
                  * In W2K, there is the notion of per-user devicemode. The first time you use
                  * a printer, a per-user devicemode is build from the global devicemode.
                  * If you change your per-user devicemode, it is saved in the registry, under the
-                 * H_KEY_CURRENT_KEY sub_tree. So that everytime you print, you have your default
+                 * H_KEY_CURRENT_KEY sub_tree. So that every time you print, you have your default
                  * printer preferences available.
                  *
                  * To change the per-user devicemode: it's the "Printing Preferences ..." button
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml
index 8a380c206db..75138458d93 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.sgml
@@ -21,7 +21,7 @@
 	<pubdate>16 Oct 2000</pubdate>
 </chapterinfo>
 
-<title>Unifed Logons between Windows NT and UNIX using Winbind</title>
+<title>Unified Logons between Windows NT and UNIX using Winbind</title>
 
 <sect1>
 	<title>Abstract</title>
@@ -30,7 +30,7 @@
 	a unified logon has been considered a "holy grail" in heterogeneous 
 	computing environments for a long time. We present <emphasis>winbind
 	</emphasis>, a component of the Samba suite of programs as a 
-	solution to the unied logon problem. Winbind uses a UNIX implementation 
+	solution to the unified logon problem. Winbind uses a UNIX implementation 
 	of Microsoft RPC calls, Pluggable Authentication Modules, and the Name 
 	Service Switch to allow Windows NT domain users to appear and operate 
 	as UNIX users on a UNIX machine. This paper describes the winbind 
@@ -57,7 +57,7 @@
 	can lead to synchronization problems between the UNIX and Windows 
 	systems and confusion for users.</para>
 	
-	<para>We divide the unifed logon problem for UNIX machines into 
+	<para>We divide the unified logon problem for UNIX machines into 
 	three smaller problems:</para>
 	
 	<itemizedlist>
@@ -77,7 +77,7 @@
 	information on the UNIX machines and without creating additional 
 	tasks for the system administrator when maintaining users and 
 	groups on either system. The winbind system provides a simple 
-	and elegant solution to all three components of the unifed logon 
+	and elegant solution to all three components of the unified logon 
 	problem.</para>
 </sect1>
 
@@ -179,7 +179,7 @@
 		<para>The Name Service Switch, or NSS, is a feature that is 
 		present in many UNIX operating systems. It allows system 
 		information such as hostnames, mail aliases and user information 
-		to be resolved from dierent sources. For example, a standalone 
+		to be resolved from different sources. For example, a standalone 
 		UNIX workstation may resolve system information from a series of 
 		flat files stored on the local lesystem. A networked workstation 
 		may first attempt to resolve system information from local files, 
@@ -202,7 +202,7 @@
 		for a line which matches the service type being requested, for 
 		example the "passwd" service type is used when user or group names 
 		are looked up. This	config line species which implementations 
-		of that service should be tried andin what order. If the passwd 
+		of that service should be tried and in what order. If the passwd 
 		config line is:</para>
 
 		<para><command>passwd: files example</command></para>
@@ -229,7 +229,7 @@
 		<para>Pluggable Authentication Modules, also known as PAM, 
 		is a system for abstracting authentication and authorization 
 		technologies. With a PAM module it is possible to specify different 
-		authentication methods for dierent system applications without 
+		authentication methods for different system applications without 
 		having to recompile these applications. PAM is also useful
 		for implementing a particular policy for authorization. For example, 
 		a system administrator may only allow console logins from users 
@@ -244,7 +244,7 @@
 		this change take eect directly on the Primary Domain Controller.
 		</para>
 		
-		<para>PAM is congured by providing control files in the directory 
+		<para>PAM is configured by providing control files in the directory 
 		<filename>/etc/pam.d/</filename> for each of the services that 
 		require authentication. When an authentication request is made 
 		by an application the PAM code in the C library looks up this
@@ -263,11 +263,11 @@
 		<title>User and Group ID Allocation</title>
 		
 		<para>When a user or group is created under Windows NT 
-		is it allocated a numerical relative identier (RID). This is 
-		slightly dierent to UNIX which has a range of numbers which are 
+		is it allocated a numerical relative identifier (RID). This is 
+		slightly different to UNIX which has a range of numbers which are 
 		used to identify users, and the same range in which to identify 
 		groups. It is winbind's job to convert RIDs to UNIX id numbers and
-		vice versa.  When winbind is congured it is given part of the UNIX 
+		vice versa.  When winbind is configured it is given part of the UNIX 
 		user id space and a part of the UNIX group id space in which to 
 		store Windows NT users and groups. If a Windows NT user is 
 		resolved for the first time, it is allocated the next UNIX id from 
@@ -290,7 +290,7 @@
 		by NT domain controllers.  User or group information returned 
 		by a PDC is cached by winbind along with a sequence number also 
 		returned by the PDC. This sequence number is incremented by 
-		Windows NT whenever any user or group information is modied. If 
+		Windows NT whenever any user or group information is modified. If 
 		a cached entry has expired, the sequence number is requested from 
 		the PDC and compared against the sequence number of the cached entry. 
 		If the sequence numbers do not match, then the cached information 
@@ -314,7 +314,7 @@
 	
 	<para>Once you have installed the packages you should read 
 	the <command>winbindd(8)</command> man page which will provide you 
-	with conguration information and give you sample conguration files. 
+	with configuration information and give you sample configuration files. 
 	You may also wish to update the main Samba daemons smbd and nmbd) 
 	with a more recent development release, such as the recently
 	announced Samba 2.2 alpha release.</para>
diff --git a/docs/htmldocs/CVS-Access.html b/docs/htmldocs/CVS-Access.html
index ea47cede040..ff02a18f290 100644
--- a/docs/htmldocs/CVS-Access.html
+++ b/docs/htmldocs/CVS-Access.html
@@ -32,10 +32,10 @@ NAME="AEN3"
 >Introduction</A
 ></H1
 ><P
->Samba is developed in an open environnment.  Developers use CVS
+>Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
 "commit") new source code.  Samba's various CVS branches can
-be accessed via anonymouns CVS using the instructions
+be accessed via anonymous CVS using the instructions
 detailed in this chapter.</P
 ><P
 >This document is a modified version of the instructions found at
@@ -91,7 +91,7 @@ NAME="AEN16"
 >You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
 do with the repository and allows you to checkout whole source trees 
-and keep them uptodate via normal cvs commands. This is the 
+and keep them up to date via normal cvs commands. This is the 
 preferred method of access if you are a developer and not
 just a casual browser.</P
 ><P
diff --git a/docs/htmldocs/ENCRYPTION.html b/docs/htmldocs/ENCRYPTION.html
index f7424be11a4..cff06c4822a 100644
--- a/docs/htmldocs/ENCRYPTION.html
+++ b/docs/htmldocs/ENCRYPTION.html
@@ -118,7 +118,7 @@ NAME="AEN18"
 ><P
 >The unix and SMB password encryption techniques seem similar 
 	on the surface. This similarity is, however, only skin deep. The unix 
-	scheme typically sends clear text passwords over the nextwork when 
+	scheme typically sends clear text passwords over the network when 
 	logging in. This is bad. The SMB encryption scheme never sends the 
 	cleartext password over the network but it does store the 16 byte 
 	hashed values on disk. This is also bad. Why? Because the 16 byte hashed 
@@ -196,7 +196,7 @@ CLASS="EMPHASIS"
 		Microsoft SMB/CIFS clients support authentication via the
 		SMB Challenge/Response mechanism described here.  Enabling
 		clear text authentication does not disable the ability
-		of the client to particpate in encrypted authentication.</P
+		of the client to participate in encrypted authentication.</P
 ></TD
 ></TR
 ></TABLE
diff --git a/docs/htmldocs/Integrating-with-Windows.html b/docs/htmldocs/Integrating-with-Windows.html
index e8b0ac83d1f..7062b128529 100644
--- a/docs/htmldocs/Integrating-with-Windows.html
+++ b/docs/htmldocs/Integrating-with-Windows.html
@@ -609,12 +609,7 @@ needed in the smb.conf file:</P
 ><PRE
 CLASS="PROGRAMLISTING"
 >	wins support = No
-	wins server = <TT
-CLASS="REPLACEABLE"
-><I
->xxx.xxx.xxx.xxx</I
-></TT
-></PRE
+	wins server = xxx.xxx.xxx.xxx</PRE
 ></P
 ><P
 >where <TT
@@ -631,7 +626,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN122"
+NAME="AEN121"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></H1
@@ -698,7 +693,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN132"
+NAME="AEN131"
 >MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></H1
@@ -771,7 +766,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN149"
+NAME="AEN148"
 >Use MS Windows NT as an authentication server</A
 ></H2
 ><P
@@ -807,7 +802,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN157"
+NAME="AEN156"
 >Make Samba a member of an MS Windows NT security domain</A
 ></H2
 ><P
@@ -856,7 +851,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN171"
+NAME="AEN170"
 >Configure Samba as an authentication server</A
 ></H2
 ><P
@@ -883,7 +878,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN178"
+NAME="AEN177"
 >Users</A
 ></H3
 ><P
@@ -916,7 +911,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN185"
+NAME="AEN184"
 >MS Windows NT Machine Accounts</A
 ></H3
 ><P
@@ -937,7 +932,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN190"
+NAME="AEN189"
 >Configuration of Samba as ...</A
 ></H1
 ><P
diff --git a/docs/htmldocs/NT_Security.html b/docs/htmldocs/NT_Security.html
index 43ba0566249..e7bf9890a9d 100644
--- a/docs/htmldocs/NT_Security.html
+++ b/docs/htmldocs/NT_Security.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->UNIX Permission Bits and WIndows NT Access Control Lists</TITLE
+>UNIX Permission Bits and Windows NT Access Control Lists</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
@@ -20,7 +20,7 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN1"
->UNIX Permission Bits and WIndows NT Access Control Lists</A
+>UNIX Permission Bits and Windows NT Access Control Lists</A
 ></H1
 ><HR></DIV
 ><DIV
@@ -153,7 +153,7 @@ CLASS="REPLACEABLE"
 >(Long name)</I
 ></TT
 >
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database). Click on the <B
 CLASS="COMMAND"
 >Close
@@ -182,7 +182,7 @@ CLASS="COMMAND"
 	you to change the ownership of this file to yourself (clicking on 
 	it will display a dialog box complaining that the user you are 
 	currently logged onto the NT client cannot be found). The reason 
-	for this is that changing the ownership of a file is a privilaged 
+	for this is that changing the ownership of a file is a privileged 
 	operation in UNIX, available only to the <I
 CLASS="EMPHASIS"
 >root</I
@@ -192,7 +192,7 @@ CLASS="EMPHASIS"
 	client this will not work with Samba at this time.</P
 ><P
 >There is an NT chown command that will work with Samba 
-	and allow a user with Administrator privillage connected 
+	and allow a user with Administrator privilege connected 
 	to a Samba 2.0.4 server as root to change the ownership of 
 	files on both a local NTFS filesystem or remote mounted NTFS 
 	or Samba drive. This is available as part of the <I
@@ -242,7 +242,7 @@ CLASS="REPLACEABLE"
 >(Long name)</I
 ></TT
 >
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database).</P
 ><P
 >If the parameter <TT
@@ -274,7 +274,7 @@ NAME="AEN58"
 ></H2
 ><P
 >The standard UNIX user/group/world triple and 
-		the correspinding "read", "write", "execute" permissions 
+		the corresponding "read", "write", "execute" permissions 
 		triples are mapped by Samba into a three element NT ACL 
 		with the 'r', 'w', and 'x' bits mapped into the corresponding 
 		NT permissions. The UNIX world permissions are mapped into 
@@ -400,7 +400,7 @@ CLASS="COMMAND"
 	button will not return a list of users in Samba 2.0.4 (it will give 
 	an error message of <B
 CLASS="COMMAND"
->"The remote proceedure call failed 
+>"The remote procedure call failed 
 	and did not execute"</B
 >). This means that you can only 
 	manipulate the current user/group/world permissions listed in 
@@ -450,7 +450,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >"Take
 	Ownership"</B
-> permission (dsplayed as <B
+> permission (displayed as <B
 CLASS="COMMAND"
 >"O"
 	</B
@@ -582,7 +582,7 @@ CLASS="PARAMETER"
 ></A
 > parameter to provide compatibility
 	with Samba 2.0.4 where the permission change facility was introduced.
-	To allow a user to modify all the user/group/world permissions on a file,
+	To allow a user to modify all the user/group/world permissions on a file
 	with no restrictions set this parameter to 000.</P
 ><P
 >The <TT
diff --git a/docs/htmldocs/OS2-Client-HOWTO.html b/docs/htmldocs/OS2-Client-HOWTO.html
index 84a424c017e..d7a3132d151 100644
--- a/docs/htmldocs/OS2-Client-HOWTO.html
+++ b/docs/htmldocs/OS2-Client-HOWTO.html
@@ -173,7 +173,7 @@ NAME="AEN33"
 		driver from an OS/2 system.</P
 ><P
 >Install the NT driver first for that printer.  Then, 
-		add to your smb.conf a paramater, "os2 driver map = 
+		add to your smb.conf a parameter, "os2 driver map = 
 		<TT
 CLASS="REPLACEABLE"
 ><I
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 086636006e0..4bd9e671978 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -630,7 +630,7 @@ HREF="#AEN1494"
 ><DT
 >8. <A
 HREF="#AEN1519"
->Unifed Logons between Windows NT and UNIX using Winbind</A
+>Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
@@ -712,7 +712,7 @@ HREF="#AEN1623"
 ><DT
 >9. <A
 HREF="#AEN1626"
->UNIX Permission Bits and WIndows NT Access Control Lists</A
+>UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
@@ -915,7 +915,7 @@ CLASS="USERINPUT"
 ></P
 ><P
 >first to see what special options you can enable.
-	Then exectuting</P
+	Then executing</P
 ><P
 ><TT
 CLASS="PROMPT"
@@ -1042,7 +1042,7 @@ CLASS="PROGRAMLISTING"
 >which would allow connections by anyone with an 
 	account on the server, using either their login name or 
 	"homes" as the service name. (Note that I also set the 
-	workgroup that Samba is part of. See BROWSING.txt for defails)</P
+	workgroup that Samba is part of. See BROWSING.txt for details)</P
 ><P
 >Note that <B
 CLASS="COMMAND"
@@ -1089,7 +1089,7 @@ CLASS="FILENAME"
 	not it will give an error message.</P
 ><P
 >Make sure it runs OK and that the services look 
-	resonable before proceeding. </P
+	reasonable before proceeding. </P
 ></DIV
 ><DIV
 CLASS="SECT1"
@@ -1207,7 +1207,7 @@ CLASS="FILENAME"
 		<TT
 CLASS="FILENAME"
 >/etc/inetd.conf</TT
-> to make them consistant.</P
+> to make them consistent.</P
 ><P
 >NOTE: On many systems you may need to use the 
 		"interfaces" option in smb.conf to specify the IP address 
@@ -1220,7 +1220,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >nmbd</B
 > tries to determine it at run 
-		time, but fails on somunixes. See the section on "testing nmbd" 
+		time, but fails on some unixes. See the section on "testing nmbd" 
 		for a method of finding if you need to do this.</P
 ><P
 >!!!WARNING!!! Many unixes only accept around 5 
@@ -1495,7 +1495,7 @@ NAME="AEN176"
 >1.10.1. Diagnosing Problems</A
 ></H2
 ><P
->If you have instalation problems then go to 
+>If you have installation problems then go to 
 		<TT
 CLASS="FILENAME"
 >DIAGNOSIS.txt</TT
@@ -1629,7 +1629,7 @@ NAME="AEN196"
 		are set by an application when it opens a file to determine 
 		what types of access should be allowed simultaneously with 
 		its open. A client may ask for DENY_NONE, DENY_READ, DENY_WRITE 
-		or DENY_ALL. There are also special compatability modes called 
+		or DENY_ALL. There are also special compatibility modes called 
 		DENY_FCB and  DENY_DOS.</P
 ><P
 >You can disable share modes using "share modes = no". 
@@ -1662,7 +1662,7 @@ NAME="AEN209"
 ><P
 >If you have problems using filenames with accented 
 		characters in them (like the German, French or Scandinavian 
-		character sets) then I recommmend you look at the "valid chars" 
+		character sets) then I recommend you look at the "valid chars" 
 		option in smb.conf and also take a look at the validchars 
 		package in the examples directory.</P
 ></DIV
@@ -2857,7 +2857,7 @@ NAME="AEN446"
 ><P
 >The unix and SMB password encryption techniques seem similar 
 	on the surface. This similarity is, however, only skin deep. The unix 
-	scheme typically sends clear text passwords over the nextwork when 
+	scheme typically sends clear text passwords over the network when 
 	logging in. This is bad. The SMB encryption scheme never sends the 
 	cleartext password over the network but it does store the 16 byte 
 	hashed values on disk. This is also bad. Why? Because the 16 byte hashed 
@@ -2933,7 +2933,7 @@ ALIGN="LEFT"
 		Microsoft SMB/CIFS clients support authentication via the
 		SMB Challenge/Response mechanism described here.  Enabling
 		clear text authentication does not disable the ability
-		of the client to particpate in encrypted authentication.</P
+		of the client to participate in encrypted authentication.</P
 ></TD
 ></TR
 ></TABLE
@@ -4123,7 +4123,7 @@ Add Printer Wizard icon.  The APW will be show only if</P
 ><P
 >The connected user is able to successfully
 	execute an OpenPrinterEx(\\server) with administrative
-	priviledges (i.e. root or <TT
+	privileges (i.e. root or <TT
 CLASS="PARAMETER"
 ><I
 >printer admin</I
@@ -4405,7 +4405,7 @@ foreach (supported architecture for a given driver)
 		the Imprints tool set was the name space issues between 
 		various supported client architectures.  For example, Windows 
 		NT includes a driver named "Apple LaserWriter II NTX v51.8" 
-		and Windows 95 callsits version of this driver "Apple 
+		and Windows 95 calls its version of this driver "Apple 
 		LaserWriter II NTX"</P
 ><P
 >The problem is how to know what client drivers have 
@@ -4455,7 +4455,7 @@ it will remember the server as a LanMan printer server.  Upgrading
 the Samba host to 2.2 makes support for MSRPC printing possible, but 
 the NT client will still remember the previous setting.</P
 ><P
->In order to give an NT client printing "amesia" (only necessary if you 
+>In order to give an NT client printing "amnesia" (only necessary if you 
 want to use the newer MSRPC printing functionality in Samba), delete 
 the registry keys associated with the print server contained in 
 <TT
@@ -4973,9 +4973,9 @@ NAME="AEN989"
 >7.1. Prerequisite Reading</A
 ></H1
 ><P
->Before you continue readingin this chapter, please make sure 
+>Before you continue reading in this chapter, please make sure 
 that you are comfortable with configuring basic files services
-in smb.conf and how to enable and administrate password 
+in smb.conf and how to enable and administer password 
 encryption in Samba.  Theses two topics are covered in the
 <A
 HREF="smb.conf.5.html"
@@ -4986,7 +4986,7 @@ CLASS="FILENAME"
 ></A
 > 
 manpage and the <A
-HREF="EMCRYPTION.html"
+HREF="ENCRYPTION.html"
 TARGET="_top"
 >Encryption chapter</A
 > 
@@ -5011,7 +5011,7 @@ CLASS="NOTE"
 >Author's Note :</EM
 > This document is a combination 
 of David Bannon's Samba 2.2 PDC HOWTO and the Samba NT Domain FAQ. 
-Both documents are superceeded by this one.</P
+Both documents are superseded by this one.</P
 ></BLOCKQUOTE
 ></DIV
 ><P
@@ -5384,7 +5384,7 @@ to the Domain</A
 >A machine trust account is a samba user account owned by a computer.  
 The account password acts as the shared secret for secure 
 communication with the Domain Controller.  This is a security feature
-to prevent an unauthorized machine with the same netbios name from 
+to prevent an unauthorized machine with the same NetBIOS name from 
 joining the domain and gaining access to domain user/group accounts.  
 Hence a Windows 9x host is never a true member of a domain because it does 
 not posses a machine trust account, and thus has no shared secret with the DC.</P
@@ -5417,7 +5417,7 @@ CLASS="FILENAME"
 ><P
 >	Manual creation before joining the client to the domain.  In this case, 
 	the password is set to a known value -- the lower case of the 
-	machine's netbios name.
+	machine's NetBIOS name.
 	</P
 ></LI
 ><LI
@@ -5504,7 +5504,7 @@ CLASS="REPLACEABLE"
 >machine_name</I
 ></TT
 > absolutely must be 
-the netbios name of the pc to be added to the domain.  The "$" must append the netbios
+the NetBIOS name of the pc to be added to the domain.  The "$" must append the NetBIOS
 name of the pc or samba will not recognize this as a machine account</P
 ><P
 >Now that the UNIX account has been created, the next step is to create 
@@ -5534,7 +5534,7 @@ CLASS="REPLACEABLE"
 ><I
 >machine_name</I
 ></TT
-> is the machine's netbios
+> is the machine's NetBIOS
 name. </P
 ><DIV
 CLASS="WARNING"
@@ -5560,7 +5560,7 @@ ALIGN="LEFT"
 	the "Server Manager".  From the time at which the account is created
 	to the time which th client joins the domain and changes the password,
 	your domain is vulnerable to an intruder joining your domain using a
-	a machine with the same netbios name.  A PDC inherently trusts
+	a machine with the same NetBIOS name.  A PDC inherently trusts
 	members of the domain and will serve out a large degree of user 
 	information to such clients.  You have been warned!
 	</P
@@ -5741,8 +5741,8 @@ CLASS="PARAMETER"
 	have not been created correctly. Make sure that you have the entry 
 	correct for the machine account in smbpasswd file on the Samba PDC. 
 	If you added the account using an editor rather than using the smbpasswd 
-	utility, make sure that the account name is the machine netbios name 
-	with a '$' appended to it ( ie. computer_name$ ). There must be an entry 
+	utility, make sure that the account name is the machine NetBIOS name 
+	with a '$' appended to it ( i.e. computer_name$ ). There must be an entry 
 	in both /etc/passwd and the smbpasswd file. Some people have reported 
 	that inconsistent subnet masks between the Samba server and the NT 
 	client have caused this problem.   Make sure that these are consistent 
@@ -5767,7 +5767,7 @@ CLASS="PARAMETER"
 CLASS="COMMAND"
 >smbpasswd -e 
 	%user%</B
->, this is normaly done, when you create an account.
+>, this is normally done, when you create an account.
 	</P
 ><P
 >	In order to work around this problem in 2.2.0, configure the 
@@ -5885,7 +5885,7 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >servicepackname /x</B
 >, 
-	ie thats <B
+	i.e. that's <B
 CLASS="COMMAND"
 >Nt4sp6ai.exe /x</B
 > for service pack 6a.  The policy editor, 
@@ -5998,7 +5998,7 @@ general SMB topics such as browsing.</P
 	</P
 ><P
 >	One of the best diagnostic tools for debugging problems is Samba itself.  
-	You can use the -d option for both smbd and nmbd to specifiy what 
+	You can use the -d option for both smbd and nmbd to specify what 
 	'debug level' at which to run.  See the man pages on smbd, nmbd  and 
 	smb.conf for more information on debugging options.  The debug 
 	level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -6054,7 +6054,7 @@ TARGET="_top"
 	(aka. netmon) is available on the Microsoft Developer Network CD's, 
 	the Windows NT Server install CD and the SMS CD's.  The version of 
 	netmon that ships with SMS allows for dumping packets between any two 
-	computers (ie. placing the network interface in promiscuous mode).  
+	computers (i.e. placing the network interface in promiscuous mode).  
 	The version on the NT Server install CD will only allow monitoring 
 	of network traffic directed to the local NT box and broadcasts on the 
 	local subnet.  Be aware that Ethereal can read and write netmon 
@@ -6306,7 +6306,7 @@ TARGET="_top"
 ><LI
 ><P
 > Don't cross post. Work out which is the best list to post to 
-		and see what happens, ie don't post to both samba-ntdom and samba-technical.
+		and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
         Many people active on the lists subscribe to more 
 		than one list and get annoyed to see the same message two or more times. 
 		Often someone will see a message and thinking it would be better dealt 
@@ -6412,7 +6412,7 @@ profiles for MS Windows for workgroups and MS Windows 9X clients.</P
 logon server.  The first one to reply gets the job, and validates its
 password using whatever mechanism the Samba administrator has installed.
 It is possible (but very stupid) to create a domain where the user
-database is not shared between servers, ie they are effectively workgroup
+database is not shared between servers, i.e. they are effectively workgroup
 servers advertising themselves as participating in a domain.  This
 demonstrates how authentication is quite different from but closely
 involved with domains.</P
@@ -6492,7 +6492,7 @@ TYPE="1"
 ><LI
 ><P
 >	The client then connects to the user's home share and searches for the 
-	user's profile. As it turns out, you can specify the users home share as
+	user's profile. As it turns out, you can specify the user's home share as
 	a sharename and path. For example, \\server\fred\.profile.
 	If the profiles are found, they are implemented.
 	</P
@@ -6620,7 +6620,7 @@ CLASS="PROGRAMLISTING"
 ></LI
 ><LI
 ><P
->	you will probabaly find that your clients automatically mount the
+>	you will probably find that your clients automatically mount the
 	\\SERVER\NETLOGON share as drive z: while logging in. You can put
 	some useful programs there to execute from the batch files.
 	</P
@@ -6670,7 +6670,7 @@ or not Samba must be the domain master browser for its workgroup
 when operating as a DC.  While it may technically be possible
 to configure a server as such (after all, browsing and domain logons
 are two distinctly different functions), it is not a good idea to
-so.  You should remember that the DC must register the DOMAIN#1b netbios 
+so.  You should remember that the DC must register the DOMAIN#1b NetBIOS 
 name.  This is the name used by Windows clients to locate the DC.
 Windows clients do not distinguish between the DC and the DMB.
 For this reason, it is very wise to configure the Samba DC as the DMB.</P
@@ -6735,7 +6735,7 @@ Win9X and WinNT clients implement these features.</P
 ><P
 >Win9X clients send a NetUserGetInfo request to the server to get the user's
 profiles location. However, the response does not have room for a separate 
-profiles location field, only the users home share. This means that Win9X 
+profiles location field, only the user's home share. This means that Win9X 
 profiles are restricted to being in the user's home directory.</P
 ><P
 >WinNT clients send a NetSAMLogon RPC request, which contains many fields, 
@@ -6992,7 +6992,7 @@ TYPE="1"
 ></LI
 ><LI
 ><P
->	search for the user's .PWL password-cacheing file in the c:\windows
+>	search for the user's .PWL password-caching file in the c:\windows
 	directory, and delete it.
 	</P
 ></LI
@@ -7086,11 +7086,11 @@ case, or whether there is some configuration issue, as yet unknown,
 that makes NT Workstation _think_ that the link is a slow one is a
 matter to be resolved].</P
 ><P
->[lkcl 20aug97 - after samba digest correspondance, one user found, and
+>[lkcl 20aug97 - after samba digest correspondence, one user found, and
 another confirmed, that profiles cannot be loaded from a samba server
 unless "security = user" and "encrypt passwords = yes" (see the file
 ENCRYPTION.txt) or "security = server" and "password server = ip.address.
-of.yourNTserver" are used.  either of these options will allow the NT
+of.yourNTserver" are used.  Either of these options will allow the NT
 workstation to access the samba server using LAN manager encrypted
 passwords, without the user intervention normally required by NT
 workstation for clear-text passwords].</P
@@ -7282,7 +7282,7 @@ plain Servers.</P
 ><P
 >The User database is called the SAM (Security Access Manager) database and
 is used for all user authentication as well as for authentication of inter-
-process authentication (ie: to ensure that the service action a user has
+process authentication (i.e. to ensure that the service action a user has
 requested is permitted within the limits of that user's privileges).</P
 ><P
 >The Samba team have produced a utility that can dump the Windows NT SAM into 
@@ -7293,7 +7293,7 @@ to Samba systems.</P
 ><P
 >Windows for Workgroups, Windows 95, and Windows NT Workstations and Servers
 can participate in a Domain security system that is controlled by Windows NT
-servers that have been correctly configured. At most every domain will have
+servers that have been correctly configured. Almost every domain will have
 ONE Primary Domain Controller (PDC). It is desirable that each domain will
 have at least one Backup Domain Controller (BDC).</P
 ><P
@@ -7307,7 +7307,7 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="AEN1519"
->Chapter 8. Unifed Logons between Windows NT and UNIX using Winbind</A
+>Chapter 8. Unified Logons between Windows NT and UNIX using Winbind</A
 ></H1
 ><DIV
 CLASS="SECT1"
@@ -7324,7 +7324,7 @@ NAME="AEN1537"
 >winbind
 	</EM
 >, a component of the Samba suite of programs as a 
-	solution to the unied logon problem. Winbind uses a UNIX implementation 
+	solution to the unified logon problem. Winbind uses a UNIX implementation 
 	of Microsoft RPC calls, Pluggable Authentication Modules, and the Name 
 	Service Switch to allow Windows NT domain users to appear and operate 
 	as UNIX users on a UNIX machine. This paper describes the winbind 
@@ -7355,7 +7355,7 @@ NAME="AEN1541"
 	can lead to synchronization problems between the UNIX and Windows 
 	systems and confusion for users.</P
 ><P
->We divide the unifed logon problem for UNIX machines into 
+>We divide the unified logon problem for UNIX machines into 
 	three smaller problems:</P
 ><P
 ></P
@@ -7382,7 +7382,7 @@ NAME="AEN1541"
 	information on the UNIX machines and without creating additional 
 	tasks for the system administrator when maintaining users and 
 	groups on either system. The winbind system provides a simple 
-	and elegant solution to all three components of the unifed logon 
+	and elegant solution to all three components of the unified logon 
 	problem.</P
 ></DIV
 ><DIV
@@ -7509,7 +7509,7 @@ NAME="AEN1574"
 >The Name Service Switch, or NSS, is a feature that is 
 		present in many UNIX operating systems. It allows system 
 		information such as hostnames, mail aliases and user information 
-		to be resolved from dierent sources. For example, a standalone 
+		to be resolved from different sources. For example, a standalone 
 		UNIX workstation may resolve system information from a series of 
 		flat files stored on the local lesystem. A networked workstation 
 		may first attempt to resolve system information from local files, 
@@ -7538,7 +7538,7 @@ CLASS="FILENAME"
 		for a line which matches the service type being requested, for 
 		example the "passwd" service type is used when user or group names 
 		are looked up. This	config line species which implementations 
-		of that service should be tried andin what order. If the passwd 
+		of that service should be tried and in what order. If the passwd 
 		config line is:</P
 ><P
 ><B
@@ -7588,7 +7588,7 @@ NAME="AEN1590"
 >Pluggable Authentication Modules, also known as PAM, 
 		is a system for abstracting authentication and authorization 
 		technologies. With a PAM module it is possible to specify different 
-		authentication methods for dierent system applications without 
+		authentication methods for different system applications without 
 		having to recompile these applications. PAM is also useful
 		for implementing a particular policy for authorization. For example, 
 		a system administrator may only allow console logins from users 
@@ -7603,7 +7603,7 @@ NAME="AEN1590"
 		this change take eect directly on the Primary Domain Controller.
 		</P
 ><P
->PAM is congured by providing control files in the directory 
+>PAM is configured by providing control files in the directory 
 		<TT
 CLASS="FILENAME"
 >/etc/pam.d/</TT
@@ -7635,11 +7635,11 @@ NAME="AEN1598"
 ></H2
 ><P
 >When a user or group is created under Windows NT 
-		is it allocated a numerical relative identier (RID). This is 
-		slightly dierent to UNIX which has a range of numbers which are 
+		is it allocated a numerical relative identifier (RID). This is 
+		slightly different to UNIX which has a range of numbers which are 
 		used to identify users, and the same range in which to identify 
 		groups. It is winbind's job to convert RIDs to UNIX id numbers and
-		vice versa.  When winbind is congured it is given part of the UNIX 
+		vice versa.  When winbind is configured it is given part of the UNIX 
 		user id space and a part of the UNIX group id space in which to 
 		store Windows NT users and groups. If a Windows NT user is 
 		resolved for the first time, it is allocated the next UNIX id from 
@@ -7666,7 +7666,7 @@ NAME="AEN1602"
 		by NT domain controllers.  User or group information returned 
 		by a PDC is cached by winbind along with a sequence number also 
 		returned by the PDC. This sequence number is incremented by 
-		Windows NT whenever any user or group information is modied. If 
+		Windows NT whenever any user or group information is modified. If 
 		a cached entry has expired, the sequence number is requested from 
 		the PDC and compared against the sequence number of the cached entry. 
 		If the sequence numbers do not match, then the cached information 
@@ -7700,7 +7700,7 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >winbindd(8)</B
 > man page which will provide you 
-	with conguration information and give you sample conguration files. 
+	with configuration information and give you sample configuration files. 
 	You may also wish to update the main Samba daemons smbd and nmbd) 
 	with a more recent development release, such as the recently
 	announced Samba 2.2 alpha release.</P
@@ -7775,7 +7775,7 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="AEN1626"
->Chapter 9. UNIX Permission Bits and WIndows NT Access Control Lists</A
+>Chapter 9. UNIX Permission Bits and Windows NT Access Control Lists</A
 ></H1
 ><DIV
 CLASS="SECT1"
@@ -7901,7 +7901,7 @@ CLASS="REPLACEABLE"
 >(Long name)</I
 ></TT
 >
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database). Click on the <B
 CLASS="COMMAND"
 >Close
@@ -7930,7 +7930,7 @@ CLASS="COMMAND"
 	you to change the ownership of this file to yourself (clicking on 
 	it will display a dialog box complaining that the user you are 
 	currently logged onto the NT client cannot be found). The reason 
-	for this is that changing the ownership of a file is a privilaged 
+	for this is that changing the ownership of a file is a privileged 
 	operation in UNIX, available only to the <EM
 >root</EM
 > 
@@ -7939,7 +7939,7 @@ CLASS="COMMAND"
 	client this will not work with Samba at this time.</P
 ><P
 >There is an NT chown command that will work with Samba 
-	and allow a user with Administrator privillage connected 
+	and allow a user with Administrator privilege connected 
 	to a Samba 2.0.4 server as root to change the ownership of 
 	files on both a local NTFS filesystem or remote mounted NTFS 
 	or Samba drive. This is available as part of the <EM
@@ -7988,7 +7988,7 @@ CLASS="REPLACEABLE"
 >(Long name)</I
 ></TT
 >
-	is the discriptive string identifying the user (normally found in the
+	is the descriptive string identifying the user (normally found in the
 	GECOS field of the UNIX password database).</P
 ><P
 >If the parameter <TT
@@ -8020,7 +8020,7 @@ NAME="AEN1692"
 ></H2
 ><P
 >The standard UNIX user/group/world triple and 
-		the correspinding "read", "write", "execute" permissions 
+		the corresponding "read", "write", "execute" permissions 
 		triples are mapped by Samba into a three element NT ACL 
 		with the 'r', 'w', and 'x' bits mapped into the corresponding 
 		NT permissions. The UNIX world permissions are mapped into 
@@ -8146,7 +8146,7 @@ CLASS="COMMAND"
 	button will not return a list of users in Samba 2.0.4 (it will give 
 	an error message of <B
 CLASS="COMMAND"
->"The remote proceedure call failed 
+>"The remote procedure call failed 
 	and did not execute"</B
 >). This means that you can only 
 	manipulate the current user/group/world permissions listed in 
@@ -8196,7 +8196,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >"Take
 	Ownership"</B
-> permission (dsplayed as <B
+> permission (displayed as <B
 CLASS="COMMAND"
 >"O"
 	</B
@@ -8327,7 +8327,7 @@ CLASS="PARAMETER"
 ></A
 > parameter to provide compatibility
 	with Samba 2.0.4 where the permission change facility was introduced.
-	To allow a user to modify all the user/group/world permissions on a file,
+	To allow a user to modify all the user/group/world permissions on a file
 	with no restrictions set this parameter to 000.</P
 ><P
 >The <TT
@@ -8689,7 +8689,7 @@ NAME="AEN1850"
 		driver from an OS/2 system.</P
 ><P
 >Install the NT driver first for that printer.  Then, 
-		add to your smb.conf a paramater, "os2 driver map = 
+		add to your smb.conf a parameter, "os2 driver map = 
 		<TT
 CLASS="REPLACEABLE"
 ><I
@@ -8737,10 +8737,10 @@ NAME="AEN1866"
 >11.1. Introduction</A
 ></H1
 ><P
->Samba is developed in an open environnment.  Developers use CVS
+>Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
 "commit") new source code.  Samba's various CVS branches can
-be accessed via anonymouns CVS using the instructions
+be accessed via anonymous CVS using the instructions
 detailed in this chapter.</P
 ><P
 >This document is a modified version of the instructions found at
@@ -8796,7 +8796,7 @@ NAME="AEN1879"
 >You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
 do with the repository and allows you to checkout whole source trees 
-and keep them uptodate via normal cvs commands. This is the 
+and keep them up to date via normal cvs commands. This is the 
 preferred method of access if you are a developer and not
 just a casual browser.</P
 ><P
diff --git a/docs/htmldocs/Samba-PDC-HOWTO.html b/docs/htmldocs/Samba-PDC-HOWTO.html
index 883de3a0abb..1c67649f4ca 100644
--- a/docs/htmldocs/Samba-PDC-HOWTO.html
+++ b/docs/htmldocs/Samba-PDC-HOWTO.html
@@ -32,9 +32,9 @@ NAME="AEN3"
 >Prerequisite Reading</A
 ></H1
 ><P
->Before you continue readingin this chapter, please make sure 
+>Before you continue reading in this chapter, please make sure 
 that you are comfortable with configuring basic files services
-in smb.conf and how to enable and administrate password 
+in smb.conf and how to enable and administer password 
 encryption in Samba.  Theses two topics are covered in the
 <A
 HREF="smb.conf.5.html"
@@ -45,7 +45,7 @@ CLASS="FILENAME"
 ></A
 > 
 manpage and the <A
-HREF="EMCRYPTION.html"
+HREF="ENCRYPTION.html"
 TARGET="_top"
 >Encryption chapter</A
 > 
@@ -71,7 +71,7 @@ CLASS="EMPHASIS"
 >Author's Note :</I
 > This document is a combination 
 of David Bannon's Samba 2.2 PDC HOWTO and the Samba NT Domain FAQ. 
-Both documents are superceeded by this one.</P
+Both documents are superseded by this one.</P
 ></BLOCKQUOTE
 ></DIV
 ><P
@@ -435,7 +435,7 @@ to the Domain</A
 >A machine trust account is a samba user account owned by a computer.  
 The account password acts as the shared secret for secure 
 communication with the Domain Controller.  This is a security feature
-to prevent an unauthorized machine with the same netbios name from 
+to prevent an unauthorized machine with the same NetBIOS name from 
 joining the domain and gaining access to domain user/group accounts.  
 Hence a Windows 9x host is never a true member of a domain because it does 
 not posses a machine trust account, and thus has no shared secret with the DC.</P
@@ -468,7 +468,7 @@ CLASS="FILENAME"
 ><P
 >	Manual creation before joining the client to the domain.  In this case, 
 	the password is set to a known value -- the lower case of the 
-	machine's netbios name.
+	machine's NetBIOS name.
 	</P
 ></LI
 ><LI
@@ -546,7 +546,7 @@ CLASS="REPLACEABLE"
 >machine_name</I
 ></TT
 > absolutely must be 
-the netbios name of the pc to be added to the domain.  The "$" must append the netbios
+the NetBIOS name of the pc to be added to the domain.  The "$" must append the NetBIOS
 name of the pc or samba will not recognize this as a machine account</P
 ><P
 >Now that the UNIX account has been created, the next step is to create 
@@ -576,7 +576,7 @@ CLASS="REPLACEABLE"
 ><I
 >machine_name</I
 ></TT
-> is the machine's netbios
+> is the machine's NetBIOS
 name. </P
 ><DIV
 CLASS="WARNING"
@@ -602,7 +602,7 @@ ALIGN="LEFT"
 	the "Server Manager".  From the time at which the account is created
 	to the time which th client joins the domain and changes the password,
 	your domain is vulnerable to an intruder joining your domain using a
-	a machine with the same netbios name.  A PDC inherently trusts
+	a machine with the same NetBIOS name.  A PDC inherently trusts
 	members of the domain and will serve out a large degree of user 
 	information to such clients.  You have been warned!
 	</P
@@ -781,8 +781,8 @@ CLASS="PARAMETER"
 	have not been created correctly. Make sure that you have the entry 
 	correct for the machine account in smbpasswd file on the Samba PDC. 
 	If you added the account using an editor rather than using the smbpasswd 
-	utility, make sure that the account name is the machine netbios name 
-	with a '$' appended to it ( ie. computer_name$ ). There must be an entry 
+	utility, make sure that the account name is the machine NetBIOS name 
+	with a '$' appended to it ( i.e. computer_name$ ). There must be an entry 
 	in both /etc/passwd and the smbpasswd file. Some people have reported 
 	that inconsistent subnet masks between the Samba server and the NT 
 	client have caused this problem.   Make sure that these are consistent 
@@ -808,7 +808,7 @@ CLASS="EMPHASIS"
 CLASS="COMMAND"
 >smbpasswd -e 
 	%user%</B
->, this is normaly done, when you create an account.
+>, this is normally done, when you create an account.
 	</P
 ><P
 >	In order to work around this problem in 2.2.0, configure the 
@@ -920,7 +920,7 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >servicepackname /x</B
 >, 
-	ie thats <B
+	i.e. that's <B
 CLASS="COMMAND"
 >Nt4sp6ai.exe /x</B
 > for service pack 6a.  The policy editor, 
@@ -1036,7 +1036,7 @@ CLASS="EMPHASIS"
 	</P
 ><P
 >	One of the best diagnostic tools for debugging problems is Samba itself.  
-	You can use the -d option for both smbd and nmbd to specifiy what 
+	You can use the -d option for both smbd and nmbd to specify what 
 	'debug level' at which to run.  See the man pages on smbd, nmbd  and 
 	smb.conf for more information on debugging options.  The debug 
 	level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -1092,7 +1092,7 @@ TARGET="_top"
 	(aka. netmon) is available on the Microsoft Developer Network CD's, 
 	the Windows NT Server install CD and the SMS CD's.  The version of 
 	netmon that ships with SMS allows for dumping packets between any two 
-	computers (ie. placing the network interface in promiscuous mode).  
+	computers (i.e. placing the network interface in promiscuous mode).  
 	The version on the NT Server install CD will only allow monitoring 
 	of network traffic directed to the local NT box and broadcasts on the 
 	local subnet.  Be aware that Ethereal can read and write netmon 
@@ -1347,7 +1347,7 @@ TARGET="_top"
 ><LI
 ><P
 > Don't cross post. Work out which is the best list to post to 
-		and see what happens, ie don't post to both samba-ntdom and samba-technical.
+		and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
         Many people active on the lists subscribe to more 
 		than one list and get annoyed to see the same message two or more times. 
 		Often someone will see a message and thinking it would be better dealt 
@@ -1455,7 +1455,7 @@ profiles for MS Windows for workgroups and MS Windows 9X clients.</P
 logon server.  The first one to reply gets the job, and validates its
 password using whatever mechanism the Samba administrator has installed.
 It is possible (but very stupid) to create a domain where the user
-database is not shared between servers, ie they are effectively workgroup
+database is not shared between servers, i.e. they are effectively workgroup
 servers advertising themselves as participating in a domain.  This
 demonstrates how authentication is quite different from but closely
 involved with domains.</P
@@ -1535,7 +1535,7 @@ TYPE="1"
 ><LI
 ><P
 >	The client then connects to the user's home share and searches for the 
-	user's profile. As it turns out, you can specify the users home share as
+	user's profile. As it turns out, you can specify the user's home share as
 	a sharename and path. For example, \\server\fred\.profile.
 	If the profiles are found, they are implemented.
 	</P
@@ -1636,7 +1636,7 @@ CLASS="PROGRAMLISTING"
 ></LI
 ><LI
 ><P
->	you will probabaly find that your clients automatically mount the
+>	you will probably find that your clients automatically mount the
 	\\SERVER\NETLOGON share as drive z: while logging in. You can put
 	some useful programs there to execute from the batch files.
 	</P
@@ -1686,7 +1686,7 @@ or not Samba must be the domain master browser for its workgroup
 when operating as a DC.  While it may technically be possible
 to configure a server as such (after all, browsing and domain logons
 are two distinctly different functions), it is not a good idea to
-so.  You should remember that the DC must register the DOMAIN#1b netbios 
+so.  You should remember that the DC must register the DOMAIN#1b NetBIOS 
 name.  This is the name used by Windows clients to locate the DC.
 Windows clients do not distinguish between the DC and the DMB.
 For this reason, it is very wise to configure the Samba DC as the DMB.</P
@@ -1752,7 +1752,7 @@ Win9X and WinNT clients implement these features.</P
 ><P
 >Win9X clients send a NetUserGetInfo request to the server to get the user's
 profiles location. However, the response does not have room for a separate 
-profiles location field, only the users home share. This means that Win9X 
+profiles location field, only the user's home share. This means that Win9X 
 profiles are restricted to being in the user's home directory.</P
 ><P
 >WinNT clients send a NetSAMLogon RPC request, which contains many fields, 
@@ -1983,7 +1983,7 @@ CLASS="EMPHASIS"
 ></LI
 ><LI
 ><P
->	search for the user's .PWL password-cacheing file in the c:\windows
+>	search for the user's .PWL password-caching file in the c:\windows
 	directory, and delete it.
 	</P
 ></LI
@@ -2077,11 +2077,11 @@ case, or whether there is some configuration issue, as yet unknown,
 that makes NT Workstation _think_ that the link is a slow one is a
 matter to be resolved].</P
 ><P
->[lkcl 20aug97 - after samba digest correspondance, one user found, and
+>[lkcl 20aug97 - after samba digest correspondence, one user found, and
 another confirmed, that profiles cannot be loaded from a samba server
 unless "security = user" and "encrypt passwords = yes" (see the file
 ENCRYPTION.txt) or "security = server" and "password server = ip.address.
-of.yourNTserver" are used.  either of these options will allow the NT
+of.yourNTserver" are used.  Either of these options will allow the NT
 workstation to access the samba server using LAN manager encrypted
 passwords, without the user intervention normally required by NT
 workstation for clear-text passwords].</P
@@ -2274,7 +2274,7 @@ plain Servers.</P
 ><P
 >The User database is called the SAM (Security Access Manager) database and
 is used for all user authentication as well as for authentication of inter-
-process authentication (ie: to ensure that the service action a user has
+process authentication (i.e. to ensure that the service action a user has
 requested is permitted within the limits of that user's privileges).</P
 ><P
 >The Samba team have produced a utility that can dump the Windows NT SAM into 
@@ -2285,7 +2285,7 @@ to Samba systems.</P
 ><P
 >Windows for Workgroups, Windows 95, and Windows NT Workstations and Servers
 can participate in a Domain security system that is controlled by Windows NT
-servers that have been correctly configured. At most every domain will have
+servers that have been correctly configured. Almost every domain will have
 ONE Primary Domain Controller (PDC). It is desirable that each domain will
 have at least one Backup Domain Controller (BDC).</P
 ><P
diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index 34f4ed9283a..32c4b7be593 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -84,7 +84,7 @@ CLASS="USERINPUT"
 ></P
 ><P
 >first to see what special options you can enable.
-	Then exectuting</P
+	Then executing</P
 ><P
 ><TT
 CLASS="PROMPT"
@@ -202,7 +202,7 @@ CLASS="PROGRAMLISTING"
 >which would allow connections by anyone with an 
 	account on the server, using either their login name or 
 	"homes" as the service name. (Note that I also set the 
-	workgroup that Samba is part of. See BROWSING.txt for defails)</P
+	workgroup that Samba is part of. See BROWSING.txt for details)</P
 ><P
 >Note that <B
 CLASS="COMMAND"
@@ -249,7 +249,7 @@ CLASS="FILENAME"
 	not it will give an error message.</P
 ><P
 >Make sure it runs OK and that the services look 
-	resonable before proceeding. </P
+	reasonable before proceeding. </P
 ></DIV
 ><DIV
 CLASS="SECT1"
@@ -358,7 +358,7 @@ CLASS="FILENAME"
 		<TT
 CLASS="FILENAME"
 >/etc/inetd.conf</TT
-> to make them consistant.</P
+> to make them consistent.</P
 ><P
 >NOTE: On many systems you may need to use the 
 		"interfaces" option in smb.conf to specify the IP address 
@@ -371,7 +371,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >nmbd</B
 > tries to determine it at run 
-		time, but fails on somunixes. See the section on "testing nmbd" 
+		time, but fails on some unixes. See the section on "testing nmbd" 
 		for a method of finding if you need to do this.</P
 ><P
 >!!!WARNING!!! Many unixes only accept around 5 
@@ -637,7 +637,7 @@ NAME="AEN162"
 >Diagnosing Problems</A
 ></H2
 ><P
->If you have instalation problems then go to 
+>If you have installation problems then go to 
 		<TT
 CLASS="FILENAME"
 >DIAGNOSIS.txt</TT
@@ -771,7 +771,7 @@ NAME="AEN182"
 		are set by an application when it opens a file to determine 
 		what types of access should be allowed simultaneously with 
 		its open. A client may ask for DENY_NONE, DENY_READ, DENY_WRITE 
-		or DENY_ALL. There are also special compatability modes called 
+		or DENY_ALL. There are also special compatibility modes called 
 		DENY_FCB and  DENY_DOS.</P
 ><P
 >You can disable share modes using "share modes = no". 
@@ -804,7 +804,7 @@ NAME="AEN195"
 ><P
 >If you have problems using filenames with accented 
 		characters in them (like the German, French or Scandinavian 
-		character sets) then I recommmend you look at the "valid chars" 
+		character sets) then I recommend you look at the "valid chars" 
 		option in smb.conf and also take a look at the validchars 
 		package in the examples directory.</P
 ></DIV
diff --git a/docs/htmldocs/make_unicodemap.1.html b/docs/htmldocs/make_unicodemap.1.html
index a0b87406936..b8b768ce40d 100644
--- a/docs/htmldocs/make_unicodemap.1.html
+++ b/docs/htmldocs/make_unicodemap.1.html
@@ -58,7 +58,7 @@ TARGET="_top"
 CLASS="COMMAND"
 >make_unicodemap</B
 > compiles text unicode map 
-	files into binary unicodef map files for use with the 
+	files into binary unicode map files for use with the 
 	internationalization features of Samba 2.2.
 	</P
 ></DIV
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index 4b2c39dc4a4..29bd8180407 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -539,7 +539,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >nmbd</B
 > will accept SIGHUP, which will cause 
-	it to dump out it's namelists into the file <TT
+	it to dump out its namelists into the file <TT
 CLASS="FILENAME"
 >namelist.debug
 	</TT
@@ -555,7 +555,7 @@ CLASS="FILENAME"
 	cause <B
 CLASS="COMMAND"
 >nmbd</B
-> to dump out it's server database in
+> to dump out its server database in
 	the <TT
 CLASS="FILENAME"
 >log.nmb</TT
diff --git a/docs/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index 0cce3000744..c87d7d35db9 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -128,7 +128,7 @@ CLASS="CONSTANT"
 		datagrams. The reason for this option is a bug in Windows 95 
 		where it ignores the source port of the requesting packet 
 	 	and only replies to UDP port 137. Unfortunately, on most UNIX 
-		systems root privilage is needed to bind to this port, and 
+		systems root privilege is needed to bind to this port, and 
 		in addition, if the <A
 HREF="nmbd.8.html"
 TARGET="_top"
diff --git a/docs/htmldocs/printer_driver2.html b/docs/htmldocs/printer_driver2.html
index c44d9c5bf81..5bb83939a05 100644
--- a/docs/htmldocs/printer_driver2.html
+++ b/docs/htmldocs/printer_driver2.html
@@ -514,7 +514,7 @@ Add Printer Wizard icon.  The APW will be show only if</P
 ><P
 >The connected user is able to successfully
 	execute an OpenPrinterEx(\\server) with administrative
-	priviledges (i.e. root or <TT
+	privileges (i.e. root or <TT
 CLASS="PARAMETER"
 ><I
 >printer admin</I
@@ -788,7 +788,7 @@ foreach (supported architecture for a given driver)
 		the Imprints tool set was the name space issues between 
 		various supported client architectures.  For example, Windows 
 		NT includes a driver named "Apple LaserWriter II NTX v51.8" 
-		and Windows 95 callsits version of this driver "Apple 
+		and Windows 95 calls its version of this driver "Apple 
 		LaserWriter II NTX"</P
 ><P
 >The problem is how to know what client drivers have 
@@ -838,7 +838,7 @@ it will remember the server as a LanMan printer server.  Upgrading
 the Samba host to 2.2 makes support for MSRPC printing possible, but 
 the NT client will still remember the previous setting.</P
 ><P
->In order to give an NT client printing "amesia" (only necessary if you 
+>In order to give an NT client printing "amnesia" (only necessary if you 
 want to use the newer MSRPC printing functionality in Samba), delete 
 the registry keys associated with the print server contained in 
 <TT
diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 9c19660a461..53a0ea98dd2 100644
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@@ -137,7 +137,10 @@ CLASS="PROGRAMLISTING"
 ><P
 >set the debuglevel. Debug level 0 is the lowest 
 		and 100 being the highest. This should be set to 100 if you are
-		planning on submitting a bug report to the Samba team (see BUGS.txt). 
+		planning on submitting a bug report to the Samba team (see <TT
+CLASS="FILENAME"
+>BUGS.txt</TT
+>). 
 		</P
 ></DD
 ><DT
@@ -152,7 +155,10 @@ CLASS="PROGRAMLISTING"
 ><DD
 ><P
 >File name for log/debug files. The extension 
-		'.client' will be appended. The log file is never removed  
+		<TT
+CLASS="CONSTANT"
+>'.client'</TT
+> will be appended. The log file is never removed  
 		by the client.
 		</P
 ></DD
@@ -199,7 +205,7 @@ CLASS="ENVAR"
 		<TT
 CLASS="ENVAR"
 >LOGNAME</TT
-> variable and if either exist, the 
+> variable and if either exists, the 
 		string is uppercased. If these environmental variables are not 
 		found, the username <TT
 CLASS="CONSTANT"
@@ -247,7 +253,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN90"
+NAME="AEN92"
 ></A
 ><H2
 >COMMANDS</H2
@@ -641,7 +647,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN210"
+NAME="AEN212"
 ></A
 ><H2
 >BUGS</H2
@@ -663,7 +669,7 @@ CLASS="COMMAND"
 	available from the original creators  (Microsoft) on how MSRPC over 
 	SMB works, or how the individual MSRPC services  work. Microsoft's 
 	implementation of these services has been demonstrated  (and reported) 
-	to be... a bit flakey in places. </P
+	to be... a bit flaky in places. </P
 ><P
 >The development of Samba's implementation is also a bit rough, 
 	and as more  of the services are understood, it can even result in 
@@ -682,7 +688,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN220"
+NAME="AEN222"
 ></A
 ><H2
 >VERSION</H2
@@ -693,7 +699,7 @@ NAME="AEN220"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN223"
+NAME="AEN225"
 ></A
 ><H2
 >AUTHOR</H2
@@ -704,7 +710,7 @@ NAME="AEN223"
 	to the way the Linux kernel is developed.</P
 ><P
 >The original rpcclient man page was written by Matthew 
-	Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter.  
+	Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter.  
 	The conversion to DocBook for Samba 2.2 was done by Gerald 
 	Carter.</P
 ></DIV
diff --git a/docs/htmldocs/samba-pdc-faq.html b/docs/htmldocs/samba-pdc-faq.html
index 058a5d5f518..d9c204bf1b5 100644
--- a/docs/htmldocs/samba-pdc-faq.html
+++ b/docs/htmldocs/samba-pdc-faq.html
@@ -45,9 +45,9 @@ NAME="AEN12"
 ></H1
 ><P
 >	This is the FAQ for Samba 2.2 as an NTDomain controller. 
-	This document is derived from the origional FAQ that was built and 
+	This document is derived from the original FAQ that was built and 
 	maintained by Gerald Carter from the early days of Samba NTDomain development 
-	up until recently.  It is now being updated as significent changes are 
+	up until recently.  It is now being updated as significant changes are 
 	made to 2.2.0.
 	</P
 ><P
@@ -165,7 +165,7 @@ HREF="#AEN103"
 ><A
 HREF="#AEN110"
 >"The machine account for this computer either does not 
-exist or is not accessable."</A
+exist or is not accessible."</A
 ></DT
 ><DT
 ><A
@@ -256,7 +256,7 @@ HREF="#AEN180"
 ><DT
 ><A
 HREF="#AEN182"
->What are 'Policies' ?.</A
+>What are 'Policies' ?</A
 ></DT
 ><DT
 ><A
@@ -314,12 +314,12 @@ HREF="#AEN248"
 ><A
 HREF="#AEN250"
 >What editor can I use in DOS/Windows that won't 
-mess with my unix EOF</A
+mess with my unix EOF ?</A
 ></DT
 ><DT
 ><A
 HREF="#AEN263"
->How do I get 'User Manager' and 'Server Manager'</A
+>How do I get 'User Manager' and 'Server Manager' ?</A
 ></DT
 ><DT
 ><A
@@ -334,7 +334,7 @@ HREF="#AEN282"
 ><DT
 ><A
 HREF="#AEN286"
->How do I get my samba server to become a member ( not PDC ) of an NT domain?</A
+>How do I get my samba server to become a member ( not PDC ) of an NT domain ?</A
 ></DT
 ></DL
 ></DD
@@ -358,13 +358,13 @@ HREF="#AEN292"
 ><A
 HREF="#AEN294"
 >What are some diagnostics tools I can use to debug the domain logon process and where can I
-	find them?</A
+	find them ?</A
 ></DT
 ><DT
 ><A
 HREF="#AEN309"
 >How do I install 'Network Monitor' on an NT Workstation 
-or a Windows 9x box?</A
+or a Windows 9x box ?</A
 ></DT
 ></DL
 ></DD
@@ -419,13 +419,13 @@ CLASS="FILENAME"
 > dialog
 	will let you reset the smbpasswd. That is you don't need to do it from
 	the unix box. However, at the present, you do need to have root as an 
-	administrator and use the root user name and password.</P
+	administrator and use the root username and password.</P
 ><P
 ><B
 CLASS="COMMAND"
 >Policies</B
 > do work on a W2K machine. MS says that recent 
-	builds of W2K dont observe an NT policy but it appears it does in 'legacy' 
+	builds of W2K don't observe an NT policy but it appears it does in 'legacy' 
 	mode.</P
 ></DIV
 ><DIV
@@ -437,7 +437,7 @@ NAME="AEN27"
 >Introduction</A
 ></H1
 ><P
->	This FAQ was origionally compiled by Jerry Carter (gc) chiefly dealing 
+>	This FAQ was originally compiled by Jerry Carter (gc) chiefly dealing 
 	with the 'old HEAD' version of Samba and its NTDomain facilities. It is 
 	being rewritten by David Bannon (drb) so that it addresses more 
 	accurately the Samba 2.2.x release. 
@@ -454,7 +454,7 @@ TARGET="_top"
 	</P
 ><P
 >Hopefully, as we all become familiar with the Samba 2.2 as a 
-	PDC this document will become much more usefull.</P
+	PDC this document will become much more useful.</P
 ></DIV
 ></DIV
 ><DIV
@@ -532,7 +532,7 @@ NAME="AEN37"
 ></LI
 ></UL
 ><P
->	These things are note expected to work in the forseeable future:
+>	These things are not expected to work in the foreseeable future:
 	</P
 ><P
 ></P
@@ -558,7 +558,7 @@ controlled domain?</A
 ></H2
 ><P
 >	The 2.2 release branch of Samba  supports Windows 2000 domain 
-	clients in legacy mode, ie as if the PDC is a NTServer, not a
+	clients in legacy mode, i.e. as if the PDC is a NTServer, not a
 	W2K server.
 	</P
 ></DIV
@@ -572,7 +572,7 @@ NAME="AEN65"
 >CVS</A
 ></H1
 ><P
->	CVS is a programme (publically available) that the Samba developers 
+>	CVS is a program (publicly available) that the Samba developers 
 	use to maintain the central source code. Non developers can get 
 	access to the source in a read only capacity. Many flavours of unix 
 	now arrive with cvs installed.</P
@@ -606,7 +606,7 @@ CLASS="VARIABLELIST"
 ><P
 >Samba 3.0 ? This code boasts all the main 
 		development work in Samba. Due to its developmental
-		nature, its not really suitable for production work.
+		nature, it's not really suitable for production work.
 		</P
 ></DD
 ><DT
@@ -693,7 +693,7 @@ controlled Domain?</A
 HREF="samba-pdc-howto.html"
 TARGET="_top"
 >HOWTO</A
-> accessable from the samba web 
+> accessible from the samba web 
 	site under 'Documentation'. Read it.
 	</P
 ></DIV
@@ -734,11 +734,11 @@ CLASS="SECT2"
 ><A
 NAME="AEN110"
 >"The machine account for this computer either does not 
-exist or is not accessable."</A
+exist or is not accessible."</A
 ></H2
 ><P
 >	When I try to join the domain I get the message "The machine account 
-	for this computer either does not exist or is not accessable". Whats 
+	for this computer either does not exist or is not accessible". Whats 
 	wrong ?
 	</P
 ><P
@@ -802,7 +802,7 @@ CLASS="COMMAND"
 	path to the <B
 CLASS="COMMAND"
 >smbpasswd</B
-> programme, do this :
+> program, do this :
 	</P
 ><P
 >	<B
@@ -812,7 +812,7 @@ CLASS="COMMAND"
 	</P
 ><P
 >	The entry will be created with a well known password, so any machine that 
-	says its doppy could join the domain as long as it gets in first. So 
+	says it's doppy could join the domain as long as it gets in first. So 
 	don't create the accounts any earlier than you need them.
 	</P
 ></DIV
@@ -854,7 +854,7 @@ when creating a machine account.</A
 ><P
 >	This happens if you try to create a machine account from the 
 	machine itself and use a user	name that does not work (for whatever 
-	reason) and then try another (possibly valid) user name.
+	reason) and then try another (possibly valid) username.
 	Exit out of the network applet to close the initial connection 
 	and try again.
 	</P
@@ -891,7 +891,7 @@ NAME="AEN143"
 ><P
 >I joined the domain successfully but after upgrading 
 	to a newer version of the Samba code I get the message, "The system 
-	can not log you on (C000019B), Please try a gain or consult your 
+	can not log you on (C000019B), Please try again or consult your 
 	system administrator" when attempting to logon.
 	</P
 ><P
@@ -1029,14 +1029,14 @@ HREF="#AEN278"
 >
 	</P
 ><P
->	Make sure that the "logon path" is writeable by the user and make sure 
+>	Make sure that the "logon path" is writable by the user and make sure 
 	that the connection to the logon path location is by the current user.   
-	Sometimes Windows client do not drop the connection immediately upon 
+	Sometimes Windows clients do not drop the connection immediately upon 
 	logoff.
 	</P
 ><P
 >	Some people have reported that the logon path location should 
-	also be browseable.  I (GC) have yet to emperically verify this, 
+	also be browseable.  I (GC) have yet to empirically verify this, 
 	but you can try.</P
 ></DIV
 ></DIV
@@ -1054,13 +1054,13 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN182"
->What are 'Policies' ?.</A
+>What are 'Policies' ?</A
 ></H2
 ><P
 >	When a user logs onto the domain via a client machine, the PDC 
 	sends the client machine a list of things contained in the 
 	'policy' (if it exists).  This list may do things like suppress 
-	a splach screen, format the dates the way you like them or perhaps 
+	a splash screen, format the dates the way you like them or perhaps 
 	remove locally stored profiles.
 	</P
 ><P
@@ -1070,7 +1070,7 @@ CLASS="FILENAME"
 >ntconfig.pol</TT
 > and located in the [netlogon] 
 	share. The file is created with a policy editor and must be readable 
-	by anyone and writeable by only root. See <A
+	by anyone and writable by only root. See <A
 HREF="#AEN203"
 >    below</A
 > for how  to get a suitable editor.
@@ -1102,7 +1102,7 @@ CLASS="PROGRAMLISTING"
 ></P
 ><P
 >	A policy file must be in the [netlogon] share and must be 
-    readable by everyone and writeable by only root. The file 
+    readable by everyone and writable by only root. The file 
 	must be created by an NTServer <A
 HREF="#AEN203"
 >Policy 
@@ -1170,7 +1170,7 @@ CLASS="EMPHASIS"
 >. 
     Further, although the Windows 95 
 	Policy Editor can be installed on an NT Workstation/Server, it will not
-	work with NT policies because the registry key that are set by the policy templates. 
+	work with NT policies because of the registry keys that are set by the policy templates. 
 	However, the files from the NT Server will run happily enough on an NTws. 
 	You need <TT
 CLASS="FILENAME"
@@ -1192,7 +1192,7 @@ CLASS="FILENAME"
     <B
 CLASS="COMMAND"
 >servicepackname /x</B
->, ie thats <B
+>, i.e. that's <B
 CLASS="COMMAND"
 >Nt4sp6ai.exe 
 	/x</B
@@ -1201,7 +1201,7 @@ CLASS="COMMAND"
 >poledt.exe</B
 > and the 
 	associated template files (*.adm) should
-	be extracted as well.  It is also possible to downloaded the policy template 
+	be extracted as well.  It is also possible to download the policy template 
 	files for Office97 and get a copy of the policy editor.  Another possible 
 	location is with the Zero Administration Kit available for download from Microsoft.
     </P
@@ -1261,7 +1261,7 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >/etc/shadow</TT
 >). 
-	In lots of situations thats OK, for example :
+	In lots of situations that's OK, for example :
 	</P
 ><P
 ></P
@@ -1278,10 +1278,10 @@ CLASS="FILENAME"
 ></LI
 ></UL
 ><P
->	But sometimes you really do need to maintain two seperate password 
+>	But sometimes you really do need to maintain two separate password 
 	databases and there are good reasons to keep then in sync.  Trying 
 	to explain to users that they need to change their passwords in two 
-	seperate places or use two seperate passwords is not fun.
+	separate places or use two separate passwords is not fun.
 	</P
 ><P
 >	However do understand that setting up password sync is not without 
@@ -1358,11 +1358,11 @@ CLASS="SECT2"
 ><A
 NAME="AEN250"
 >What editor can I use in DOS/Windows that won't 
-mess with my unix EOF</A
+mess with my unix EOF ?</A
 ></H2
 ><P
 >There are a number of Windows or DOS based editors that will 
-	understand, and leave intact, the unix eof (as opposed to a DOS CL/LF). 
+	understand, and leave intact, the unix eof (as opposed to a DOS CR/LF). 
 	List members suggested :
 	</P
 ><P
@@ -1390,7 +1390,7 @@ TARGET="_top"
 HREF="http://www.lancs.ac.uk/people/cpaap/pfe/"
 TARGET="_top"
 >		www.lancs.ac.uk/people/cpaap/pfe/</A
-> but its no longer being developed...</P
+> but it's no longer being developed...</P
 ></LI
 ></UL
 ></DIV
@@ -1400,7 +1400,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN263"
->How do I get 'User Manager' and 'Server Manager'</A
+>How do I get 'User Manager' and 'Server Manager' ?</A
 ></H2
 ><P
 >	Since I don't need to buy an NT Server CD now, how do I get 
@@ -1409,7 +1409,7 @@ NAME="AEN263"
 ><P
 >	Microsoft distributes a version of 
 	these tools called nexus for installation on Windows 95 systems.  The 
-	tools set includes
+	tool set includes
 	</P
 ><P
 ></P
@@ -1482,7 +1482,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN286"
->How do I get my samba server to become a member ( not PDC ) of an NT domain?</A
+>How do I get my samba server to become a member ( not PDC ) of an NT domain ?</A
 ></H2
 ><P
 >	Please refer to the <A
@@ -1517,11 +1517,11 @@ CLASS="SECT2"
 ><A
 NAME="AEN294"
 >What are some diagnostics tools I can use to debug the domain logon process and where can I
-	find them?</A
+	find them ?</A
 ></H2
 ><P
 >	One of the best diagnostic tools for debugging problems is Samba itself.  
-	You can use the -d option for both smbd and nmbd to specifiy what 
+	You can use the -d option for both smbd and nmbd to specify what 
 	'debug level' at which to run.  See the man pages on smbd, nmbd  and 
 	smb.conf for more information on debugging options.  The debug 
 	level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -1532,19 +1532,19 @@ NAME="AEN294"
 CLASS="COMMAND"
 >gcc -g </B
 > flag.   This will include debug 
-	information in the binaries and allow you to attch gdb to the 
+	information in the binaries and allow you to attach gdb to the 
 	running smbd / nmbd process.  In order to attach gdb to an smbd 
 	process for an NT workstation, first get the workstation to make the 
-	connection. Pressing ctrl-alt-delete and going down to the domain box 
+	connection. Pressing Ctrl-Alt-Del and going down to the domain box 
 	is sufficient (at least, on the first time you join the domain) to 
 	generate a 'LsaEnumTrustedDomains'. Thereafter, the workstation 
 	maintains an open connection, and therefore there will be an smbd 
 	process running (assuming that you haven't set a really short smbd 
-	idle timeout)  So, in between pressing ctrl alt delete, and actually 
+	idle timeout)  So, in between pressing Ctrl-Alt-Del, and actually 
 	typing in your password, you can gdb attach and continue.
 	</P
 ><P
->	Some usefull samba commands worth investigating:
+>	Some useful samba commands worth investigating:
 	</P
 ><P
 ></P
@@ -1563,7 +1563,7 @@ CLASS="COMMAND"
     <A
 HREF="http://www.tcpdump.org/"
 TARGET="_top"
->http://www.tcpdup.org/</A
+>http://www.tcpdump.org/</A
 >.
 	Ethereal, another good packet sniffer for UNIX and Win32
 	hosts, can be downloaded from <A
@@ -1573,11 +1573,11 @@ TARGET="_top"
 >.
 	</P
 ><P
->	For tracing things on the Microsoft Windows NT, Network Monitor 
+>	For tracing things on Microsoft Windows NT, Network Monitor 
 	(aka. netmon) is available on the Microsoft Developer Network CD's, 
 	the Windows NT Server install CD and the SMS CD's.  The version of 
 	netmon that ships with SMS allows for dumping packets between any two 
-	computers (ie. placing the network interface in promiscuous mode).  
+	computers (i.e. placing the network interface in promiscuous mode).  
 	The version on the NT Server install CD will only allow monitoring 
 	of network traffic directed to the local NT box and broadcasts on the 
 	local subnet.  Be aware that Ethereal can read and write netmon 
@@ -1591,7 +1591,7 @@ CLASS="SECT2"
 ><A
 NAME="AEN309"
 >How do I install 'Network Monitor' on an NT Workstation 
-or a Windows 9x box?</A
+or a Windows 9x box ?</A
 ></H2
 ><P
 >	Installing netmon on an NT workstation requires a couple 
@@ -1732,13 +1732,13 @@ CLASS="EMPHASIS"
 ></LI
 ><LI
 ><P
-> Ignacio Coupeau has a very comprehesive look at LDAP with Samba at 
+> Ignacio Coupeau has a very comprehensive look at LDAP with Samba at 
 		<A
 HREF="http://www.unav.es/cti/ldap-smb-howto.html"
 TARGET="_top"
 >		http://www.unav.es/cti/ldap-smb-howto.html</A
 > 
-		Be a little carefull however, I suspect that it does not specificly 
+		Be a little careful however, I suspect that it does not specifically 
 		address samba 2.2.x. The HEAD pre-2.1 may possibly be the best
 		stream to look at.</P
 ></LI
@@ -1754,7 +1754,7 @@ HREF="http://www.kneschke.de/projekte/samba_tng"
 TARGET="_top"
 >		http://www.kneschke.de/projekte/samba_tng</A
 >, but again, a 
-		lot of it does not apply to the main stream Samba.</P
+		lot of it does not apply to the mainstream Samba.</P
 ></LI
 ><LI
 ><P
@@ -1839,7 +1839,7 @@ TARGET="_top"
 >http://www.samba-tng.org/</A
 > 
 	    It has been requested that you don't post questions about Samba-TNG to the
-        main stream Samba lists.</P
+        mainstream Samba lists.</P
 ><P
 ></P
 ><P
@@ -1872,18 +1872,18 @@ TARGET="_top"
 > Try and make your question clear and brief, lots of long, 
 		convoluted questions get deleted before	they are completely read ! 
 		Don't post html encoded messages (if you can select colour or font 
-		size its html).</P
+		size it's html).</P
 ></LI
 ><LI
 ><P
-> If you run one of those niffy 'I'm on holidays' things when 
+> If you run one of those nifty 'I'm on holidays' things when 
 		you are away, make sure its configured	to not answer mailing lists.
 		</P
 ></LI
 ><LI
 ><P
 > Don't cross post. Work out which is the best list to post to 
-		and see what happens, ie don't post to both samba-ntdom and samba-technical.
+		and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
         Many people active on the lists subscribe to more 
 		than one list and get annoyed to see the same message two or more times. 
 		Often someone will see a message and thinking it would be better dealt 
@@ -1943,7 +1943,7 @@ TARGET="_top"
 ></P
 ><P
 >	Please don't post messages to the list asking to be removed, you will just
-        be refered to the above address (unless that process failed in some way...)
+        be referred to the above address (unless that process failed in some way...)
     </P
 ></DIV
 ></DIV
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 75e25876894..8d1e1577c55 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -756,7 +756,7 @@ CLASS="VARIABLELIST"
 		upper case, or if they are forced to be the "default" 
 		case. This option can be use with "preserve case = yes" 
 		to permit long filenames to retain their case, while short names 
-		are lowered. Default <EM
+		are lowercased. Default <EM
 >yes</EM
 >.</P
 ></DD
@@ -808,7 +808,7 @@ CLASS="REPLACEABLE"
 ></LI
 ><LI
 ><P
->The client's netbios name and any previously 
+>The client's NetBIOS name and any previously 
 		used user names are checked against the supplied password, if 
 		they match then the connection is allowed as the corresponding 
 		user.</P
@@ -4224,7 +4224,7 @@ NAME="ADDPRINTERCOMMAND"
 		NT/2000 print server.</P
 ><P
 >For a Samba host this means that the printer must be 
-		physically added to underlying printing system.  The <TT
+		physically added to the underlying printing system.  The <TT
 CLASS="PARAMETER"
 ><I
 >add 
@@ -4727,7 +4727,11 @@ CLASS="CONSTANT"
 >domain</TT
 >.  
 		If it is set to no, then attempts to connect to a resource from 
-		a domain or workgroup other than the one which smbd is running 
+		a domain or workgroup other than the one which <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> is running 
 		in will fail, even if that domain is trusted by the remote server 
 		doing the authentication.</P
 ><P
@@ -4785,7 +4789,7 @@ CLASS="COMMAND"
 ><A
 NAME="ANNOUNCEVERSION"
 ></A
->annouce version (G)</DT
+>announce version (G)</DT
 ><DD
 ><P
 >This specifies the major and minor version numbers 
@@ -4852,7 +4856,7 @@ NAME="BINDINTERFACESONLY"
 ><DD
 ><P
 >This global parameter allows the Samba admin 
-		to limit what interfaces on a machine will serve smb requests. If 
+		to limit what interfaces on a machine will serve SMB requests. If 
 		affects file service <A
 HREF="smbd.8.html"
 TARGET="_top"
@@ -5082,7 +5086,7 @@ TARGET="_top"
 ><P
 >If this parameter is set to <TT
 CLASS="CONSTANT"
->False</TT
+>false</TT
 >, then 
 		Samba 2.2 will behave as previous versions of Samba would and 
 		will fail the lock request immediately if the lock range 
@@ -5360,7 +5364,11 @@ NAME="CHARACTERSET"
 >character set (G)</DT
 ><DD
 ><P
->This allows a smbd to map incoming filenames 
+>This allows <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> to map incoming filenames 
 		from a DOS Code page (see the <A
 HREF="#CLIENTCODEPAGE"
 >client 
@@ -6135,7 +6143,11 @@ NAME="DEBUGPID"
 ><DD
 ><P
 >When using only one log file for more then one 
-		forked smbd-process there may be hard to follow which process 
+		forked <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+>-process there may be hard to follow which process 
 		outputs which message. This boolean parameter is adds the process-id 
 		to the timestamp message headers in the logfile when turned on.</P
 ><P
@@ -6761,13 +6773,16 @@ CLASS="PARAMETER"
 ></TT
 ></A
 >
-		option).  If this option is set to False (the default) then if a vetoed 
+		option).  If this option is set to <TT
+CLASS="CONSTANT"
+>false</TT
+> (the default) then if a vetoed 
 		directory contains any non-vetoed files or directories then the 
 		directory delete will fail. This is usually what you want.</P
 ><P
 >If this option is set to <TT
 CLASS="CONSTANT"
->True</TT
+>true</TT
 >, then Samba 
 		will attempt to recursively delete any files and directories within 
 		the vetoed directory. This can be useful for integration with file 
@@ -7078,7 +7093,10 @@ NAME="DIRECTORYSECURITYMASK"
 		Samba server through other means can easily bypass this restriction, 
 		so it is primarily useful for standalone "appliance" systems.  
 		Administrators of most normal systems will probably want to leave
-		it as the default of 0777.</P
+		it as the default of <TT
+CLASS="CONSTANT"
+>0777</TT
+>.</P
 ><P
 >See also the <A
 HREF="#FORCEDIRECTORYSECURITYMODE"
@@ -7266,7 +7284,10 @@ NAME="DOMAINLOGONS"
 >domain logons (G)</DT
 ><DD
 ><P
->If set to true, the Samba server will serve 
+>If set to <TT
+CLASS="CONSTANT"
+>true</TT
+>, the Samba server will serve 
 		Windows 95/98 Domain logons for the <A
 HREF="#WORKGROUP"
 >		<TT
@@ -7445,7 +7466,7 @@ NAME="DOSFILEMODE"
 ><DD
 ><P
 > The default behavior in Samba is to provide 
-		UNIX-like behavor where only the owner of a file/directory is 
+		UNIX-like behavior where only the owner of a file/directory is 
 		able to change the permissions on it.  However, this behavior
 		is often confusing to  DOS/Windows users.  Enabling this parameter 
 		allows a user who has write access to the file (by whatever 
@@ -7514,8 +7535,12 @@ CLASS="COMMAND"
 > is acting 
 		on behalf of is not the file owner. Setting this option to <TT
 CLASS="CONSTANT"
->		True</TT
-> allows DOS semantics and smbd will change the file 
+>		true</TT
+> allows DOS semantics and <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> will change the file 
 		timestamp as DOS requires.</P
 ><P
 >Default: <B
@@ -7567,7 +7592,7 @@ CLASS="COMMAND"
 > program for information on how to set up 
  		and maintain this file), or set the <A
 HREF="#SECURITY"
->security=[serve|domain]</A
+>security=[server|domain]</A
 > parameter which 
 		causes <B
 CLASS="COMMAND"
@@ -7588,18 +7613,18 @@ NAME="ENHANCEDBROWSING"
 ><DD
 ><P
 >This option enables a couple of enhancements to 
-		cross-subnet browse propogation that have been added in Samba 
+		cross-subnet browse propagation that have been added in Samba 
 		but which are not standard in Microsoft implementations.  
 		<EM
 >These enhancements are currently only available in
 		the HEAD Samba CVS tree (not Samba 2.2.x).</EM
 ></P
 ><P
->The first enhancement to browse propogation consists of a regular
+>The first enhancement to browse propagation consists of a regular
 		wildcard query to a Samba WINS server for all Domain Master Browsers,
-		followed by a browse synchronisation with each of the returned
+		followed by a browse synchronization with each of the returned
 		DMBs. The second enhancement consists of a regular randomised browse
-		synchronisation with all currently known DMBs.</P
+		synchronization with all currently known DMBs.</P
 ><P
 >You may wish to disable this option if you have a problem with empty
 		workgroups not disappearing from browse lists. Due to the restrictions
@@ -7607,7 +7632,7 @@ NAME="ENHANCEDBROWSING"
 		to stay around forever which can be annoying.</P
 ><P
 >In general you should leave this option enabled as it makes
-		cross-subnet browse propogation much more reliable.</P
+		cross-subnet browse propagation much more reliable.</P
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -7704,7 +7729,7 @@ NAME="FAKEDIRECTORYCREATETIMES"
 		reported by Samba will be updated whenever a file is created or 
 		or deleted in the directory.  NMAKE finds all object files in 
 		the object directory.  The timestamp of the last one built is then 
-		compared to the timestamp of the object dircetory.  If the 
+		compared to the timestamp of the object directory.  If the 
 		directory's timestamp if newer, then all object files
 		will be rebuilt.  Enabling this option 
 		ensures directories always predate their contents and an NMAKE build 
@@ -7843,7 +7868,10 @@ CLASS="PARAMETER"
 		mask</I
 ></TT
 ></A
-> to true.</P
+> to <TT
+CLASS="CONSTANT"
+>true</TT
+>.</P
 ><P
 >See also the parameter <A
 HREF="#CREATEMASK"
@@ -7915,7 +7943,10 @@ CLASS="PARAMETER"
 		mask</I
 ></TT
 ></A
-> to true.</P
+> to <TT
+CLASS="CONSTANT"
+>true</TT
+>.</P
 ><P
 >See also the parameter <A
 HREF="#DIRECTORYMASK"
@@ -8268,7 +8299,7 @@ CLASS="PARAMETER"
 		</A
 >parameter is set to <TT
 CLASS="CONSTANT"
->False</TT
+>false</TT
 >.</P
 ><P
 >Default: <B
@@ -8538,7 +8569,7 @@ CLASS="PARAMETER"
 ></A
 > is <TT
 CLASS="CONSTANT"
->True</TT
+>true</TT
 >, and <A
 HREF="smbd.8.html"
 TARGET="_top"
@@ -8817,7 +8848,7 @@ CLASS="PARAMETER"
 >		hosts equiv</I
 ></TT
 > may be useful for NT clients which will 
-		not supply passwords to samba.</P
+		not supply passwords to Samba.</P
 ><P
 ><EM
 >NOTE :</EM
@@ -8976,7 +9007,7 @@ CLASS="PARAMETER"
 		inheritance (the code explicitly prohibits this).</P
 ><P
 >This can be particularly useful on large systems with 
-		many users, perhaps several thousand,to allow a single [homes] 
+		many users, perhaps several thousand, to allow a single [homes] 
 		share to be used flexibly by each user.</P
 ><P
 >See also <A
@@ -9286,8 +9317,12 @@ NAME="LANMANAUTH"
 >lanman auth (G)</DT
 ><DD
 ><P
->This parameter determines whether or not smbd will
-		attempt to authentication users using the LANMAN password hash.
+>This parameter determines whether or not <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> will
+		attempt to authenticate users using the LANMAN password hash.
 		If disabled, only clients which support NT password hashes (e.g. Windows 
 		NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS 
 		network client) will be able to connect to the Samba host.</P
@@ -9350,7 +9385,10 @@ CLASS="PARAMETER"
 ></TT
 >
 		</A
-> parameter must be set to "true" on this share in order for 
+> parameter must be set to <TT
+CLASS="CONSTANT"
+>true</TT
+> on this share in order for 
 		this parameter to have any effect.</P
 ><P
 >See also the <A
@@ -9543,13 +9581,19 @@ CLASS="COMMAND"
 > to try and become a local master browser 
 		on a subnet. If set to <TT
 CLASS="CONSTANT"
->False</TT
+>false</TT
 > then <B
 CLASS="COMMAND"
 >		nmbd</B
 > will not attempt to become a local master browser 
 		on a subnet and will also lose in all browsing elections. By
-		default this value is set to true. Setting this value to true doesn't
+		default this value is set to <TT
+CLASS="CONSTANT"
+>true</TT
+>. Setting this value to <TT
+CLASS="CONSTANT"
+>true</TT
+> doesn't
 		mean that Samba will <EM
 >become</EM
 > the local master 
@@ -9560,7 +9604,10 @@ CLASS="COMMAND"
 >		participate</EM
 > in elections for local master browser.</P
 ><P
->Setting this value to False will cause <B
+>Setting this value to <TT
+CLASS="CONSTANT"
+>false</TT
+> will cause <B
 CLASS="COMMAND"
 >nmbd</B
 >
@@ -9651,7 +9698,7 @@ CLASS="COMMAND"
 		filesystems which <EM
 >may</EM
 > not need locking (such as 
-		cdrom drives), although setting this parameter of <TT
+		CDROM drives), although setting this parameter of <TT
 CLASS="CONSTANT"
 >no</TT
 > 
@@ -9864,7 +9911,7 @@ CLASS="FILENAME"
 ><P
 >The share and the path must be readable by the user for 
 		the preferences and directories to be loaded onto the Windows NT
-		client.  The share must be writeable when the logs in for the first
+		client.  The share must be writeable when the user logs in for the first
 		time, in order that the Windows NT client can create the NTuser.dat
 		and other directories.</P
 ><P
@@ -9908,7 +9955,7 @@ NAME="LOGONSCRIPT"
 >This parameter specifies the batch file (.bat) or 
 		NT command file (.cmd) to be downloaded and run on a machine when 
 		a user successfully logs in.  The file must contain the DOS 
-		style cr/lf line endings. Using a DOS-style editor to create the 
+		style CR/LF line endings. Using a DOS-style editor to create the 
 		file is recommended.</P
 ><P
 >The script must be a relative path to the [netlogon] 
@@ -9935,7 +9982,7 @@ CLASS="FILENAME"
 >/usr/local/samba/netlogon/STARTUP.BAT</TT
 ></P
 ><P
->The contents of the batch file is entirely your choice.  A 
+>The contents of the batch file are entirely your choice.  A 
 		suggested command would be to add <B
 CLASS="COMMAND"
 >NET TIME \\SERVER /SET 
@@ -9992,7 +10039,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. A <TT
 CLASS="PARAMETER"
 ><I
@@ -10173,7 +10220,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the 
 		command.</P
 ><P
@@ -10243,7 +10290,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. A <TT
 CLASS="PARAMETER"
 ><I
@@ -10329,7 +10376,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. A <TT
 CLASS="PARAMETER"
 ><I
@@ -10387,7 +10434,7 @@ NAME="MACHINEPASSWORDTIMEOUT"
 >machine password timeout (G)</DT
 ><DD
 ><P
->If a Samba server is a member of an Windows 
+>If a Samba server is a member of a Windows 
 		NT Domain (see the <A
 HREF="#SECURITYEQUALSDOMAIN"
 >security=domain</A
@@ -10476,8 +10523,8 @@ NAME="MAGICSCRIPT"
 		executed on behalf of the connected user.</P
 ><P
 >Scripts executed in this way will be deleted upon 
-		completion assuming that the user has the appripriate level 
-		of priviledge and the ile permissions allow the deletion.</P
+		completion assuming that the user has the appropriate level 
+		of privilege and the file permissions allow the deletion.</P
 ><P
 >If the script generates output, output will be sent to 
 		the file specified by the <A
@@ -10539,7 +10586,7 @@ NAME="MANGLEDMAP"
 ><DD
 ><P
 >This is for those who want to directly map UNIX 
-		file names which can not be represented on Windows/DOS.  The mangling 
+		file names which cannot be represented on Windows/DOS.  The mangling 
 		of names is not always what is needed.  In particular you may have 
 		documents with file extensions that differ between DOS and UNIX. 
 		For example, under UNIX it is common to use <TT
@@ -10570,7 +10617,7 @@ CLASS="COMMAND"
 CLASS="FILENAME"
 >;1
 		</TT
-> off the ends of filenames on some CDROMS (only visible 
+> off the ends of filenames on some CDROMs (only visible 
 		under some UNIXes). To do this use a map of (*;1 *;).</P
 ><P
 >Default: <EM
@@ -10687,12 +10734,12 @@ TARGET="_top"
 ><P
 >The larger this value, the more likely it is that mangled 
 		names can be successfully converted to correct long UNIX names. 
-		However, large stack sizes will slow most directory access. Smaller 
+		However, large stack sizes will slow most directory accesses. Smaller 
 		stacks save memory in the server (each stack element costs 256 bytes).
 		</P
 ><P
 >It is not possible to absolutely guarantee correct long 
-		file names, so be prepared for some surprises!</P
+		filenames, so be prepared for some surprises!</P
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -11077,7 +11124,7 @@ NAME="MAXMUX"
 ><DD
 ><P
 >This option controls the maximum number of 
-		outstanding simultaneous SMB operations that samba tells the client 
+		outstanding simultaneous SMB operations that Samba tells the client 
 		it will allow. You should never need to set this parameter.</P
 ><P
 >Default: <B
@@ -11250,10 +11297,14 @@ CLASS="COMMAND"
 ></A
 >
 		processes concurrently running on a system and is intended
-		as a stop gap to prevent degrading service to clients in the event
+		as a stopgap to prevent degrading service to clients in the event
 		that the server has insufficient resources to handle more than this
 		number of connections.  Remember that under normal operating
-		conditions, each user will have an smbd associated with him or her
+		conditions, each user will have an <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> associated with him or her
 		to handle connections to all shares from a given host.
 		</P
 ><P
@@ -11391,7 +11442,7 @@ CLASS="COMMAND"
 >. That's why I 
 		have the '&#38;' on the end. If it doesn't return immediately then 
 		your PCs may freeze when sending messages (they should recover 
-		after 30secs, hopefully).</P
+		after 30 seconds, hopefully).</P
 ><P
 >All messages are delivered as the global guest user. 
 		The command takes the standard substitutions, although <TT
@@ -12188,7 +12239,11 @@ TARGET="_top"
 		improve the efficiency of the granting of oplocks under multiple 
 		client contention for the same file.</P
 ><P
->In brief it specifies a number, which causes smbd not to 
+>In brief it specifies a number, which causes <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> not to 
 		grant an oplock even when requested if the approximate number of 
 		clients contending for an oplock on the same file goes over this 
 		limit. This causes <B
@@ -12214,7 +12269,10 @@ NAME="OPLOCKS"
 >oplocks (S)</DT
 ><DD
 ><P
->This boolean option tells smbd whether to 
+>This boolean option tells <B
+CLASS="COMMAND"
+>smbd</B
+> whether to 
 		issue oplocks (opportunistic locks) to file open requests on this 
 		share. The oplock code can dramatically (approx. 30% or more) improve 
 	 	the speed of access to files on Samba servers. It allows the clients 
@@ -12336,7 +12394,7 @@ NAME="OS2DRIVERMAP"
 		name&#62;.&#60;device name&#62;</P
 ><P
 >For example, a valid entry using the HP LaserJet 5
-		printer driver woudl appear as <B
+		printer driver would appear as <B
 CLASS="COMMAND"
 >HP LaserJet 5L = LASERJET.HP 
 		LaserJet 5L</B
@@ -12381,7 +12439,7 @@ CLASS="PARAMETER"
 ></TT
 ></A
 > must be
-		be changed to work with the pam prompts.
+		be changed to work with the PAM prompts.
 		</P
 ><P
 >Default: <B
@@ -12434,7 +12492,7 @@ HREF="smbd.8.html"
 TARGET="_top"
 >smbd</A
 > and the local password changing
-		program to change the users password. The string describes a 
+		program to change the user's password. The string describes a 
 		sequence of response-receive pairs that <A
 HREF="smbd.8.html"
 TARGET="_top"
@@ -12491,8 +12549,8 @@ CLASS="CONSTANT"
 		in them into a single string.</P
 ><P
 >If the send string in any part of the chat sequence 
-		is a fullstop ".",  then no string is sent. Similarly, 
-		if the expect string is a fullstop then no string is expected.</P
+		is a full stop ".",  then no string is sent. Similarly, 
+		if the expect string is a full stop then no string is expected.</P
 ><P
 >Note that if the <A
 HREF="#UNIXPASSWORDSYNC"
@@ -12503,7 +12561,10 @@ CLASS="PARAMETER"
 		password sync</I
 ></TT
 ></A
-> parameter is set to true, then this 
+> parameter is set to <TT
+CLASS="CONSTANT"
+>true</TT
+>, then this 
 		sequence is called <EM
 >AS ROOT</EM
 > when the SMB password 
@@ -12520,12 +12581,15 @@ CLASS="PARAMETER"
 		password change</I
 ></TT
 ></A
-> parameter is set to true, then the
+> parameter is set to <TT
+CLASS="CONSTANT"
+>true</TT
+>, then the
 		chat sequence should consist of three elements. The first element should
-		match the pam prompt for the old password, the second element should match
-		the pam prompt for the first request for the new password, and the final
-		element should match the pam prompt for the second request for the new password.
-		These matches are done case insentively. Under most conditions this change
+		match the PAM prompt for the old password, the second element should match
+		the PAM prompt for the first request for the new password, and the final
+		element should match the PAM prompt for the second request for the new password.
+		These matches are done case insensitively. Under most conditions this change
 		is done as root so the prompt for the old password will never be matched.
 		</P
 ><P
@@ -12683,7 +12747,7 @@ CLASS="PARAMETER"
 ></TT
 > parameter is set to <TT
 CLASS="CONSTANT"
->True
+>true
 		</TT
 > then this program is called <EM
 >AS ROOT</EM
@@ -12720,7 +12784,7 @@ CLASS="PARAMETER"
 ></TT
 > is set to <TT
 CLASS="CONSTANT"
->False</TT
+>false</TT
 >.</P
 ><P
 >See also <A
@@ -12967,7 +13031,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >			security=server</B
 >  mode the network logon will appear to 
-			come from there rather than from the users workstation.</P
+			come from there rather than from the user's workstation.</P
 ></LI
 ></UL
 ><P
@@ -13092,7 +13156,7 @@ NAME="POSTEXEC"
 		substitutions. The command may be run as the root on some 
 		systems.</P
 ><P
->An interesting example may be do unmount server 
+>An interesting example may be to unmount server 
 		resources:</P
 ><P
 ><B
@@ -13130,7 +13194,7 @@ NAME="POSTSCRIPT"
 ><DD
 ><P
 >This parameter forces a printer to interpret 
-		the print files as postscript. This is done by adding a <TT
+		the print files as PostScript. This is done by adding a <TT
 CLASS="CONSTANT"
 >%!
 		</TT
@@ -13235,7 +13299,10 @@ TARGET="_top"
 > is a preferred master browser 
 		for its workgroup.</P
 ><P
->If this is set to true, on startup, <B
+>If this is set to <TT
+CLASS="CONSTANT"
+>true</TT
+>, on startup, <B
 CLASS="COMMAND"
 >nmbd</B
 > 
@@ -13706,7 +13773,7 @@ NAME="PRINTERDRIVER"
 ><P
 ><EM
 >Note :</EM
->This is a depreciated 
+>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<TT
@@ -13766,7 +13833,7 @@ NAME="PRINTERDRIVERFILE"
 ><P
 ><EM
 >Note :</EM
->This is a depreciated 
+>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<TT
@@ -13839,7 +13906,7 @@ NAME="PRINTERDRIVERLOCATION"
 ><P
 ><EM
 >Note :</EM
->This is a depreciated 
+>This is a deprecated 
 		parameter and will be removed in the next major release
 		following version 2.2.  Please see the instructions in
 		<TT
@@ -13977,7 +14044,7 @@ CLASS="PARAMETER"
 >lprm command</I
 ></TT
 > if specified in the 
-		[global]f&#62; section.</P
+		[global] section.</P
 ><P
 >Currently eight printing styles are supported. They are
 		<TT
@@ -14070,14 +14137,14 @@ NAME="QUEUEPAUSECOMMAND"
 ><DD
 ><P
 >This parameter specifies the command to be 
-		executed on the server host in order to pause the printerqueue.</P
+		executed on the server host in order to pause the printer queue.</P
 ><P
 >This command should be a program or script which takes 
-		a printer name as its only parameter and stops the printerqueue, 
+		a printer name as its only parameter and stops the printer queue, 
 		such that no longer jobs are submitted to the printer.</P
 ><P
 >This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printer's window under Windows 95 
+		but can be issued from the Printers window under Windows 95 
 		and NT.</P
 ><P
 >If a <TT
@@ -14085,7 +14152,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the command.
 		</P
 ><P
@@ -14116,7 +14183,7 @@ NAME="QUEUERESUMECOMMAND"
 ><DD
 ><P
 >This parameter specifies the command to be 
-		executed on the server host in order to resume the printerqueue. It 
+		executed on the server host in order to resume the printer queue. It 
  		is the command to undo the behavior that is caused by the 
 		previous parameter (<A
 HREF="#QUEUEPAUSECOMMAND"
@@ -14129,11 +14196,11 @@ CLASS="PARAMETER"
 >).</P
 ><P
 >This command should be a program or script which takes 
-		a printer name as its only parameter and resumes the printerqueue, 
+		a printer name as its only parameter and resumes the printer queue, 
 		such that queued jobs are resubmitted to the printer.</P
 ><P
 >This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printer's window under Windows 95 
+		but can be issued from the Printers window under Windows 95 
 		and NT.</P
 ><P
 >If a <TT
@@ -14141,7 +14208,7 @@ CLASS="PARAMETER"
 ><I
 >%p</I
 ></TT
-> is given then the printername 
+> is given then the printer name 
 		is put in its place. Otherwise it is placed at the end of the 
 		command.</P
 ><P
@@ -14370,7 +14437,10 @@ CLASS="COMMAND"
 		192.168.4.255/STAFF</B
 ></P
 ><P
->the above line would cause nmbd to announce itself 
+>the above line would cause <B
+CLASS="COMMAND"
+>nmbd</B
+> to announce itself 
 		to the two given IP addresses using the given workgroup names. 
 		If you leave out the workgroup name then the one given in 
 		the <A
@@ -14415,10 +14485,10 @@ HREF="nmbd.8.html"
 TARGET="_top"
 >nmbd(8)</A
 > to periodically request 
-		synchronization of browse lists with the master browser of a samba 
+		synchronization of browse lists with the master browser of a Samba 
 		server that is on a remote segment. This option will allow you to 
 		gain browse lists for multiple workgroups across routed networks. This 
-		is done in a manner that does not work with any non-samba servers.</P
+		is done in a manner that does not work with any non-Samba servers.</P
 ><P
 >This is useful if you want your Samba server and all local 
 		clients to appear in a remote workgroup for which the normal browse 
@@ -14445,7 +14515,7 @@ CLASS="COMMAND"
 		of known browse masters if your network config is that stable. If 
 		a machine IP address is given Samba makes NO attempt to validate 
 		that the remote machine is available, is listening, nor that it 
-		is in fact the browse master on it's segment.</P
+		is in fact the browse master on its segment.</P
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -14460,12 +14530,18 @@ NAME="RESTRICTACLWITHMASK"
 >restrict acl with mask (S)</DT
 ><DD
 ><P
->This is a boolean parameter.  If set to false (default), then 
-		Creation of files with access control lists (ACLS) and modification of ACLs
+>This is a boolean parameter.  If set to <TT
+CLASS="CONSTANT"
+>false</TT
+> (default), then 
+		creation of files with access control lists (ACLS) and modification of ACLs
 		using the Windows NT/2000 ACL editor will be applied directly to the file
 		or directory.</P
 ><P
->If set to True, then all requests to set an ACL on a file will have the
+>If set to <TT
+CLASS="CONSTANT"
+>true</TT
+>, then all requests to set an ACL on a file will have the
 		parameters <A
 HREF="#CREATEMASK"
 ><TT
@@ -14556,10 +14632,16 @@ NAME="RESTRICTANONYMOUS"
 >restrict anonymous (G)</DT
 ><DD
 ><P
->This is a boolean parameter.  If it is true, then 
+>This is a boolean parameter.  If it is <TT
+CLASS="CONSTANT"
+>true</TT
+>, then 
 		anonymous access to the server will be restricted, namely in the 
 		case where the server is expecting the client to send a username, 
-		but it doesn't.  Setting it to true will force these anonymous 
+		but it doesn't.  Setting it to <TT
+CLASS="CONSTANT"
+>true</TT
+> will force these anonymous 
  		connections to be denied, and the client will be required to always 
 		supply a username and password when connecting. Use of this parameter 
 		is only recommended for homogeneous NT client environments.</P
@@ -14569,10 +14651,13 @@ NAME="RESTRICTANONYMOUS"
 		likes to use anonymous connections when refreshing the share list, 
 		and this is a way to work around that.</P
 ><P
->When restrict anonymous is true, all anonymous connections 
+>When restrict anonymous is <TT
+CLASS="CONSTANT"
+>true</TT
+>, all anonymous connections 
 		are denied no matter what they are for.  This can effect the ability 
-		of a machine to access the samba Primary Domain Controller to revalidate 
-		it's machine account after someone else has logged on the client 
+		of a machine to access the Samba Primary Domain Controller to revalidate 
+		its machine account after someone else has logged on the client 
 		interactively.  The NT client will display a message saying that 
 		the machine's account in  the domain doesn't exist or the password is 
 		bad.  The best way to deal  with this is to reboot NT client machines 
@@ -14629,7 +14714,7 @@ NAME="ROOTDIRECTORY"
 CLASS="COMMAND"
 >chroot()</B
 > (i.e. 
-		Change it's root directory) to this directory on startup. This is 
+		Change its root directory) to this directory on startup. This is 
 		not strictly necessary for secure operation. Even without it the 
 		server will deny access to files not in one of the service entries. 
 		It may also check for, and deny access to, soft links to other 
@@ -14703,7 +14788,7 @@ CLASS="PARAMETER"
 >
 		parameter except that the command is run as root. This 
 		is useful for unmounting filesystems 
-		(such as cdroms) after a connection is closed.</P
+		(such as CDROMs) after a connection is closed.</P
 ><P
 >See also <A
 HREF="#POSTEXEC"
@@ -14735,8 +14820,8 @@ CLASS="PARAMETER"
 ></TT
 >
 		parameter except that the command is run as root. This 
-		is useful for mounting filesystems (such as cdroms) after a 
-		connection is closed.</P
+		is useful for mounting filesystems (such as CDROMs) when a 
+		connection is opened.</P
 ><P
 >See also <A
 HREF="#PREEXEC"
@@ -14916,7 +15001,7 @@ NAME="SECURITYEQUALSSHARE"
 		</EM
 ></P
 ><P
->When clients connect to a share level security server then 
+>When clients connect to a share level security server they 
 		need not log onto the server with a valid username and password before 
 		attempting to connect to a shared resource (although modern clients 
 		such as Windows 95/98 and Windows NT will send a logon request with 
@@ -15173,7 +15258,7 @@ CLASS="FILENAME"
 ><P
 ><EM
 >Note</EM
-> that from the clients point of 
+> that from the client's point of 
 		view <B
 CLASS="COMMAND"
 >security = server</B
@@ -15275,7 +15360,7 @@ CLASS="CONSTANT"
 ><P
 ><EM
 >Note</EM
-> that from the clients point 
+> that from the client's point 
 		of view <B
 CLASS="COMMAND"
 >security = domain</B
@@ -15390,7 +15475,10 @@ NAME="SECURITYMASK"
 		Samba server through other means can easily bypass this 
 		restriction, so it is primarily useful for standalone 
 		"appliance" systems.  Administrators of most normal systems will 
-		probably want to leave it set to 0777.</P
+		probably want to leave it set to <TT
+CLASS="CONSTANT"
+>0777</TT
+>.</P
 ><P
 >See also the <A
 HREF="#FORCEDIRECTORYSECURITYMODE"
@@ -15441,7 +15529,7 @@ NAME="SERVERSTRING"
 		printer comment box in print manager and next to the IPC connection 
 		in <B
 CLASS="COMMAND"
->net view"</B
+>net view</B
 >. It can be any string that you wish 
 		to show to your users.</P
 ><P
@@ -15622,7 +15710,7 @@ CLASS="PARAMETER"
 >printer admin</I
 ></TT
 > group), the OpenPrinterEx() 
-		call fails and the clients another open call with a request for 
+		call fails and the client makes another open call with a request for 
 		a lower privilege level.  This should succeed, however the APW 
 		icon will not be displayed.</P
 ><P
@@ -15705,7 +15793,7 @@ NAME="SOCKETADDRESS"
 		support multiple virtual interfaces on the one server, each 
 		with a different configuration.</P
 ><P
->By default samba will accept connections on any 
+>By default Samba will accept connections on any 
 		address.</P
 ><P
 >Example: <B
@@ -15915,8 +16003,8 @@ CLASS="COMMAND"
 		it is set to <TT
 CLASS="CONSTANT"
 >no</TT
->, the SSL enabled samba behaves 
-		exactly like the non-SSL samba. If set to <TT
+>, the SSL-enabled Samba behaves 
+		exactly like the non-SSL Samba. If set to <TT
 CLASS="CONSTANT"
 >yes</TT
 >, 
@@ -15969,7 +16057,7 @@ CLASS="COMMAND"
 ><P
 >This variable defines where to look up the Certification
 		Authorities. The given directory should contain one file for 
-		each CA that samba will trust.  The file name must be the hash 
+		each CA that Samba will trust.  The file name must be the hash 
 		value over the "Distinguished Name" of the CA. How this directory 
 		is set up is explained later in this document. All files within the 
 		directory that don't fit into this naming scheme are ignored. You 
@@ -16197,8 +16285,8 @@ CLASS="COMMAND"
 > enabled by default in any 
 		current binary version of Samba.</P
 ><P
->These two variables define whether samba will go 
-		into SSL mode or not. If none of them is defined, samba will 
+>These two variables define whether Samba will go 
+		into SSL mode or not. If none of them is defined, Samba will 
 		allow only SSL connections. If the <A
 HREF="#SSLHOSTS"
 >		<TT
@@ -16215,7 +16303,9 @@ CLASS="PARAMETER"
 >		ssl hosts resign</I
 ></TT
 > variable lists hosts, only these 
-		hosts will NOT be forced into SSL mode. The syntax for these two 
+		hosts will <EM
+>NOT</EM
+> be forced into SSL mode. The syntax for these two 
 		variables is the same as for the <A
 HREF="#HOSTSALLOW"
 ><TT
@@ -16585,7 +16675,7 @@ CLASS="CONSTANT"
 > the server does file 
 		lock checks only when the client explicitly asks for them.</P
 ><P
->Well behaved clients always ask for lock checks when it 
+>Well-behaved clients always ask for lock checks when it 
 		is important, so in the vast majority of cases <B
 CLASS="COMMAND"
 >strict 
@@ -16614,7 +16704,11 @@ NAME="STRICTSYNC"
 CLASS="CONSTANT"
 >no</TT
 > (the 
-		default) means that smbd ignores the Windows applications requests for
+		default) means that <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> ignores the Windows applications requests for
 		a sync call. There is only a possibility of losing data if the
 		operating system itself that Samba is running on crashes, so there is
 		little danger in this default setting. In addition, this fixes many
@@ -16662,10 +16756,16 @@ NAME="SYNCALWAYS"
 ><P
 >This is a boolean parameter that controls 
 		whether writes will always be written to stable storage before 
-		the write call returns. If this is false then the server will be 
+		the write call returns. If this is <TT
+CLASS="CONSTANT"
+>false</TT
+> then the server will be 
 		guided by the client's request in each write call (clients can 
 		set a bit indicating that a particular write should be synchronous). 
-		If this is true then every write will be followed by a <B
+		If this is <TT
+CLASS="CONSTANT"
+>true</TT
+> then every write will be followed by a <B
 CLASS="COMMAND"
 >fsync()
 		</B
@@ -16882,7 +16982,11 @@ NAME="TOTALPRINTJOBS"
 >This parameter accepts an integer value which defines
 		a limit on the maximum number of print jobs that will be accepted 
 		system wide at any given time.  If a print job is submitted
-		by a client which will exceed this number, then smbd will return an 
+		by a client which will exceed this number, then <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd</A
+> will return an 
 		error indicating that no space is available on the server.  The 
 		default value of 0 means that no such limit exists.  This parameter
 		can be used to prevent a server from exceeding its capacity and is
@@ -16918,7 +17022,10 @@ NAME="UNIXPASSWORDSYNC"
 >This boolean parameter controls whether Samba 
 		attempts to synchronize the UNIX password with the SMB password 
 		when the encrypted SMB password in the smbpasswd file is changed. 
-		If this is set to true the program specified in the <TT
+		If this is set to <TT
+CLASS="CONSTANT"
+>true</TT
+> the program specified in the <TT
 CLASS="PARAMETER"
 ><I
 >passwd
@@ -16928,7 +17035,7 @@ CLASS="PARAMETER"
 >AS ROOT</EM
 > - 
 		to allow the new UNIX password to be set without access to the 
-		old UNIX password (as the SMB password has change code has no 
+		old UNIX password (as the SMB password change code has no 
 		access to the old password cleartext, only the new).</P
 ><P
 >See also <A
@@ -17017,8 +17124,11 @@ NAME="USERHOSTS"
 >use rhosts (G)</DT
 ><DD
 ><P
->If this global parameter is a true, it specifies 
-		that the UNIX users <TT
+>If this global parameter is <TT
+CLASS="CONSTANT"
+>true</TT
+>, it specifies 
+		that the UNIX user's <TT
 CLASS="FILENAME"
 >.rhosts</TT
 > file in their home directory 
@@ -17143,7 +17253,7 @@ CLASS="PARAMETER"
 > parameter.</P
 ><P
 >If any of the usernames begin with a '@' then the name 
-		will be looked up first in the yp netgroups list (if Samba 
+		will be looked up first in the NIS netgroups list (if Samba 
 		is compiled with netgroup support), followed by a lookup in 
 		the UNIX groups database and will expand to a list of all users 
 		in the group of that name.</P
@@ -17153,7 +17263,7 @@ CLASS="PARAMETER"
 		expand to a list of all users in the group of that name.</P
 ><P
 >If any of the usernames begin with a '&#38;'then the name 
-		will be looked up only in the yp netgroups database (if Samba 
+		will be looked up only in the NIS netgroups database (if Samba 
 		is compiled with netgroup support) and will expand to a list 
 		of all users in the netgroup group of that name.</P
 ><P
@@ -17379,7 +17489,10 @@ NAME="UTMP"
 		Samba has been configured and compiled  with the option <B
 CLASS="COMMAND"
 >		--with-utmp</B
->. If set to True then Samba will attempt
+>. If set to <TT
+CLASS="CONSTANT"
+>true</TT
+> then Samba will attempt
 		to add utmp or utmpx records (depending on the UNIX system) whenever a
 		connection is made to a Samba server. Sites may use this to record the
 		user connecting to a Samba share.</P
@@ -17780,7 +17893,7 @@ NAME="VFSOPTIONS"
 ><DD
 ><P
 >This parameter allows parameters to be passed 
-		to the vfs layer at initialisation time.  The Samba VFS layer 
+		to the vfs layer at initialization time.  The Samba VFS layer 
 		is new to Samba 2.2 and must be enabled at compile time 
 		with --with-vfs.  See also <A
 HREF="#VFSOBJECT"
@@ -17877,7 +17990,7 @@ HREF="winbindd.8.html"
 TARGET="_top"
 >		winbindd(8)</A
 > daemon.  This range of group ids should have no 
-		existing local or nis groups within it as strange conflicts can 
+		existing local or NIS groups within it as strange conflicts can 
 		occur otherwise.</P
 ><P
 >Default: <B
@@ -17954,7 +18067,7 @@ HREF="winbindd.8.html"
 TARGET="_top"
 >		winbindd(8)</A
 > daemon.  This range of ids should have no 
-		existing local or nis users within it as strange conflicts can 
+		existing local or NIS users within it as strange conflicts can 
 		occur otherwise.</P
 ><P
 >Default: <B
@@ -18003,14 +18116,14 @@ CLASS="COMMAND"
 ></LI
 ><LI
 ><P
->The second argument is the netbios name. If the 
+>The second argument is the NetBIOS name. If the 
 			name is not a legal name then the wins hook is not called. 
 			Legal names contain only  letters, digits, hyphens, underscores 
 			and periods.</P
 ></LI
 ><LI
 ><P
->The third argument is the netbios name 
+>The third argument is the NetBIOS name 
 			type as a 2 digit hexadecimal number. </P
 ></LI
 ><LI
@@ -18108,14 +18221,20 @@ TARGET="_top"
 > 		
 		nmbd(8)</A
 > process in Samba will act as a WINS server. You should 
-		not set this to true unless you have a multi-subnetted network and 
+		not set this to <TT
+CLASS="CONSTANT"
+>true</TT
+> unless you have a multi-subnetted network and 
 		you wish a particular <B
 CLASS="COMMAND"
 >nmbd</B
 > to be your WINS server. 
 		Note that you should <EM
 >NEVER</EM
-> set this to true 
+> set this to <TT
+CLASS="CONSTANT"
+>true</TT
+>
 		on more than one machine in your network.</P
 ><P
 >Default: <B
@@ -18187,7 +18306,7 @@ NAME="WRITECACHESIZE"
 		within it.</P
 ><P
 >This cache allows Samba to batch client writes into a more 
-		efficient write size for RAID disks (ie. writes may be tuned to 
+		efficient write size for RAID disks (i.e. writes may be tuned to 
 		be the RAID stripe size) and can improve performance on systems 
 		where the disk subsystem is a bottleneck but there is free 
 		memory for userspace programs.</P
@@ -18279,7 +18398,7 @@ NAME="WRITERAW"
 ><DD
 ><P
 >This parameter controls whether or not the server 
-		will support raw writes SMB's when transferring data from clients. 
+		will support raw write SMB's when transferring data from clients. 
 		You should never need to change this parameter.</P
 ><P
 >Default: <B
@@ -18331,7 +18450,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5791"
+NAME="AEN5828"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18361,7 +18480,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5797"
+NAME="AEN5834"
 ></A
 ><H2
 >VERSION</H2
@@ -18372,7 +18491,7 @@ NAME="AEN5797"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5800"
+NAME="AEN5837"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18451,7 +18570,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5820"
+NAME="AEN5857"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcacls.1.html b/docs/htmldocs/smbcacls.1.html
index b8323dd8f5b..637720fa6ba 100644
--- a/docs/htmldocs/smbcacls.1.html
+++ b/docs/htmldocs/smbcacls.1.html
@@ -52,18 +52,24 @@ TARGET="_top"
 >	Samba</A
 > suite.</P
 ><P
->The smbcacls program manipulates NT Access Control Lists 
+>The <B
+CLASS="COMMAND"
+>smbcacls</B
+> program manipulates NT Access Control Lists 
 	(ACLs) on SMB file shares. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN28"
 ></A
 ><H2
 >OPTIONS</H2
 ><P
->The following options are available to the smbcacls program.  
+>The following options are available to the <B
+CLASS="COMMAND"
+>smbcacls</B
+> program.  
 	The format of ACLs is described in the section ACL FORMAT </P
 ><P
 ></P
@@ -90,7 +96,7 @@ CLASS="VARIABLELIST"
 >-D acls</DT
 ><DD
 ><P
->Delete any ACLs specfied on the command line.  
+>Delete any ACLs specified on the command line.  
 		An error will be printed for each ACL specified that was not 
 		already present in the ACL list. </P
 ></DD
@@ -175,7 +181,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73"
+NAME="AEN75"
 ></A
 ><H2
 >ACL FORMAT</H2
@@ -322,7 +328,7 @@ ACL:&#60;sid or name&#62;:&#60;type&#62;/&#60;flags&#62;/&#60;mask&#62;
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN123"
+NAME="AEN125"
 ></A
 ><H2
 >EXIT STATUS</H2
@@ -334,8 +340,11 @@ CLASS="COMMAND"
 	depending on the success or otherwise of the operations performed.  
 	The exit status may be one of the following values. </P
 ><P
->If the operation succeded, smbcacls returns and exit 
-	status of 0.  If smbcacls couldn't connect to the specified server, 
+>If the operation succeeded, smbcacls returns and exit 
+	status of 0.  If <B
+CLASS="COMMAND"
+>smbcacls</B
+> couldn't connect to the specified server, 
 	or there was an error getting or setting the ACLs, an exit status 
 	of 1 is returned.  If there was an error parsing any command line 
 	arguments, an exit status of 2 is returned. </P
@@ -343,7 +352,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN128"
+NAME="AEN131"
 ></A
 ><H2
 >VERSION</H2
@@ -354,7 +363,7 @@ NAME="AEN128"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN131"
+NAME="AEN134"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 8232906680f..f38ae269951 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -121,8 +121,14 @@ CLASS="PARAMETER"
 ><I
 >-R</I
 ></TT
-> parameter to smbclient or 
-		using the name resolve order parameter in the smb.conf file, 
+> parameter to <B
+CLASS="COMMAND"
+>smbclient</B
+> or 
+		using the name resolve order parameter in the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file, 
 		allowing an administrator to change the order and methods 
 		by which server names are looked up. </P
 ></DD
@@ -194,7 +200,7 @@ CLASS="FILENAME"
 ><P
 >This option is used by the programs in the Samba 
 		suite to determine what naming services and in what order to resolve 
-		host names to IP addresses. The option takes a space separated 
+		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 
@@ -227,7 +233,7 @@ CLASS="FILENAME"
 >/etc/hosts
 			</TT
 >, NIS, or DNS lookups. This method of name resolution 
-			is operating system depended for instance on IRIX or Solaris this 
+			is operating system dependent, for instance on IRIX or Solaris this 
 			may be controlled by the <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
@@ -284,7 +290,10 @@ CLASS="PARAMETER"
 >name resolve order
 		</I
 ></TT
-> parameter of the smb.conf file the name resolution
+> parameter of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file the name resolution
 		methods will be attempted in this order. </P
 ></DD
 ><DT
@@ -351,7 +360,13 @@ CLASS="FILENAME"
 ><P
 >This specifies a NetBIOS scope that smbclient will 
 		use to communicate with when generating NetBIOS names. For details 
-		on the use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt.
+		on the use of NetBIOS scopes, see <TT
+CLASS="FILENAME"
+>rfc1001.txt</TT
+> and <TT
+CLASS="FILENAME"
+>rfc1002.txt</TT
+>.
 		NetBIOS scopes are <EM
 >very</EM
 > rarely used, only set 
@@ -383,7 +398,12 @@ CLASS="FILENAME"
 >-d debuglevel</DT
 ><DD
 ><P
->debuglevel is an integer from 0 to 10, or 
+><TT
+CLASS="REPLACEABLE"
+><I
+>debuglevel</I
+></TT
+> is an integer from 0 to 10, or 
 		the letter 'A'. </P
 ><P
 >The default value if this parameter is not specified 
@@ -400,7 +420,12 @@ CLASS="FILENAME"
 		data, and should only be used when investigating a problem.
 		Levels above 3 are designed for use only by developers and 
 		generate HUGE amounts of log data, most of which is extremely 
-		cryptic. If debuglevel is set to the letter 'A', then <EM
+		cryptic. If <TT
+CLASS="REPLACEABLE"
+><I
+>debuglevel</I
+></TT
+> is set to the letter 'A', then <EM
 >all
 		</EM
 >  debug messages will be printed. This setting
@@ -410,9 +435,9 @@ CLASS="FILENAME"
 		to know how the code works internally). </P
 ><P
 >Note that specifying this parameter here will override
-		the log level parameter in the <B
-CLASS="COMMAND"
->smb.conf (5)</B
+		the log level parameter in the <TT
+CLASS="FILENAME"
+>smb.conf (5)</TT
 > 
 		file. </P
 ></DD
@@ -429,7 +454,12 @@ CLASS="COMMAND"
 >-l logfilename</DT
 ><DD
 ><P
->If specified, logfilename specifies a base filename 
+>If specified, <TT
+CLASS="REPLACEABLE"
+><I
+>logfilename</I
+></TT
+> specifies a base filename 
 		into which operational data from the running client will be 
 		logged. </P
 ><P
@@ -455,7 +485,12 @@ CLASS="FILENAME"
 >-I IP-address</DT
 ><DD
 ><P
->IP address is the address of the server to connect to. 
+><TT
+CLASS="REPLACEABLE"
+><I
+>IP address</I
+></TT
+> is the address of the server to connect to. 
 		It should be specified in standard "a.b.c.d" notation. </P
 ><P
 >Normally the client would attempt to locate a named 
@@ -492,35 +527,37 @@ CLASS="PARAMETER"
 ><P
 >Sets the SMB username or username and password. 
 		If %pass is not specified, The user will be prompted. The client 
-		will first check the USER environment variable, then the 
+		will first check the <TT
+CLASS="ENVAR"
+>USER</TT
+> environment variable, then the 
 		<TT
-CLASS="PARAMETER"
-><I
->$LOGNAME</I
-></TT
-> variable and if either exist, the 
+CLASS="ENVAR"
+>LOGNAME</TT
+> variable and if either exists, the 
 		string is uppercased. Anything in these variables following a '%' 
-		sign will be treated as the password. If these environmental 
+		sign will be treated as the password. If these environment 
 		variables are not found, the username <TT
 CLASS="CONSTANT"
 >GUEST</TT
 > 
 		is used. </P
 ><P
->If the password is not included in these environment 
-		variables (using the %pass syntax), rpcclient will look for 
+>If the password is not included in these environment
+		variables (using the %pass syntax), <B
+CLASS="COMMAND"
+>rpcclient</B
+> will look for 
 		a <TT
-CLASS="PARAMETER"
-><I
->$PASSWD</I
-></TT
+CLASS="ENVAR"
+>PASSWD</TT
 > environment variable from which 
 		to read the password. </P
 ><P
 >A third option is to use a credentials file which 
 		contains the plaintext of the username and password.  This 
 		option is mainly provided for scripts where the admin doesn't 
-		desire to pass the credentials on the command line or via environment 
+		wish to pass the credentials on the command line or via environment 
 		variables. If this method is used, make certain that the permissions 
 		on the file restrict access from unwanted users.  See the 
 		<TT
@@ -532,10 +569,8 @@ CLASS="PARAMETER"
 ><P
 >Be cautious about including passwords in scripts or in 
 		the <TT
-CLASS="PARAMETER"
-><I
->$PASSWD</I
-></TT
+CLASS="ENVAR"
+>PASSWD</TT
 > environment variable. Also, on 
 		many systems the command line of a running process may be seen 
 		via the <B
@@ -592,14 +627,17 @@ CLASS="PARAMETER"
 		</I
 ></TT
 > option may be useful if your NetBIOS names don't 
-		match your tcp/ip dns host names or if you are trying to reach a 
+		match your TCP/IP DNS host names or if you are trying to reach a 
 		host on another network. </P
 ></DD
 ><DT
 >-t terminal code</DT
 ><DD
 ><P
->This option tells smbclient how to interpret 
+>This option tells <B
+CLASS="COMMAND"
+>smbclient</B
+> how to interpret 
 		filenames coming from the remote server. Usually Asian language 
 		multibyte UNIX implementations use different character sets than 
 		SMB/CIFS servers (<EM
@@ -771,7 +809,7 @@ CLASS="PARAMETER"
 >r</I
 ></TT
 > - Regular expression include
-			or exclude.  Uses regular  regular expression matching for 
+			or exclude.  Uses regular  expression matching for 
 			excluding or excluding files if  compiled with HAVE_REGEX_H. 
 			However this mode can be very slow. If  not compiled with 
 			HAVE_REGEX_H, does a limited wildcard match on '*' and  '?'. 
@@ -829,7 +867,10 @@ CLASS="COMMAND"
 >'s tar option now supports long 
 		file names both on backup and restore. However, the full path 
 		name of the file must be less than 1024 bytes.  Also, when
-		a tar archive is created, smbclient's tar option places all 
+		a tar archive is created, <B
+CLASS="COMMAND"
+>smbclient</B
+>'s tar option places all 
 		files in the archive with relative names, not absolute names. 
 		</P
 ><P
@@ -845,12 +886,15 @@ CLASS="COMMAND"
 >Examples</EM
 ></P
 ><P
->Restore from tar file backup.tar into myshare on mypc 
+>Restore from tar file <TT
+CLASS="FILENAME"
+>backup.tar</TT
+> into myshare on mypc 
 		(no password on share). </P
 ><P
 ><B
 CLASS="COMMAND"
->smbclient //mypc/myshare "" -N -Tx backup.tar
+>smbclient //mypc/yshare "" -N -Tx backup.tar
 		</B
 ></P
 ><P
@@ -906,7 +950,7 @@ CLASS="COMMAND"
 >-c command string</DT
 ><DD
 ><P
->command string is a semicolon separated list of 
+>command string is a semicolon-separated list of 
 		commands to be executed instead of prompting from stdin. <TT
 CLASS="PARAMETER"
 ><I
@@ -931,7 +975,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN297"
+NAME="AEN311"
 ></A
 ><H2
 >OPERATIONS</H2
@@ -979,7 +1023,12 @@ CLASS="VARIABLELIST"
 >? [command]</DT
 ><DD
 ><P
->If "command" is specified, the ? command will display 
+>If <TT
+CLASS="REPLACEABLE"
+><I
+>command</I
+></TT
+> is specified, the ? command will display 
 		a brief informative message about the specified command.  If no 
 		command is specified, a list of available commands will
 		be displayed. </P
@@ -988,7 +1037,12 @@ CLASS="VARIABLELIST"
 >! [shell command]</DT
 ><DD
 ><P
->If "shell command" is specified, the !  
+>If <TT
+CLASS="REPLACEABLE"
+><I
+>shell command</I
+></TT
+> 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. 
 		</P
@@ -1010,14 +1064,24 @@ CLASS="VARIABLELIST"
 ><DD
 ><P
 >The client will request that the server attempt 
-		to delete all files matching "mask" from the current working 
+		to delete all files matching <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> from the current working 
 		directory on the server. </P
 ></DD
 ><DT
 >dir &#60;mask&#62;</DT
 ><DD
 ><P
->A list of the files matching "mask" in the current 
+>A list of the files matching <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> in the current 
 		working directory on the server will be retrieved from the server 
 		and displayed. </P
 ></DD
@@ -1032,9 +1096,15 @@ CLASS="VARIABLELIST"
 >get &#60;remote file name&#62; [local file name]</DT
 ><DD
 ><P
->Copy the file called "remote file name" from 
+>Copy the file called <TT
+CLASS="FILENAME"
+>remote file name</TT
+> from 
 		the server to the machine running the client. If specified, name 
-		the local copy "local file name".  Note that all transfers in 
+		the local copy <TT
+CLASS="FILENAME"
+>local file name</TT
+>.  Note that all transfers in 
 		<B
 CLASS="COMMAND"
 >smbclient</B
@@ -1051,7 +1121,12 @@ CLASS="COMMAND"
 >lcd [directory name]</DT
 ><DD
 ><P
->If "directory name" is specified, the current 
+>If <TT
+CLASS="REPLACEABLE"
+><I
+>directory name</I
+></TT
+> is specified, the current 
 		working directory on the local machine will be changed to 
 		the directory specified. This operation will fail if for any 
 		reason the specified directory is inaccessible. </P
@@ -1114,13 +1189,26 @@ CLASS="COMMAND"
 >mget &#60;mask&#62;</DT
 ><DD
 ><P
->Copy all files matching mask from the server to 
+>Copy all files matching <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> from the server to 
 		the machine running the client. </P
 ><P
->Note that mask is interpreted differently during recursive 
+>Note that <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> is interpreted differently during recursive 
 		operation and non-recursive operation - refer to the recurse and 
 		mask commands for more information. Note that all transfers in 
-		smbclient are binary. See also the lowercase command. </P
+		<B
+CLASS="COMMAND"
+>smbclient</B
+> are binary. See also the lowercase command. </P
 ></DD
 ><DT
 >mkdir &#60;directory name&#62;</DT
@@ -1133,13 +1221,26 @@ CLASS="COMMAND"
 >mput &#60;mask&#62;</DT
 ><DD
 ><P
->Copy all files matching mask in the current working 
+>Copy all files matching <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> in the current working 
 		directory on the local machine to the current working directory on 
 		the server. </P
 ><P
->Note that mask is interpreted differently during recursive 
+>Note that <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> is interpreted differently during recursive 
 		operation and non-recursive operation - refer to the recurse and mask 
-		commands for more information. Note that all transfers in smbclient 
+		commands for more information. Note that all transfers in <B
+CLASS="COMMAND"
+>smbclient</B
+> 
 		are binary. </P
 ></DD
 ><DT
@@ -1175,10 +1276,19 @@ CLASS="COMMAND"
 >put &#60;local file name&#62; [remote file name]</DT
 ><DD
 ><P
->Copy the file called "local file name" from the 
+>Copy the file called <TT
+CLASS="FILENAME"
+>local file name</TT
+> from the 
 		machine running the client to the server. If specified,
-		name the remote copy "remote file name". Note that all transfers 
-		in smbclient are binary. See also the lowercase command. 
+		name the remote copy <TT
+CLASS="FILENAME"
+>remote file name</TT
+>. Note that all transfers 
+		in <B
+CLASS="COMMAND"
+>smbclient</B
+> are binary. See also the lowercase command. 
 		</P
 ></DD
 ><DT
@@ -1223,7 +1333,12 @@ CLASS="COMMAND"
 >rm &#60;mask&#62;</DT
 ><DD
 ><P
->Remove all files matching mask from the current 
+>Remove all files matching <TT
+CLASS="REPLACEABLE"
+><I
+>mask</I
+></TT
+> from the current 
 		working directory on the server. </P
 ></DD
 ><DT
@@ -1255,7 +1370,12 @@ CLASS="PARAMETER"
 ><P
 >Blocksize. Must be followed by a valid (greater 
 		than zero) blocksize. Causes tar file to be written out in 
-		blocksize*TBLOCK (usually 512 byte) blocks. </P
+		<TT
+CLASS="REPLACEABLE"
+><I
+>blocksize</I
+></TT
+>*TBLOCK (usually 512 byte) blocks. </P
 ></DD
 ><DT
 >tarmode &#60;full|inc|reset|noreset&#62;</DT
@@ -1288,7 +1408,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN446"
+NAME="AEN478"
 ></A
 ><H2
 >NOTES</H2
@@ -1309,26 +1429,22 @@ NAME="AEN446"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN451"
+NAME="AEN483"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
 ><P
 >The variable <TT
-CLASS="PARAMETER"
-><I
->$USER</I
-></TT
+CLASS="ENVAR"
+>USER</TT
 > may contain the 
 	username of the person  using the client. This information is 
 	used only if the protocol  level is high enough to support 
 	session-level passwords.</P
 ><P
 >The variable <TT
-CLASS="PARAMETER"
-><I
->$PASSWD</I
-></TT
+CLASS="ENVAR"
+>PASSWD</TT
 > may contain 
 	the password of the person using the client.  This information is 
 	used only if the protocol level is high enough to support 
@@ -1337,7 +1453,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN457"
+NAME="AEN489"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -1368,14 +1484,14 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >smbd(8)
 	</B
-> an ordinary user - running that server as a daemon 
+> as an ordinary user - running that server as a daemon 
 	on a user-accessible port (typically any port number over 1024)
 	would provide a suitable test server. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN467"
+NAME="AEN499"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -1391,7 +1507,7 @@ NAME="AEN467"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN471"
+NAME="AEN503"
 ></A
 ><H2
 >VERSION</H2
@@ -1402,7 +1518,7 @@ NAME="AEN471"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN474"
+NAME="AEN506"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 35520b05afc..7096dc205f7 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -98,12 +98,15 @@ CLASS="FILENAME"
 	can force a reload by sending a SIGHUP to the server.  Reloading 
 	the configuration file will not affect connections to any service 
 	that is already established.  Either the user will have to 
-	disconnect from the service, or smbd killed and restarted.</P
+	disconnect from the service, or <B
+CLASS="COMMAND"
+>smbd</B
+> killed and restarted.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN35"
+NAME="AEN36"
 ></A
 ><H2
 >OPTIONS</H2
@@ -120,9 +123,12 @@ CLASS="VARIABLELIST"
 		the server to operate as a daemon. That is, it detaches 
 		itself and runs in the background, fielding requests 
 		on the appropriate port. Operating the server as a
-		daemon is the recommended way of running smbd for 
+		daemon is the recommended way of running <B
+CLASS="COMMAND"
+>smbd</B
+> for 
 		servers that provide more than casual use file and 
-		print services.  This switch is assumed is <B
+		print services.  This switch is assumed if <B
 CLASS="COMMAND"
 >smbd
 		</B
@@ -153,7 +159,10 @@ CLASS="COMMAND"
 >-P</DT
 ><DD
 ><P
->Passive option. Causes smbd not to 
+>Passive option. Causes <B
+CLASS="COMMAND"
+>smbd</B
+> not to 
 		send any network traffic out. Used for debugging by 
 		the developers only.</P
 ></DD
@@ -181,7 +190,12 @@ CLASS="COMMAND"
 >-d &#60;debug level&#62;</DT
 ><DD
 ><P
->debuglevel is an integer 
+><TT
+CLASS="REPLACEABLE"
+><I
+>debuglevel</I
+></TT
+> is an integer 
 		from 0 to 10.  The default value if this parameter is 
 		not specified is zero.</P
 ><P
@@ -217,8 +231,11 @@ CLASS="FILENAME"
 >-l &#60;log file&#62;</DT
 ><DD
 ><P
->If specified, <EM
->log file</EM
+>If specified, <TT
+CLASS="REPLACEABLE"
+><I
+>log file</I
+></TT
 > 
 		specifies a log filename into which informational and debug 
 		messages from the running server will be logged. The log 
@@ -261,7 +278,12 @@ CLASS="FILENAME"
 >-p &#60;port number&#62;</DT
 ><DD
 ><P
->port number is a positive integer 
+><TT
+CLASS="REPLACEABLE"
+><I
+>port number</I
+></TT
+> is a positive integer 
 		value.  The default value if this parameter is not 
 		specified is 139.</P
 ><P
@@ -309,7 +331,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN104"
+NAME="AEN109"
 ></A
 ><H2
 >FILES</H2
@@ -407,7 +429,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN137"
+NAME="AEN142"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -426,7 +448,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN141"
+NAME="AEN146"
 ></A
 ><H2
 >ENVIRONMENTVARIABLES</H2
@@ -436,12 +458,18 @@ NAME="AEN141"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
->PRINTER</DT
+><TT
+CLASS="ENVAR"
+>PRINTER</TT
+></DT
 ><DD
 ><P
 >If no printer name is specified to 
 		printable services, most systems will use the value of 
-		this variable (or lp if this variable is 
+		this variable (or <TT
+CLASS="CONSTANT"
+>lp</TT
+> if this variable is 
 		not defined) as the name of the printer to use. This 
 		is not specific to the server, however.</P
 ></DD
@@ -451,7 +479,7 @@ CLASS="VARIABLELIST"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN148"
+NAME="AEN155"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -469,10 +497,16 @@ CLASS="FILENAME"
 	program itself should be executable by all, as users may wish to 
 	run the server themselves (in which case it will of course run 
 	with their privileges).  The server should NOT be setuid. On some 
-	systems it may be worthwhile to make smbd setgid to an empty group. 
+	systems it may be worthwhile to make <B
+CLASS="COMMAND"
+>smbd</B
+> setgid to an empty group. 
 	This is because some systems may have a security hole where daemon 
 	processes that become a user can be attached to with a debugger. 
-	Making the smbd file setgid to an empty group may prevent
+	Making the <B
+CLASS="COMMAND"
+>smbd</B
+> file setgid to an empty group may prevent
 	this hole from being exploited. This security hole and the suggested
 	fix has only been confirmed on old versions (pre-kernel 2.0) of Linux
 	at the time this was written. It is possible that this hole only
@@ -567,7 +601,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN179"
+NAME="AEN188"
 ></A
 ><H2
 >RUNNING THE SERVER AS A DAEMON</H2
@@ -622,7 +656,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN192"
+NAME="AEN201"
 ></A
 ><H2
 >RUNNING THE SERVER ON REQUEST</H2
@@ -631,7 +665,10 @@ NAME="AEN192"
 CLASS="COMMAND"
 >inetd
 	</B
->, you can arrange to have the smbd server started 
+>, you can arrange to have the <B
+CLASS="COMMAND"
+>smbd</B
+> server started 
 	whenever a process attempts to connect to it. This requires several 
 	changes to the startup files on the host machine. If you are 
 	experimenting as an ordinary user rather than as root, you will 
@@ -755,7 +792,7 @@ CLASS="COMPUTEROUTPUT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN223"
+NAME="AEN233"
 ></A
 ><H2
 >TESTING THE INSTALLATION</H2
@@ -769,8 +806,18 @@ CLASS="COMMAND"
 > will reread their configuration
 	tables if they receive a HUP signal.</P
 ><P
->If your machine's name is fred and your 
-	name is mary, you should now be able to connect 
+>If your machine's name is <TT
+CLASS="REPLACEABLE"
+><I
+>fred</I
+></TT
+> and your 
+	name is <TT
+CLASS="REPLACEABLE"
+><I
+>mary</I
+></TT
+>, you should now be able to connect 
 	to the service <TT
 CLASS="FILENAME"
 >\\fred\mary</TT
@@ -803,7 +850,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN235"
+NAME="AEN247"
 ></A
 ><H2
 >VERSION</H2
@@ -814,7 +861,7 @@ NAME="AEN235"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN238"
+NAME="AEN250"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -837,19 +884,25 @@ NAME="AEN238"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN243"
+NAME="AEN255"
 ></A
 ><H2
 >SIGNALS</H2
 ><P
->Sending the smbd a SIGHUP will cause it to 
-	re-load its <TT
+>Sending the <B
+CLASS="COMMAND"
+>smbd</B
+> a SIGHUP will cause it to 
+	reload its <TT
 CLASS="FILENAME"
 >smb.conf</TT
 > configuration 
 	file within a short period of time.</P
 ><P
->To shut down a users smbd process it is recommended 
+>To shut down a user's <B
+CLASS="COMMAND"
+>smbd</B
+> process it is recommended 
 	that <B
 CLASS="COMMAND"
 >SIGKILL (-9)</B
@@ -858,10 +911,16 @@ CLASS="COMMAND"
 > 
 	be used, except as a last resort, as this may leave the shared
 	memory area in an inconsistent state. The safe way to terminate 
-	an smbd is to send it a SIGTERM (-15) signal and wait for 
+	an <B
+CLASS="COMMAND"
+>smbd</B
+> is to send it a SIGTERM (-15) signal and wait for 
 	it to die on its own.</P
 ><P
->The debug log level of smbd may be raised by sending 
+>The debug log level of <B
+CLASS="COMMAND"
+>smbd</B
+> may be raised by sending 
 	it a SIGUSR1 (<B
 CLASS="COMMAND"
 >kill -USR1 &#60;smbd-pid&#62;</B
@@ -874,8 +933,14 @@ CLASS="COMMAND"
 	whilst still running at a normally low log level.</P
 ><P
 >Note that as the signal handlers send a debug write, 
-	they are not re-entrant in smbd. This you should wait until 
-	smbd is in a state of waiting for an incoming smb before 
+	they are not re-entrant in <B
+CLASS="COMMAND"
+>smbd</B
+>. This you should wait until 
+	<B
+CLASS="COMMAND"
+>smbd</B
+> is in a state of waiting for an incoming SMB before 
 	issuing them. It is possible to make the signal handlers safe 
 	by un-blocking the signals before the select call and re-blocking 
 	them after, however this would affect performance.</P
@@ -883,7 +948,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN254"
+NAME="AEN272"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -949,7 +1014,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN271"
+NAME="AEN289"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbmnt.8.html b/docs/htmldocs/smbmnt.8.html
index e083cfd3bad..6546b7c7070 100644
--- a/docs/htmldocs/smbmnt.8.html
+++ b/docs/htmldocs/smbmnt.8.html
@@ -55,7 +55,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >smbmnt</B
 > is meant to be installed setuid root 
-	so that normal users can mount their smb shares. It checks 
+	so that normal users can mount their SMB shares. It checks 
 	whether the user has write permissions on the mount point and 
 	then mounts the directory.</P
 ><P
@@ -125,7 +125,7 @@ CLASS="VARIABLELIST"
 ><DD
 ><P
 >		list of options that are passed as-is to smbfs, if this
-		command is run on a 2.4 or higher linux kernel.
+		command is run on a 2.4 or higher Linux kernel.
 		</P
 ></DD
 ></DL
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index 4642dfe8910..721397312ae 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -60,17 +60,29 @@ CLASS="COMMAND"
 > command when using the 
 	"-t smb" option. The kernel must support the smbfs filesystem. </P
 ><P
->Options to smbmount are specified as a comma separated
+>Options to <B
+CLASS="COMMAND"
+>smbmount</B
+> are specified as a comma-separated
 	list of key=value pairs. It is possible to send options other
 	than those listed here, assuming that smbfs supports them. If
 	you get mount failures, check your kernel log for errors on
 	unknown options.</P
 ><P
->smbmount is a daemon. After mounting it keeps running until
+><B
+CLASS="COMMAND"
+>smbmount</B
+> is a daemon. After mounting it keeps running until
 	the mounted smbfs is umounted. It will log things that happen
 	when in daemon mode using the "machine name" smbmount, so
-	typically this output will end up in log.smbmount. The
-	smbmount process may also be called mount.smbfs.</P
+	typically this output will end up in <TT
+CLASS="FILENAME"
+>log.smbmount</TT
+>. The
+	<B
+CLASS="COMMAND"
+>smbmount</B
+> process may also be called mount.smbfs.</P
 ><P
 ><EM
 >NOTE:</EM
@@ -91,7 +103,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN31"
 ></A
 ><H2
 >OPTIONS</H2
@@ -162,7 +174,10 @@ CLASS="PROGRAMLISTING"
 		</P
 ><P
 >This is preferred over having passwords in plaintext in a
-		shared file, such as /etc/fstab. Be sure to protect any
+		shared file, such as <TT
+CLASS="FILENAME"
+>/etc/fstab</TT
+>. Be sure to protect any
 		credentials file properly.
 		</P
 ></DD
@@ -210,7 +225,7 @@ CLASS="PROGRAMLISTING"
 >dmask=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the directory mask. This deterines the 
+>sets the directory mask. This determines the 
 		permissions that remote directories have in the local filesystem. 
 		The default is based on the current umask. </P
 ></DD
@@ -282,7 +297,7 @@ CLASS="PARAMETER"
 >iocharset=&#60;arg&#62;</DT
 ><DD
 ><P
->		sets the charset used by the linux side for codepage
+>		sets the charset used by the Linux side for codepage
 		to charset translations (NLS). Argument should be the
 		name of a charset, like iso8859-1. (Note: only kernel
 		2.4.0 or later)
@@ -318,7 +333,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN120"
+NAME="AEN125"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -345,12 +360,12 @@ CLASS="ENVAR"
 >PASSWD_FILE</TT
 > may contain the pathname of
 	a file to read the password from. A single line of input is
-	read and used as password.</P
+	read and used as the password.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN128"
+NAME="AEN133"
 ></A
 ><H2
 >BUGS</H2
@@ -370,7 +385,7 @@ NAME="AEN128"
 ></LI
 ></UL
 ><P
->Note that the typical response to a bugreport is suggestion
+>Note that the typical response to a bug report is suggestion
 	to try the latest version first. So please try doing that first,
 	and always include which versions you use of relevant software
 	when reporting bugs (minimum: samba, kernel, distribution)</P
@@ -378,7 +393,7 @@ NAME="AEN128"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN135"
+NAME="AEN140"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -389,7 +404,7 @@ NAME="AEN135"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN138"
+NAME="AEN143"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbpasswd.5.html b/docs/htmldocs/smbpasswd.5.html
index 7de54f63092..1f862b66114 100644
--- a/docs/htmldocs/smbpasswd.5.html
+++ b/docs/htmldocs/smbpasswd.5.html
@@ -101,9 +101,9 @@ CLASS="VARIABLELIST"
 >Lanman Password Hash</DT
 ><DD
 ><P
->This is the LANMAN hash of the users password, 
+>This is the LANMAN hash of the user's password, 
 		encoded as 32 hex digits.  The LANMAN hash is created by DES 
-		encrypting a well known string with the users password as the 
+		encrypting a well known string with the user's password as the 
 		DES key. This is the same password used by Windows 95/98 machines. 
 		Note that this password hash is regarded as weak as it is
 		vulnerable to dictionary attacks and if two users choose the 
@@ -111,7 +111,7 @@ CLASS="VARIABLELIST"
 		is not "salted" as the UNIX password is). If the user has a 
 		null password this field will contain the characters "NO PASSWORD" 
 		as the start of the hex string. If the hex string is equal to 
-		32 'X' characters then the users account is marked as 
+		32 'X' characters then the user's account is marked as 
 		<TT
 CLASS="CONSTANT"
 >disabled</TT
@@ -140,14 +140,14 @@ CLASS="CONSTANT"
 >NT Password Hash</DT
 ><DD
 ><P
->This is the Windows NT hash of the users 
+>This is the Windows NT hash of the user's 
 		password, encoded as 32 hex digits.  The Windows NT hash is 
-		created by taking the users password as represented in 
+		created by taking the user's password as represented in 
 		16-bit, little-endian UNICODE and then applying the MD4 
 		(internet rfc1321) hashing algorithm to it. </P
 ><P
 >This password hash is considered more secure than
-		the Lanman Password Hash as it preserves the case of the 
+		the LANMAN Password Hash as it preserves the case of the 
 		password and uses a much higher quality hashing algorithm. 
 		However, it is still the case that if two users choose the same 
 		password this entry will be identical (i.e. the password is 
@@ -198,7 +198,7 @@ CLASS="CONSTANT"
 ><EM
 >N</EM
 > - This means the
-			account has no password (the passwords in the fields Lanman 
+			account has no password (the passwords in the fields LANMAN 
 			Password Hash and NT Password Hash are ignored). Note that this 
 			will only allow users to log on with no password if the <TT
 CLASS="PARAMETER"
diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index 1c4df519414..f48754163b9 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -24,7 +24,7 @@ NAME="AEN5"
 ></A
 ><H2
 >Name</H2
->smbpasswd&nbsp;--&nbsp;change a users SMB password</DIV
+>smbpasswd&nbsp;--&nbsp;change a user's SMB password</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
@@ -61,7 +61,7 @@ TARGET="_top"
 	SMB passwords. </P
 ><P
 >By default (when run with no arguments) it will attempt to 
-	change the current users SMB password on the local machine. This is 
+	change the current user's SMB password on the local machine. This is 
 	similar to the way the <B
 CLASS="COMMAND"
 >passwd(1)</B
@@ -86,10 +86,10 @@ CLASS="FILENAME"
 > file. </P
 ><P
 >When run by an ordinary user with no options. smbpasswd 
-	will prompt them for their old smb password and then ask them 
+	will prompt them for their old SMB password and then ask them 
 	for their new password twice, to ensure that the new password
 	was typed correctly. No passwords will be echoed on the screen 
-	whilst being typed. If you have a blank smb password (specified by 
+	whilst being typed. If you have a blank SMB password (specified by 
 	the string "NO PASSWORD" in the smbpasswd file) then just press 
 	the &#60;Enter&#62; key when asked for your old password. </P
 ><P
@@ -167,7 +167,7 @@ CLASS="CONSTANT"
 		will fail. </P
 ><P
 >If the smbpasswd file is in the 'old' format (pre-Samba 2.0 
-		format) there is no space in the users password entry to write
+		format) there is no space in the user's password entry to write
 		this information and so the user is disabled by writing 'X' characters 
 		into the password space in the smbpasswd file. See <B
 CLASS="COMMAND"
@@ -217,7 +217,7 @@ CLASS="COMMAND"
 ><DD
 ><P
 ><TT
-CLASS="PARAMETER"
+CLASS="REPLACEABLE"
 ><I
 >debuglevel</I
 ></TT
@@ -500,7 +500,7 @@ CLASS="COMMAND"
 ><DD
 ><P
 >This option causes smbpasswd to be silent (i.e. 
-		not issue prompts) and to read it's old and new passwords from 
+		not issue prompts) and to read its old and new passwords from 
 		standard  input, rather than from <TT
 CLASS="FILENAME"
 >/dev/tty</TT
diff --git a/docs/htmldocs/smbsh.1.html b/docs/htmldocs/smbsh.1.html
index 3033a50ccd2..3f1b704d388 100644
--- a/docs/htmldocs/smbsh.1.html
+++ b/docs/htmldocs/smbsh.1.html
@@ -67,7 +67,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >rcp</B
 >. You must use a 
-	shell that is dynmanically linked in order for <B
+	shell that is dynamically linked in order for <B
 CLASS="COMMAND"
 >smbsh</B
 > 
diff --git a/docs/htmldocs/smbspool.8.html b/docs/htmldocs/smbspool.8.html
index f689b4a0bce..254abe9a9de 100644
--- a/docs/htmldocs/smbspool.8.html
+++ b/docs/htmldocs/smbspool.8.html
@@ -89,10 +89,8 @@ TARGET="_top"
 ><P
 >smbspool tries to get the URI from argv[0]. If argv[0] 
 	contains the name of the program then it looks in the <TT
-CLASS="PARAMETER"
-><I
->	DEVICE_URI</I
-></TT
+CLASS="ENVAR"
+>	DEVICE_URI</TT
 > environment variable.</P
 ><P
 >Programs using the <B
@@ -101,10 +99,8 @@ CLASS="COMMAND"
 > functions can 
 	pass the URI in argv[0], while shell scripts must set the 
 	<TT
-CLASS="PARAMETER"
-><I
->DEVICE_URI</I
-></TT
+CLASS="ENVAR"
+>DEVICE_URI</TT
 > environment variable prior to
 	running smbspool.</P
 ></DIV
diff --git a/docs/htmldocs/smbumount.8.html b/docs/htmldocs/smbumount.8.html
index 0a26e720945..68929fd5f91 100644
--- a/docs/htmldocs/smbumount.8.html
+++ b/docs/htmldocs/smbumount.8.html
@@ -51,7 +51,7 @@ NAME="AEN12"
 CLASS="COMMAND"
 >smbumount</B
 > has 
-	been written to give normal linux-users more control over their 
+	been written to give normal Linux users more control over their 
 	resources. It is safe to install this program suid root, because only 
 	the user who has mounted a filesystem is allowed to unmount it again.  
 	For root it is not necessary to use smbumount. The normal umount 
diff --git a/docs/htmldocs/swat.8.html b/docs/htmldocs/swat.8.html
index be16272bb68..386fe5bc7af 100644
--- a/docs/htmldocs/swat.8.html
+++ b/docs/htmldocs/swat.8.html
@@ -68,15 +68,24 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >swat</B
 > configuration page has help links 
-	to all the configurable options in the smb.conf file allowing an 
+	to all the configurable options in the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file allowing an 
 	administrator to easily look up the effects of any change. </P
 ><P
->swat is run from inetd </P
+><B
+CLASS="COMMAND"
+>swat</B
+> is run from <B
+CLASS="COMMAND"
+>inetd</B
+> </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23"
+NAME="AEN26"
 ></A
 ><H2
 >OPTIONS</H2
@@ -95,7 +104,10 @@ CLASS="VARIABLELIST"
 CLASS="COMMAND"
 >smbd
 		</B
-> server. This is the file that swat will modify. 
+> server. This is the file that <B
+CLASS="COMMAND"
+>swat</B
+> will modify. 
 		The information in this file includes server-specific 
 		information such as what printcap file to use, as well as 
 		descriptions of all the services that the server is to provide.
@@ -110,8 +122,14 @@ CLASS="FILENAME"
 ><DD
 ><P
 >This option disables authentication and puts 
-		swat in demo mode. In that mode anyone will be able to modify 
-		the smb.conf file. </P
+		<B
+CLASS="COMMAND"
+>swat</B
+> in demo mode. In that mode anyone will be able to modify 
+		the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file. </P
 ><P
 ><EM
 >Do NOT enable this option on a production 
@@ -124,7 +142,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN38"
+NAME="AEN44"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -158,7 +176,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN50"
+NAME="AEN56"
 ></A
 ><H3
 >Inetd Installation</H3
@@ -171,7 +189,10 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >/etc/services</TT
 >
-		to enable SWAT to be launched via inetd.</P
+		to enable SWAT to be launched via <B
+CLASS="COMMAND"
+>inetd</B
+>.</P
 ><P
 >In <TT
 CLASS="FILENAME"
@@ -228,15 +249,15 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN71"
+NAME="AEN78"
 ></A
 ><H3
 >Launching</H3
 ><P
->To launch swat just run your favorite web browser and 
+>To launch SWAT just run your favorite web browser and 
 		point it at "http://localhost:901/".</P
 ><P
->Note that you can attach to swat from any IP connected 
+>Note that you can attach to SWAT from any IP connected 
 		machine but connecting from a remote machine leaves your 
 		connection open to password sniffing as passwords will be sent 
 		in the clear over the wire. </P
@@ -245,7 +266,7 @@ NAME="AEN71"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN75"
+NAME="AEN82"
 ></A
 ><H2
 >FILES</H2
@@ -303,7 +324,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN96"
+NAME="AEN103"
 ></A
 ><H2
 >WARNINGS</H2
@@ -335,7 +356,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN104"
+NAME="AEN111"
 ></A
 ><H2
 >VERSION</H2
@@ -346,7 +367,7 @@ NAME="AEN104"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN107"
+NAME="AEN114"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -373,7 +394,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN114"
+NAME="AEN121"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 599746e4145..bae907c687a 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.html
@@ -125,7 +125,12 @@ CLASS="COMMAND"
 >-L servername</DT
 ><DD
 ><P
->Sets the value of the %L macro to servername.
+>Sets the value of the %L macro to <TT
+CLASS="REPLACEABLE"
+><I
+>servername</I
+></TT
+>.
 		This is useful for testing include files specified with the 
 		%L macro. </P
 ></DD
@@ -146,7 +151,10 @@ CLASS="FILENAME"
 ><DD
 ><P
 >If this parameter and the following are 
-		specified, then testparm will examine the <TT
+		specified, then <B
+CLASS="COMMAND"
+>testparm</B
+> will examine the <TT
 CLASS="PARAMETER"
 ><I
 >hosts
@@ -184,7 +192,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN64"
+NAME="AEN66"
 ></A
 ><H2
 >FILES</H2
@@ -213,13 +221,13 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN73"
+NAME="AEN75"
 ></A
 ><H2
 >DIAGNOSTICS</H2
 ><P
 >The program will issue a message saying whether the 
-	configuration file loaded OK or not. This message may be preceeded by 
+	configuration file loaded OK or not. This message may be preceded by 
 	errors and warnings if the file did not load. If the file was 
 	loaded OK, the program then dumps all known service details 
 	to stdout. </P
@@ -227,7 +235,7 @@ NAME="AEN73"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN76"
+NAME="AEN78"
 ></A
 ><H2
 >VERSION</H2
@@ -238,7 +246,7 @@ NAME="AEN76"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79"
+NAME="AEN81"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -264,7 +272,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN86"
+NAME="AEN88"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 2787f514c07..129d0459e1f 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -243,13 +243,16 @@ NAME="AEN88"
 CLASS="COMMAND"
 >winbindd(8)
 	</B
-> daemon is not working wbinfo will always return 
+> daemon is not working <B
+CLASS="COMMAND"
+>wbinfo</B
+> will always return 
 	failure. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92"
+NAME="AEN93"
 ></A
 ><H2
 >VERSION</H2
@@ -261,7 +264,7 @@ NAME="AEN92"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN95"
+NAME="AEN96"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -279,7 +282,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN100"
+NAME="AEN101"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index 2f023561edc..447069f17aa 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Unifed Logons between Windows NT and UNIX using Winbind</TITLE
+>Unified Logons between Windows NT and UNIX using Winbind</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
@@ -20,7 +20,7 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN1"
->Unifed Logons between Windows NT and UNIX using Winbind</A
+>Unified Logons between Windows NT and UNIX using Winbind</A
 ></H1
 ><HR></DIV
 ><DIV
@@ -39,7 +39,7 @@ CLASS="EMPHASIS"
 >winbind
 	</I
 >, a component of the Samba suite of programs as a 
-	solution to the unied logon problem. Winbind uses a UNIX implementation 
+	solution to the unified logon problem. Winbind uses a UNIX implementation 
 	of Microsoft RPC calls, Pluggable Authentication Modules, and the Name 
 	Service Switch to allow Windows NT domain users to appear and operate 
 	as UNIX users on a UNIX machine. This paper describes the winbind 
@@ -70,7 +70,7 @@ NAME="AEN7"
 	can lead to synchronization problems between the UNIX and Windows 
 	systems and confusion for users.</P
 ><P
->We divide the unifed logon problem for UNIX machines into 
+>We divide the unified logon problem for UNIX machines into 
 	three smaller problems:</P
 ><P
 ></P
@@ -97,7 +97,7 @@ NAME="AEN7"
 	information on the UNIX machines and without creating additional 
 	tasks for the system administrator when maintaining users and 
 	groups on either system. The winbind system provides a simple 
-	and elegant solution to all three components of the unifed logon 
+	and elegant solution to all three components of the unified logon 
 	problem.</P
 ></DIV
 ><DIV
@@ -224,7 +224,7 @@ NAME="AEN40"
 >The Name Service Switch, or NSS, is a feature that is 
 		present in many UNIX operating systems. It allows system 
 		information such as hostnames, mail aliases and user information 
-		to be resolved from dierent sources. For example, a standalone 
+		to be resolved from different sources. For example, a standalone 
 		UNIX workstation may resolve system information from a series of 
 		flat files stored on the local lesystem. A networked workstation 
 		may first attempt to resolve system information from local files, 
@@ -253,7 +253,7 @@ CLASS="FILENAME"
 		for a line which matches the service type being requested, for 
 		example the "passwd" service type is used when user or group names 
 		are looked up. This	config line species which implementations 
-		of that service should be tried andin what order. If the passwd 
+		of that service should be tried and in what order. If the passwd 
 		config line is:</P
 ><P
 ><B
@@ -303,7 +303,7 @@ NAME="AEN56"
 >Pluggable Authentication Modules, also known as PAM, 
 		is a system for abstracting authentication and authorization 
 		technologies. With a PAM module it is possible to specify different 
-		authentication methods for dierent system applications without 
+		authentication methods for different system applications without 
 		having to recompile these applications. PAM is also useful
 		for implementing a particular policy for authorization. For example, 
 		a system administrator may only allow console logins from users 
@@ -318,7 +318,7 @@ NAME="AEN56"
 		this change take eect directly on the Primary Domain Controller.
 		</P
 ><P
->PAM is congured by providing control files in the directory 
+>PAM is configured by providing control files in the directory 
 		<TT
 CLASS="FILENAME"
 >/etc/pam.d/</TT
@@ -350,11 +350,11 @@ NAME="AEN64"
 ></H2
 ><P
 >When a user or group is created under Windows NT 
-		is it allocated a numerical relative identier (RID). This is 
-		slightly dierent to UNIX which has a range of numbers which are 
+		is it allocated a numerical relative identifier (RID). This is 
+		slightly different to UNIX which has a range of numbers which are 
 		used to identify users, and the same range in which to identify 
 		groups. It is winbind's job to convert RIDs to UNIX id numbers and
-		vice versa.  When winbind is congured it is given part of the UNIX 
+		vice versa.  When winbind is configured it is given part of the UNIX 
 		user id space and a part of the UNIX group id space in which to 
 		store Windows NT users and groups. If a Windows NT user is 
 		resolved for the first time, it is allocated the next UNIX id from 
@@ -381,7 +381,7 @@ NAME="AEN68"
 		by NT domain controllers.  User or group information returned 
 		by a PDC is cached by winbind along with a sequence number also 
 		returned by the PDC. This sequence number is incremented by 
-		Windows NT whenever any user or group information is modied. If 
+		Windows NT whenever any user or group information is modified. If 
 		a cached entry has expired, the sequence number is requested from 
 		the PDC and compared against the sequence number of the cached entry. 
 		If the sequence numbers do not match, then the cached information 
@@ -415,7 +415,7 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >winbindd(8)</B
 > man page which will provide you 
-	with conguration information and give you sample conguration files. 
+	with configuration information and give you sample configuration files. 
 	You may also wish to update the main Samba daemons smbd and nmbd) 
 	with a more recent development release, such as the recently
 	announced Samba 2.2 alpha release.</P
diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index 938c2dcb2fc..125daccf34c 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -70,7 +70,10 @@ CLASS="FILENAME"
 	of user and group ids specified by the administrator of the 
 	Samba system.</P
 ><P
->The service provided by winbindd is called `winbind' and 
+>The service provided by <B
+CLASS="COMMAND"
+>winbindd</B
+> is called `winbind' and 
 	can be used to resolve user and group information from a 
 	Windows NT server. The service can also provide authentication
 	services via an associated PAM module. </P
@@ -147,7 +150,7 @@ group:          files winbind
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN52"
+NAME="AEN53"
 ></A
 ><H2
 >OPTIONS</H2
@@ -186,7 +189,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN65"
+NAME="AEN66"
 ></A
 ><H2
 >NAME AND ID RESOLUTION</H2
@@ -217,7 +220,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN71"
+NAME="AEN72"
 ></A
 ><H2
 >CONFIGURATION</H2
@@ -252,7 +255,7 @@ CLASS="COMMAND"
 		DOMAIN\username. In some cases this separator character may 
 		cause problems as the '\' character has special meaning in 
 		unix shells.  In that case you can use the winbind separator 
-		option to specify an alternative sepataror character. Good 
+		option to specify an alternative separator character. Good 
 		alternatives may be '/' (although that conflicts
 		with the unix directory separator) or a '+ 'character. 
 		The '+' character appears to be the best choice for 100% 
@@ -276,7 +279,7 @@ CLASS="COMMAND"
 ><P
 >The winbind uid parameter specifies the 
 		range of user ids that are allocated by the winbindd daemon.  
-		This range of ids should have no existing local or nis users 
+		This range of ids should have no existing local or NIS users 
 		within it as strange conflicts can occur otherwise. </P
 ><P
 >Default: <B
@@ -296,7 +299,7 @@ CLASS="COMMAND"
 ><P
 >The winbind gid parameter specifies the 
 		range of group ids that are allocated by the winbindd daemon.  
-		This range of group ids should have no existing local or nis 
+		This range of group ids should have no existing local or NIS 
 		groups within it as strange conflicts can occur otherwise.</P
 ><P
 >Default: <B
@@ -319,7 +322,7 @@ CLASS="COMMAND"
 		seconds the winbindd daemon will cache user and group information 
 		before querying a Windows NT server again. When a item in the 
 		cache is older than this time winbindd will ask the domain 
-		controller for the sequence number of the servers account database. 
+		controller for the sequence number of the server's account database. 
 		If the sequence number has not changed then the cached item is 
 		marked as valid for a further <TT
 CLASS="PARAMETER"
@@ -375,7 +378,10 @@ CLASS="COMMAND"
 ><EM
 >Warning:</EM
 > Turning off user enumeration 
-		may cause some programs to behave oddly.  For example, the finger 
+		may cause some programs to behave oddly.  For example, the <B
+CLASS="COMMAND"
+>finger</B
+> 
 		program relies on having access to the full user list when 
 		searching  for matching usernames. </P
 ><P
@@ -479,7 +485,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN152"
+NAME="AEN154"
 ></A
 ><H2
 >EXAMPLE SETUP</H2
@@ -577,7 +583,7 @@ CLASS="PARAMETER"
 >-U</I
 ></TT
 > can be any Domain 
-	user that has administrator priviliges on the machine. Next from 
+	user that has administrator privileges on the machine. Next from 
 	within <B
 CLASS="COMMAND"
 >samedit</B
@@ -620,7 +626,10 @@ CLASS="FILENAME"
 >/lib/libnss_winbind.so.1</TT
 >.</P
 ><P
->Finally, setup a smb.conf containing directives like the 
+>Finally, setup a <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> containing directives like the 
 	following:  </P
 ><P
 ><TABLE
@@ -663,7 +672,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN194"
+NAME="AEN197"
 ></A
 ><H2
 >Notes</H2
@@ -723,7 +732,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN210"
+NAME="AEN213"
 ></A
 ><H2
 >Signals</H2
@@ -774,7 +783,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN227"
+NAME="AEN230"
 ></A
 ><H2
 >Files</H2
@@ -848,19 +857,19 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN256"
+NAME="AEN259"
 ></A
 ><H2
 >VERSION</H2
 ><P
 >This man page is correct for version 2.2 of 
 	the Samba suite.  winbindd is however not available in
-	stable release of Samba as of yet.</P
+	the stable release of Samba as of yet.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN259"
+NAME="AEN262"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -888,7 +897,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN266"
+NAME="AEN269"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1
index f7c37ce0975..77a580dcea9 100644
--- a/docs/manpages/make_unicodemap.1
+++ b/docs/manpages/make_unicodemap.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 "MAKE_UNICODEMAP" "1" "03 May 2001" "" ""
+.TH "MAKE_UNICODEMAP" "1" "22 June 2001" "" ""
 .SH NAME
 make_unicodemap \- construct a unicode map file for Samba
 .SH SYNOPSIS
@@ -15,7 +15,7 @@ This tool is part of the Samba
 suite.
 .PP
 \fBmake_unicodemap\fR compiles text unicode map 
-files into binary unicodef map files for use with the 
+files into binary unicode map files for use with the 
 internationalization features of Samba 2.2.
 .SH "OPTIONS"
 .TP
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 561b295cac2..851383e5c0a 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" "03 May 2001" "" ""
+.TH "NMBD" "8" "22 June 2001" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
@@ -203,11 +203,11 @@ 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 
-it to dump out it's namelists into the file \fInamelist.debug
+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 
-cause \fBnmbd\fR to dump out it's server database in
+cause \fBnmbd\fR to dump out its server database in
 the \fIlog.nmb\fR file. In addition, the debug log level 
 of nmbd may be raised by sending it a SIGUSR1 (\fBkill -USR1
 <nmbd-pid>\fR) and lowered by sending it a
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 71b5d2250ad..afc1ec3a107 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.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 "NMBLOOKUP" "1" "21 June 2001" "" ""
+.TH "NMBLOOKUP" "1" "22 June 2001" "" ""
 .SH NAME
 nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS  names
 .SH SYNOPSIS
@@ -44,7 +44,7 @@ Try and bind to UDP port 137 to send and receive UDP
 datagrams. The reason for this option is a bug in Windows 95 
 where it ignores the source port of the requesting packet 
 and only replies to UDP port 137. Unfortunately, on most UNIX 
-systems root privilage is needed to bind to this port, and 
+systems root privilege is needed to bind to this port, and 
 in addition, if the nmbd(8)
 daemon is running on this machine it also binds to this port.
 .TP
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index c9be4dd7bbc..9dce67898ab 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.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 "RPCCLIENT" "1" "22 May 2001" "" ""
+.TH "RPCCLIENT" "1" "22 June 2001" "" ""
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
 .SH SYNOPSIS
@@ -50,7 +50,7 @@ below))
 \fB-d debuglevel\fR
 set the debuglevel. Debug level 0 is the lowest 
 and 100 being the highest. This should be set to 100 if you are
-planning on submitting a bug report to the Samba team (see BUGS.txt). 
+planning on submitting a bug report to the Samba team (see \fIBUGS.txt\fR). 
 .TP
 \fB-h\fR
 Print a summary of command line options.
@@ -74,7 +74,7 @@ Sets the SMB username or username and password.
 
 If %password is not specified, The user will be prompted. The 
 client will first check the \fBUSER\fR environment variable, then the 
-\fBLOGNAME\fR variable and if either exist, the 
+\fBLOGNAME\fR variable and if either exists, the 
 string is uppercased. If these environmental variables are not 
 found, the username GUEST is used. 
 
@@ -303,7 +303,7 @@ been developed from examining Network traces. No documentation is
 available from the original creators (Microsoft) on how MSRPC over 
 SMB works, or how the individual MSRPC services work. Microsoft's 
 implementation of these services has been demonstrated (and reported) 
-to be... a bit flakey in places. 
+to be... a bit flaky in places. 
 .PP
 The development of Samba's implementation is also a bit rough, 
 and as more of the services are understood, it can even result in 
@@ -324,6 +324,6 @@ by the Samba Team as an Open Source project similar
 to the way the Linux kernel is developed.
 .PP
 The original rpcclient man page was written by Matthew 
-Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter. 
+Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter. 
 The conversion to DocBook for Samba 2.2 was done by Gerald 
 Carter.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 1b77fd95e3c..cc184d17e01 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" "18 May 2001" "" ""
+.TH "SMB.CONF" "5" "22 June 2001" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -447,7 +447,7 @@ that is all in upper case and of suitable length, are created
 upper case, or if they are forced to be the "default" 
 case. This option can be use with "preserve case = yes" 
 to permit long filenames to retain their case, while short names 
-are lowered. Default \fByes\fR.
+are lowercased. Default \fByes\fR.
 .PP
 By default, Samba 2.2 has the same semantics as a Windows 
 NT server, in that it is case insensitive but case preserving.
@@ -474,7 +474,7 @@ If the client has previously registered a username
 with the system and now supplies a correct password for that 
 username then the connection is allowed.
 .IP 3. 
-The client's netbios name and any previously 
+The client's NetBIOS name and any previously 
 used user names are checked against the supplied password, if 
 they match then the connection is allowed as the corresponding 
 user.
@@ -1347,7 +1347,7 @@ allows for printers to be add remotely to a Samba or Windows
 NT/2000 print server.
 
 For a Samba host this means that the printer must be 
-physically added to underlying printing system. The \fIadd 
+physically added to the underlying printing system. The \fIadd 
 printer command\fR defines a script to be run which 
 will perform the necessary operations for adding the printer
 to the print system and to add the appropriate service definition 
@@ -1512,7 +1512,7 @@ Synonym for  \fIhosts allow\fR.
 This option only takes effect when the \fIsecurity\fR option is set to 
 server or domain. 
 If it is set to no, then attempts to connect to a resource from 
-a domain or workgroup other than the one which smbd is running 
+a domain or workgroup other than the one which smbdis running 
 in will fail, even if that domain is trusted by the remote server 
 doing the authentication.
 
@@ -1544,7 +1544,7 @@ Default: \fBannounce as = NT Server\fR
 
 Example: \fBannounce as = Win95\fR
 .TP
-\fBannouce version (G)\fR
+\fBannounce version (G)\fR
 This specifies the major and minor version numbers 
 that nmbd will use when announcing itself as a server. The default 
 is 4.2. Do not change this parameter unless you have a specific 
@@ -1567,7 +1567,7 @@ Default: \fBavailable = yes\fR
 .TP
 \fBbind interfaces only (G)\fR
 This global parameter allows the Samba admin 
-to limit what interfaces on a machine will serve smb requests. If 
+to limit what interfaces on a machine will serve SMB requests. If 
 affects file service smbd(8)and 
 name service nmbd(8)in slightly 
 different ways.
@@ -1632,7 +1632,7 @@ cannot be immediately satisfied, Samba 2.2 will internally
 queue the lock request, and periodically attempt to obtain 
 the lock until the timeout period expires.
 
-If this parameter is set to False, then 
+If this parameter is set to false, then 
 Samba 2.2 will behave as previous versions of Samba would and 
 will fail the lock request immediately if the lock range 
 cannot be obtained.
@@ -1726,7 +1726,7 @@ Example: \fBchange share command = /usr/local/bin/addshare\fR
 .PP
 .TP
 \fBcharacter set (G)\fR
-This allows a smbd to map incoming filenames 
+This allows smbdto map incoming filenames 
 from a DOS Code page (see the client 
 code page parameter) to several built in UNIX character sets. 
 The built in code page translations are:
@@ -2256,11 +2256,11 @@ Example: \fBdelete user script = /usr/local/samba/bin/del_user
 This option is used when Samba is attempting to 
 delete a directory that contains one or more vetoed directories 
 (see the \fIveto files\fR
-option). If this option is set to False (the default) then if a vetoed 
+option). If this option is set to false (the default) then if a vetoed 
 directory contains any non-vetoed files or directories then the 
 directory delete will fail. This is usually what you want.
 
-If this option is set to True, then Samba 
+If this option is set to true, then Samba 
 will attempt to recursively delete any files and directories within 
 the vetoed directory. This can be useful for integration with file 
 serving systems such as NetAtalk which create meta-files within 
@@ -2524,7 +2524,7 @@ Example: \fBdont descend = /proc,/dev\fR
 .TP
 \fBdos filemode (S)\fR
 The default behavior in Samba is to provide 
-UNIX-like behavor where only the owner of a file/directory is 
+UNIX-like behavior where only the owner of a file/directory is 
 able to change the permissions on it. However, this behavior
 is often confusing to DOS/Windows users. Enabling this parameter 
 allows a user who has write access to the file (by whatever 
@@ -2563,7 +2563,7 @@ file they can change the timestamp on it. Under POSIX semantics,
 only the owner of the file or root may change the timestamp. By 
 default, Samba runs with POSIX semantics and refuses to change the 
 timestamp on a file if the user \fBsmbd\fR is acting 
-on behalf of is not the file owner. Setting this option to  True allows DOS semantics and smbd will change the file 
+on behalf of is not the file owner. Setting this option to  true allows DOS semantics and smbdwill change the file 
 timestamp as DOS requires.
 
 Default: \fBdos filetimes = no\fR
@@ -2580,7 +2580,7 @@ In order for encrypted passwords to work correctly
 \fBsmbd(8)\fRmust either 
 have access to a local \fIsmbpasswd(5)
 \fRprogram for information on how to set up 
-and maintain this file), or set the security=[serve|domain] parameter which 
+and maintain this file), or set the security=[server|domain] parameter which 
 causes \fBsmbd\fR to authenticate against another 
 server.
 
@@ -2588,16 +2588,16 @@ Default: \fBencrypt passwords = no\fR
 .TP
 \fBenhanced browsing (G)\fR
 This option enables a couple of enhancements to 
-cross-subnet browse propogation that have been added in Samba 
+cross-subnet browse propagation that have been added in Samba 
 but which are not standard in Microsoft implementations. 
 \fBThese enhancements are currently only available in
 the HEAD Samba CVS tree (not Samba 2.2.x).\fR
 
-The first enhancement to browse propogation consists of a regular
+The first enhancement to browse propagation consists of a regular
 wildcard query to a Samba WINS server for all Domain Master Browsers,
-followed by a browse synchronisation with each of the returned
+followed by a browse synchronization with each of the returned
 DMBs. The second enhancement consists of a regular randomised browse
-synchronisation with all currently known DMBs.
+synchronization with all currently known DMBs.
 
 You may wish to disable this option if you have a problem with empty
 workgroups not disappearing from browse lists. Due to the restrictions
@@ -2605,7 +2605,7 @@ of the browse protocols these enhancements can cause a empty workgroup
 to stay around forever which can be annoying.
 
 In general you should leave this option enabled as it makes
-cross-subnet browse propogation much more reliable.
+cross-subnet browse propagation much more reliable.
 
 Default: \fBenhanced browsing = yes\fR
 .TP
@@ -2653,7 +2653,7 @@ However, Unix time semantics mean that the create time
 reported by Samba will be updated whenever a file is created or 
 or deleted in the directory. NMAKE finds all object files in 
 the object directory. The timestamp of the last one built is then 
-compared to the timestamp of the object dircetory. If the 
+compared to the timestamp of the object directory. If the 
 directory's timestamp if newer, then all object files
 will be rebuilt. Enabling this option 
 ensures directories always predate their contents and an NMAKE build 
@@ -2894,7 +2894,7 @@ This is a tuning option. When this is enabled a
 caching algorithm will be used to reduce the time taken for getwd() 
 calls. This can have a significant impact on performance, especially 
 when the \fIwide links\fR
-parameter is set to False.
+parameter is set to false.
 
 Default: \fBgetwd cache = yes\fR
 .TP
@@ -2987,7 +2987,7 @@ Default: \fBhide local users = no\fR
 .TP
 \fBhomedir map (G)\fR
 If\fInis homedir
-\fRis True, and \fBsmbd(8)\fRis also acting 
+\fRis true, and \fBsmbd(8)\fRis also acting 
 as a Win95/98 \fIlogon server\fR then this parameter 
 specifies the NIS (or YP) map from which the server for the user's 
 home directory should be extracted. At present, only the Sun 
@@ -3097,7 +3097,7 @@ and users who will be allowed access without specifying a password.
 
 This is not be confused with  \fIhosts allow\fR which is about hosts 
 access to services and is more useful for guest services. \fI hosts equiv\fR may be useful for NT clients which will 
-not supply passwords to samba.
+not supply passwords to Samba.
 
 \fBNOTE :\fR The use of \fIhosts equiv
 \fRcan be a major security hole. This is because you are 
@@ -3145,7 +3145,7 @@ Note that the setuid bit is \fBnever\fR set via
 inheritance (the code explicitly prohibits this).
 
 This can be particularly useful on large systems with 
-many users, perhaps several thousand,to allow a single [homes] 
+many users, perhaps several thousand, to allow a single [homes] 
 share to be used flexibly by each user.
 
 See also \fIcreate mask
@@ -3280,8 +3280,8 @@ and \fIlevel2 oplocks
 Default: \fBkernel oplocks = yes\fR
 .TP
 \fBlanman auth (G)\fR
-This parameter determines whether or not smbd will
-attempt to authentication users using the LANMAN password hash.
+This parameter determines whether or not smbdwill
+attempt to authenticate users using the LANMAN password hash.
 If disabled, only clients which support NT password hashes (e.g. Windows 
 NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS 
 network client) will be able to connect to the Samba host.
@@ -3316,7 +3316,7 @@ Currently, if \fIkernel
 oplocks\fR are supported then level2 oplocks are 
 not granted (even if this parameter is set to yes). 
 Note also, the \fIoplocks\fR
-parameter must be set to "true" on this share in order for 
+parameter must be set to true on this share in order for 
 this parameter to have any effect.
 
 See also the \fIoplocks\fR
@@ -3372,13 +3372,13 @@ Default: \fBload printers = yes\fR
 .TP
 \fBlocal master (G)\fR
 This option allows \fB nmbd(8)\fRto try and become a local master browser 
-on a subnet. If set to False then \fB nmbd\fR will not attempt to become a local master browser 
+on a subnet. If set to false then \fB nmbd\fR will not attempt to become a local master browser 
 on a subnet and will also lose in all browsing elections. By
 default this value is set to true. Setting this value to true doesn't
 mean that Samba will \fBbecome\fR the local master 
 browser on a subnet, just that \fBnmbd\fR will \fB participate\fR in elections for local master browser.
 
-Setting this value to False will cause \fBnmbd\fR
+Setting this value to false will cause \fBnmbd\fR
 \fBnever\fR to become a local master browser.
 
 Default: \fBlocal master = yes\fR
@@ -3410,7 +3410,7 @@ by the server.
 
 This option \fBmay\fR be useful for read-only 
 filesystems which \fBmay\fR not need locking (such as 
-cdrom drives), although setting this parameter of no 
+CDROM drives), although setting this parameter of no 
 is not really recommended even in this case.
 
 Be careful about disabling locking either globally or in a 
@@ -3505,7 +3505,7 @@ your Windows NT client.
 
 The share and the path must be readable by the user for 
 the preferences and directories to be loaded onto the Windows NT
-client. The share must be writeable when the logs in for the first
+client. The share must be writeable when the user logs in for the first
 time, in order that the Windows NT client can create the NTuser.dat
 and other directories.
 
@@ -3535,7 +3535,7 @@ Example: \fBlogon path = \\\\PROFILESERVER\\PROFILE\\%U\fR
 This parameter specifies the batch file (.bat) or 
 NT command file (.cmd) to be downloaded and run on a machine when 
 a user successfully logs in. The file must contain the DOS 
-style cr/lf line endings. Using a DOS-style editor to create the 
+style CR/LF line endings. Using a DOS-style editor to create the 
 file is recommended.
 
 The script must be a relative path to the [netlogon] 
@@ -3545,7 +3545,7 @@ the file that will be downloaded is:
 
 \fI/usr/local/samba/netlogon/STARTUP.BAT\fR
 
-The contents of the batch file is entirely your choice. A 
+The contents of the batch file are entirely your choice. A 
 suggested command would be to add \fBNET TIME \\\\SERVER /SET 
 /YES\fR, to force every machine to synchronize clocks with 
 the same time server. Another use would be to add \fBNET USE 
@@ -3577,7 +3577,7 @@ a printer name and job number to pause the print job. One way
 of implementing this is by using job priorities, where jobs 
 having a too low priority won't be sent to the printer.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. A \fI%j\fR is replaced with 
 the job number (an integer). On HPUX (see \fIprinting=hpux
 \fR), if the \fI-p%p\fR option is added 
@@ -3650,7 +3650,7 @@ requesting status information about. To get around this, the
 server reports on the first printer service connected to by the 
 client. This only happens if the connection number sent is invalid.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. Otherwise it is placed at the end of the 
 command.
 
@@ -3675,7 +3675,7 @@ a printer name and job number to resume the print job. See
 also the \fIlppause command
 \fRparameter.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. A \fI%j\fR is replaced with 
 the job number (an integer).
 
@@ -3707,7 +3707,7 @@ executed on the server host in order to delete a print job.
 This command should be a program or script which takes 
 a printer name and job number, and deletes the print job.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. A \fI%j\fR is replaced with 
 the job number (an integer).
 
@@ -3725,7 +3725,7 @@ Example 1: \fBlprm command = /usr/bin/lprm -P%p %j
 Example 2: \fBlprm command = /usr/bin/cancel %p-%j
 \fR.TP
 \fBmachine password timeout (G)\fR
-If a Samba server is a member of an Windows 
+If a Samba server is a member of a Windows 
 NT Domain (see the security=domain) 
 parameter) then periodically a running  smbd(8)process will try and change the MACHINE ACCOUNT 
 PASSWORD stored in the TDB called \fIprivate/secrets.tdb
@@ -3759,8 +3759,8 @@ This allows a UNIX script to be sent to the Samba host and
 executed on behalf of the connected user.
 
 Scripts executed in this way will be deleted upon 
-completion assuming that the user has the appripriate level 
-of priviledge and the ile permissions allow the deletion.
+completion assuming that the user has the appropriate level 
+of privilege and the file permissions allow the deletion.
 
 If the script generates output, output will be sent to 
 the file specified by the \fI magic output\fR parameter (see above).
@@ -3785,7 +3785,7 @@ Default: \fBmangle case = no\fR
 .TP
 \fBmangled map (S)\fR
 This is for those who want to directly map UNIX 
-file names which can not be represented on Windows/DOS. The mangling 
+file names which cannot be represented on Windows/DOS. The mangling 
 of names is not always what is needed. In particular you may have 
 documents with file extensions that differ between DOS and UNIX. 
 For example, under UNIX it is common to use \fI.html\fR 
@@ -3798,7 +3798,7 @@ you would use:
 \fBmangled map = (*.html *.htm)\fR
 
 One very useful case is to remove the annoying \fI;1
-\fRoff the ends of filenames on some CDROMS (only visible 
+\fRoff the ends of filenames on some CDROMs (only visible 
 under some UNIXes). To do this use a map of (*;1 *;).
 
 Default: \fBno mangled map\fR
@@ -3878,11 +3878,11 @@ or contains upper case characters).
 
 The larger this value, the more likely it is that mangled 
 names can be successfully converted to correct long UNIX names. 
-However, large stack sizes will slow most directory access. Smaller 
+However, large stack sizes will slow most directory accesses. Smaller 
 stacks save memory in the server (each stack element costs 256 bytes).
 
 It is not possible to absolutely guarantee correct long 
-file names, so be prepared for some surprises!
+filenames, so be prepared for some surprises!
 
 Default: \fBmangled stack = 50\fR
 
@@ -4039,7 +4039,7 @@ Example: \fBmax log size = 1000\fR
 .TP
 \fBmax mux (G)\fR
 This option controls the maximum number of 
-outstanding simultaneous SMB operations that samba tells the client 
+outstanding simultaneous SMB operations that Samba tells the client 
 it will allow. You should never need to set this parameter.
 
 Default: \fBmax mux = 50\fR
@@ -4114,10 +4114,10 @@ Example: \fBmax protocol = LANMAN1\fR
 This parameter limits the maximum number of 
 \fBsmbd(8)\fR
 processes concurrently running on a system and is intended
-as a stop gap to prevent degrading service to clients in the event
+as a stopgap to prevent degrading service to clients in the event
 that the server has insufficient resources to handle more than this
 number of connections. Remember that under normal operating
-conditions, each user will have an smbd associated with him or her
+conditions, each user will have an smbdassociated with him or her
 to handle connections to all shares from a given host.
 
 Default: \fBmax smbd processes = 0\fR ## no limit
@@ -4172,7 +4172,7 @@ removes it afterwards. \fBNOTE THAT IT IS VERY IMPORTANT
 THAT THIS COMMAND RETURN IMMEDIATELY\fR. That's why I 
 have the '&' on the end. If it doesn't return immediately then 
 your PCs may freeze when sending messages (they should recover 
-after 30secs, hopefully).
+after 30 seconds, hopefully).
 
 All messages are delivered as the global guest user. 
 The command takes the standard substitutions, although \fI %u\fR won't work (\fI%U\fR may be better 
@@ -4505,7 +4505,7 @@ smbd(8)tuning option to
 improve the efficiency of the granting of oplocks under multiple 
 client contention for the same file.
 
-In brief it specifies a number, which causes smbd not to 
+In brief it specifies a number, which causes smbdnot to 
 grant an oplock even when requested if the approximate number of 
 clients contending for an oplock on the same file goes over this 
 limit. This causes \fBsmbd\fR to behave in a similar 
@@ -4517,7 +4517,7 @@ AND UNDERSTOOD THE SAMBA OPLOCK CODE\fR.
 Default: \fBoplock contention limit = 2\fR
 .TP
 \fBoplocks (S)\fR
-This boolean option tells smbd whether to 
+This boolean option tells \fBsmbd\fR whether to 
 issue oplocks (opportunistic locks) to file open requests on this 
 share. The oplock code can dramatically (approx. 30% or more) improve 
 the speed of access to files on Samba servers. It allows the clients 
@@ -4566,7 +4566,7 @@ names to OS/2 printer driver names. The format is:
 name>.<device name>
 
 For example, a valid entry using the HP LaserJet 5
-printer driver woudl appear as \fBHP LaserJet 5L = LASERJET.HP 
+printer driver would appear as \fBHP LaserJet 5L = LASERJET.HP 
 LaserJet 5L\fR.
 
 The need for the file is due to the printer driver namespace 
@@ -4582,7 +4582,7 @@ With the addition of better PAM support in Samba 2.2,
 this parameter, it is possible to use PAM's password change control 
 flag for Samba. If enabled, then PAM will be used for password
 changes when requested by an SMB client, and the \fIpasswd chat\fR must be
-be changed to work with the pam prompts.
+be changed to work with the PAM prompts.
 
 Default: \fBpam password change = no\fR
 .TP
@@ -4599,7 +4599,7 @@ Example: \fBpanic action = "/bin/sleep 90000"\fR
 \fBpasswd chat (G)\fR
 This string controls the \fB"chat"\fR 
 conversation that takes places between smbdand the local password changing
-program to change the users password. The string describes a 
+program to change the user's password. The string describes a 
 sequence of response-receive pairs that  smbd(8)uses to determine what to send to the 
 \fIpasswd program\fR
 and what to expect back. If the expected output is not 
@@ -4622,8 +4622,8 @@ Double quotes can be used to collect strings with spaces
 in them into a single string.
 
 If the send string in any part of the chat sequence 
-is a fullstop ".", then no string is sent. Similarly, 
-if the expect string is a fullstop then no string is expected.
+is a full stop ".", then no string is sent. Similarly, 
+if the expect string is a full stop then no string is expected.
 
 Note that if the \fIunix 
 password sync\fR parameter is set to true, then this 
@@ -4635,10 +4635,10 @@ to "" (the empty string).
 Also, if the \fIpam
 password change\fR parameter is set to true, then the
 chat sequence should consist of three elements. The first element should
-match the pam prompt for the old password, the second element should match
-the pam prompt for the first request for the new password, and the final
-element should match the pam prompt for the second request for the new password.
-These matches are done case insentively. Under most conditions this change
+match the PAM prompt for the old password, the second element should match
+the PAM prompt for the first request for the new password, and the final
+element should match the PAM prompt for the second request for the new password.
+These matches are done case insensitively. Under most conditions this change
 is done as root so the prompt for the old password will never be matched.
 
 See also \fIunix password 
@@ -4683,7 +4683,7 @@ of mixed case chars and digits. This can pose a problem as some clients
 it.
 
 \fBNote\fR that if the \fIunix 
-password sync\fR parameter is set to True
+password sync\fR parameter is set to true
 then this program is called \fBAS ROOT\fR 
 before the SMB password in the smbpasswd(5)
 file is changed. If this UNIX password change fails, then 
@@ -4694,7 +4694,7 @@ If the \fIunix password sync\fR parameter
 is set this parameter \fBMUST USE ABSOLUTE PATHS\fR 
 for \fBALL\fR programs called, and must be examined 
 for security implications. Note that by default \fIunix 
-password sync\fR is set to False.
+password sync\fR is set to false.
 
 See also \fIunix 
 password sync\fR.
@@ -4813,7 +4813,7 @@ restriction of the SMB/CIFS protocol when in \fBsecurity=server
 If you are using a Windows NT server as your 
 password server then you will have to ensure that your users 
 are able to login from the Samba server, as when in \fB security=server\fR mode the network logon will appear to 
-come from there rather than from the users workstation.
+come from there rather than from the user's workstation.
 .RE
 .PP
 See also the \fIsecurity
@@ -4871,7 +4871,7 @@ whenever the service is disconnected. It takes the usual
 substitutions. The command may be run as the root on some 
 systems.
 
-An interesting example may be do unmount server 
+An interesting example may be to unmount server 
 resources:
 
 \fBpostexec = /etc/umount /cdrom\fR
@@ -4886,7 +4886,7 @@ from %m (%I)\\" >> /tmp/log\fR
 .TP
 \fBpostscript (S)\fR
 This parameter forces a printer to interpret 
-the print files as postscript. This is done by adding a %!
+the print files as PostScript. This is done by adding a %!
 to the start of print output.
 
 This is most useful when you have lots of PCs that persist 
@@ -5106,7 +5106,7 @@ Default: \fBprinter admin = <empty string>\fR
 Example: \fBprinter admin = admin, @staff\fR
 .TP
 \fBprinter driver (S)\fR
-\fBNote :\fRThis is a depreciated 
+\fBNote :\fRThis is a deprecated 
 parameter and will be removed in the next major release
 following version 2.2. Please see the instructions in
 \fIPRINTER_DRIVER2.txt\fR in the \fIdocs
@@ -5132,7 +5132,7 @@ driver file\fR.
 Example: \fBprinter driver = HP LaserJet 4L\fR
 .TP
 \fBprinter driver file (G)\fR
-\fBNote :\fRThis is a depreciated 
+\fBNote :\fRThis is a deprecated 
 parameter and will be removed in the next major release
 following version 2.2. Please see the instructions in
 \fIPRINTER_DRIVER2.txt\fR in the \fIdocs
@@ -5160,7 +5160,7 @@ Example: \fBprinter driver file =
 /usr/local/samba/printers/drivers.def\fR
 .TP
 \fBprinter driver location (S)\fR
-\fBNote :\fRThis is a depreciated 
+\fBNote :\fRThis is a deprecated 
 parameter and will be removed in the next major release
 following version 2.2. Please see the instructions in
 \fIPRINTER_DRIVER2.txt\fR in the \fIdocs
@@ -5208,7 +5208,7 @@ default values for the \fIprint command\fR,
 \fIlpq command\fR, \fIlppause command
 \fR, \fIlpresume command\fR, and 
 \fIlprm command\fR if specified in the 
-[global]f> section.
+[global] section.
 
 Currently eight printing styles are supported. They are
 BSD, AIX, 
@@ -5233,17 +5233,17 @@ ok\fR.
 .TP
 \fBqueuepause command (S)\fR
 This parameter specifies the command to be 
-executed on the server host in order to pause the printerqueue.
+executed on the server host in order to pause the printer queue.
 
 This command should be a program or script which takes 
-a printer name as its only parameter and stops the printerqueue, 
+a printer name as its only parameter and stops the printer queue, 
 such that no longer jobs are submitted to the printer.
 
 This command is not supported by Windows for Workgroups, 
-but can be issued from the Printer's window under Windows 95 
+but can be issued from the Printers window under Windows 95 
 and NT.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. Otherwise it is placed at the end of the command.
 
 Note that it is good practice to include the absolute 
@@ -5256,19 +5256,19 @@ Example: \fBqueuepause command = disable %p\fR
 .TP
 \fBqueueresume command (S)\fR
 This parameter specifies the command to be 
-executed on the server host in order to resume the printerqueue. It 
+executed on the server host in order to resume the printer queue. It 
 is the command to undo the behavior that is caused by the 
 previous parameter (\fI queuepause command\fR).
 
 This command should be a program or script which takes 
-a printer name as its only parameter and resumes the printerqueue, 
+a printer name as its only parameter and resumes the printer queue, 
 such that queued jobs are resubmitted to the printer.
 
 This command is not supported by Windows for Workgroups, 
-but can be issued from the Printer's window under Windows 95 
+but can be issued from the Printers window under Windows 95 
 and NT.
 
-If a \fI%p\fR is given then the printername 
+If a \fI%p\fR is given then the printer name 
 is put in its place. Otherwise it is placed at the end of the 
 command.
 
@@ -5360,7 +5360,7 @@ For example:
 \fBremote announce = 192.168.2.255/SERVERS 
 192.168.4.255/STAFF\fR
 
-the above line would cause nmbd to announce itself 
+the above line would cause \fBnmbd\fR to announce itself 
 to the two given IP addresses using the given workgroup names. 
 If you leave out the workgroup name then the one given in 
 the \fIworkgroup\fR 
@@ -5377,10 +5377,10 @@ Default: \fBremote announce = <empty string>
 \fR.TP
 \fBremote browse sync (G)\fR
 This option allows you to setup nmbd(8)to periodically request 
-synchronization of browse lists with the master browser of a samba 
+synchronization of browse lists with the master browser of a Samba 
 server that is on a remote segment. This option will allow you to 
 gain browse lists for multiple workgroups across routed networks. This 
-is done in a manner that does not work with any non-samba servers.
+is done in a manner that does not work with any non-Samba servers.
 
 This is useful if you want your Samba server and all local 
 clients to appear in a remote workgroup for which the normal browse 
@@ -5400,17 +5400,17 @@ addresses of the remote networks, but can also be the IP addresses
 of known browse masters if your network config is that stable. If 
 a machine IP address is given Samba makes NO attempt to validate 
 that the remote machine is available, is listening, nor that it 
-is in fact the browse master on it's segment.
+is in fact the browse master on its segment.
 
 Default: \fBremote browse sync = <empty string>
 \fR.TP
 \fBrestrict acl with mask (S)\fR
 This is a boolean parameter. If set to false (default), then 
-Creation of files with access control lists (ACLS) and modification of ACLs
+creation of files with access control lists (ACLS) and modification of ACLs
 using the Windows NT/2000 ACL editor will be applied directly to the file
 or directory.
 
-If set to True, then all requests to set an ACL on a file will have the
+If set to true, then all requests to set an ACL on a file will have the
 parameters \fIcreate mask\fR,
 \fIforce create mode\fR
 applied before setting the ACL, and all requests to set an ACL on a directory will
@@ -5441,8 +5441,8 @@ and this is a way to work around that.
 
 When restrict anonymous is true, all anonymous connections 
 are denied no matter what they are for. This can effect the ability 
-of a machine to access the samba Primary Domain Controller to revalidate 
-it's machine account after someone else has logged on the client 
+of a machine to access the Samba Primary Domain Controller to revalidate 
+its machine account after someone else has logged on the client 
 interactively. The NT client will display a message saying that 
 the machine's account in the domain doesn't exist or the password is 
 bad. The best way to deal with this is to reboot NT client machines 
@@ -5459,7 +5459,7 @@ Synonym for  \fIroot directory"\fR.
 .TP
 \fBroot directory (G)\fR
 The server will \fBchroot()\fR (i.e. 
-Change it's root directory) to this directory on startup. This is 
+Change its root directory) to this directory on startup. This is 
 not strictly necessary for secure operation. Even without it the 
 server will deny access to files not in one of the service entries. 
 It may also check for, and deny access to, soft links to other 
@@ -5488,7 +5488,7 @@ Example: \fBroot directory = /homes/smb\fR
 This is the same as the \fIpostexec\fR
 parameter except that the command is run as root. This 
 is useful for unmounting filesystems 
-(such as cdroms) after a connection is closed.
+(such as CDROMs) after a connection is closed.
 
 See also \fI postexec\fR.
 
@@ -5497,8 +5497,8 @@ Default: \fBroot postexec = <empty string>
 \fBroot preexec (S)\fR
 This is the same as the \fIpreexec\fR
 parameter except that the command is run as root. This 
-is useful for mounting filesystems (such as cdroms) after a 
-connection is closed.
+is useful for mounting filesystems (such as CDROMs) when a 
+connection is opened.
 
 See also \fI preexec\fR and  \fIpreexec close\fR.
 
@@ -5561,7 +5561,7 @@ The different settings will now be explained.
 
 \fBSECURITY = SHARE
 \fR
-When clients connect to a share level security server then 
+When clients connect to a share level security server they 
 need not log onto the server with a valid username and password before 
 attempting to connect to a shared resource (although modern clients 
 such as Windows 95/98 and Windows NT will send a logon request with 
@@ -5668,7 +5668,7 @@ documentation file in the \fIdocs/\fR directory
 up.
 .PP
 .PP
-\fBNote\fR that from the clients point of 
+\fBNote\fR that from the client's point of 
 view \fBsecurity = server\fR is the same as \fB security = user\fR. It only affects how the server deals 
 with the authentication, it does not in any way affect what the 
 client sees.
@@ -5707,7 +5707,7 @@ exist as well as the account on the Domain Controller to allow
 Samba to have a valid UNIX account to map file access to.
 .PP
 .PP
-\fBNote\fR that from the clients point 
+\fBNote\fR that from the client's point 
 of view \fBsecurity = domain\fR is the same as \fBsecurity = user
 \fR\&. It only affects how the server deals with the authentication, 
 it does not in any way affect what the client sees.
@@ -5777,7 +5777,7 @@ Example: \fBsecurity mask = 0770\fR
 \fBserver string (G)\fR
 This controls what string will show up in the 
 printer comment box in print manager and next to the IPC connection 
-in \fBnet view"\fR. It can be any string that you wish 
+in \fBnet view\fR. It can be any string that you wish 
 to show to your users.
 
 It also sets what will appear in browse lists next 
@@ -5854,7 +5854,7 @@ open a handle on the printer server with OpenPrinterEx() asking for
 Administrator privileges. If the user does not have administrative
 access on the print server (i.e is not root or a member of the 
 \fIprinter admin\fR group), the OpenPrinterEx() 
-call fails and the clients another open call with a request for 
+call fails and the client makes another open call with a request for 
 a lower privilege level. This should succeed, however the APW 
 icon will not be displayed.
 
@@ -5883,7 +5883,7 @@ address Samba will listen for connections on. This is used to
 support multiple virtual interfaces on the one server, each 
 with a different configuration.
 
-By default samba will accept connections on any 
+By default Samba will accept connections on any 
 address.
 
 Example: \fBsocket address = 192.168.2.20\fR
@@ -6020,8 +6020,8 @@ this code is \fBNOT\fR enabled by default in any
 current binary version of Samba.
 
 This variable enables or disables the entire SSL mode. If 
-it is set to no, the SSL enabled samba behaves 
-exactly like the non-SSL samba. If set to yes, 
+it is set to no, the SSL-enabled Samba behaves 
+exactly like the non-SSL Samba. If set to yes, 
 it depends on the variables \fI ssl hosts\fR and  \fIssl hosts resign\fR whether an SSL 
 connection will be required.
 
@@ -6039,7 +6039,7 @@ current binary version of Samba.
 
 This variable defines where to look up the Certification
 Authorities. The given directory should contain one file for 
-each CA that samba will trust. The file name must be the hash 
+each CA that Samba will trust. The file name must be the hash 
 value over the "Distinguished Name" of the CA. How this directory 
 is set up is explained later in this document. All files within the 
 directory that don't fit into this naming scheme are ignored. You 
@@ -6142,12 +6142,12 @@ given at configure time.
 this code is \fBNOT\fR enabled by default in any 
 current binary version of Samba.
 
-These two variables define whether samba will go 
-into SSL mode or not. If none of them is defined, samba will 
+These two variables define whether Samba will go 
+into SSL mode or not. If none of them is defined, Samba will 
 allow only SSL connections. If the  \fIssl hosts\fR variable lists
 hosts (by IP-address, IP-address range, net group or name), 
 only these hosts will be forced into SSL mode. If the \fI ssl hosts resign\fR variable lists hosts, only these 
-hosts will NOT be forced into SSL mode. The syntax for these two 
+hosts will \fBNOT\fR be forced into SSL mode. The syntax for these two 
 variables is the same as for the \fI hosts allow\fR and  \fIhosts deny\fR pair of variables, only 
 that the subject of the decision is different: It's not the access 
 right but whether SSL is used or not. 
@@ -6294,7 +6294,7 @@ deny access if locks exist. This can be slow on some systems.
 When strict locking is no the server does file 
 lock checks only when the client explicitly asks for them.
 
-Well behaved clients always ask for lock checks when it 
+Well-behaved clients always ask for lock checks when it 
 is important, so in the vast majority of cases \fBstrict 
 locking = no\fR is preferable.
 
@@ -6308,7 +6308,7 @@ the process to be suspended until the kernel has ensured that
 all outstanding data in kernel disk buffers has been safely stored 
 onto stable storage. This is very slow and should only be done 
 rarely. Setting this parameter to no (the 
-default) means that smbd ignores the Windows applications requests for
+default) means that smbdignores the Windows applications requests for
 a sync call. There is only a possibility of losing data if the
 operating system itself that Samba is running on crashes, so there is
 little danger in this default setting. In addition, this fixes many
@@ -6413,7 +6413,7 @@ Synonym for \fI debug timestamp\fR.
 This parameter accepts an integer value which defines
 a limit on the maximum number of print jobs that will be accepted 
 system wide at any given time. If a print job is submitted
-by a client which will exceed this number, then smbd will return an 
+by a client which will exceed this number, then smbdwill return an 
 error indicating that no space is available on the server. The 
 default value of 0 means that no such limit exists. This parameter
 can be used to prevent a server from exceeding its capacity and is
@@ -6431,7 +6431,7 @@ when the encrypted SMB password in the smbpasswd file is changed.
 If this is set to true the program specified in the \fIpasswd
 program\fRparameter is called \fBAS ROOT\fR - 
 to allow the new UNIX password to be set without access to the 
-old UNIX password (as the SMB password has change code has no 
+old UNIX password (as the SMB password change code has no 
 access to the old password cleartext, only the new).
 
 See also \fIpasswd 
@@ -6466,8 +6466,8 @@ password in order to connect correctly, and to update their hashed
 Default: \fBupdate encrypted = no\fR
 .TP
 \fBuse rhosts (G)\fR
-If this global parameter is a true, it specifies 
-that the UNIX users \fI.rhosts\fR file in their home directory 
+If this global parameter is true, it specifies 
+that the UNIX user's \fI.rhosts\fR file in their home directory 
 will be read to find the names of hosts and users who will be allowed 
 access without specifying a password.
 
@@ -6517,7 +6517,7 @@ can use the \fIvalid users
 \fRparameter.
 
 If any of the usernames begin with a '@' then the name 
-will be looked up first in the yp netgroups list (if Samba 
+will be looked up first in the NIS netgroups list (if Samba 
 is compiled with netgroup support), followed by a lookup in 
 the UNIX groups database and will expand to a list of all users 
 in the group of that name.
@@ -6527,7 +6527,7 @@ will be looked up only in the UNIX groups database and will
 expand to a list of all users in the group of that name.
 
 If any of the usernames begin with a '&'then the name 
-will be looked up only in the yp netgroups database (if Samba 
+will be looked up only in the NIS netgroups database (if Samba 
 is compiled with netgroup support) and will expand to a list 
 of all users in the netgroup group of that name.
 
@@ -6653,7 +6653,7 @@ Example: \fBusername map = /usr/local/samba/lib/users.map
 \fR.TP
 \fButmp (S)\fR
 This boolean parameter is only available if 
-Samba has been configured and compiled with the option \fB --with-utmp\fR. If set to True then Samba will attempt
+Samba has been configured and compiled with the option \fB --with-utmp\fR. If set to true then Samba will attempt
 to add utmp or utmpx records (depending on the UNIX system) whenever a
 connection is made to a Samba server. Sites may use this to record the
 user connecting to a Samba share.
@@ -6827,7 +6827,7 @@ Default : \fBno value\fR
 .TP
 \fBvfs options (S)\fR
 This parameter allows parameters to be passed 
-to the vfs layer at initialisation time. The Samba VFS layer 
+to the vfs layer at initialization time. The Samba VFS layer 
 is new to Samba 2.2 and must be enabled at compile time 
 with --with-vfs. See also \fI vfs object\fR.
 
@@ -6870,7 +6870,7 @@ available in Samba 3.0.
 
 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 
+existing local or NIS groups within it as strange conflicts can 
 occur otherwise.
 
 Default: \fBwinbind gid = <empty string>
@@ -6897,7 +6897,7 @@ available in Samba 3.0.
 
 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 
+existing local or NIS users within it as strange conflicts can 
 occur otherwise.
 
 Default: \fBwinbind uid = <empty string>
@@ -6926,13 +6926,13 @@ name has not previously been added, in that case it should be treated
 as an add.
 .TP 0.2i
 \(bu
-The second argument is the netbios name. If the 
+The second argument is the NetBIOS name. If the 
 name is not a legal name then the wins hook is not called. 
 Legal names contain only letters, digits, hyphens, underscores 
 and periods.
 .TP 0.2i
 \(bu
-The third argument is the netbios name 
+The third argument is the NetBIOS name 
 type as a 2 digit hexadecimal number. 
 .TP 0.2i
 \(bu
@@ -6981,7 +6981,7 @@ This boolean controls if the
 nmbd(8)process in Samba will act as a WINS server. You should 
 not set this to true unless you have a multi-subnetted network and 
 you wish a particular \fBnmbd\fR to be your WINS server. 
-Note that you should \fBNEVER\fR set this to true 
+Note that you should \fBNEVER\fR set this to true
 on more than one machine in your network.
 
 Default: \fBwins support = no\fR
@@ -7011,7 +7011,7 @@ Reads for the file are also served from this cache if the data is stored
 within it.
 
 This cache allows Samba to batch client writes into a more 
-efficient write size for RAID disks (ie. writes may be tuned to 
+efficient write size for RAID disks (i.e. writes may be tuned to 
 be the RAID stripe size) and can improve performance on systems 
 where the disk subsystem is a bottleneck but there is free 
 memory for userspace programs.
@@ -7047,7 +7047,7 @@ Synonym for \fI writeable\fR.
 .TP
 \fBwrite raw (G)\fR
 This parameter controls whether or not the server 
-will support raw writes SMB's when transferring data from clients. 
+will support raw write SMB's when transferring data from clients. 
 You should never need to change this parameter.
 
 Default: \fBwrite raw = yes\fR
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index bc27d565945..882a7e5e0e5 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.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 "SMBCACLS" "1" "03 May 2001" "" ""
+.TH "SMBCACLS" "1" "22 June 2001" "" ""
 .SH NAME
 smbcacls \- Set or get ACLs on an NT file or directory names
 .SH SYNOPSIS
@@ -13,11 +13,11 @@ smbcacls \- Set or get ACLs on an NT file or directory names
 .PP
 This tool is part of the  Sambasuite.
 .PP
-The smbcacls program manipulates NT Access Control Lists 
+The \fBsmbcacls\fR program manipulates NT Access Control Lists 
 (ACLs) on SMB file shares. 
 .SH "OPTIONS"
 .PP
-The following options are available to the smbcacls program. 
+The following options are available to the \fBsmbcacls\fR program. 
 The format of ACLs is described in the section ACL FORMAT 
 .TP
 \fB-A acls\fR
@@ -30,7 +30,7 @@ specified on the command line. An error will be printed for each
 ACL specified that was not already present in the ACL list
 .TP
 \fB-D acls\fR
-Delete any ACLs specfied on the command line. 
+Delete any ACLs specified on the command line. 
 An error will be printed for each ACL specified that was not 
 already present in the ACL list. 
 .TP
@@ -168,8 +168,8 @@ The \fBsmbcacls\fR program sets the exit status
 depending on the success or otherwise of the operations performed. 
 The exit status may be one of the following values. 
 .PP
-If the operation succeded, smbcacls returns and exit 
-status of 0. If smbcacls couldn't connect to the specified server, 
+If the operation succeeded, smbcacls returns and exit 
+status of 0. If \fBsmbcacls\fR couldn't connect to the specified server, 
 or there was an error getting or setting the ACLs, an exit status 
 of 1 is returned. If there was an error parsing any command line 
 arguments, an exit status of 2 is returned. 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index f7c0e70dc93..59a2df21b9c 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" "03 May 2001" "" ""
+.TH "SMBCLIENT" "1" "22 June 2001" "" ""
 .SH NAME
 smbclient \- ftp-like client to access SMB/CIFS resources  on servers
 .SH SYNOPSIS
@@ -38,8 +38,8 @@ a NetBIOS server name, which may or may not be the
 same as the IP hostname of the machine running the server.
 
 The server name is looked up according to either 
-the \fI-R\fR parameter to smbclient or 
-using the name resolve order parameter in the smb.conf file, 
+the \fI-R\fR parameter to \fBsmbclient\fR or 
+using the name resolve order parameter in the \fIsmb.conf\fR file, 
 allowing an administrator to change the order and methods 
 by which server names are looked up. 
 .TP
@@ -75,7 +75,7 @@ options.
 \fB-R <name resolve order>\fR
 This option is used by the programs in the Samba 
 suite to determine what naming services and in what order to resolve 
-host names to IP addresses. The option takes a space separated 
+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 
@@ -92,7 +92,7 @@ any name type matches for lookup.
 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 depended for instance on IRIX or Solaris this 
+is operating system dependent, for instance on IRIX or Solaris this 
 may be controlled by the \fI/etc/nsswitch.conf\fR 
 file). Note that this method is only used if the NetBIOS name 
 type being queried is the 0x20 (server) name type, otherwise 
@@ -120,7 +120,7 @@ defined in the \fIsmb.conf\fR file parameter
 .PP
 The default order is lmhosts, host, wins, bcast and without 
 this parameter or any entry in the \fIname resolve order
-\fRparameter of the smb.conf file the name resolution
+\fRparameter of the \fIsmb.conf\fR file the name resolution
 methods will be attempted in this order. 
 .PP
 .TP
@@ -157,7 +157,7 @@ messages.
 \fB-i scope\fR
 This specifies a NetBIOS scope that smbclient will 
 use to communicate with when generating NetBIOS names. For details 
-on the use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt.
+on the use of NetBIOS scopes, see \fIrfc1001.txt\fR and \fIrfc1002.txt\fR.
 NetBIOS scopes are \fBvery\fR rarely used, only set 
 this parameter if you are the system administrator in charge of all 
 the NetBIOS systems you communicate with. 
@@ -178,7 +178,7 @@ allows you to override the host name and use whatever NetBIOS
 name you wish. 
 .TP
 \fB-d debuglevel\fR
-debuglevel is an integer from 0 to 10, or 
+\fIdebuglevel\fR is an integer from 0 to 10, or 
 the letter 'A'. 
 
 The default value if this parameter is not specified 
@@ -195,13 +195,13 @@ Levels above 1 will generate considerable amounts of log
 data, and should only be used when investigating a problem.
 Levels above 3 are designed for use only by developers and 
 generate HUGE amounts of log data, most of which is extremely 
-cryptic. If debuglevel is set to the letter 'A', then \fBall
+cryptic. If \fIdebuglevel\fR is set to the letter 'A', then \fBall
 \fRdebug messages will be printed. This setting
 is for developers only (and people who \fBreally\fR want 
 to know how the code works internally). 
 
 Note that specifying this parameter here will override
-the log level parameter in the \fBsmb.conf (5)\fR 
+the log level parameter in the \fIsmb.conf (5)\fR 
 file. 
 .TP
 \fB-p port\fR
@@ -211,7 +211,7 @@ TCP port number for an SMB/CIFS server is 139, which is the
 default. 
 .TP
 \fB-l logfilename\fR
-If specified, logfilename specifies a base filename 
+If specified, \fIlogfilename\fR specifies a base filename 
 into which operational data from the running client will be 
 logged. 
 
@@ -227,7 +227,7 @@ The log file generated is never removed by the client.
 Print the usage message for the client. 
 .TP
 \fB-I IP-address\fR
-IP address is the address of the server to connect to. 
+\fIIP address\fR is the address of the server to connect to. 
 It should be specified in standard "a.b.c.d" notation. 
 
 Normally the client would attempt to locate a named 
@@ -253,28 +253,28 @@ By default, the client writes messages to standard output
 \fB-U username[%pass]\fR
 Sets the SMB username or username and password. 
 If %pass is not specified, The user will be prompted. The client 
-will first check the USER environment variable, then the 
-\fI$LOGNAME\fR variable and if either exist, the 
+will first check the \fBUSER\fR environment variable, then the 
+\fBLOGNAME\fR variable and if either exists, the 
 string is uppercased. Anything in these variables following a '%' 
-sign will be treated as the password. If these environmental 
+sign will be treated as the password. If these environment 
 variables are not found, the username GUEST 
 is used. 
 
-If the password is not included in these environment 
-variables (using the %pass syntax), rpcclient will look for 
-a \fI$PASSWD\fR environment variable from which 
+If the password is not included in these environment
+variables (using the %pass syntax), \fBrpcclient\fR will look for 
+a \fBPASSWD\fR environment variable from which 
 to read the password. 
 
 A third option is to use a credentials file which 
 contains the plaintext of the username and password. This 
 option is mainly provided for scripts where the admin doesn't 
-desire to pass the credentials on the command line or via environment 
+wish to pass the credentials on the command line or via environment 
 variables. If this method is used, make certain that the permissions 
 on the file restrict access from unwanted users. See the 
 \fI-A\fR for more details. 
 
 Be cautious about including passwords in scripts or in 
-the \fI$PASSWD\fR environment variable. Also, on 
+the \fBPASSWD\fR environment variable. Also, on 
 many systems the command line of a running process may be seen 
 via the \fBps\fR command to be safe always allow 
 \fBrpcclient\fR to prompt for a password and type 
@@ -301,11 +301,11 @@ This option allows you to look at what services
 are available on a server. You use it as \fBsmbclient -L 
 host\fR and a list should appear. The \fI-I
 \fRoption may be useful if your NetBIOS names don't 
-match your tcp/ip dns host names or if you are trying to reach a 
+match your TCP/IP DNS host names or if you are trying to reach a 
 host on another network. 
 .TP
 \fB-t terminal code\fR
-This option tells smbclient how to interpret 
+This option tells \fBsmbclient\fR how to interpret 
 filenames coming from the remote server. Usually Asian language 
 multibyte UNIX implementations use different character sets than 
 SMB/CIFS servers (\fBEUC\fR instead of \fB SJIS\fR for example). Setting this parameter will let 
@@ -383,7 +383,7 @@ diagnostics as it works. This is the same as tarmode quiet.
 .TP 0.2i
 \(bu
 \fIr\fR - Regular expression include
-or exclude. Uses regular regular expression matching for 
+or exclude. Uses regular expression matching for 
 excluding or excluding files if compiled with HAVE_REGEX_H. 
 However this mode can be very slow. If not compiled with 
 HAVE_REGEX_H, does a limited wildcard match on '*' and '?'. 
@@ -407,7 +407,7 @@ archive bit to be reset when a file is backed up. Useful with the
 \fBsmbclient\fR's tar option now supports long 
 file names both on backup and restore. However, the full path 
 name of the file must be less than 1024 bytes. Also, when
-a tar archive is created, smbclient's tar option places all 
+a tar archive is created, \fBsmbclient\fR's tar option places all 
 files in the archive with relative names, not absolute names. 
 .PP
 .PP
@@ -422,11 +422,11 @@ the component separator).
 \fBExamples\fR
 .PP
 .PP
-Restore from tar file backup.tar into myshare on mypc 
+Restore from tar file \fIbackup.tar\fR into myshare on mypc 
 (no password on share). 
 .PP
 .PP
-\fBsmbclient //mypc/myshare "" -N -Tx backup.tar
+\fBsmbclient //mypc/yshare "" -N -Tx backup.tar
 \fR.PP
 .PP
 Restore everything except \fIusers/docs\fR
@@ -463,7 +463,7 @@ Change to initial directory before starting. Probably
 only of any use with the tar -T option. 
 .TP
 \fB-c command string\fR
-command string is a semicolon separated list of 
+command string is a semicolon-separated list of 
 commands to be executed instead of prompting from stdin. \fI -N\fR is implied by \fI-c\fR.
 
 This is particularly useful in scripts and for printing stdin 
@@ -500,13 +500,13 @@ vary from server to server, depending on how the server was implemented.
 The commands available are given here in alphabetical order. 
 .TP
 \fB? [command]\fR
-If "command" is specified, the ? command will display 
+If \fIcommand\fR is specified, the ? command will display 
 a brief informative message about the specified command. If no 
 command is specified, a list of available commands will
 be displayed. 
 .TP
 \fB! [shell command]\fR
-If "shell command" is specified, the ! 
+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
@@ -521,11 +521,11 @@ directory on the server will be reported.
 .TP
 \fBdel <mask>\fR
 The client will request that the server attempt 
-to delete all files matching "mask" from the current working 
+to delete all files matching \fImask\fR from the current working 
 directory on the server. 
 .TP
 \fBdir <mask>\fR
-A list of the files matching "mask" in the current 
+A list of the files matching \fImask\fR in the current 
 working directory on the server will be retrieved from the server 
 and displayed. 
 .TP
@@ -534,9 +534,9 @@ Terminate the connection with the server and exit
 from the program. 
 .TP
 \fBget <remote file name> [local file name]\fR
-Copy the file called "remote file name" from 
+Copy the file called \fIremote file name\fR from 
 the server to the machine running the client. If specified, name 
-the local copy "local file name". Note that all transfers in 
+the local copy \fIlocal file name\fR. Note that all transfers in 
 \fBsmbclient\fR are binary. See also the 
 lowercase command. 
 .TP
@@ -544,7 +544,7 @@ lowercase command.
 See the ? command above. 
 .TP
 \fBlcd [directory name]\fR
-If "directory name" is specified, the current 
+If \fIdirectory name\fR is specified, the current 
 working directory on the local machine will be changed to 
 the directory specified. This operation will fail if for any 
 reason the specified directory is inaccessible. 
@@ -591,26 +591,26 @@ mask back to "*" after using the mget or mput commands.
 See the mkdir command. 
 .TP
 \fBmget <mask>\fR
-Copy all files matching mask from the server to 
+Copy all files matching \fImask\fR from the server to 
 the machine running the client. 
 
-Note that mask is interpreted differently during recursive 
+Note that \fImask\fR is interpreted differently during recursive 
 operation and non-recursive operation - refer to the recurse and 
 mask commands for more information. Note that all transfers in 
-smbclient are binary. See also the lowercase command. 
+\fBsmbclient\fR are binary. See also the lowercase command. 
 .TP
 \fBmkdir <directory name>\fR
 Create a new directory on the server (user access 
 privileges permitting) with the specified name. 
 .TP
 \fBmput <mask>\fR
-Copy all files matching mask in the current working 
+Copy all files matching \fImask\fR in the current working 
 directory on the local machine to the current working directory on 
 the server. 
 
-Note that mask is interpreted differently during recursive 
+Note that \fImask\fR is interpreted differently during recursive 
 operation and non-recursive operation - refer to the recurse and mask 
-commands for more information. Note that all transfers in smbclient 
+commands for more information. Note that all transfers in \fBsmbclient\fR 
 are binary. 
 .TP
 \fBprint <file name>\fR
@@ -633,10 +633,10 @@ the transfer of each file during these commands. When toggled
 OFF, all specified files will be transferred without prompting. 
 .TP
 \fBput <local file name> [remote file name]\fR
-Copy the file called "local file name" from the 
+Copy the file called \fIlocal file name\fR from the 
 machine running the client to the server. If specified,
-name the remote copy "remote file name". Note that all transfers 
-in smbclient are binary. See also the lowercase command. 
+name the remote copy \fIremote file name\fR. Note that all transfers 
+in \fBsmbclient\fR are binary. See also the lowercase command. 
 .TP
 \fBqueue\fR
 Displays the print queue, showing the job id, 
@@ -664,7 +664,7 @@ to the mget or mput commands will be copied, and any mask specified
 using the mask command will be ignored. 
 .TP
 \fBrm <mask>\fR
-Remove all files matching mask from the current 
+Remove all files matching \fImask\fR from the current 
 working directory on the server. 
 .TP
 \fBrmdir <directory name>\fR
@@ -681,7 +681,7 @@ with tar x may not work - use the command line option instead.
 \fBblocksize <blocksize>\fR
 Blocksize. Must be followed by a valid (greater 
 than zero) blocksize. Causes tar file to be written out in 
-blocksize*TBLOCK (usually 512 byte) blocks. 
+\fIblocksize\fR*TBLOCK (usually 512 byte) blocks. 
 .TP
 \fBtarmode <full|inc|reset|noreset>\fR
 Changes tar's behavior with regard to archive 
@@ -713,12 +713,12 @@ smbclient supports long file names where the server
 supports the LANMAN2 protocol or above. 
 .SH "ENVIRONMENT VARIABLES"
 .PP
-The variable \fI$USER\fR may contain the 
+The variable \fBUSER\fR may contain the 
 username of the person using the client. This information is 
 used only if the protocol level is high enough to support 
 session-level passwords.
 .PP
-The variable \fI$PASSWD\fR may contain 
+The variable \fBPASSWD\fR may contain 
 the password of the person using the client. This information is 
 used only if the protocol level is high enough to support 
 session-level passwords. 
@@ -739,7 +739,7 @@ and writeable only by the user.
 .PP
 To test the client, you will need to know the name of a 
 running SMB/CIFS server. It is possible to run \fBsmbd(8)
-\fRan ordinary user - running that server as a daemon 
+\fRas an ordinary user - running that server as a daemon 
 on a user-accessible port (typically any port number over 1024)
 would provide a suitable test server. 
 .SH "DIAGNOSTICS"
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index e41de2a5ea5..fae2974e891 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" "03 May 2001" "" ""
+.TH "SMBD" "8" "22 June 2001" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
@@ -46,7 +46,7 @@ are automatically reloaded every minute, if they change. You
 can force a reload by sending a SIGHUP to the server. Reloading 
 the configuration file will not affect connections to any service 
 that is already established. Either the user will have to 
-disconnect from the service, or smbd killed and restarted.
+disconnect from the service, or \fBsmbd\fR killed and restarted.
 .SH "OPTIONS"
 .TP
 \fB-D\fR
@@ -54,9 +54,9 @@ If specified, this parameter causes
 the server to operate as a daemon. That is, it detaches 
 itself and runs in the background, fielding requests 
 on the appropriate port. Operating the server as a
-daemon is the recommended way of running smbd for 
+daemon is the recommended way of running \fBsmbd\fR for 
 servers that provide more than casual use file and 
-print services. This switch is assumed is \fBsmbd
+print services. This switch is assumed if \fBsmbd
 \fRis executed on the command line of a shell.
 .TP
 \fB-a\fR
@@ -71,7 +71,7 @@ log files will be overwritten when opened. By default,
 files.
 .TP
 \fB-P\fR
-Passive option. Causes smbd not to 
+Passive option. Causes \fBsmbd\fR not to 
 send any network traffic out. Used for debugging by 
 the developers only.
 .TP
@@ -84,7 +84,7 @@ Prints the version number for
 \fBsmbd\fR.
 .TP
 \fB-d <debug level>\fR
-debuglevel is an integer 
+\fIdebuglevel\fR is an integer 
 from 0 to 10. The default value if this parameter is 
 not specified is zero.
 
@@ -106,7 +106,7 @@ override the log
 levelfile.
 .TP
 \fB-l <log file>\fR
-If specified, \fBlog file\fR 
+If specified, \fIlog file\fR 
 specifies a log filename into which informational and debug 
 messages from the running server will be logged. The log 
 file generated is never removed by the server although 
@@ -120,7 +120,7 @@ parameter in the \fIsmb.conf(5)
 \fRfile for details.
 .TP
 \fB-p <port number>\fR
-port number is a positive integer 
+\fIport number\fR is a positive integer 
 value. The default value if this parameter is not 
 specified is 139.
 
@@ -213,10 +213,10 @@ in a directory readable by all, writeable only by root. The server
 program itself should be executable by all, as users may wish to 
 run the server themselves (in which case it will of course run 
 with their privileges). The server should NOT be setuid. On some 
-systems it may be worthwhile to make smbd setgid to an empty group. 
+systems it may be worthwhile to make \fBsmbd\fR setgid to an empty group. 
 This is because some systems may have a security hole where daemon 
 processes that become a user can be attached to with a debugger. 
-Making the smbd file setgid to an empty group may prevent
+Making the \fBsmbd\fR file setgid to an empty group may prevent
 this hole from being exploited. This security hole and the suggested
 fix has only been confirmed on old versions (pre-kernel 2.0) of Linux
 at the time this was written. It is possible that this hole only
@@ -307,7 +307,7 @@ be omitted. See the section OPTIONS above.
 .SH "RUNNING THE SERVER ON REQUEST"
 .PP
 If your system uses a meta-daemon such as \fBinetd
-\fR, you can arrange to have the smbd server started 
+\fR, you can arrange to have the \fBsmbd\fR server started 
 whenever a process attempts to connect to it. This requires several 
 changes to the startup files on the host machine. If you are 
 experimenting as an ordinary user rather than as root, you will 
@@ -381,8 +381,8 @@ or kill and restart the meta-daemon. Some versions of
 \fBinetd\fR will reread their configuration
 tables if they receive a HUP signal.
 .PP
-If your machine's name is fred and your 
-name is mary, you should now be able to connect 
+If your machine's name is \fIfred\fR and your 
+name is \fImary\fR, you should now be able to connect 
 to the service \fI\\\\fred\\mary\fR.
 .PP
 To properly test and experiment with the server, we 
@@ -413,26 +413,26 @@ source code and inspect the conditions that gave rise to the
 diagnostics you are seeing.
 .SH "SIGNALS"
 .PP
-Sending the smbd a SIGHUP will cause it to 
-re-load its \fIsmb.conf\fR configuration 
+Sending the \fBsmbd\fR a SIGHUP will cause it to 
+reload its \fIsmb.conf\fR configuration 
 file within a short period of time.
 .PP
-To shut down a users smbd process it is recommended 
+To shut down a user's \fBsmbd\fR process it is recommended 
 that \fBSIGKILL (-9)\fR \fBNOT\fR 
 be used, except as a last resort, as this may leave the shared
 memory area in an inconsistent state. The safe way to terminate 
-an smbd is to send it a SIGTERM (-15) signal and wait for 
+an \fBsmbd\fR is to send it a SIGTERM (-15) signal and wait for 
 it to die on its own.
 .PP
-The debug log level of smbd may be raised by sending 
+The debug log level of \fBsmbd\fR may be raised by sending 
 it a SIGUSR1 (\fBkill -USR1 <smbd-pid>\fR)
 and lowered by sending it a SIGUSR2 (\fBkill -USR2 <smbd-pid>
 \fR). This is to allow transient problems to be diagnosed, 
 whilst still running at a normally low log level.
 .PP
 Note that as the signal handlers send a debug write, 
-they are not re-entrant in smbd. This you should wait until 
-smbd is in a state of waiting for an incoming smb before 
+they are not re-entrant in \fBsmbd\fR. This you should wait until 
+\fBsmbd\fR is in a state of waiting for an incoming SMB before 
 issuing them. It is possible to make the signal handlers safe 
 by un-blocking the signals before the select call and re-blocking 
 them after, however this would affect performance.
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index 3ecdcd12b46..74037b7c45a 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.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 "SMBMNT" "8" "03 May 2001" "" ""
+.TH "SMBMNT" "8" "22 June 2001" "" ""
 .SH NAME
 smbmnt \- helper utility for mounting SMB filesystems
 .SH SYNOPSIS
@@ -14,7 +14,7 @@ smbmnt \- helper utility for mounting SMB filesystems
 \fBsmbmnt\fR is a helper application used 
 by the smbmount program to do the actual mounting of SMB shares. 
 \fBsmbmnt\fR is meant to be installed setuid root 
-so that normal users can mount their smb shares. It checks 
+so that normal users can mount their SMB shares. It checks 
 whether the user has write permissions on the mount point and 
 then mounts the directory.
 .PP
@@ -43,7 +43,7 @@ applied
 .TP
 \fB-o options\fR
 list of options that are passed as-is to smbfs, if this
-command is run on a 2.4 or higher linux kernel.
+command is run on a 2.4 or higher Linux kernel.
 .SH "AUTHOR"
 .PP
 Volker Lendecke, Andrew Tridgell, Michael H. Warfield 
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 695df8b86de..b9c9bf7f239 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -16,17 +16,17 @@ is usually invoked as \fBmount.smb\fR from
 the \fBmount(8)\fR command when using the 
 "-t smb" option. The kernel must support the smbfs filesystem. 
 .PP
-Options to smbmount are specified as a comma separated
+Options to \fBsmbmount\fR are specified as a comma-separated
 list of key=value pairs. It is possible to send options other
 than those listed here, assuming that smbfs supports them. If
 you get mount failures, check your kernel log for errors on
 unknown options.
 .PP
-smbmount is a daemon. After mounting it keeps running until
+\fBsmbmount\fR is a daemon. After mounting it keeps running until
 the mounted smbfs is umounted. It will log things that happen
 when in daemon mode using the "machine name" smbmount, so
-typically this output will end up in log.smbmount. The
-smbmount process may also be called mount.smbfs.
+typically this output will end up in \fIlog.smbmount\fR. The
+\fBsmbmount\fR process may also be called mount.smbfs.
 .PP
 \fBNOTE:\fR \fBsmbmount\fR 
 calls \fBsmbmnt(8)\fR to do the actual mount. You 
@@ -68,7 +68,7 @@ and/or password. The format of the file is:
 .fi
 
 This is preferred over having passwords in plaintext in a
-shared file, such as /etc/fstab. Be sure to protect any
+shared file, such as \fI/etc/fstab\fR. Be sure to protect any
 credentials file properly.
 .TP
 \fBnetbiosname=<arg>\fR
@@ -96,7 +96,7 @@ permissions that remote files have in the local filesystem.
 The default is based on the current umask. 
 .TP
 \fBdmask=<arg>\fR
-sets the directory mask. This deterines the 
+sets the directory mask. This determines the 
 permissions that remote directories have in the local filesystem. 
 The default is based on the current umask. 
 .TP
@@ -127,7 +127,7 @@ mount read-only
 mount read-write 
 .TP
 \fBiocharset=<arg>\fR
-sets the charset used by the linux side for codepage
+sets the charset used by the Linux side for codepage
 to charset translations (NLS). Argument should be the
 name of a charset, like iso8859-1. (Note: only kernel
 2.4.0 or later)
@@ -162,7 +162,7 @@ passwords.
 .PP
 The variable \fBPASSWD_FILE\fR may contain the pathname of
 a file to read the password from. A single line of input is
-read and used as password.
+read and used as the password.
 .SH "BUGS"
 .PP
 Not many known smbmount bugs. But one smbfs bug is
@@ -175,7 +175,7 @@ reconnect when the server disconnects, the mount will go
 dead. A re-mount normally fixes this. At least 2 ways to
 trigger this bug are known.
 .PP
-Note that the typical response to a bugreport is suggestion
+Note that the typical response to a bug report is suggestion
 to try the latest version first. So please try doing that first,
 and always include which versions you use of relevant software
 when reporting bugs (minimum: samba, kernel, distribution)
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index fbebaa61e3c..234b4c746dc 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.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 "SMBPASSWD" "5" "03 May 2001" "" ""
+.TH "SMBPASSWD" "5" "22 June 2001" "" ""
 .SH NAME
 smbpasswd \- The Samba encrypted password file
 .SH SYNOPSIS
@@ -38,9 +38,9 @@ If this does not match then Samba will refuse to recognize
 this smbpasswd file entry as being valid for a user. 
 .TP
 \fBLanman Password Hash\fR
-This is the LANMAN hash of the users password, 
+This is the LANMAN hash of the user's password, 
 encoded as 32 hex digits. The LANMAN hash is created by DES 
-encrypting a well known string with the users password as the 
+encrypting a well known string with the user's password as the 
 DES key. This is the same password used by Windows 95/98 machines. 
 Note that this password hash is regarded as weak as it is
 vulnerable to dictionary attacks and if two users choose the 
@@ -48,7 +48,7 @@ same password this entry will be identical (i.e. the password
 is not "salted" as the UNIX password is). If the user has a 
 null password this field will contain the characters "NO PASSWORD" 
 as the start of the hex string. If the hex string is equal to 
-32 'X' characters then the users account is marked as 
+32 'X' characters then the user's account is marked as 
 disabled and the user will not be able to 
 log onto the Samba server. 
 
@@ -65,14 +65,14 @@ itself must be set to be read/write only by root, with no
 other access. 
 .TP
 \fBNT Password Hash\fR
-This is the Windows NT hash of the users 
+This is the Windows NT hash of the user's 
 password, encoded as 32 hex digits. The Windows NT hash is 
-created by taking the users password as represented in 
+created by taking the user's password as represented in 
 16-bit, little-endian UNICODE and then applying the MD4 
 (internet rfc1321) hashing algorithm to it. 
 
 This password hash is considered more secure than
-the Lanman Password Hash as it preserves the case of the 
+the LANMAN Password Hash as it preserves the case of the 
 password and uses a much higher quality hashing algorithm. 
 However, it is still the case that if two users choose the same 
 password this entry will be identical (i.e. the password is 
@@ -106,7 +106,7 @@ in the smbpasswd file.
 .TP 0.2i
 \(bu
 \fBN\fR - This means the
-account has no password (the passwords in the fields Lanman 
+account has no password (the passwords in the fields LANMAN 
 Password Hash and NT Password Hash are ignored). Note that this 
 will only allow users to log on with no password if the \fI null passwords\fR parameter is set in the \fIsmb.conf(5)
 \fRconfig file. 
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index f867949068e..91c344f11d0 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -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 "SMBPASSWD" "8" "03 May 2001" "" ""
+.TH "SMBPASSWD" "8" "22 June 2001" "" ""
 .SH NAME
-smbpasswd \- change a users SMB password
+smbpasswd \- change a user's SMB password
 .SH SYNOPSIS
 .sp
 \fBsmbpasswd\fR [ \fB-a\fR ]  [ \fB-x\fR ]  [ \fB-d\fR ]  [ \fB-e\fR ]  [ \fB-D debuglevel\fR ]  [ \fB-n\fR ]  [ \fB-r <remote machine>\fR ]  [ \fB-R <name resolve order>\fR ]  [ \fB-m\fR ]  [ \fB-j DOMAIN\fR ]  [ \fB-U username\fR ]  [ \fB-h\fR ]  [ \fB-s\fR ]  [ \fBusername\fR ] 
@@ -20,7 +20,7 @@ the password used for their SMB sessions on any machines that store
 SMB passwords. 
 .PP
 By default (when run with no arguments) it will attempt to 
-change the current users SMB password on the local machine. This is 
+change the current user's SMB password on the local machine. This is 
 similar to the way the \fBpasswd(1)\fR program works. 
 \fBsmbpasswd\fR differs from how the passwd program works 
 however in that it is not \fBsetuid root\fR but works in 
@@ -31,10 +31,10 @@ UNIX machine the encrypted SMB passwords are usually stored in
 the \fIsmbpasswd(5)\fR file. 
 .PP
 When run by an ordinary user with no options. smbpasswd 
-will prompt them for their old smb password and then ask them 
+will prompt them for their old SMB password and then ask them 
 for their new password twice, to ensure that the new password
 was typed correctly. No passwords will be echoed on the screen 
-whilst being typed. If you have a blank smb password (specified by 
+whilst being typed. If you have a blank SMB password (specified by 
 the string "NO PASSWORD" in the smbpasswd file) then just press 
 the <Enter> key when asked for your old password. 
 .PP
@@ -79,7 +79,7 @@ is done all attempts to authenticate via SMB using this username
 will fail. 
 
 If the smbpasswd file is in the 'old' format (pre-Samba 2.0 
-format) there is no space in the users password entry to write
+format) there is no space in the user's password entry to write
 this information and so the user is disabled by writing 'X' characters 
 into the password space in the smbpasswd file. See \fBsmbpasswd(5)
 \fRfor details on the 'old' and new password file formats.
@@ -254,7 +254,7 @@ or as an ordinary user.
 .TP
 \fB-s\fR
 This option causes smbpasswd to be silent (i.e. 
-not issue prompts) and to read it's old and new passwords from 
+not issue prompts) and to read its old and new passwords from 
 standard input, rather than from \fI/dev/tty\fR 
 (like the \fBpasswd(1)\fR program does). This option 
 is to aid people writing scripts to drive smbpasswd
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 78f91b616d5..ac5d5f073c5 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.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 "SMBSH" "1" "03 May 2001" "" ""
+.TH "SMBSH" "1" "22 June 2001" "" ""
 .SH NAME
 smbsh \- Allows access to Windows NT filesystem  using UNIX commands
 .SH SYNOPSIS
@@ -15,7 +15,7 @@ This tool is part of the  Sambasuite.
 .PP
 \fBsmbsh\fR allows you to access an NT filesystem 
 using UNIX commands such as \fBls\fR, \fB egrep\fR, and \fBrcp\fR. You must use a 
-shell that is dynmanically linked in order for \fBsmbsh\fR 
+shell that is dynamically linked in order for \fBsmbsh\fR 
 to work correctly.
 .PP
 To use the \fBsmbsh\fR command, execute \fB smbsh\fR from the prompt and enter the username and password 
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index 41466597d4b..9597f840b73 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.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 "SMBSPOOL" "8" "07 May 2001" "" ""
+.TH "SMBSPOOL" "8" "22 June 2001" "" ""
 .SH NAME
 smbspool \- send print file to an SMB printer
 .SH SYNOPSIS
@@ -38,12 +38,12 @@ smb://username:password@server/printer
 smb://username:password@workgroup/server/printer
 .PP
 smbspool tries to get the URI from argv[0]. If argv[0] 
-contains the name of the program then it looks in the \fI DEVICE_URI\fR environment variable.
+contains the name of the program then it looks in the \fB DEVICE_URI\fR environment variable.
 .PP
 .PP
 Programs using the \fBexec(2)\fR functions can 
 pass the URI in argv[0], while shell scripts must set the 
-\fIDEVICE_URI\fR environment variable prior to
+\fBDEVICE_URI\fR environment variable prior to
 running smbspool.
 .PP
 .SH "OPTIONS"
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index 12c811ea352..5bc1d61c00d 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.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 "SMBUMOUNT" "8" "03 May 2001" "" ""
+.TH "SMBUMOUNT" "8" "22 June 2001" "" ""
 .SH NAME
 smbumount \- smbfs umount for normal users
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ smbumount \- smbfs umount for normal users
 .PP
 With this program, normal users can unmount smb-filesystems, 
 provided that it is suid root. \fBsmbumount\fR has 
-been written to give normal linux-users more control over their 
+been written to give normal Linux users more control over their 
 resources. It is safe to install this program suid root, because only 
 the user who has mounted a filesystem is allowed to unmount it again. 
 For root it is not necessary to use smbumount. The normal umount 
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index ad9bf31b935..2d1d13ccefe 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.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 "SWAT" "8" "01 June 2001" "" ""
+.TH "SWAT" "8" "22 June 2001" "" ""
 .SH NAME
 swat \- Samba Web Administration Tool
 .SH SYNOPSIS
@@ -16,17 +16,17 @@ This tool is part of the  Sambasuite.
 \fBswat\fR allows a Samba administrator to 
 configure the complex \fI smb.conf(5)\fRfile via a Web browser. In addition, 
 a \fBswat\fR configuration page has help links 
-to all the configurable options in the smb.conf file allowing an 
+to all the configurable options in the \fIsmb.conf\fR file allowing an 
 administrator to easily look up the effects of any change. 
 .PP
-swat is run from inetd 
+\fBswat\fR is run from \fBinetd\fR 
 .SH "OPTIONS"
 .TP
 \fB-s smb configuration file\fR
 The default configuration file path is 
 determined at compile time. The file specified contains 
 the configuration details required by the \fBsmbd
-\fRserver. This is the file that swat will modify. 
+\fRserver. This is the file that \fBswat\fR will modify. 
 The information in this file includes server-specific 
 information such as what printcap file to use, as well as 
 descriptions of all the services that the server is to provide.
@@ -34,8 +34,8 @@ See \fIsmb.conf\fR for more information.
 .TP
 \fB-a\fR
 This option disables authentication and puts 
-swat in demo mode. In that mode anyone will be able to modify 
-the smb.conf file. 
+\fBswat\fR in demo mode. In that mode anyone will be able to modify 
+the \fIsmb.conf\fR file. 
 
 \fBDo NOT enable this option on a production 
 server. \fR
@@ -58,7 +58,7 @@ these in:
 .PP
 You need to edit your \fI/etc/inetd.conf
 \fRand \fI/etc/services\fR
-to enable SWAT to be launched via inetd.
+to enable SWAT to be launched via \fBinetd\fR.
 .PP
 In \fI/etc/services\fR you need to 
 add a line like this: 
@@ -86,10 +86,10 @@ HUP signal to inetd. To do this use \fBkill -1 PID
 \fRwhere PID is the process ID of the inetd daemon. 
 .SS "LAUNCHING"
 .PP
-To launch swat just run your favorite web browser and 
+To launch SWAT just run your favorite web browser and 
 point it at "http://localhost:901/".
 .PP
-Note that you can attach to swat from any IP connected 
+Note that you can attach to SWAT from any IP connected 
 machine but connecting from a remote machine leaves your 
 connection open to password sniffing as passwords will be sent 
 in the clear over the wire. 
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 449d42b803d..b87c2a29bb2 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.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 "TESTPARM" "1" "03 May 2001" "" ""
+.TH "TESTPARM" "1" "22 June 2001" "" ""
 .SH NAME
 testparm \- check an smb.conf configuration file for  internal correctness
 .SH SYNOPSIS
@@ -42,7 +42,7 @@ names and before dumping the service definitions.
 Print usage message 
 .TP
 \fB-L servername\fR
-Sets the value of the %L macro to servername.
+Sets the value of the %L macro to \fIservername\fR.
 This is useful for testing include files specified with the 
 %L macro. 
 .TP
@@ -53,7 +53,7 @@ default \fIsmb.conf\fR file will be checked.
 .TP
 \fBhostname\fR
 If this parameter and the following are 
-specified, then testparm will examine the \fIhosts
+specified, then \fBtestparm\fR will examine the \fIhosts
 allow\fR and \fIhosts deny\fR 
 parameters in the \fIsmb.conf\fR file to 
 determine if the hostname with this IP address would be
@@ -73,7 +73,7 @@ file used by \fBsmbd\fR.
 .SH "DIAGNOSTICS"
 .PP
 The program will issue a message saying whether the 
-configuration file loaded OK or not. This message may be preceeded by 
+configuration file loaded OK or not. This message may be preceded by 
 errors and warnings if the file did not load. If the file was 
 loaded OK, the program then dumps all known service details 
 to stdout. 
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 59966ca2649..653c8304cd1 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.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 "WBINFO" "1" "03 May 2001" "" ""
+.TH "WBINFO" "1" "22 June 2001" "" ""
 .SH NAME
 wbinfo \- Query information from winbind daemon
 .SH SYNOPSIS
@@ -86,7 +86,7 @@ NT domain the server is a Primary Domain Controller for.
 .PP
 The wbinfo program returns 0 if the operation 
 succeeded, or 1 if the operation failed. If the \fBwinbindd(8)
-\fRdaemon is not working wbinfo will always return 
+\fRdaemon is not working \fBwbinfo\fR will always return 
 failure. 
 .SH "VERSION"
 .PP
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 58cc79b1dd9..5f891021b43 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" "08 June 2001" "" ""
+.TH "WINBINDD" "8" "22 June 2001" "" ""
 .SH NAME
 winbindd \- Name Service Switch daemon for resolving names  from NT servers
 .SH SYNOPSIS
@@ -24,7 +24,7 @@ Users and groups are allocated as they are resolved to a range
 of user and group ids specified by the administrator of the 
 Samba system.
 .PP
-The service provided by winbindd is called `winbind' and 
+The service provided by \fBwinbindd\fR is called `winbind' and 
 can be used to resolve user and group information from a 
 Windows NT server. The service can also provide authentication
 services via an associated PAM module. 
@@ -107,7 +107,7 @@ separator so that the unix user names look like
 DOMAIN\\username. In some cases this separator character may 
 cause problems as the '\\' character has special meaning in 
 unix shells. In that case you can use the winbind separator 
-option to specify an alternative sepataror character. Good 
+option to specify an alternative separator character. Good 
 alternatives may be '/' (although that conflicts
 with the unix directory separator) or a '+ 'character. 
 The '+' character appears to be the best choice for 100% 
@@ -121,7 +121,7 @@ Example: \fBwinbind separator = + \fR
 \fBwinbind uid\fR
 The winbind uid parameter specifies the 
 range of user ids that are allocated by the winbindd daemon. 
-This range of ids should have no existing local or nis users 
+This range of ids should have no existing local or NIS users 
 within it as strange conflicts can occur otherwise. 
 
 Default: \fBwinbind uid = <empty string> 
@@ -131,7 +131,7 @@ Example: \fBwinbind uid = 10000-20000\fR
 \fBwinbind gid\fR
 The winbind gid parameter specifies the 
 range of group ids that are allocated by the winbindd daemon. 
-This range of group ids should have no existing local or nis 
+This range of group ids should have no existing local or NIS 
 groups within it as strange conflicts can occur otherwise.
 
 Default: \fBwinbind gid = <empty string>
@@ -143,7 +143,7 @@ This parameter specifies the number of
 seconds the winbindd daemon will cache user and group information 
 before querying a Windows NT server again. When a item in the 
 cache is older than this time winbindd will ask the domain 
-controller for the sequence number of the servers account database. 
+controller for the sequence number of the server's account database. 
 If the sequence number has not changed then the cached item is 
 marked as valid for a further \fIwinbind cache time
 \fRseconds. Otherwise the item is fetched from the 
@@ -163,7 +163,7 @@ calls to the \fBgetpwent\fR system call will not
 return any data. 
 
 \fBWarning:\fR Turning off user enumeration 
-may cause some programs to behave oddly. For example, the finger 
+may cause some programs to behave oddly. For example, the \fBfinger\fR 
 program relies on having access to the full user list when 
 searching for matching usernames. 
 
@@ -242,7 +242,7 @@ The next step is to join the domain. To do that use the
 \fBsamedit -S '*' -W DOMAIN -UAdministrator\fR
 .PP
 The username after the \fI-U\fR can be any Domain 
-user that has administrator priviliges on the machine. Next from 
+user that has administrator privileges on the machine. Next from 
 within \fBsamedit\fR, run the command: 
 .PP
 \fBcreateuser MACHINE$ -j DOMAIN -L\fR
@@ -258,7 +258,7 @@ made from \fI/lib/libnss_winbind.so\fR to
 older version of glibc then the target of the link should be
 \fI/lib/libnss_winbind.so.1\fR.
 .PP
-Finally, setup a smb.conf containing directives like the 
+Finally, setup a \fIsmb.conf\fR containing directives like the 
 following: 
 .PP
 .sp
@@ -358,7 +358,7 @@ Storage for cached user and group information.
 .PP
 This man page is correct for version 2.2 of 
 the Samba suite. winbindd is however not available in
-stable release of Samba as of yet.
+the stable release of Samba as of yet.
 .SH "SEE ALSO"
 .PP
 \fInsswitch.conf(5)\fR,
author	Gerald Carter <jerry@samba.org>	2001-06-22 16:53:39 +0000
committer	Gerald Carter <jerry@samba.org>	2001-06-22 16:53:39 +0000
commit	6c2edc0ea50bef81ac2ec08bae549deb6742234d (patch)
tree	9e29b8bc6a845585ee0ca9711895e695fa971646 /docs
parent	d57410e0f9c28aa857c0ada934b71dbb0afec81f (diff)
download	samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.tar.gz samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.tar.xz samba-6c2edc0ea50bef81ac2ec08bae549deb6742234d.zip