From 72b9b48904fb006112256d532445355499a51700 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Nov 2002 13:29:46 +0000
Subject: Add note about error that happens when the loopback device doesn't
 work (This used to be commit 377631b3a07c0fb52e4374cc2484e7852d81a84e)

---
 docs/docbook/faq/errors.sgml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs')

diff --git a/docs/docbook/faq/errors.sgml b/docs/docbook/faq/errors.sgml
index 2f378a3688..819462899e 100644
--- a/docs/docbook/faq/errors.sgml
+++ b/docs/docbook/faq/errors.sgml
@@ -167,4 +167,10 @@ A domain controller has to announce on the network who it is. This usually takes
 </para>
 </sect1>
 
+<sect1>
+<title>I'm getting "open_oplock_ipc: Failed to get local UDP socket for address 100007f. Error was Cannot assign requested" in the logs</title>
+<para>Your loopback device isn't working correctly. Make sure it's running.
+</para>
+</sect1>
+
 </chapter>
-- 
cgit 


From 6ff60f301e48692087dd9ebd15ad784924868bb3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Nov 2002 19:20:23 +0000
Subject: fix typo(s/plaintext pass column/plain pass column/) (This used to be
 commit 411647ecfbfbb17e46ea2289a09e77a2fbb1162f)

---
 docs/docbook/projdoc/pdb_mysql.sgml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/projdoc/pdb_mysql.sgml b/docs/docbook/projdoc/pdb_mysql.sgml
index 220f17caa1..05262ebe10 100644
--- a/docs/docbook/projdoc/pdb_mysql.sgml
+++ b/docs/docbook/projdoc/pdb_mysql.sgml
@@ -81,7 +81,7 @@ identifier:user sid column               - varchar(255) - NT user SID
 identifier:group sid column              - varchar(255) - NT group ID
 identifier:lanman pass column            - varchar(255) - encrypted lanman password
 identifier:nt pass column                - varchar(255) - encrypted nt passwd
-identifier:plaintext pass column         - varchar(255) - plaintext password
+identifier:plain pass column             - varchar(255) - plaintext password
 identifier:acct control column           - int(9) - nt user data
 identifier:unknown 3 column              - int(9) - unknown
 identifier:logon divs column             - int(9) - ?
@@ -107,11 +107,11 @@ I strongly discourage the use of plaintext passwords, however, you can use them:
 </para>
 
 <para>
-If you would like to use plaintext passwords, set 'identifier:lanman pass column' and 'identifier:nt pass column' to 'NULL' (without the quotes) and 'identifier:plaintext pass column' to the name of the column containing the plaintext passwords. 
+If you would like to use plaintext passwords, set 'identifier:lanman pass column' and 'identifier:nt pass column' to 'NULL' (without the quotes) and 'identifier:plain pass column' to the name of the column containing the plaintext passwords. 
 </para>
 
 <para>
-If you use encrypted passwords, set the 'identifier:plaintext pass column' to 'NULL' (without the quotes). This is the default.
+If you use encrypted passwords, set the 'identifier:plain pass column' to 'NULL' (without the quotes). This is the default.
 </para>
 
 </sect1>
-- 
cgit 


From d77a6ea8a429bd9e27a646935ef98e1a4ec0b645 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 13 Nov 2002 13:04:16 +0000
Subject: Move VFS documentation to SGML (This used to be commit
 cf9c1c2584743a059c2d266158d4e8280aaeba8a)

---
 docs/docbook/projdoc/VFS.sgml       | 195 ++++++++++++++++++++++++++++++++++++
 docs/docbook/projdoc/samba-doc.sgml |   2 +
 2 files changed, 197 insertions(+)
 create mode 100644 docs/docbook/projdoc/VFS.sgml

(limited to 'docs')

diff --git a/docs/docbook/projdoc/VFS.sgml b/docs/docbook/projdoc/VFS.sgml
new file mode 100644
index 0000000000..4c228dfa87
--- /dev/null
+++ b/docs/docbook/projdoc/VFS.sgml
@@ -0,0 +1,195 @@
+<chapter id="VFS">
+<chapterinfo>
+	<author><firstname>Jelmer</firstname><surname>Vernooij</surname></author>
+	<author><firstname>Alexander</firstname><surname>Bokovoy</surname></author>
+	<author><firstname>Tim</firstname><surname>Potter</surname></author>
+	<author><firstname>Simo</firstname><surname>Sorce</surname></author>
+</chapterinfo>
+<title>Stackable VFS modules</title>
+
+<sect1>
+<title>Introduction and configuration</title>
+
+<para>
+Since samba 3.0, samba supports stackable VFS(Virtual File System) modules. 
+Samba passes each request to access the unix file system thru the loaded VFS modules. 
+This chapter covers all the modules that come with the samba source and references to 
+some external modules.
+</para>
+
+<para>
+You may have problems to compile these modules, as shared libraries are
+compiled and linked in different ways on different systems.
+I currently tested them against GNU/linux and IRIX.
+</para>
+
+<para>
+To use the VFS modules, create a share similar to the one below.  The
+important parameter is the <command>vfs object</command> parameter which must point to
+the exact pathname of the shared library object. For example, to use audit.so:
+
+<programlisting>
+       [audit]
+                comment = Audited /data directory
+                path = /data
+                vfs object = /path/to/audit.so
+                writeable = yes
+                browseable = yes
+</programlisting>
+</para>
+
+<para>
+Further documentation on writing VFS modules for Samba can be found in
+docs directory of the Samba source distribution.
+</para>
+
+</sect1>
+
+<sect1>
+<title>Included modules</title>
+
+<sect2>
+<title>audit</title>
+<para>A simple module to audit file access to the syslog
+facility.  The following operations are logged:
+<simplelist>
+<member>share</member>
+<member>connect/disconnect</member>
+<member>directory opens/create/remove</member>
+<member>file open/close/rename/unlink/chmod</member>
+</simplelist>
+</para>
+</sect2>
+
+<sect2>
+<title>recycle</title>
+<para>
+A recycle-bin like modules. When used any unlink call
+will be intercepted and files moved to the recycle
+directory instead of beeing deleted.
+</para>
+
+<para>Supported options:
+<variablelist>
+	<varlistentry>
+	<term>vfs_recycle_bin:repository</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:keeptree</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+	
+	<varlistentry>
+	<term>vfs_recycle_bin:versions</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:touch</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:maxsize</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:exclude</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:exclude_dir</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+	<term>vfs_recycle_bin:noversions</term>
+	<listitem><para>FIXME</para></listitem>
+	</varlistentry>
+</variablelist>
+</para>
+
+</sect2>
+
+<sect2>
+<title>netatalk</title>
+<para>
+A netatalk module, that will ease co-existence of samba and
+netatalk file sharing services.
+</para>
+
+<para>Advantages compared to the old netatalk module:
+<simplelist>
+<member>it doesn't care about creating of .AppleDouble forks, just keeps ones in sync</member>
+<member>if share in smb.conf doesn't contain .AppleDouble item in hide or veto list, it will be added automatically</member>
+</simplelist>
+</para>
+
+</sect2>
+
+</sect1>
+
+<sect1>
+<title>VFS modules available elsewhere</title>
+
+<para>
+This section contains a listing of various other VFS modules that 
+have been posted but don't currently reside in the Samba CVS 
+tree for one reason ot another (e.g. it is easy for the maintainer 
+to have his or her own CVS tree).
+</para>
+
+<para>
+No statemets about the stability or functionality any module
+should be implied due to its presence here.
+</para>
+
+<sect2>
+<title>DatabaseFS</title>
+
+<para>
+URL: <ulink url="http://www.css.tayloru.edu/~elorimer/databasefs/index.php">http://www.css.tayloru.edu/~elorimer/databasefs/index.php</ulink>
+</para>
+
+<para>By <ulink url="mailto:elorimer@css.tayloru.edu">Eric Lorimer</ulink>.</para>
+
+<para>
+I have created a VFS module which implements a fairly complete read-only
+filesystem.  It presents information from a database as a filesystem in
+a modular and generic way to allow different databases to be used
+(originally designed for organizing MP3s under directories such as
+"Artists," "Song Keywords," etc... I have since applied it to a student
+roster database very easily).  The directory structure is stored in the
+database itself and the module makes no assumptions about the database
+structure beyond the table it requires to run.
+</para>
+
+<para>
+Any feedback would be appreciated: comments, suggestions, patches,
+etc...  If nothing else, hopefully it might prove useful for someone
+else who wishes to create a virtual filesystem.
+</para>
+
+</sect2>
+
+<sect2>
+<title>vscan</title>
+<para>URL: <ulink url="http://www.openantivirus.org/">http://www.openantivirus.org/</ulink></para>
+
+<para>
+samba-vscan is a proof-of-concept module for Samba, which
+uses the VFS (virtual file system) features of Samba 2.2.x/3.0
+alphaX. Of couse, Samba has to be compiled with VFS support. 
+samba-vscan supports various virus scanners and is maintained 
+by Rainer Link.
+</para>
+
+</sect2>
+
+</sect1>
+
+</chapter>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index f00dfd9db6..52fb0e7bfa 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -25,6 +25,7 @@
 <!ENTITY oplocks SYSTEM "oplocks.sgml">
 <!ENTITY pdb-mysql SYSTEM "pdb_mysql.sgml">
 <!ENTITY pdb-xml SYSTEM "pdb_xml.sgml">
+<!ENTITY VFS SYSTEM "VFS.sgml">
 ]>
 
 <book id="Samba-HOWTO-Collection">
@@ -113,6 +114,7 @@ part each cover one specific feature.</para>
 &WINBIND;
 &pdb-mysql;
 &pdb-xml;
+&VFS;
 &Samba-LDAP;
 &CVS-Access;
 &GROUP-MAPPING-HOWTO;
-- 
cgit 


From 2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 13 Nov 2002 15:34:49 +0000
Subject: Some more doc updates: - make - update status of docs document - move
 security_level to 'type of installation' part (This used to be commit
 11ad39398e077c3901e63f31bcc6efb223854357)

---
 docs/docbook/projdoc/samba-doc.sgml       |  22 +-
 docs/docbook/projdoc/security_level.sgml  |  46 +-
 docs/docs-status                          |   5 +-
 docs/htmldocs/ads.html                    |  42 +-
 docs/htmldocs/appendixes.html             | 391 ++++++++++++
 docs/htmldocs/browsing-quick.html         |  16 +-
 docs/htmldocs/bugreport.html              |  30 +-
 docs/htmldocs/cvs-access.html             |  22 +-
 docs/htmldocs/diagnosis.html              |  66 +--
 docs/htmldocs/domain-security.html        |  24 +-
 docs/htmldocs/groupmapping.html           |   6 +-
 docs/htmldocs/improved-browsing.html      |  28 +-
 docs/htmldocs/install.html                |  46 +-
 docs/htmldocs/integrate-ms-networks.html  |  92 +--
 docs/htmldocs/introduction.html           | 438 ++++++++++++++
 docs/htmldocs/msdfs.html                  |  14 +-
 docs/htmldocs/oplocks.html                |   6 +-
 docs/htmldocs/optional.html               | 955 ++++++++++++++++++++++++++++++
 docs/htmldocs/other-clients.html          |  58 +-
 docs/htmldocs/pam.html                    |  18 +-
 docs/htmldocs/pdb-mysql.html              |  18 +-
 docs/htmldocs/pdb-xml.html                |  18 +-
 docs/htmldocs/portability.html            |  28 +-
 docs/htmldocs/printing.html               | 104 ++--
 docs/htmldocs/pwencrypt.html              |  20 +-
 docs/htmldocs/samba-bdc.html              |  38 +-
 docs/htmldocs/samba-howto-collection.html | 561 +++++++++---------
 docs/htmldocs/samba-ldap-howto.html       |  64 +-
 docs/htmldocs/samba-pdc.html              | 100 ++--
 docs/htmldocs/securitylevels.html         |  92 +--
 docs/htmldocs/speed.html                  |  92 +--
 docs/htmldocs/type.html                   | 392 ++++++++++++
 docs/htmldocs/unix-permissions.html       |  42 +-
 docs/htmldocs/vfs.html                    | 403 +++++++++++++
 docs/htmldocs/winbind.html                |  70 +--
 35 files changed, 3446 insertions(+), 921 deletions(-)
 create mode 100644 docs/htmldocs/appendixes.html
 create mode 100644 docs/htmldocs/introduction.html
 create mode 100644 docs/htmldocs/optional.html
 create mode 100644 docs/htmldocs/type.html
 create mode 100644 docs/htmldocs/vfs.html

(limited to 'docs')

diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index 52fb0e7bfa..ce16405d54 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -43,7 +43,7 @@
 <title>Abstract</title>
 
 <para>
-<emphasis>Last Update</emphasis> : Thu Aug 15 12:48:45 CDT 2002
+<emphasis>Last Update</emphasis> : $Date: 2002/11/13 15:34:49 $
 </para>
 
 <para>
@@ -52,7 +52,8 @@ I try to ensure that all are current, but sometimes the is a larger job
 than one person can maintain.  The most recent version of this document
 can be found at <ulink url="http://www.samba.org/">http://www.samba.org/</ulink>
 on the "Documentation" page.  Please send updates to <ulink 
-url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
+url="mailto:jerry@samba.org">jerry@samba.org</ulink> or 
+<ulink url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>.
 </para>
 
 <para>
@@ -69,7 +70,7 @@ Cheers, jerry
 </dedication>
 
 <!-- Chapters -->
-<part>
+<part id="introduction">
 <title>General installation</title>
 <partintro>
 <title>Introduction</title>
@@ -84,21 +85,23 @@ PLEASE read this.</para>
 &ENCRYPTION;
 </part>
 
-<part>
+<part id="type">
 <title>Type of installation</title>
 <partintro>
 <title>Introduction</title>
-<para>This part contains information on using samba in a (NT 4 or ADS) domain. 
-If you wish to run samba as a domain member or DC, read the appropriate chapter in 
-this part.</para>
+<para>
+Samba can operate in various SMB networks. This part contains information on configuring samba 
+for various environments.
+</para>
 </partintro>
+&SECURITY-LEVEL;
 &Samba-PDC-HOWTO;
 &Samba-BDC-HOWTO;
 &ADS-HOWTO;
 &DOMAIN-MEMBER;
 </part>
 
-<part>
+<part id="optional">
 <title>Optional configuration</title>
 <partintro>
 <title>Introduction</title>
@@ -110,7 +113,6 @@ part each cover one specific feature.</para>
 &Samba-PAM;
 &MS-Dfs-Setup;
 &PRINTER-DRIVER2;
-&SECURITY-LEVEL;
 &WINBIND;
 &pdb-mysql;
 &pdb-xml;
@@ -121,7 +123,7 @@ part each cover one specific feature.</para>
 &SPEED;
 </part>
 
-<part>
+<part id="Appendixes">
 <title>Appendixes</title>
 &Portability;
 &Other-Clients;
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index 2f9a92d872..e2d9cfbbaa 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -9,40 +9,7 @@
 	</author>
 </chapterinfo>
 
-<title>Security levels</title>
-
-<sect1>
-<title>Introduction</title>
-
-<para>
-Samba supports the following options to the global smb.conf parameter
-</para>
-
-<para><programlisting>
-[global]
-<ulink url="smb.conf.5.html#SECURITY"><parameter>security</parameter></ulink> = [share|user(default)|server|domain|ads]
-</programlisting></para>
-
-<para>
-Please refer to the smb.conf man page for usage information and to the document
-<ulink url="DOMAIN_MEMBER.html">DOMAIN_MEMBER.html</ulink> for further background details
-on domain mode security.  The Windows 2000 Kerberos domain security model
-(security = ads) is described in the <ulink url="ADS-HOWTO.html">ADS-HOWTO.html</ulink>.
-</para>
-
-<para>
-Of the above, "security = server" means that Samba reports to clients that
-it is running in "user mode" but actually passes off all authentication
-requests to another "user mode" server. This requires an additional
-parameter "password server =" that points to the real authentication server.
-That real authentication server can be another Samba server or can be a
-Windows NT server, the later natively capable of encrypted password support.
-</para>
-
-</sect1>
-
-<sect1>
-<title>More complete description of security levels</title>
+<title>User and Share security level (for servers not in a domain)</title>
 
 <para>
 A SMB server tells the client at startup what "security level" it is
@@ -136,5 +103,14 @@ cryptographically impossible to translate from unix style encryption
 to SMB style encryption, although there are some fairly simple management
 schemes by which the two could be kept in sync.
 </para>
-</sect1>
+
+<para>
+"security = server" means that Samba reports to clients that
+it is running in "user mode" but actually passes off all authentication
+requests to another "user mode" server. This requires an additional
+parameter "password server =" that points to the real authentication server.
+That real authentication server can be another Samba server or can be a
+Windows NT server, the later natively capable of encrypted password support.
+</para>
+
 </chapter>
diff --git a/docs/docs-status b/docs/docs-status
index 9dfcd841d6..23a0127c3b 100644
--- a/docs/docs-status
+++ b/docs/docs-status
@@ -23,7 +23,6 @@ docs/docbook/projdoc/Samba-PDC-HOWTO.sgml - Needs update to 3.0
 docs/docbook/projdoc/Speed.sgml - contains outdated and invalid information
 docs/docbook/projdoc/UNIX_INSTALL.sgml - Needs a lot of updating (swat, etc)
 docs/docbook/projdoc/printer_driver2.sgml - still up to date?
-docs/docbook/projdoc/security_level.sgml - information about ads and domain should be added (currently only contains pointers to the ads and domain_member docs)
 docs/docbook/projdoc/winbind.sgml - needs documentation for ADS
 docs/textdocs/CUPS-PrintingInfo.txt - needs to be converted to sgml - Kurt Pfeifle
 docs/textdocs/PROFILES.txt - needs to be converted to sgml
@@ -51,6 +50,8 @@ Merge the various docs about wins and browsing
 Windows NT 4.0 Style Trust Relationship
 One Time Migration script from a Windows NT 4.0 PDC to a Samba PDC
 ldap passwd sync
-merge the various pdb docs
+merge the various pdb docs and the doc about encryption
+UNICODE support
+Winbind with samba PDC
 
 http://www.unav.es/cti/ldap-smb/smb-ldap-3-howto.html
diff --git a/docs/htmldocs/ads.html b/docs/htmldocs/ads.html
index fc6b78b32c..49345be2c0 100644
--- a/docs/htmldocs/ads.html
+++ b/docs/htmldocs/ads.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Type of installation"
-HREF="p544.html"><LINK
+HREF="type.html"><LINK
 REL="PREVIOUS"
 TITLE="How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain"
 HREF="samba-bdc.html"><LINK
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="ADS"
 ></A
->Chapter 8. Samba as a ADS domain member</H1
+>Chapter 9. Samba as a ADS domain member</H1
 ><P
 >This is a VERY ROUGH guide to setting up the current (November 2001)
 pre-alpha version of Samba 3.0 with kerberos authentication against a
@@ -113,9 +113,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1178"
+NAME="AEN1203"
 ></A
->8.1. Installing the required packages for Debian</H1
+>9.1. Installing the required packages for Debian</H1
 ><P
 >On Debian you need to install the following packages:
 <P
@@ -142,9 +142,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1184"
+NAME="AEN1209"
 ></A
->8.2. Installing the required packages for RedHat</H1
+>9.2. Installing the required packages for RedHat</H1
 ><P
 >On RedHat this means you should have at least: 
 <P
@@ -180,9 +180,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1193"
+NAME="AEN1218"
 ></A
->8.3. Compile Samba</H1
+>9.3. Compile Samba</H1
 ><P
 >If your kerberos libraries are in a non-standard location then
   remember to add the configure option --with-krb5=DIR.</P
@@ -225,9 +225,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1205"
+NAME="AEN1230"
 ></A
->8.4. Setup your /etc/krb5.conf</H1
+>9.4. Setup your /etc/krb5.conf</H1
 ><P
 >The minimal configuration for krb5.conf is:</P
 ><P
@@ -264,9 +264,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1215"
+NAME="AEN1240"
 ></A
->8.5. Create the computer account</H1
+>9.5. Create the computer account</H1
 ><P
 >Do a "kinit" as a user that has authority to change arbitrary
 passwords on the KDC ("Administrator" is a good choice). Then as a
@@ -281,9 +281,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1219"
+NAME="AEN1244"
 ></A
->8.5.1. Possible errors</H2
+>9.5.1. Possible errors</H2
 ><P
 ><P
 ></P
@@ -312,9 +312,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1231"
+NAME="AEN1256"
 ></A
->8.6. Test your server setup</H1
+>9.6. Test your server setup</H1
 ><P
 >On a Windows 2000 client try <B
 CLASS="COMMAND"
@@ -332,9 +332,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1236"
+NAME="AEN1261"
 ></A
->8.7. Testing with smbclient</H1
+>9.7. Testing with smbclient</H1
 ><P
 >On your Samba server try to login to a Win2000 server or your Samba
 server using smbclient and kerberos. Use smbclient as usual, but
@@ -345,9 +345,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1239"
+NAME="AEN1264"
 ></A
->8.8. Notes</H1
+>9.8. Notes</H1
 ><P
 >You must change administrator password at least once after DC install,
  to create the right encoding types</P
@@ -406,7 +406,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/appendixes.html b/docs/htmldocs/appendixes.html
new file mode 100644
index 0000000000..49242c6554
--- /dev/null
+++ b/docs/htmldocs/appendixes.html
@@ -0,0 +1,391 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Appendixes</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+REL="HOME"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="PREVIOUS"
+TITLE="Samba performance issues"
+HREF="speed.html"><LINK
+REL="NEXT"
+TITLE="Portability"
+HREF="portability.html"></HEAD
+><BODY
+CLASS="PART"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SAMBA Project Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="speed.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="portability.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="PART"
+><A
+NAME="APPENDIXES"
+></A
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+>IV. Appendixes</H1
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>24. <A
+HREF="portability.html"
+>Portability</A
+></DT
+><DD
+><DL
+><DT
+>24.1. <A
+HREF="portability.html#AEN3198"
+>HPUX</A
+></DT
+><DT
+>24.2. <A
+HREF="portability.html#AEN3204"
+>SCO Unix</A
+></DT
+><DT
+>24.3. <A
+HREF="portability.html#AEN3208"
+>DNIX</A
+></DT
+><DT
+>24.4. <A
+HREF="portability.html#AEN3237"
+>RedHat Linux Rembrandt-II</A
+></DT
+></DL
+></DD
+><DT
+>25. <A
+HREF="other-clients.html"
+>Samba and other CIFS clients</A
+></DT
+><DD
+><DL
+><DT
+>25.1. <A
+HREF="other-clients.html#AEN3258"
+>Macintosh clients?</A
+></DT
+><DT
+>25.2. <A
+HREF="other-clients.html#AEN3267"
+>OS2 Client</A
+></DT
+><DD
+><DL
+><DT
+>25.2.1. <A
+HREF="other-clients.html#AEN3269"
+>How can I configure OS/2 Warp Connect or 
+		OS/2 Warp 4 as a client for Samba?</A
+></DT
+><DT
+>25.2.2. <A
+HREF="other-clients.html#AEN3284"
+>How can I configure OS/2 Warp 3 (not Connect), 
+		OS/2 1.2, 1.3 or 2.x for Samba?</A
+></DT
+><DT
+>25.2.3. <A
+HREF="other-clients.html#AEN3293"
+>Are there any other issues when OS/2 (any version) 
+		is used as a client?</A
+></DT
+><DT
+>25.2.4. <A
+HREF="other-clients.html#AEN3297"
+>How do I get printer driver download working 
+		for OS/2 clients?</A
+></DT
+></DL
+></DD
+><DT
+>25.3. <A
+HREF="other-clients.html#AEN3307"
+>Windows for Workgroups</A
+></DT
+><DD
+><DL
+><DT
+>25.3.1. <A
+HREF="other-clients.html#AEN3309"
+>Use latest TCP/IP stack from Microsoft</A
+></DT
+><DT
+>25.3.2. <A
+HREF="other-clients.html#AEN3314"
+>Delete .pwl files after password change</A
+></DT
+><DT
+>25.3.3. <A
+HREF="other-clients.html#AEN3319"
+>Configure WfW password handling</A
+></DT
+><DT
+>25.3.4. <A
+HREF="other-clients.html#AEN3323"
+>Case handling of passwords</A
+></DT
+></DL
+></DD
+><DT
+>25.4. <A
+HREF="other-clients.html#AEN3328"
+>Windows '95/'98</A
+></DT
+><DT
+>25.5. <A
+HREF="other-clients.html#AEN3344"
+>Windows 2000 Service Pack 2</A
+></DT
+></DL
+></DD
+><DT
+>26. <A
+HREF="bugreport.html"
+>Reporting Bugs</A
+></DT
+><DD
+><DL
+><DT
+>26.1. <A
+HREF="bugreport.html#AEN3368"
+>Introduction</A
+></DT
+><DT
+>26.2. <A
+HREF="bugreport.html#AEN3378"
+>General info</A
+></DT
+><DT
+>26.3. <A
+HREF="bugreport.html#AEN3384"
+>Debug levels</A
+></DT
+><DT
+>26.4. <A
+HREF="bugreport.html#AEN3401"
+>Internal errors</A
+></DT
+><DT
+>26.5. <A
+HREF="bugreport.html#AEN3411"
+>Attaching to a running process</A
+></DT
+><DT
+>26.6. <A
+HREF="bugreport.html#AEN3414"
+>Patches</A
+></DT
+></DL
+></DD
+><DT
+>27. <A
+HREF="diagnosis.html"
+>Diagnosing your samba server</A
+></DT
+><DD
+><DL
+><DT
+>27.1. <A
+HREF="diagnosis.html#AEN3437"
+>Introduction</A
+></DT
+><DT
+>27.2. <A
+HREF="diagnosis.html#AEN3442"
+>Assumptions</A
+></DT
+><DT
+>27.3. <A
+HREF="diagnosis.html#AEN3452"
+>Tests</A
+></DT
+><DD
+><DL
+><DT
+>27.3.1. <A
+HREF="diagnosis.html#AEN3454"
+>Test 1</A
+></DT
+><DT
+>27.3.2. <A
+HREF="diagnosis.html#AEN3460"
+>Test 2</A
+></DT
+><DT
+>27.3.3. <A
+HREF="diagnosis.html#AEN3466"
+>Test 3</A
+></DT
+><DT
+>27.3.4. <A
+HREF="diagnosis.html#AEN3481"
+>Test 4</A
+></DT
+><DT
+>27.3.5. <A
+HREF="diagnosis.html#AEN3486"
+>Test 5</A
+></DT
+><DT
+>27.3.6. <A
+HREF="diagnosis.html#AEN3492"
+>Test 6</A
+></DT
+><DT
+>27.3.7. <A
+HREF="diagnosis.html#AEN3500"
+>Test 7</A
+></DT
+><DT
+>27.3.8. <A
+HREF="diagnosis.html#AEN3526"
+>Test 8</A
+></DT
+><DT
+>27.3.9. <A
+HREF="diagnosis.html#AEN3543"
+>Test 9</A
+></DT
+><DT
+>27.3.10. <A
+HREF="diagnosis.html#AEN3551"
+>Test 10</A
+></DT
+><DT
+>27.3.11. <A
+HREF="diagnosis.html#AEN3557"
+>Test 11</A
+></DT
+></DL
+></DD
+><DT
+>27.4. <A
+HREF="diagnosis.html#AEN3562"
+>Still having troubles?</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="speed.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="portability.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Samba performance issues</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Portability</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/browsing-quick.html b/docs/htmldocs/browsing-quick.html
index d2546f74b2..cc703d217f 100644
--- a/docs/htmldocs/browsing-quick.html
+++ b/docs/htmldocs/browsing-quick.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="PREVIOUS"
 TITLE="Oplocks"
 HREF="oplocks.html"><LINK
@@ -86,7 +86,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN392"
+NAME="AEN393"
 ></A
 >4.1. Discussion</H1
 ><P
@@ -132,7 +132,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN400"
+NAME="AEN401"
 ></A
 >4.2. Use of the "Remote Announce" parameter</H1
 ><P
@@ -190,7 +190,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN414"
+NAME="AEN415"
 ></A
 >4.3. Use of the "Remote Browse Sync" parameter</H1
 ><P
@@ -212,7 +212,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN419"
+NAME="AEN420"
 ></A
 >4.4. Use of WINS</H1
 ><P
@@ -274,7 +274,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN430"
+NAME="AEN431"
 ></A
 >4.5. Do NOT use more than one (1) protocol on MS Windows machines</H1
 ><P
@@ -304,7 +304,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN436"
+NAME="AEN437"
 ></A
 >4.6. Name Resolution Order</H1
 ><P
@@ -435,7 +435,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/bugreport.html b/docs/htmldocs/bugreport.html
index b3d4972c16..9e21f48556 100644
--- a/docs/htmldocs/bugreport.html
+++ b/docs/htmldocs/bugreport.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Appendixes"
-HREF="p3106.html"><LINK
+HREF="appendixes.html"><LINK
 REL="PREVIOUS"
 TITLE="Samba and other CIFS clients"
 HREF="other-clients.html"><LINK
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="BUGREPORT"
 ></A
->Chapter 25. Reporting Bugs</H1
+>Chapter 26. Reporting Bugs</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3285"
+NAME="AEN3368"
 ></A
->25.1. Introduction</H1
+>26.1. Introduction</H1
 ><P
 >The email address for bug reports for stable releases is <A
 HREF="samba@samba.org"
@@ -125,9 +125,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3295"
+NAME="AEN3378"
 ></A
->25.2. General info</H1
+>26.2. General info</H1
 ><P
 >Before submitting a bug report check your config for silly
 errors. Look in your log files for obvious messages that tell you that
@@ -150,9 +150,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3301"
+NAME="AEN3384"
 ></A
->25.3. Debug levels</H1
+>26.3. Debug levels</H1
 ><P
 >If the bug has anything to do with Samba behaving incorrectly as a
 server (like refusing to open a file) then the log files will probably
@@ -220,9 +220,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3318"
+NAME="AEN3401"
 ></A
->25.4. Internal errors</H1
+>26.4. Internal errors</H1
 ><P
 >If you get a "INTERNAL ERROR" message in your log files it means that
 Samba got an unexpected signal while running. It is probably a
@@ -264,9 +264,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3328"
+NAME="AEN3411"
 ></A
->25.5. Attaching to a running process</H1
+>26.5. Attaching to a running process</H1
 ><P
 >Unfortunately some unixes (in particular some recent linux kernels)
 refuse to dump a core file if the task has changed uid (which smbd
@@ -281,9 +281,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3331"
+NAME="AEN3414"
 ></A
->25.6. Patches</H1
+>26.6. Patches</H1
 ><P
 >The best sort of bug report is one that includes a fix! If you send us
 patches please use <B
@@ -348,7 +348,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/cvs-access.html b/docs/htmldocs/cvs-access.html
index 5578824ee3..fe82189eba 100644
--- a/docs/htmldocs/cvs-access.html
+++ b/docs/htmldocs/cvs-access.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Storing Samba's User/Machine Account information in an LDAP Directory"
 HREF="samba-ldap-howto.html"><LINK
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="CVS-ACCESS"
 ></A
->Chapter 20. HOWTO Access Samba source code via CVS</H1
+>Chapter 21. HOWTO Access Samba source code via CVS</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2891"
+NAME="AEN2974"
 ></A
->20.1. Introduction</H1
+>21.1. Introduction</H1
 ><P
 >Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
@@ -102,9 +102,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2896"
+NAME="AEN2979"
 ></A
->20.2. CVS Access to samba.org</H1
+>21.2. CVS Access to samba.org</H1
 ><P
 >The machine samba.org runs a publicly accessible CVS 
 repository for access to the source code of several packages, 
@@ -115,9 +115,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2899"
+NAME="AEN2982"
 ></A
->20.2.1. Access via CVSweb</H2
+>21.2.1. Access via CVSweb</H2
 ><P
 >You can access the source code via your 
 favourite WWW browser. This allows you to access the contents of 
@@ -136,9 +136,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2904"
+NAME="AEN2987"
 ></A
->20.2.2. Access via cvs</H2
+>21.2.2. Access via cvs</H2
 ><P
 >You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
@@ -290,7 +290,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/diagnosis.html b/docs/htmldocs/diagnosis.html
index 976197c3bb..eaa550dc30 100644
--- a/docs/htmldocs/diagnosis.html
+++ b/docs/htmldocs/diagnosis.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Appendixes"
-HREF="p3106.html"><LINK
+HREF="appendixes.html"><LINK
 REL="PREVIOUS"
 TITLE="Reporting Bugs"
 HREF="bugreport.html"></HEAD
@@ -67,15 +67,15 @@ CLASS="CHAPTER"
 ><A
 NAME="DIAGNOSIS"
 ></A
->Chapter 26. Diagnosing your samba server</H1
+>Chapter 27. Diagnosing your samba server</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3354"
+NAME="AEN3437"
 ></A
->26.1. Introduction</H1
+>27.1. Introduction</H1
 ><P
 >This file contains a list of tests you can perform to validate your
 Samba server. It also tells you what the likely cause of the problem
@@ -95,9 +95,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3359"
+NAME="AEN3442"
 ></A
->26.2. Assumptions</H1
+>27.2. Assumptions</H1
 ><P
 >In all of the tests it is assumed you have a Samba server called 
 BIGSERVER and a PC called ACLIENT both in workgroup TESTGROUP.</P
@@ -133,17 +133,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3369"
+NAME="AEN3452"
 ></A
->26.3. Tests</H1
+>27.3. Tests</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3371"
+NAME="AEN3454"
 ></A
->26.3.1. Test 1</H2
+>27.3.1. Test 1</H2
 ><P
 >In the directory in which you store your smb.conf file, run the command
 "testparm smb.conf". If it reports any errors then your smb.conf
@@ -163,9 +163,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3377"
+NAME="AEN3460"
 ></A
->26.3.2. Test 2</H2
+>27.3.2. Test 2</H2
 ><P
 >Run the command "ping BIGSERVER" from the PC and "ping ACLIENT" from
 the unix box. If you don't get a valid response then your TCP/IP
@@ -189,9 +189,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3383"
+NAME="AEN3466"
 ></A
->26.3.3. Test 3</H2
+>27.3.3. Test 3</H2
 ><P
 >Run the command "smbclient -L BIGSERVER" on the unix box. You
 should get a list of available shares back. </P
@@ -260,9 +260,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3398"
+NAME="AEN3481"
 ></A
->26.3.4. Test 4</H2
+>27.3.4. Test 4</H2
 ><P
 >Run the command "nmblookup -B BIGSERVER __SAMBA__". You should get the
 IP address of your Samba server back.</P
@@ -281,9 +281,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3403"
+NAME="AEN3486"
 ></A
->26.3.5. Test 5</H2
+>27.3.5. Test 5</H2
 ><P
 >run the command <B
 CLASS="COMMAND"
@@ -302,9 +302,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3409"
+NAME="AEN3492"
 ></A
->26.3.6. Test 6</H2
+>27.3.6. Test 6</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -336,9 +336,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3417"
+NAME="AEN3500"
 ></A
->26.3.7. Test 7</H2
+>27.3.7. Test 7</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -425,9 +425,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3443"
+NAME="AEN3526"
 ></A
->26.3.8. Test 8</H2
+>27.3.8. Test 8</H2
 ><P
 >On the PC type the command <B
 CLASS="COMMAND"
@@ -485,9 +485,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3460"
+NAME="AEN3543"
 ></A
->26.3.9. Test 9</H2
+>27.3.9. Test 9</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -519,9 +519,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3468"
+NAME="AEN3551"
 ></A
->26.3.10. Test 10</H2
+>27.3.10. Test 10</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -545,9 +545,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3474"
+NAME="AEN3557"
 ></A
->26.3.11. Test 11</H2
+>27.3.11. Test 11</H2
 ><P
 >From file manager try to browse the server. Your samba server should
 appear in the browse list of your local workgroup (or the one you
@@ -573,9 +573,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3479"
+NAME="AEN3562"
 ></A
->26.4. Still having troubles?</H1
+>27.4. Still having troubles?</H1
 ><P
 >Try the mailing list or newsgroup, or use the ethereal utility to
 sniff the problem. The official samba mailing list can be reached at
@@ -641,7 +641,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/domain-security.html b/docs/htmldocs/domain-security.html
index 9cf9eceb8d..1a10767235 100644
--- a/docs/htmldocs/domain-security.html
+++ b/docs/htmldocs/domain-security.html
@@ -11,13 +11,13 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Type of installation"
-HREF="p544.html"><LINK
+HREF="type.html"><LINK
 REL="PREVIOUS"
 TITLE="Samba as a ADS domain member"
 HREF="ads.html"><LINK
 REL="NEXT"
 TITLE="Optional configuration"
-HREF="p1346.html"></HEAD
+HREF="optional.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="DOMAIN-SECURITY"
 ></A
->Chapter 9. Samba as a NT4 domain member</H1
+>Chapter 10. Samba as a NT4 domain member</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1261"
+NAME="AEN1286"
 ></A
->9.1. Joining an NT Domain with Samba 2.2</H1
+>10.1. Joining an NT Domain with Samba 2.2</H1
 ><P
 >Assume you have a Samba 2.x server with a NetBIOS name of 
 	<TT
@@ -311,9 +311,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1325"
+NAME="AEN1350"
 ></A
->9.2. Samba and Windows 2000 Domains</H1
+>10.2. Samba and Windows 2000 Domains</H1
 ><P
 >Many people have asked regarding the state of Samba's ability to participate in
 a Windows 2000 Domain.  Samba 3.0 is able to act as a member server of a Windows
@@ -336,9 +336,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1330"
+NAME="AEN1355"
 ></A
->9.3. Why is this better than security = server?</H1
+>10.3. Why is this better than security = server?</H1
 ><P
 >Currently, domain security in Samba doesn't free you from 
 	having to create local Unix users to represent the users attaching 
@@ -456,7 +456,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -472,7 +472,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/groupmapping.html b/docs/htmldocs/groupmapping.html
index e2bbf14dd8..c23a2094be 100644
--- a/docs/htmldocs/groupmapping.html
+++ b/docs/htmldocs/groupmapping.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="HOWTO Access Samba source code via CVS"
 HREF="cvs-access.html"><LINK
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="GROUPMAPPING"
 ></A
->Chapter 21. Group mapping HOWTO</H1
+>Chapter 22. Group mapping HOWTO</H1
 ><P
 > 
 Starting with Samba 3.0 alpha 2, a new group mapping function is available. The
@@ -219,7 +219,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/improved-browsing.html b/docs/htmldocs/improved-browsing.html
index 9c7038a031..7609ce69cd 100644
--- a/docs/htmldocs/improved-browsing.html
+++ b/docs/htmldocs/improved-browsing.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="PREVIOUS"
 TITLE="How to Install and Test SAMBA"
 HREF="install.html"><LINK
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN228"
+NAME="AEN229"
 ></A
 >2.1. Overview of browsing</H1
 ><P
@@ -104,7 +104,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN232"
+NAME="AEN233"
 ></A
 >2.2. Browsing support in samba</H1
 ><P
@@ -149,7 +149,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN241"
+NAME="AEN242"
 ></A
 >2.3. Problem resolution</H1
 ><P
@@ -183,7 +183,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN248"
+NAME="AEN249"
 ></A
 >2.4. Browsing across subnets</H1
 ><P
@@ -214,7 +214,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN253"
+NAME="AEN254"
 ></A
 >2.4.1. How does cross subnet browsing work ?</H2
 ><P
@@ -426,7 +426,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN288"
+NAME="AEN289"
 ></A
 >2.5. Setting up a WINS server</H1
 ><P
@@ -509,7 +509,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN307"
+NAME="AEN308"
 ></A
 >2.6. Setting up Browsing in a WORKGROUP</H1
 ><P
@@ -593,7 +593,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN325"
+NAME="AEN326"
 ></A
 >2.7. Setting up Browsing in a DOMAIN</H1
 ><P
@@ -644,7 +644,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN335"
+NAME="AEN336"
 ></A
 >2.8. Forcing samba to be the master</H1
 ><P
@@ -692,7 +692,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN344"
+NAME="AEN345"
 ></A
 >2.9. Making samba the domain master</H1
 ><P
@@ -765,7 +765,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN362"
+NAME="AEN363"
 ></A
 >2.10. Note about broadcast addresses</H1
 ><P
@@ -779,7 +779,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN365"
+NAME="AEN366"
 ></A
 >2.11. Multiple interfaces</H1
 ><P
@@ -838,7 +838,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/install.html b/docs/htmldocs/install.html
index 64a23b1a48..22cd3f32c5 100644
--- a/docs/htmldocs/install.html
+++ b/docs/htmldocs/install.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="PREVIOUS"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="NEXT"
 TITLE="Improved browsing in samba"
 HREF="improved-browsing.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN25"
+NAME="AEN26"
 ></A
 >1.1. Read the man pages</H1
 ><P
@@ -122,7 +122,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN35"
+NAME="AEN36"
 ></A
 >1.2. Building the Binaries</H1
 ><P
@@ -221,7 +221,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN63"
+NAME="AEN64"
 ></A
 >1.3. The all important step</H1
 ><P
@@ -238,7 +238,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN67"
+NAME="AEN68"
 ></A
 >1.4. Create the smb configuration file.</H1
 ><P
@@ -294,7 +294,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN81"
+NAME="AEN82"
 ></A
 >1.5. Test your config file with 
 	<B
@@ -324,7 +324,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN89"
+NAME="AEN90"
 ></A
 >1.6. Starting the smbd and nmbd</H1
 ><P
@@ -364,7 +364,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN99"
+NAME="AEN100"
 ></A
 >1.6.1. Starting from inetd.conf</H2
 ><P
@@ -468,7 +468,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN128"
+NAME="AEN129"
 ></A
 >1.6.2. Alternative: starting it as a daemon</H2
 ><P
@@ -525,7 +525,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN144"
+NAME="AEN145"
 ></A
 >1.7. Try listing the shares available on your 
 	server</H1
@@ -566,7 +566,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN153"
+NAME="AEN154"
 ></A
 >1.8. Try connecting with the unix client</H1
 ><P
@@ -629,7 +629,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN169"
+NAME="AEN170"
 ></A
 >1.9. Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</H1
@@ -678,7 +678,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN183"
+NAME="AEN184"
 ></A
 >1.10. What If Things Don't Work?</H1
 ><P
@@ -701,7 +701,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN188"
+NAME="AEN189"
 ></A
 >1.10.1. Diagnosing Problems</H2
 ><P
@@ -718,7 +718,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN192"
+NAME="AEN193"
 ></A
 >1.10.2. Scope IDs</H2
 ><P
@@ -734,7 +734,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN195"
+NAME="AEN196"
 ></A
 >1.10.3. Choosing the Protocol Level</H2
 ><P
@@ -775,7 +775,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN204"
+NAME="AEN205"
 ></A
 >1.10.4. Printing from UNIX to a Client PC</H2
 ><P
@@ -796,7 +796,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN209"
+NAME="AEN210"
 ></A
 >1.10.5. Locking</H2
 ><P
@@ -856,7 +856,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN218"
+NAME="AEN219"
 ></A
 >1.10.6. Mapping Usernames</H2
 ><P
@@ -882,7 +882,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -916,7 +916,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/integrate-ms-networks.html b/docs/htmldocs/integrate-ms-networks.html
index 051364e5b9..a3b51283d0 100644
--- a/docs/htmldocs/integrate-ms-networks.html
+++ b/docs/htmldocs/integrate-ms-networks.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="NEXT"
 TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
 HREF="unix-permissions.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="INTEGRATE-MS-NETWORKS"
 ></A
->Chapter 10. Integrating MS Windows networks with Samba</H1
+>Chapter 11. Integrating MS Windows networks with Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1362"
+NAME="AEN1387"
 ></A
->10.1. Agenda</H1
+>11.1. Agenda</H1
 ><P
 >To identify the key functional mechanisms of MS Windows networking 
 to enable the deployment of Samba as a means of extending and/or 
@@ -147,9 +147,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1384"
+NAME="AEN1409"
 ></A
->10.2. Name Resolution in a pure Unix/Linux world</H1
+>11.2. Name Resolution in a pure Unix/Linux world</H1
 ><P
 >The key configuration files covered in this section are:</P
 ><P
@@ -189,9 +189,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1400"
+NAME="AEN1425"
 ></A
->10.2.1. <TT
+>11.2.1. <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 ></H2
@@ -270,9 +270,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1416"
+NAME="AEN1441"
 ></A
->10.2.2. <TT
+>11.2.2. <TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
 ></H2
@@ -308,9 +308,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1427"
+NAME="AEN1452"
 ></A
->10.2.3. <TT
+>11.2.3. <TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
 ></H2
@@ -337,9 +337,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1435"
+NAME="AEN1460"
 ></A
->10.2.4. <TT
+>11.2.4. <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
 ></H2
@@ -406,9 +406,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1447"
+NAME="AEN1472"
 ></A
->10.3. Name resolution as used within MS Windows networking</H1
+>11.3. Name resolution as used within MS Windows networking</H1
 ><P
 >MS Windows networking is predicated about the name each machine 
 is given. This name is known variously (and inconsistently) as 
@@ -491,9 +491,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1459"
+NAME="AEN1484"
 ></A
->10.3.1. The NetBIOS Name Cache</H2
+>11.3.1. The NetBIOS Name Cache</H2
 ><P
 >All MS Windows machines employ an in memory buffer in which is 
 stored the NetBIOS names and IP addresses for all external 
@@ -518,9 +518,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1464"
+NAME="AEN1489"
 ></A
->10.3.2. The LMHOSTS file</H2
+>11.3.2. The LMHOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 
 2000 in <TT
@@ -621,9 +621,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1472"
+NAME="AEN1497"
 ></A
->10.3.3. HOSTS file</H2
+>11.3.3. HOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 2000 in 
 <TT
@@ -643,9 +643,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1477"
+NAME="AEN1502"
 ></A
->10.3.4. DNS Lookup</H2
+>11.3.4. DNS Lookup</H2
 ><P
 >This capability is configured in the TCP/IP setup area in the network 
 configuration facility. If enabled an elaborate name resolution sequence 
@@ -663,9 +663,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1480"
+NAME="AEN1505"
 ></A
->10.3.5. WINS Lookup</H2
+>11.3.5. WINS Lookup</H2
 ><P
 >A WINS (Windows Internet Name Server) service is the equivaent of the 
 rfc1001/1002 specified NBNS (NetBIOS Name Server). A WINS server stores 
@@ -706,9 +706,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1492"
+NAME="AEN1517"
 ></A
->10.4. How browsing functions and how to deploy stable and 
+>11.4. How browsing functions and how to deploy stable and 
 dependable browsing using Samba</H1
 ><P
 >As stated above, MS Windows machines register their NetBIOS names 
@@ -773,9 +773,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1502"
+NAME="AEN1527"
 ></A
->10.5. MS Windows security options and how to configure 
+>11.5. MS Windows security options and how to configure 
 Samba for seemless integration</H1
 ><P
 >MS Windows clients may use encrypted passwords as part of a 
@@ -910,9 +910,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1530"
+NAME="AEN1555"
 ></A
->10.5.1. Use MS Windows NT as an authentication server</H2
+>11.5.1. Use MS Windows NT as an authentication server</H2
 ><P
 >This method involves the additions of the following parameters 
 in the smb.conf file:</P
@@ -946,9 +946,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1538"
+NAME="AEN1563"
 ></A
->10.5.2. Make Samba a member of an MS Windows NT security domain</H2
+>11.5.2. Make Samba a member of an MS Windows NT security domain</H2
 ><P
 >This method involves additon of the following paramters in the smb.conf file:</P
 ><P
@@ -1009,9 +1009,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1555"
+NAME="AEN1580"
 ></A
->10.5.3. Configure Samba as an authentication server</H2
+>11.5.3. Configure Samba as an authentication server</H2
 ><P
 >This mode of authentication demands that there be on the 
 Unix/Linux system both a Unix style account as well as an 
@@ -1046,9 +1046,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1562"
+NAME="AEN1587"
 ></A
->10.5.3.1. Users</H3
+>11.5.3.1. Users</H3
 ><P
 >A user account that may provide a home directory should be 
 created. The following Linux system commands are typical of 
@@ -1069,9 +1069,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1567"
+NAME="AEN1592"
 ></A
->10.5.3.2. MS Windows NT Machine Accounts</H3
+>11.5.3.2. MS Windows NT Machine Accounts</H3
 ><P
 >These are required only when Samba is used as a domain 
 controller.  Refer to the Samba-PDC-HOWTO for more details.</P
@@ -1090,9 +1090,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1572"
+NAME="AEN1597"
 ></A
->10.6. Conclusions</H1
+>11.6. Conclusions</H1
 ><P
 >Samba provides a flexible means to operate as...</P
 ><P
@@ -1138,7 +1138,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -1172,7 +1172,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/introduction.html b/docs/htmldocs/introduction.html
new file mode 100644
index 0000000000..581687e8ab
--- /dev/null
+++ b/docs/htmldocs/introduction.html
@@ -0,0 +1,438 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>General installation</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+REL="HOME"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="PREVIOUS"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="NEXT"
+TITLE="How to Install and Test SAMBA"
+HREF="install.html"></HEAD
+><BODY
+CLASS="PART"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SAMBA Project Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="install.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="PART"
+><A
+NAME="INTRODUCTION"
+></A
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+>I. General installation</H1
+><DIV
+CLASS="PARTINTRO"
+><A
+NAME="AEN21"
+></A
+><H1
+>Introduction</H1
+><P
+>This part contains general info on how to install samba 
+and how to configure the parts of samba you will most likely need.
+PLEASE read this.</P
+></DIV
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>1. <A
+HREF="install.html"
+>How to Install and Test SAMBA</A
+></DT
+><DD
+><DL
+><DT
+>1.1. <A
+HREF="install.html#AEN26"
+>Read the man pages</A
+></DT
+><DT
+>1.2. <A
+HREF="install.html#AEN36"
+>Building the Binaries</A
+></DT
+><DT
+>1.3. <A
+HREF="install.html#AEN64"
+>The all important step</A
+></DT
+><DT
+>1.4. <A
+HREF="install.html#AEN68"
+>Create the smb configuration file.</A
+></DT
+><DT
+>1.5. <A
+HREF="install.html#AEN82"
+>Test your config file with 
+	<B
+CLASS="COMMAND"
+>testparm</B
+></A
+></DT
+><DT
+>1.6. <A
+HREF="install.html#AEN90"
+>Starting the smbd and nmbd</A
+></DT
+><DD
+><DL
+><DT
+>1.6.1. <A
+HREF="install.html#AEN100"
+>Starting from inetd.conf</A
+></DT
+><DT
+>1.6.2. <A
+HREF="install.html#AEN129"
+>Alternative: starting it as a daemon</A
+></DT
+></DL
+></DD
+><DT
+>1.7. <A
+HREF="install.html#AEN145"
+>Try listing the shares available on your 
+	server</A
+></DT
+><DT
+>1.8. <A
+HREF="install.html#AEN154"
+>Try connecting with the unix client</A
+></DT
+><DT
+>1.9. <A
+HREF="install.html#AEN170"
+>Try connecting from a DOS, WfWg, Win9x, WinNT, 
+	Win2k, OS/2, etc... client</A
+></DT
+><DT
+>1.10. <A
+HREF="install.html#AEN184"
+>What If Things Don't Work?</A
+></DT
+><DD
+><DL
+><DT
+>1.10.1. <A
+HREF="install.html#AEN189"
+>Diagnosing Problems</A
+></DT
+><DT
+>1.10.2. <A
+HREF="install.html#AEN193"
+>Scope IDs</A
+></DT
+><DT
+>1.10.3. <A
+HREF="install.html#AEN196"
+>Choosing the Protocol Level</A
+></DT
+><DT
+>1.10.4. <A
+HREF="install.html#AEN205"
+>Printing from UNIX to a Client PC</A
+></DT
+><DT
+>1.10.5. <A
+HREF="install.html#AEN210"
+>Locking</A
+></DT
+><DT
+>1.10.6. <A
+HREF="install.html#AEN219"
+>Mapping Usernames</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>2. <A
+HREF="improved-browsing.html"
+>Improved browsing in samba</A
+></DT
+><DD
+><DL
+><DT
+>2.1. <A
+HREF="improved-browsing.html#AEN229"
+>Overview of browsing</A
+></DT
+><DT
+>2.2. <A
+HREF="improved-browsing.html#AEN233"
+>Browsing support in samba</A
+></DT
+><DT
+>2.3. <A
+HREF="improved-browsing.html#AEN242"
+>Problem resolution</A
+></DT
+><DT
+>2.4. <A
+HREF="improved-browsing.html#AEN249"
+>Browsing across subnets</A
+></DT
+><DD
+><DL
+><DT
+>2.4.1. <A
+HREF="improved-browsing.html#AEN254"
+>How does cross subnet browsing work ?</A
+></DT
+></DL
+></DD
+><DT
+>2.5. <A
+HREF="improved-browsing.html#AEN289"
+>Setting up a WINS server</A
+></DT
+><DT
+>2.6. <A
+HREF="improved-browsing.html#AEN308"
+>Setting up Browsing in a WORKGROUP</A
+></DT
+><DT
+>2.7. <A
+HREF="improved-browsing.html#AEN326"
+>Setting up Browsing in a DOMAIN</A
+></DT
+><DT
+>2.8. <A
+HREF="improved-browsing.html#AEN336"
+>Forcing samba to be the master</A
+></DT
+><DT
+>2.9. <A
+HREF="improved-browsing.html#AEN345"
+>Making samba the domain master</A
+></DT
+><DT
+>2.10. <A
+HREF="improved-browsing.html#AEN363"
+>Note about broadcast addresses</A
+></DT
+><DT
+>2.11. <A
+HREF="improved-browsing.html#AEN366"
+>Multiple interfaces</A
+></DT
+></DL
+></DD
+><DT
+>3. <A
+HREF="oplocks.html"
+>Oplocks</A
+></DT
+><DD
+><DL
+><DT
+>3.1. <A
+HREF="oplocks.html#AEN378"
+>What are oplocks?</A
+></DT
+></DL
+></DD
+><DT
+>4. <A
+HREF="browsing-quick.html"
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</A
+></DT
+><DD
+><DL
+><DT
+>4.1. <A
+HREF="browsing-quick.html#AEN393"
+>Discussion</A
+></DT
+><DT
+>4.2. <A
+HREF="browsing-quick.html#AEN401"
+>Use of the "Remote Announce" parameter</A
+></DT
+><DT
+>4.3. <A
+HREF="browsing-quick.html#AEN415"
+>Use of the "Remote Browse Sync" parameter</A
+></DT
+><DT
+>4.4. <A
+HREF="browsing-quick.html#AEN420"
+>Use of WINS</A
+></DT
+><DT
+>4.5. <A
+HREF="browsing-quick.html#AEN431"
+>Do NOT use more than one (1) protocol on MS Windows machines</A
+></DT
+><DT
+>4.6. <A
+HREF="browsing-quick.html#AEN437"
+>Name Resolution Order</A
+></DT
+></DL
+></DD
+><DT
+>5. <A
+HREF="pwencrypt.html"
+>LanMan and NT Password Encryption in Samba</A
+></DT
+><DD
+><DL
+><DT
+>5.1. <A
+HREF="pwencrypt.html#AEN473"
+>Introduction</A
+></DT
+><DT
+>5.2. <A
+HREF="pwencrypt.html#AEN478"
+>Important Notes About Security</A
+></DT
+><DD
+><DL
+><DT
+>5.2.1. <A
+HREF="pwencrypt.html#AEN497"
+>Advantages of SMB Encryption</A
+></DT
+><DT
+>5.2.2. <A
+HREF="pwencrypt.html#AEN504"
+>Advantages of non-encrypted passwords</A
+></DT
+></DL
+></DD
+><DT
+>5.3. <A
+HREF="pwencrypt.html#AEN513"
+>The smbpasswd Command</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="install.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>SAMBA Project Documentation</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>How to Install and Test SAMBA</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/msdfs.html b/docs/htmldocs/msdfs.html
index 95902f7217..832187d19f 100644
--- a/docs/htmldocs/msdfs.html
+++ b/docs/htmldocs/msdfs.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Configuring PAM for distributed but centrally 
 managed authentication"
@@ -75,15 +75,15 @@ CLASS="CHAPTER"
 ><A
 NAME="MSDFS"
 ></A
->Chapter 13. Hosting a Microsoft Distributed File System tree on Samba</H1
+>Chapter 14. Hosting a Microsoft Distributed File System tree on Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1847"
+NAME="AEN1872"
 ></A
->13.1. Instructions</H1
+>14.1. Instructions</H1
 ><P
 >The Distributed File System (or Dfs) provides a means of 
 	separating the logical view of files and directories that users 
@@ -229,9 +229,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1882"
+NAME="AEN1907"
 ></A
->13.1.1. Notes</H2
+>14.1.1. Notes</H2
 ><P
 ></P
 ><UL
@@ -309,7 +309,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/oplocks.html b/docs/htmldocs/oplocks.html
index c926f32c14..6aa91fb17f 100644
--- a/docs/htmldocs/oplocks.html
+++ b/docs/htmldocs/oplocks.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="PREVIOUS"
 TITLE="Improved browsing in samba"
 HREF="improved-browsing.html"><LINK
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN377"
+NAME="AEN378"
 ></A
 >3.1. What are oplocks?</H1
 ><P
@@ -191,7 +191,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/optional.html b/docs/htmldocs/optional.html
new file mode 100644
index 0000000000..da152ea1ca
--- /dev/null
+++ b/docs/htmldocs/optional.html
@@ -0,0 +1,955 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Optional configuration</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+REL="HOME"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="PREVIOUS"
+TITLE="Samba as a NT4 domain member"
+HREF="domain-security.html"><LINK
+REL="NEXT"
+TITLE="Integrating MS Windows networks with Samba"
+HREF="integrate-ms-networks.html"></HEAD
+><BODY
+CLASS="PART"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SAMBA Project Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="domain-security.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="integrate-ms-networks.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="PART"
+><A
+NAME="OPTIONAL"
+></A
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+>III. Optional configuration</H1
+><DIV
+CLASS="PARTINTRO"
+><A
+NAME="AEN1373"
+></A
+><H1
+>Introduction</H1
+><P
+>Samba has several features that you might want or might not want to use. The chapters in this 
+part each cover one specific feature.</P
+></DIV
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>11. <A
+HREF="integrate-ms-networks.html"
+>Integrating MS Windows networks with Samba</A
+></DT
+><DD
+><DL
+><DT
+>11.1. <A
+HREF="integrate-ms-networks.html#AEN1387"
+>Agenda</A
+></DT
+><DT
+>11.2. <A
+HREF="integrate-ms-networks.html#AEN1409"
+>Name Resolution in a pure Unix/Linux world</A
+></DT
+><DD
+><DL
+><DT
+>11.2.1. <A
+HREF="integrate-ms-networks.html#AEN1425"
+><TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+></A
+></DT
+><DT
+>11.2.2. <A
+HREF="integrate-ms-networks.html#AEN1441"
+><TT
+CLASS="FILENAME"
+>/etc/resolv.conf</TT
+></A
+></DT
+><DT
+>11.2.3. <A
+HREF="integrate-ms-networks.html#AEN1452"
+><TT
+CLASS="FILENAME"
+>/etc/host.conf</TT
+></A
+></DT
+><DT
+>11.2.4. <A
+HREF="integrate-ms-networks.html#AEN1460"
+><TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf</TT
+></A
+></DT
+></DL
+></DD
+><DT
+>11.3. <A
+HREF="integrate-ms-networks.html#AEN1472"
+>Name resolution as used within MS Windows networking</A
+></DT
+><DD
+><DL
+><DT
+>11.3.1. <A
+HREF="integrate-ms-networks.html#AEN1484"
+>The NetBIOS Name Cache</A
+></DT
+><DT
+>11.3.2. <A
+HREF="integrate-ms-networks.html#AEN1489"
+>The LMHOSTS file</A
+></DT
+><DT
+>11.3.3. <A
+HREF="integrate-ms-networks.html#AEN1497"
+>HOSTS file</A
+></DT
+><DT
+>11.3.4. <A
+HREF="integrate-ms-networks.html#AEN1502"
+>DNS Lookup</A
+></DT
+><DT
+>11.3.5. <A
+HREF="integrate-ms-networks.html#AEN1505"
+>WINS Lookup</A
+></DT
+></DL
+></DD
+><DT
+>11.4. <A
+HREF="integrate-ms-networks.html#AEN1517"
+>How browsing functions and how to deploy stable and 
+dependable browsing using Samba</A
+></DT
+><DT
+>11.5. <A
+HREF="integrate-ms-networks.html#AEN1527"
+>MS Windows security options and how to configure 
+Samba for seemless integration</A
+></DT
+><DD
+><DL
+><DT
+>11.5.1. <A
+HREF="integrate-ms-networks.html#AEN1555"
+>Use MS Windows NT as an authentication server</A
+></DT
+><DT
+>11.5.2. <A
+HREF="integrate-ms-networks.html#AEN1563"
+>Make Samba a member of an MS Windows NT security domain</A
+></DT
+><DT
+>11.5.3. <A
+HREF="integrate-ms-networks.html#AEN1580"
+>Configure Samba as an authentication server</A
+></DT
+></DL
+></DD
+><DT
+>11.6. <A
+HREF="integrate-ms-networks.html#AEN1597"
+>Conclusions</A
+></DT
+></DL
+></DD
+><DT
+>12. <A
+HREF="unix-permissions.html"
+>UNIX Permission Bits and Windows NT Access Control Lists</A
+></DT
+><DD
+><DL
+><DT
+>12.1. <A
+HREF="unix-permissions.html#AEN1618"
+>Viewing and changing UNIX permissions using the NT 
+	security dialogs</A
+></DT
+><DT
+>12.2. <A
+HREF="unix-permissions.html#AEN1627"
+>How to view file security on a Samba share</A
+></DT
+><DT
+>12.3. <A
+HREF="unix-permissions.html#AEN1638"
+>Viewing file ownership</A
+></DT
+><DT
+>12.4. <A
+HREF="unix-permissions.html#AEN1658"
+>Viewing file or directory permissions</A
+></DT
+><DD
+><DL
+><DT
+>12.4.1. <A
+HREF="unix-permissions.html#AEN1673"
+>File Permissions</A
+></DT
+><DT
+>12.4.2. <A
+HREF="unix-permissions.html#AEN1687"
+>Directory Permissions</A
+></DT
+></DL
+></DD
+><DT
+>12.5. <A
+HREF="unix-permissions.html#AEN1694"
+>Modifying file or directory permissions</A
+></DT
+><DT
+>12.6. <A
+HREF="unix-permissions.html#AEN1716"
+>Interaction with the standard Samba create mask 
+	parameters</A
+></DT
+><DT
+>12.7. <A
+HREF="unix-permissions.html#AEN1780"
+>Interaction with the standard Samba file attribute 
+	mapping</A
+></DT
+></DL
+></DD
+><DT
+>13. <A
+HREF="pam.html"
+>Configuring PAM for distributed but centrally 
+managed authentication</A
+></DT
+><DD
+><DL
+><DT
+>13.1. <A
+HREF="pam.html#AEN1801"
+>Samba and PAM</A
+></DT
+><DT
+>13.2. <A
+HREF="pam.html#AEN1845"
+>Distributed Authentication</A
+></DT
+><DT
+>13.3. <A
+HREF="pam.html#AEN1852"
+>PAM Configuration in smb.conf</A
+></DT
+></DL
+></DD
+><DT
+>14. <A
+HREF="msdfs.html"
+>Hosting a Microsoft Distributed File System tree on Samba</A
+></DT
+><DD
+><DL
+><DT
+>14.1. <A
+HREF="msdfs.html#AEN1872"
+>Instructions</A
+></DT
+><DD
+><DL
+><DT
+>14.1.1. <A
+HREF="msdfs.html#AEN1907"
+>Notes</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>15. <A
+HREF="printing.html"
+>Printing Support</A
+></DT
+><DD
+><DL
+><DT
+>15.1. <A
+HREF="printing.html#AEN1933"
+>Introduction</A
+></DT
+><DT
+>15.2. <A
+HREF="printing.html#AEN1955"
+>Configuration</A
+></DT
+><DD
+><DL
+><DT
+>15.2.1. <A
+HREF="printing.html#AEN1963"
+>Creating [print$]</A
+></DT
+><DT
+>15.2.2. <A
+HREF="printing.html#AEN1998"
+>Setting Drivers for Existing Printers</A
+></DT
+><DT
+>15.2.3. <A
+HREF="printing.html#AEN2014"
+>Support a large number of printers</A
+></DT
+><DT
+>15.2.4. <A
+HREF="printing.html#AEN2025"
+>Adding New Printers via the Windows NT APW</A
+></DT
+><DT
+>15.2.5. <A
+HREF="printing.html#AEN2055"
+>Samba and Printer Ports</A
+></DT
+></DL
+></DD
+><DT
+>15.3. <A
+HREF="printing.html#AEN2063"
+>The Imprints Toolset</A
+></DT
+><DD
+><DL
+><DT
+>15.3.1. <A
+HREF="printing.html#AEN2067"
+>What is Imprints?</A
+></DT
+><DT
+>15.3.2. <A
+HREF="printing.html#AEN2077"
+>Creating Printer Driver Packages</A
+></DT
+><DT
+>15.3.3. <A
+HREF="printing.html#AEN2080"
+>The Imprints server</A
+></DT
+><DT
+>15.3.4. <A
+HREF="printing.html#AEN2084"
+>The Installation Client</A
+></DT
+></DL
+></DD
+><DT
+>15.4. <A
+HREF="printing.html#AEN2106"
+>Diagnosis</A
+></DT
+><DD
+><DL
+><DT
+>15.4.1. <A
+HREF="printing.html#AEN2108"
+>Introduction</A
+></DT
+><DT
+>15.4.2. <A
+HREF="printing.html#AEN2124"
+>Debugging printer problems</A
+></DT
+><DT
+>15.4.3. <A
+HREF="printing.html#AEN2133"
+>What printers do I have?</A
+></DT
+><DT
+>15.4.4. <A
+HREF="printing.html#AEN2141"
+>Setting up printcap and print servers</A
+></DT
+><DT
+>15.4.5. <A
+HREF="printing.html#AEN2169"
+>Job sent, no output</A
+></DT
+><DT
+>15.4.6. <A
+HREF="printing.html#AEN2180"
+>Job sent, strange output</A
+></DT
+><DT
+>15.4.7. <A
+HREF="printing.html#AEN2192"
+>Raw PostScript printed</A
+></DT
+><DT
+>15.4.8. <A
+HREF="printing.html#AEN2195"
+>Advanced Printing</A
+></DT
+><DT
+>15.4.9. <A
+HREF="printing.html#AEN2198"
+>Real debugging</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>16. <A
+HREF="winbind.html"
+>Unified Logons between Windows NT and UNIX using Winbind</A
+></DT
+><DD
+><DL
+><DT
+>16.1. <A
+HREF="winbind.html#AEN2238"
+>Abstract</A
+></DT
+><DT
+>16.2. <A
+HREF="winbind.html#AEN2242"
+>Introduction</A
+></DT
+><DT
+>16.3. <A
+HREF="winbind.html#AEN2255"
+>What Winbind Provides</A
+></DT
+><DD
+><DL
+><DT
+>16.3.1. <A
+HREF="winbind.html#AEN2262"
+>Target Uses</A
+></DT
+></DL
+></DD
+><DT
+>16.4. <A
+HREF="winbind.html#AEN2266"
+>How Winbind Works</A
+></DT
+><DD
+><DL
+><DT
+>16.4.1. <A
+HREF="winbind.html#AEN2271"
+>Microsoft Remote Procedure Calls</A
+></DT
+><DT
+>16.4.2. <A
+HREF="winbind.html#AEN2275"
+>Name Service Switch</A
+></DT
+><DT
+>16.4.3. <A
+HREF="winbind.html#AEN2291"
+>Pluggable Authentication Modules</A
+></DT
+><DT
+>16.4.4. <A
+HREF="winbind.html#AEN2299"
+>User and Group ID Allocation</A
+></DT
+><DT
+>16.4.5. <A
+HREF="winbind.html#AEN2303"
+>Result Caching</A
+></DT
+></DL
+></DD
+><DT
+>16.5. <A
+HREF="winbind.html#AEN2306"
+>Installation and Configuration</A
+></DT
+><DD
+><DL
+><DT
+>16.5.1. <A
+HREF="winbind.html#AEN2313"
+>Introduction</A
+></DT
+><DT
+>16.5.2. <A
+HREF="winbind.html#AEN2326"
+>Requirements</A
+></DT
+><DT
+>16.5.3. <A
+HREF="winbind.html#AEN2340"
+>Testing Things Out</A
+></DT
+></DL
+></DD
+><DT
+>16.6. <A
+HREF="winbind.html#AEN2555"
+>Limitations</A
+></DT
+><DT
+>16.7. <A
+HREF="winbind.html#AEN2565"
+>Conclusion</A
+></DT
+></DL
+></DD
+><DT
+>17. <A
+HREF="pdb-mysql.html"
+>Passdb MySQL plugin</A
+></DT
+><DD
+><DL
+><DT
+>17.1. <A
+HREF="pdb-mysql.html#AEN2579"
+>Building</A
+></DT
+><DT
+>17.2. <A
+HREF="pdb-mysql.html#AEN2585"
+>Configuring</A
+></DT
+><DT
+>17.3. <A
+HREF="pdb-mysql.html#AEN2600"
+>Using plaintext passwords or encrypted password</A
+></DT
+><DT
+>17.4. <A
+HREF="pdb-mysql.html#AEN2605"
+>Getting non-column data from the table</A
+></DT
+></DL
+></DD
+><DT
+>18. <A
+HREF="pdb-xml.html"
+>Passdb XML plugin</A
+></DT
+><DD
+><DL
+><DT
+>18.1. <A
+HREF="pdb-xml.html#AEN2624"
+>Building</A
+></DT
+><DT
+>18.2. <A
+HREF="pdb-xml.html#AEN2630"
+>Usage</A
+></DT
+></DL
+></DD
+><DT
+>19. <A
+HREF="vfs.html"
+>Stackable VFS modules</A
+></DT
+><DD
+><DL
+><DT
+>19.1. <A
+HREF="vfs.html#AEN2651"
+>Introduction and configuration</A
+></DT
+><DT
+>19.2. <A
+HREF="vfs.html#AEN2659"
+>Included modules</A
+></DT
+><DD
+><DL
+><DT
+>19.2.1. <A
+HREF="vfs.html#AEN2661"
+>audit</A
+></DT
+><DT
+>19.2.2. <A
+HREF="vfs.html#AEN2669"
+>recycle</A
+></DT
+><DT
+>19.2.3. <A
+HREF="vfs.html#AEN2706"
+>netatalk</A
+></DT
+></DL
+></DD
+><DT
+>19.3. <A
+HREF="vfs.html#AEN2713"
+>VFS modules available elsewhere</A
+></DT
+><DD
+><DL
+><DT
+>19.3.1. <A
+HREF="vfs.html#AEN2717"
+>DatabaseFS</A
+></DT
+><DT
+>19.3.2. <A
+HREF="vfs.html#AEN2725"
+>vscan</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>20. <A
+HREF="samba-ldap-howto.html"
+>Storing Samba's User/Machine Account information in an LDAP Directory</A
+></DT
+><DD
+><DL
+><DT
+>20.1. <A
+HREF="samba-ldap-howto.html#AEN2747"
+>Purpose</A
+></DT
+><DT
+>20.2. <A
+HREF="samba-ldap-howto.html#AEN2767"
+>Introduction</A
+></DT
+><DT
+>20.3. <A
+HREF="samba-ldap-howto.html#AEN2796"
+>Supported LDAP Servers</A
+></DT
+><DT
+>20.4. <A
+HREF="samba-ldap-howto.html#AEN2801"
+>Schema and Relationship to the RFC 2307 posixAccount</A
+></DT
+><DT
+>20.5. <A
+HREF="samba-ldap-howto.html#AEN2813"
+>Configuring Samba with LDAP</A
+></DT
+><DD
+><DL
+><DT
+>20.5.1. <A
+HREF="samba-ldap-howto.html#AEN2815"
+>OpenLDAP configuration</A
+></DT
+><DT
+>20.5.2. <A
+HREF="samba-ldap-howto.html#AEN2832"
+>Configuring Samba</A
+></DT
+></DL
+></DD
+><DT
+>20.6. <A
+HREF="samba-ldap-howto.html#AEN2860"
+>Accounts and Groups management</A
+></DT
+><DT
+>20.7. <A
+HREF="samba-ldap-howto.html#AEN2865"
+>Security and sambaAccount</A
+></DT
+><DT
+>20.8. <A
+HREF="samba-ldap-howto.html#AEN2885"
+>LDAP specials attributes for sambaAccounts</A
+></DT
+><DT
+>20.9. <A
+HREF="samba-ldap-howto.html#AEN2955"
+>Example LDIF Entries for a sambaAccount</A
+></DT
+><DT
+>20.10. <A
+HREF="samba-ldap-howto.html#AEN2963"
+>Comments</A
+></DT
+></DL
+></DD
+><DT
+>21. <A
+HREF="cvs-access.html"
+>HOWTO Access Samba source code via CVS</A
+></DT
+><DD
+><DL
+><DT
+>21.1. <A
+HREF="cvs-access.html#AEN2974"
+>Introduction</A
+></DT
+><DT
+>21.2. <A
+HREF="cvs-access.html#AEN2979"
+>CVS Access to samba.org</A
+></DT
+><DD
+><DL
+><DT
+>21.2.1. <A
+HREF="cvs-access.html#AEN2982"
+>Access via CVSweb</A
+></DT
+><DT
+>21.2.2. <A
+HREF="cvs-access.html#AEN2987"
+>Access via cvs</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>22. <A
+HREF="groupmapping.html"
+>Group mapping HOWTO</A
+></DT
+><DT
+>23. <A
+HREF="speed.html"
+>Samba performance issues</A
+></DT
+><DD
+><DL
+><DT
+>23.1. <A
+HREF="speed.html#AEN3065"
+>Comparisons</A
+></DT
+><DT
+>23.2. <A
+HREF="speed.html#AEN3071"
+>Oplocks</A
+></DT
+><DD
+><DL
+><DT
+>23.2.1. <A
+HREF="speed.html#AEN3073"
+>Overview</A
+></DT
+><DT
+>23.2.2. <A
+HREF="speed.html#AEN3081"
+>Level2 Oplocks</A
+></DT
+><DT
+>23.2.3. <A
+HREF="speed.html#AEN3087"
+>Old 'fake oplocks' option - deprecated</A
+></DT
+></DL
+></DD
+><DT
+>23.3. <A
+HREF="speed.html#AEN3091"
+>Socket options</A
+></DT
+><DT
+>23.4. <A
+HREF="speed.html#AEN3098"
+>Read size</A
+></DT
+><DT
+>23.5. <A
+HREF="speed.html#AEN3103"
+>Max xmit</A
+></DT
+><DT
+>23.6. <A
+HREF="speed.html#AEN3108"
+>Locking</A
+></DT
+><DT
+>23.7. <A
+HREF="speed.html#AEN3112"
+>Share modes</A
+></DT
+><DT
+>23.8. <A
+HREF="speed.html#AEN3117"
+>Log level</A
+></DT
+><DT
+>23.9. <A
+HREF="speed.html#AEN3120"
+>Wide lines</A
+></DT
+><DT
+>23.10. <A
+HREF="speed.html#AEN3123"
+>Read raw</A
+></DT
+><DT
+>23.11. <A
+HREF="speed.html#AEN3128"
+>Write raw</A
+></DT
+><DT
+>23.12. <A
+HREF="speed.html#AEN3132"
+>Read prediction</A
+></DT
+><DT
+>23.13. <A
+HREF="speed.html#AEN3139"
+>Memory mapping</A
+></DT
+><DT
+>23.14. <A
+HREF="speed.html#AEN3144"
+>Slow Clients</A
+></DT
+><DT
+>23.15. <A
+HREF="speed.html#AEN3148"
+>Slow Logins</A
+></DT
+><DT
+>23.16. <A
+HREF="speed.html#AEN3151"
+>Client tuning</A
+></DT
+><DT
+>23.17. <A
+HREF="speed.html#AEN3183"
+>My Results</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="domain-security.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="integrate-ms-networks.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Samba as a NT4 domain member</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Integrating MS Windows networks with Samba</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/other-clients.html b/docs/htmldocs/other-clients.html
index 38dfc04a64..892509a591 100644
--- a/docs/htmldocs/other-clients.html
+++ b/docs/htmldocs/other-clients.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Appendixes"
-HREF="p3106.html"><LINK
+HREF="appendixes.html"><LINK
 REL="PREVIOUS"
 TITLE="Portability"
 HREF="portability.html"><LINK
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="OTHER-CLIENTS"
 ></A
->Chapter 24. Samba and other CIFS clients</H1
+>Chapter 25. Samba and other CIFS clients</H1
 ><P
 >This chapter contains client-specific information.</P
 ><DIV
@@ -82,9 +82,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3175"
+NAME="AEN3258"
 ></A
->24.1. Macintosh clients?</H1
+>25.1. Macintosh clients?</H1
 ><P
 >Yes. <A
 HREF="http://www.thursby.com/"
@@ -128,17 +128,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3184"
+NAME="AEN3267"
 ></A
->24.2. OS2 Client</H1
+>25.2. OS2 Client</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3186"
+NAME="AEN3269"
 ></A
->24.2.1. How can I configure OS/2 Warp Connect or 
+>25.2.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</H2
 ><P
 >A more complete answer to this question can be 
@@ -195,9 +195,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3201"
+NAME="AEN3284"
 ></A
->24.2.2. How can I configure OS/2 Warp 3 (not Connect), 
+>25.2.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</H2
 ><P
 >You can use the free Microsoft LAN Manager 2.2c Client 
@@ -239,9 +239,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3210"
+NAME="AEN3293"
 ></A
->24.2.3. Are there any other issues when OS/2 (any version) 
+>25.2.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</H2
 ><P
 >When you do a NET VIEW or use the "File and Print 
@@ -261,9 +261,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3214"
+NAME="AEN3297"
 ></A
->24.2.4. How do I get printer driver download working 
+>25.2.4. How do I get printer driver download working 
 		for OS/2 clients?</H2
 ><P
 >First, create a share called [PRINTDRV] that is 
@@ -312,17 +312,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3224"
+NAME="AEN3307"
 ></A
->24.3. Windows for Workgroups</H1
+>25.3. Windows for Workgroups</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3226"
+NAME="AEN3309"
 ></A
->24.3.1. Use latest TCP/IP stack from Microsoft</H2
+>25.3.1. Use latest TCP/IP stack from Microsoft</H2
 ><P
 >Use the latest TCP/IP stack from microsoft if you use Windows
 for workgroups.</P
@@ -342,9 +342,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3231"
+NAME="AEN3314"
 ></A
->24.3.2. Delete .pwl files after password change</H2
+>25.3.2. Delete .pwl files after password change</H2
 ><P
 >WfWg does a lousy job with passwords. I find that if I change my
 password on either the unix box or the PC the safest thing to do is to
@@ -362,9 +362,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3236"
+NAME="AEN3319"
 ></A
->24.3.3. Configure WfW password handling</H2
+>25.3.3. Configure WfW password handling</H2
 ><P
 >There is a program call admincfg.exe
 on the last disk (disk 8) of the WFW 3.11 disk set.  To install it
@@ -381,9 +381,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3240"
+NAME="AEN3323"
 ></A
->24.3.4. Case handling of passwords</H2
+>25.3.4. Case handling of passwords</H2
 ><P
 >Windows for Workgroups uppercases the password before sending it to the server. Unix passwords can be case-sensitive though. Check the <A
 HREF="smb.conf.5.html"
@@ -400,9 +400,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3245"
+NAME="AEN3328"
 ></A
->24.4. Windows '95/'98</H1
+>25.4. Windows '95/'98</H1
 ><P
 >When using Windows 95 OEM SR2 the following updates are recommended where Samba
 is being used. Please NOTE that the above change will affect you once these
@@ -448,9 +448,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3261"
+NAME="AEN3344"
 ></A
->24.5. Windows 2000 Service Pack 2</H1
+>25.5. Windows 2000 Service Pack 2</H1
 ><P
 > 
 There are several annoyances with Windows 2000 SP2. One of which
@@ -576,7 +576,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/pam.html b/docs/htmldocs/pam.html
index a641aae87a..30b49b6944 100644
--- a/docs/htmldocs/pam.html
+++ b/docs/htmldocs/pam.html
@@ -12,7 +12,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
 HREF="unix-permissions.html"><LINK
@@ -75,16 +75,16 @@ CLASS="CHAPTER"
 ><A
 NAME="PAM"
 ></A
->Chapter 12. Configuring PAM for distributed but centrally 
+>Chapter 13. Configuring PAM for distributed but centrally 
 managed authentication</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1776"
+NAME="AEN1801"
 ></A
->12.1. Samba and PAM</H1
+>13.1. Samba and PAM</H1
 ><P
 >A number of Unix systems (eg: Sun Solaris), as well as the 
 xxxxBSD family and Linux, now utilize the Pluggable Authentication 
@@ -296,9 +296,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1820"
+NAME="AEN1845"
 ></A
->12.2. Distributed Authentication</H1
+>13.2. Distributed Authentication</H1
 ><P
 >The astute administrator will realize from this that the 
 combination of <TT
@@ -329,9 +329,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1827"
+NAME="AEN1852"
 ></A
->12.3. PAM Configuration in smb.conf</H1
+>13.3. PAM Configuration in smb.conf</H1
 ><P
 >There is an option in smb.conf called <A
 HREF="smb.conf.5.html#OBEYPAMRESTRICTIONS"
@@ -415,7 +415,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/pdb-mysql.html b/docs/htmldocs/pdb-mysql.html
index 33ccd322a3..fc5dff85f5 100644
--- a/docs/htmldocs/pdb-mysql.html
+++ b/docs/htmldocs/pdb-mysql.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Unified Logons between Windows NT and UNIX using Winbind"
 HREF="winbind.html"><LINK
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2590"
+NAME="AEN2579"
 ></A
 >17.1. Building</H1
 ><P
@@ -101,7 +101,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2596"
+NAME="AEN2585"
 ></A
 >17.2. Configuring</H1
 ><P
@@ -164,7 +164,7 @@ identifier:user sid column               - varchar(255) - NT user SID
 identifier:group sid column              - varchar(255) - NT group ID
 identifier:lanman pass column            - varchar(255) - encrypted lanman password
 identifier:nt pass column                - varchar(255) - encrypted nt passwd
-identifier:plaintext pass column         - varchar(255) - plaintext password
+identifier:plain pass column             - varchar(255) - plaintext password
 identifier:acct control column           - int(9) - nt user data
 identifier:unknown 3 column              - int(9) - unknown
 identifier:logon divs column             - int(9) - ?
@@ -183,22 +183,22 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2611"
+NAME="AEN2600"
 ></A
 >17.3. Using plaintext passwords or encrypted password</H1
 ><P
 >I strongly discourage the use of plaintext passwords, however, you can use them:</P
 ><P
->If you would like to use plaintext passwords, set 'identifier:lanman pass column' and 'identifier:nt pass column' to 'NULL' (without the quotes) and 'identifier:plaintext pass column' to the name of the column containing the plaintext passwords. </P
+>If you would like to use plaintext passwords, set 'identifier:lanman pass column' and 'identifier:nt pass column' to 'NULL' (without the quotes) and 'identifier:plain pass column' to the name of the column containing the plaintext passwords. </P
 ><P
->If you use encrypted passwords, set the 'identifier:plaintext pass column' to 'NULL' (without the quotes). This is the default.</P
+>If you use encrypted passwords, set the 'identifier:plain pass column' to 'NULL' (without the quotes). This is the default.</P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2616"
+NAME="AEN2605"
 ></A
 >17.4. Getting non-column data from the table</H1
 ><P
@@ -269,7 +269,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/pdb-xml.html b/docs/htmldocs/pdb-xml.html
index 75abfc5a81..221e51d5b7 100644
--- a/docs/htmldocs/pdb-xml.html
+++ b/docs/htmldocs/pdb-xml.html
@@ -11,13 +11,13 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Passdb MySQL plugin"
 HREF="pdb-mysql.html"><LINK
 REL="NEXT"
-TITLE="Storing Samba's User/Machine Account information in an LDAP Directory"
-HREF="samba-ldap-howto.html"></HEAD
+TITLE="Stackable VFS modules"
+HREF="vfs.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="samba-ldap-howto.html"
+HREF="vfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2635"
+NAME="AEN2624"
 ></A
 >18.1. Building</H1
 ><P
@@ -100,7 +100,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2641"
+NAME="AEN2630"
 ></A
 >18.2. Usage</H1
 ><P
@@ -156,7 +156,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="samba-ldap-howto.html"
+HREF="vfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -172,7 +172,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -180,7 +180,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Storing Samba's User/Machine Account information in an LDAP Directory</TD
+>Stackable VFS modules</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/portability.html b/docs/htmldocs/portability.html
index 09136b3961..25c24a3a2c 100644
--- a/docs/htmldocs/portability.html
+++ b/docs/htmldocs/portability.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Appendixes"
-HREF="p3106.html"><LINK
+HREF="appendixes.html"><LINK
 REL="PREVIOUS"
 TITLE="Appendixes"
-HREF="p3106.html"><LINK
+HREF="appendixes.html"><LINK
 REL="NEXT"
 TITLE="Samba and other CIFS clients"
 HREF="other-clients.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="PORTABILITY"
 ></A
->Chapter 23. Portability</H1
+>Chapter 24. Portability</H1
 ><P
 >Samba works on a wide range of platforms but the interface all the 
 platforms provide is not always compatible. This chapter contains 
@@ -84,9 +84,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3115"
+NAME="AEN3198"
 ></A
->23.1. HPUX</H1
+>24.1. HPUX</H1
 ><P
 >HP's implementation of supplementary groups is, er, non-standard (for
 hysterical reasons).  There are two group files, /etc/group and
@@ -114,9 +114,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3121"
+NAME="AEN3204"
 ></A
->23.2. SCO Unix</H1
+>24.2. SCO Unix</H1
 ><P
 > 
 If you run an old version of  SCO Unix then you may need to get important 
@@ -131,9 +131,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3125"
+NAME="AEN3208"
 ></A
->23.3. DNIX</H1
+>24.3. DNIX</H1
 ><P
 >DNIX has a problem with seteuid() and setegid(). These routines are
 needed for Samba to work correctly, but they were left out of the DNIX
@@ -238,9 +238,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3154"
+NAME="AEN3237"
 ></A
->23.4. RedHat Linux Rembrandt-II</H1
+>24.4. RedHat Linux Rembrandt-II</H1
 ><P
 >By default RedHat Rembrandt-II during installation adds an
 entry to /etc/hosts as follows:
@@ -274,7 +274,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -308,7 +308,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/printing.html b/docs/htmldocs/printing.html
index 5f054e1fda..b2b893afec 100644
--- a/docs/htmldocs/printing.html
+++ b/docs/htmldocs/printing.html
@@ -11,13 +11,13 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Hosting a Microsoft Distributed File System tree on Samba"
 HREF="msdfs.html"><LINK
 REL="NEXT"
-TITLE="Security levels"
-HREF="securitylevels.html"></HEAD
+TITLE="Unified Logons between Windows NT and UNIX using Winbind"
+HREF="winbind.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="securitylevels.html"
+HREF="winbind.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="PRINTING"
 ></A
->Chapter 14. Printing Support</H1
+>Chapter 15. Printing Support</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1908"
+NAME="AEN1933"
 ></A
->14.1. Introduction</H1
+>15.1. Introduction</H1
 ><P
 >Beginning with the 2.2.0 release, Samba supports 
 the native Windows NT printing mechanisms implemented via 
@@ -163,9 +163,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1930"
+NAME="AEN1955"
 ></A
->14.2. Configuration</H1
+>15.2. Configuration</H1
 ><DIV
 CLASS="WARNING"
 ><P
@@ -229,9 +229,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1938"
+NAME="AEN1963"
 ></A
->14.2.1. Creating [print$]</H2
+>15.2.1. Creating [print$]</H2
 ><P
 >In order to support the uploading of printer driver 
 files, you must first configure a file share named [print$].  
@@ -452,9 +452,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1973"
+NAME="AEN1998"
 ></A
->14.2.2. Setting Drivers for Existing Printers</H2
+>15.2.2. Setting Drivers for Existing Printers</H2
 ><P
 >The initial listing of printers in the Samba host's 
 Printers folder will have no real printer driver assigned 
@@ -524,9 +524,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1989"
+NAME="AEN2014"
 ></A
->14.2.3. Support a large number of printers</H2
+>15.2.3. Support a large number of printers</H2
 ><P
 >One issue that has arisen during the development
 phase of Samba 2.2 is the need to support driver downloads for
@@ -590,9 +590,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2000"
+NAME="AEN2025"
 ></A
->14.2.4. Adding New Printers via the Windows NT APW</H2
+>15.2.4. Adding New Printers via the Windows NT APW</H2
 ><P
 >By default, Samba offers all printer shares defined in <TT
 CLASS="FILENAME"
@@ -759,9 +759,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2030"
+NAME="AEN2055"
 ></A
->14.2.5. Samba and Printer Ports</H2
+>15.2.5. Samba and Printer Ports</H2
 ><P
 >Windows NT/2000 print servers associate a port with each printer.  These normally
 take the form of LPT1:, COM1:, FILE:, etc...  Samba must also support the
@@ -796,9 +796,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2038"
+NAME="AEN2063"
 ></A
->14.3. The Imprints Toolset</H1
+>15.3. The Imprints Toolset</H1
 ><P
 >The Imprints tool set provides a UNIX equivalent of the 
 	Windows NT Add Printer Wizard.  For complete information, please 
@@ -814,9 +814,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2042"
+NAME="AEN2067"
 ></A
->14.3.1. What is Imprints?</H2
+>15.3.1. What is Imprints?</H2
 ><P
 >Imprints is a collection of tools for supporting the goals 
 		of</P
@@ -846,9 +846,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2052"
+NAME="AEN2077"
 ></A
->14.3.2. Creating Printer Driver Packages</H2
+>15.3.2. Creating Printer Driver Packages</H2
 ><P
 >The process of creating printer driver packages is beyond
 		the scope of this document (refer to Imprints.txt also included
@@ -862,9 +862,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2055"
+NAME="AEN2080"
 ></A
->14.3.3. The Imprints server</H2
+>15.3.3. The Imprints server</H2
 ><P
 >The Imprints server is really a database server that 
 		may be queried via standard HTTP mechanisms.  Each printer 
@@ -886,9 +886,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2059"
+NAME="AEN2084"
 ></A
->14.3.4. The Installation Client</H2
+>15.3.4. The Installation Client</H2
 ><P
 >More information regarding the Imprints installation client 
 		is available in the <TT
@@ -980,17 +980,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2081"
+NAME="AEN2106"
 ></A
->14.4. Diagnosis</H1
+>15.4. Diagnosis</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2083"
+NAME="AEN2108"
 ></A
->14.4.1. Introduction</H2
+>15.4.1. Introduction</H2
 ><P
 >This is a short description of how to debug printing problems with
 Samba. This describes how to debug problems with printing from a SMB
@@ -1063,9 +1063,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2099"
+NAME="AEN2124"
 ></A
->14.4.2. Debugging printer problems</H2
+>15.4.2. Debugging printer problems</H2
 ><P
 >One way to debug printing problems is to start by replacing these
 command with shell scripts that record the arguments and the contents
@@ -1120,9 +1120,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2108"
+NAME="AEN2133"
 ></A
->14.4.3. What printers do I have?</H2
+>15.4.3. What printers do I have?</H2
 ><P
 >You can use the 'testprns' program to check to see if the printer
 name you are using is recognized by Samba.  For example,  you can
@@ -1149,9 +1149,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2116"
+NAME="AEN2141"
 ></A
->14.4.4. Setting up printcap and print servers</H2
+>15.4.4. Setting up printcap and print servers</H2
 ><P
 >You may need to set up some printcaps for your Samba system to use.
 It is strongly recommended that you use the facilities provided by
@@ -1233,9 +1233,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2144"
+NAME="AEN2169"
 ></A
->14.4.5. Job sent, no output</H2
+>15.4.5. Job sent, no output</H2
 ><P
 >This is the most frustrating part of printing.  You may have sent the
 job,  verified that the job was forwarded,  set up a wrapper around
@@ -1278,9 +1278,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2155"
+NAME="AEN2180"
 ></A
->14.4.6. Job sent, strange output</H2
+>15.4.6. Job sent, strange output</H2
 ><P
 >Once you have the job printing, you can then start worrying about
 making it print nicely.</P
@@ -1324,9 +1324,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2167"
+NAME="AEN2192"
 ></A
->14.4.7. Raw PostScript printed</H2
+>15.4.7. Raw PostScript printed</H2
 ><P
 >This is a problem that is usually caused by either the print spooling
 system putting information at the start of the print job that makes
@@ -1339,9 +1339,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2170"
+NAME="AEN2195"
 ></A
->14.4.8. Advanced Printing</H2
+>15.4.8. Advanced Printing</H2
 ><P
 >Note that you can do some pretty magic things by using your
 imagination with the "print command" option and some shell scripts.
@@ -1355,9 +1355,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2173"
+NAME="AEN2198"
 ></A
->14.4.9. Real debugging</H2
+>15.4.9. Real debugging</H2
 ><P
 >If the above debug tips don't help, then maybe you need to bring in
 the bug guns, system tracing. See Tracing.txt in this directory.</P
@@ -1398,7 +1398,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="securitylevels.html"
+HREF="winbind.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -1414,7 +1414,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -1422,7 +1422,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Security levels</TD
+>Unified Logons between Windows NT and UNIX using Winbind</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/pwencrypt.html b/docs/htmldocs/pwencrypt.html
index 81c709a4ff..0ce1bd037e 100644
--- a/docs/htmldocs/pwencrypt.html
+++ b/docs/htmldocs/pwencrypt.html
@@ -11,13 +11,13 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="General installation"
-HREF="p18.html"><LINK
+HREF="introduction.html"><LINK
 REL="PREVIOUS"
 TITLE="Quick Cross Subnet Browsing / Cross Workgroup Browsing guide"
 HREF="browsing-quick.html"><LINK
 REL="NEXT"
 TITLE="Type of installation"
-HREF="p544.html"></HEAD
+HREF="type.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN472"
+NAME="AEN473"
 ></A
 >5.1. Introduction</H1
 ><P
@@ -104,7 +104,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN477"
+NAME="AEN478"
 ></A
 >5.2. Important Notes About Security</H1
 ><P
@@ -206,7 +206,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN496"
+NAME="AEN497"
 ></A
 >5.2.1. Advantages of SMB Encryption</H2
 ><P
@@ -235,7 +235,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN503"
+NAME="AEN504"
 ></A
 >5.2.2. Advantages of non-encrypted passwords</H2
 ><P
@@ -266,7 +266,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN512"
+NAME="AEN513"
 ></A
 >5.3. The smbpasswd Command</H1
 ><P
@@ -412,7 +412,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -428,7 +428,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/samba-bdc.html b/docs/htmldocs/samba-bdc.html
index 0561e84419..85ec191a99 100644
--- a/docs/htmldocs/samba-bdc.html
+++ b/docs/htmldocs/samba-bdc.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Type of installation"
-HREF="p544.html"><LINK
+HREF="type.html"><LINK
 REL="PREVIOUS"
 TITLE="How to Configure Samba as a NT4 Primary Domain Controller"
 HREF="samba-pdc.html"><LINK
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SAMBA-BDC"
 ></A
->Chapter 7. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
+>Chapter 8. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1118"
+NAME="AEN1143"
 ></A
->7.1. Prerequisite Reading</H1
+>8.1. Prerequisite Reading</H1
 ><P
 >Before you continue reading in this chapter, please make sure
 that you are comfortable with configuring a Samba PDC
@@ -97,9 +97,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1122"
+NAME="AEN1147"
 ></A
->7.2. Background</H1
+>8.2. Background</H1
 ><P
 >What is a Domain Controller? It is a machine that is able to answer
 logon requests from workstations in a Windows NT Domain. Whenever a
@@ -142,9 +142,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1130"
+NAME="AEN1155"
 ></A
->7.3. What qualifies a Domain Controller on the network?</H1
+>8.3. What qualifies a Domain Controller on the network?</H1
 ><P
 >Every machine that is a Domain Controller for the domain SAMBA has to
 register the NetBIOS group name SAMBA#1c with the WINS server and/or
@@ -159,9 +159,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1133"
+NAME="AEN1158"
 ></A
->7.3.1. How does a Workstation find its domain controller?</H2
+>8.3.1. How does a Workstation find its domain controller?</H2
 ><P
 >A NT workstation in the domain SAMBA that wants a local user to be
 authenticated has to find the domain controller for SAMBA. It does
@@ -178,9 +178,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1136"
+NAME="AEN1161"
 ></A
->7.3.2. When is the PDC needed?</H2
+>8.3.2. When is the PDC needed?</H2
 ><P
 >Whenever a user wants to change his password, this has to be done on
 the PDC. To find the PDC, the workstation does a NetBIOS name query
@@ -194,9 +194,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1139"
+NAME="AEN1164"
 ></A
->7.4. Can Samba be a Backup Domain Controller?</H1
+>8.4. Can Samba be a Backup Domain Controller?</H1
 ><P
 >With version 2.2, no. The native NT SAM replication protocols have
 not yet been fully implemented. The Samba Team is working on
@@ -213,9 +213,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1143"
+NAME="AEN1168"
 ></A
->7.5. How do I set up a Samba BDC?</H1
+>8.5. How do I set up a Samba BDC?</H1
 ><P
 >Several things have to be done:</P
 ><P
@@ -280,9 +280,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1160"
+NAME="AEN1185"
 ></A
->7.5.1. How do I replicate the smbpasswd file?</H2
+>8.5.1. How do I replicate the smbpasswd file?</H2
 ><P
 >Replication of the smbpasswd file is sensitive. It has to be done
 whenever changes to the SAM are made. Every user's password change is
@@ -348,7 +348,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/samba-howto-collection.html b/docs/htmldocs/samba-howto-collection.html
index 0c5e284757..3c789a7a45 100644
--- a/docs/htmldocs/samba-howto-collection.html
+++ b/docs/htmldocs/samba-howto-collection.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="NEXT"
 TITLE="General installation"
-HREF="p18.html"></HEAD
+HREF="introduction.html"></HEAD
 ><BODY
 CLASS="BOOK"
 BGCOLOR="#FFFFFF"
@@ -48,7 +48,7 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >Last Update</I
 ></SPAN
-> : Thu Aug 15 12:48:45 CDT 2002</P
+> : $Date: 2002/11/13 15:34:49 $</P
 ><P
 >This book is a collection of HOWTOs added to Samba documentation over the years.
 I try to ensure that all are current, but sometimes the is a larger job
@@ -62,6 +62,11 @@ on the "Documentation" page.  Please send updates to <A
 HREF="mailto:jerry@samba.org"
 TARGET="_top"
 >jerry@samba.org</A
+> or 
+<A
+HREF="mailto:jelmer@samba.org"
+TARGET="_top"
+>jelmer@samba.org</A
 >.</P
 ><P
 >This documentation is distributed under the GNU General Public License (GPL) 
@@ -82,7 +87,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >I. <A
-HREF="p18.html"
+HREF="introduction.html"
 >General installation</A
 ></DT
 ><DD
@@ -96,27 +101,27 @@ HREF="install.html"
 ><DL
 ><DT
 >1.1. <A
-HREF="install.html#AEN25"
+HREF="install.html#AEN26"
 >Read the man pages</A
 ></DT
 ><DT
 >1.2. <A
-HREF="install.html#AEN35"
+HREF="install.html#AEN36"
 >Building the Binaries</A
 ></DT
 ><DT
 >1.3. <A
-HREF="install.html#AEN63"
+HREF="install.html#AEN64"
 >The all important step</A
 ></DT
 ><DT
 >1.4. <A
-HREF="install.html#AEN67"
+HREF="install.html#AEN68"
 >Create the smb configuration file.</A
 ></DT
 ><DT
 >1.5. <A
-HREF="install.html#AEN81"
+HREF="install.html#AEN82"
 >Test your config file with 
 	<B
 CLASS="COMMAND"
@@ -125,29 +130,29 @@ CLASS="COMMAND"
 ></DT
 ><DT
 >1.6. <A
-HREF="install.html#AEN89"
+HREF="install.html#AEN90"
 >Starting the smbd and nmbd</A
 ></DT
 ><DT
 >1.7. <A
-HREF="install.html#AEN144"
+HREF="install.html#AEN145"
 >Try listing the shares available on your 
 	server</A
 ></DT
 ><DT
 >1.8. <A
-HREF="install.html#AEN153"
+HREF="install.html#AEN154"
 >Try connecting with the unix client</A
 ></DT
 ><DT
 >1.9. <A
-HREF="install.html#AEN169"
+HREF="install.html#AEN170"
 >Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</A
 ></DT
 ><DT
 >1.10. <A
-HREF="install.html#AEN183"
+HREF="install.html#AEN184"
 >What If Things Don't Work?</A
 ></DT
 ></DL
@@ -161,57 +166,57 @@ HREF="improved-browsing.html"
 ><DL
 ><DT
 >2.1. <A
-HREF="improved-browsing.html#AEN228"
+HREF="improved-browsing.html#AEN229"
 >Overview of browsing</A
 ></DT
 ><DT
 >2.2. <A
-HREF="improved-browsing.html#AEN232"
+HREF="improved-browsing.html#AEN233"
 >Browsing support in samba</A
 ></DT
 ><DT
 >2.3. <A
-HREF="improved-browsing.html#AEN241"
+HREF="improved-browsing.html#AEN242"
 >Problem resolution</A
 ></DT
 ><DT
 >2.4. <A
-HREF="improved-browsing.html#AEN248"
+HREF="improved-browsing.html#AEN249"
 >Browsing across subnets</A
 ></DT
 ><DT
 >2.5. <A
-HREF="improved-browsing.html#AEN288"
+HREF="improved-browsing.html#AEN289"
 >Setting up a WINS server</A
 ></DT
 ><DT
 >2.6. <A
-HREF="improved-browsing.html#AEN307"
+HREF="improved-browsing.html#AEN308"
 >Setting up Browsing in a WORKGROUP</A
 ></DT
 ><DT
 >2.7. <A
-HREF="improved-browsing.html#AEN325"
+HREF="improved-browsing.html#AEN326"
 >Setting up Browsing in a DOMAIN</A
 ></DT
 ><DT
 >2.8. <A
-HREF="improved-browsing.html#AEN335"
+HREF="improved-browsing.html#AEN336"
 >Forcing samba to be the master</A
 ></DT
 ><DT
 >2.9. <A
-HREF="improved-browsing.html#AEN344"
+HREF="improved-browsing.html#AEN345"
 >Making samba the domain master</A
 ></DT
 ><DT
 >2.10. <A
-HREF="improved-browsing.html#AEN362"
+HREF="improved-browsing.html#AEN363"
 >Note about broadcast addresses</A
 ></DT
 ><DT
 >2.11. <A
-HREF="improved-browsing.html#AEN365"
+HREF="improved-browsing.html#AEN366"
 >Multiple interfaces</A
 ></DT
 ></DL
@@ -225,7 +230,7 @@ HREF="oplocks.html"
 ><DL
 ><DT
 >3.1. <A
-HREF="oplocks.html#AEN377"
+HREF="oplocks.html#AEN378"
 >What are oplocks?</A
 ></DT
 ></DL
@@ -239,32 +244,32 @@ HREF="browsing-quick.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="browsing-quick.html#AEN392"
+HREF="browsing-quick.html#AEN393"
 >Discussion</A
 ></DT
 ><DT
 >4.2. <A
-HREF="browsing-quick.html#AEN400"
+HREF="browsing-quick.html#AEN401"
 >Use of the "Remote Announce" parameter</A
 ></DT
 ><DT
 >4.3. <A
-HREF="browsing-quick.html#AEN414"
+HREF="browsing-quick.html#AEN415"
 >Use of the "Remote Browse Sync" parameter</A
 ></DT
 ><DT
 >4.4. <A
-HREF="browsing-quick.html#AEN419"
+HREF="browsing-quick.html#AEN420"
 >Use of WINS</A
 ></DT
 ><DT
 >4.5. <A
-HREF="browsing-quick.html#AEN430"
+HREF="browsing-quick.html#AEN431"
 >Do NOT use more than one (1) protocol on MS Windows machines</A
 ></DT
 ><DT
 >4.6. <A
-HREF="browsing-quick.html#AEN436"
+HREF="browsing-quick.html#AEN437"
 >Name Resolution Order</A
 ></DT
 ></DL
@@ -278,17 +283,17 @@ HREF="pwencrypt.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="pwencrypt.html#AEN472"
+HREF="pwencrypt.html#AEN473"
 >Introduction</A
 ></DT
 ><DT
 >5.2. <A
-HREF="pwencrypt.html#AEN477"
+HREF="pwencrypt.html#AEN478"
 >Important Notes About Security</A
 ></DT
 ><DT
 >5.3. <A
-HREF="pwencrypt.html#AEN512"
+HREF="pwencrypt.html#AEN513"
 >The smbpasswd Command</A
 ></DT
 ></DL
@@ -297,169 +302,174 @@ HREF="pwencrypt.html#AEN512"
 ></DD
 ><DT
 >II. <A
-HREF="p544.html"
+HREF="type.html"
 >Type of installation</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6. <A
+HREF="securitylevels.html"
+>User and Share security level (for servers not in a domain)</A
+></DT
+><DT
+>7. <A
 HREF="samba-pdc.html"
 >How to Configure Samba as a NT4 Primary Domain Controller</A
 ></DT
 ><DD
 ><DL
 ><DT
->6.1. <A
-HREF="samba-pdc.html#AEN566"
+>7.1. <A
+HREF="samba-pdc.html#AEN591"
 >Prerequisite Reading</A
 ></DT
 ><DT
->6.2. <A
-HREF="samba-pdc.html#AEN572"
+>7.2. <A
+HREF="samba-pdc.html#AEN597"
 >Background</A
 ></DT
 ><DT
->6.3. <A
-HREF="samba-pdc.html#AEN611"
+>7.3. <A
+HREF="samba-pdc.html#AEN636"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
->6.4. <A
-HREF="samba-pdc.html#AEN654"
+>7.4. <A
+HREF="samba-pdc.html#AEN679"
 >Creating Machine Trust Accounts and Joining Clients to the
 Domain</A
 ></DT
 ><DT
->6.5. <A
-HREF="samba-pdc.html#AEN738"
+>7.5. <A
+HREF="samba-pdc.html#AEN763"
 >Common Problems and Errors</A
 ></DT
 ><DT
->6.6. <A
-HREF="samba-pdc.html#AEN786"
+>7.6. <A
+HREF="samba-pdc.html#AEN811"
 >System Policies and Profiles</A
 ></DT
 ><DT
->6.7. <A
-HREF="samba-pdc.html#AEN830"
+>7.7. <A
+HREF="samba-pdc.html#AEN855"
 >What other help can I get?</A
 ></DT
 ><DT
->6.8. <A
-HREF="samba-pdc.html#AEN944"
+>7.8. <A
+HREF="samba-pdc.html#AEN969"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DT
->6.9. <A
-HREF="samba-pdc.html#AEN1082"
+>7.9. <A
+HREF="samba-pdc.html#AEN1107"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->7. <A
+>8. <A
 HREF="samba-bdc.html"
 >How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.1. <A
-HREF="samba-bdc.html#AEN1118"
+>8.1. <A
+HREF="samba-bdc.html#AEN1143"
 >Prerequisite Reading</A
 ></DT
 ><DT
->7.2. <A
-HREF="samba-bdc.html#AEN1122"
+>8.2. <A
+HREF="samba-bdc.html#AEN1147"
 >Background</A
 ></DT
 ><DT
->7.3. <A
-HREF="samba-bdc.html#AEN1130"
+>8.3. <A
+HREF="samba-bdc.html#AEN1155"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DT
->7.4. <A
-HREF="samba-bdc.html#AEN1139"
+>8.4. <A
+HREF="samba-bdc.html#AEN1164"
 >Can Samba be a Backup Domain Controller?</A
 ></DT
 ><DT
->7.5. <A
-HREF="samba-bdc.html#AEN1143"
+>8.5. <A
+HREF="samba-bdc.html#AEN1168"
 >How do I set up a Samba BDC?</A
 ></DT
 ></DL
 ></DD
 ><DT
->8. <A
+>9. <A
 HREF="ads.html"
 >Samba as a ADS domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.1. <A
-HREF="ads.html#AEN1178"
+>9.1. <A
+HREF="ads.html#AEN1203"
 >Installing the required packages for Debian</A
 ></DT
 ><DT
->8.2. <A
-HREF="ads.html#AEN1184"
+>9.2. <A
+HREF="ads.html#AEN1209"
 >Installing the required packages for RedHat</A
 ></DT
 ><DT
->8.3. <A
-HREF="ads.html#AEN1193"
+>9.3. <A
+HREF="ads.html#AEN1218"
 >Compile Samba</A
 ></DT
 ><DT
->8.4. <A
-HREF="ads.html#AEN1205"
+>9.4. <A
+HREF="ads.html#AEN1230"
 >Setup your /etc/krb5.conf</A
 ></DT
 ><DT
->8.5. <A
-HREF="ads.html#AEN1215"
+>9.5. <A
+HREF="ads.html#AEN1240"
 >Create the computer account</A
 ></DT
 ><DT
->8.6. <A
-HREF="ads.html#AEN1231"
+>9.6. <A
+HREF="ads.html#AEN1256"
 >Test your server setup</A
 ></DT
 ><DT
->8.7. <A
-HREF="ads.html#AEN1236"
+>9.7. <A
+HREF="ads.html#AEN1261"
 >Testing with smbclient</A
 ></DT
 ><DT
->8.8. <A
-HREF="ads.html#AEN1239"
+>9.8. <A
+HREF="ads.html#AEN1264"
 >Notes</A
 ></DT
 ></DL
 ></DD
 ><DT
->9. <A
+>10. <A
 HREF="domain-security.html"
 >Samba as a NT4 domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.1. <A
-HREF="domain-security.html#AEN1261"
+>10.1. <A
+HREF="domain-security.html#AEN1286"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
->9.2. <A
-HREF="domain-security.html#AEN1325"
+>10.2. <A
+HREF="domain-security.html#AEN1350"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
->9.3. <A
-HREF="domain-security.html#AEN1330"
+>10.3. <A
+HREF="domain-security.html#AEN1355"
 >Why is this better than security = server?</A
 ></DT
 ></DL
@@ -468,101 +478,101 @@ HREF="domain-security.html#AEN1330"
 ></DD
 ><DT
 >III. <A
-HREF="p1346.html"
+HREF="optional.html"
 >Optional configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->10. <A
+>11. <A
 HREF="integrate-ms-networks.html"
 >Integrating MS Windows networks with Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.1. <A
-HREF="integrate-ms-networks.html#AEN1362"
+>11.1. <A
+HREF="integrate-ms-networks.html#AEN1387"
 >Agenda</A
 ></DT
 ><DT
->10.2. <A
-HREF="integrate-ms-networks.html#AEN1384"
+>11.2. <A
+HREF="integrate-ms-networks.html#AEN1409"
 >Name Resolution in a pure Unix/Linux world</A
 ></DT
 ><DT
->10.3. <A
-HREF="integrate-ms-networks.html#AEN1447"
+>11.3. <A
+HREF="integrate-ms-networks.html#AEN1472"
 >Name resolution as used within MS Windows networking</A
 ></DT
 ><DT
->10.4. <A
-HREF="integrate-ms-networks.html#AEN1492"
+>11.4. <A
+HREF="integrate-ms-networks.html#AEN1517"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
->10.5. <A
-HREF="integrate-ms-networks.html#AEN1502"
+>11.5. <A
+HREF="integrate-ms-networks.html#AEN1527"
 >MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></DT
 ><DT
->10.6. <A
-HREF="integrate-ms-networks.html#AEN1572"
+>11.6. <A
+HREF="integrate-ms-networks.html#AEN1597"
 >Conclusions</A
 ></DT
 ></DL
 ></DD
 ><DT
->11. <A
+>12. <A
 HREF="unix-permissions.html"
 >UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="unix-permissions.html#AEN1593"
+>12.1. <A
+HREF="unix-permissions.html#AEN1618"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
->11.2. <A
-HREF="unix-permissions.html#AEN1602"
+>12.2. <A
+HREF="unix-permissions.html#AEN1627"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
->11.3. <A
-HREF="unix-permissions.html#AEN1613"
+>12.3. <A
+HREF="unix-permissions.html#AEN1638"
 >Viewing file ownership</A
 ></DT
 ><DT
->11.4. <A
-HREF="unix-permissions.html#AEN1633"
+>12.4. <A
+HREF="unix-permissions.html#AEN1658"
 >Viewing file or directory permissions</A
 ></DT
 ><DT
->11.5. <A
-HREF="unix-permissions.html#AEN1669"
+>12.5. <A
+HREF="unix-permissions.html#AEN1694"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
->11.6. <A
-HREF="unix-permissions.html#AEN1691"
+>12.6. <A
+HREF="unix-permissions.html#AEN1716"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
->11.7. <A
-HREF="unix-permissions.html#AEN1755"
+>12.7. <A
+HREF="unix-permissions.html#AEN1780"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>13. <A
 HREF="pam.html"
 >Configuring PAM for distributed but centrally 
 managed authentication</A
@@ -570,85 +580,66 @@ managed authentication</A
 ><DD
 ><DL
 ><DT
->12.1. <A
-HREF="pam.html#AEN1776"
+>13.1. <A
+HREF="pam.html#AEN1801"
 >Samba and PAM</A
 ></DT
 ><DT
->12.2. <A
-HREF="pam.html#AEN1820"
+>13.2. <A
+HREF="pam.html#AEN1845"
 >Distributed Authentication</A
 ></DT
 ><DT
->12.3. <A
-HREF="pam.html#AEN1827"
+>13.3. <A
+HREF="pam.html#AEN1852"
 >PAM Configuration in smb.conf</A
 ></DT
 ></DL
 ></DD
 ><DT
->13. <A
+>14. <A
 HREF="msdfs.html"
 >Hosting a Microsoft Distributed File System tree on Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->13.1. <A
-HREF="msdfs.html#AEN1847"
+>14.1. <A
+HREF="msdfs.html#AEN1872"
 >Instructions</A
 ></DT
 ></DL
 ></DD
 ><DT
->14. <A
+>15. <A
 HREF="printing.html"
 >Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1. <A
-HREF="printing.html#AEN1908"
+>15.1. <A
+HREF="printing.html#AEN1933"
 >Introduction</A
 ></DT
 ><DT
->14.2. <A
-HREF="printing.html#AEN1930"
+>15.2. <A
+HREF="printing.html#AEN1955"
 >Configuration</A
 ></DT
 ><DT
->14.3. <A
-HREF="printing.html#AEN2038"
+>15.3. <A
+HREF="printing.html#AEN2063"
 >The Imprints Toolset</A
 ></DT
 ><DT
->14.4. <A
-HREF="printing.html#AEN2081"
+>15.4. <A
+HREF="printing.html#AEN2106"
 >Diagnosis</A
 ></DT
 ></DL
 ></DD
 ><DT
->15. <A
-HREF="securitylevels.html"
->Security levels</A
-></DT
-><DD
-><DL
-><DT
->15.1. <A
-HREF="securitylevels.html#AEN2186"
->Introduction</A
-></DT
-><DT
->15.2. <A
-HREF="securitylevels.html#AEN2197"
->More complete description of security levels</A
-></DT
-></DL
-></DD
-><DT
 >16. <A
 HREF="winbind.html"
 >Unified Logons between Windows NT and UNIX using Winbind</A
@@ -657,37 +648,37 @@ HREF="winbind.html"
 ><DL
 ><DT
 >16.1. <A
-HREF="winbind.html#AEN2249"
+HREF="winbind.html#AEN2238"
 >Abstract</A
 ></DT
 ><DT
 >16.2. <A
-HREF="winbind.html#AEN2253"
+HREF="winbind.html#AEN2242"
 >Introduction</A
 ></DT
 ><DT
 >16.3. <A
-HREF="winbind.html#AEN2266"
+HREF="winbind.html#AEN2255"
 >What Winbind Provides</A
 ></DT
 ><DT
 >16.4. <A
-HREF="winbind.html#AEN2277"
+HREF="winbind.html#AEN2266"
 >How Winbind Works</A
 ></DT
 ><DT
 >16.5. <A
-HREF="winbind.html#AEN2317"
+HREF="winbind.html#AEN2306"
 >Installation and Configuration</A
 ></DT
 ><DT
 >16.6. <A
-HREF="winbind.html#AEN2566"
+HREF="winbind.html#AEN2555"
 >Limitations</A
 ></DT
 ><DT
 >16.7. <A
-HREF="winbind.html#AEN2576"
+HREF="winbind.html#AEN2565"
 >Conclusion</A
 ></DT
 ></DL
@@ -701,22 +692,22 @@ HREF="pdb-mysql.html"
 ><DL
 ><DT
 >17.1. <A
-HREF="pdb-mysql.html#AEN2590"
+HREF="pdb-mysql.html#AEN2579"
 >Building</A
 ></DT
 ><DT
 >17.2. <A
-HREF="pdb-mysql.html#AEN2596"
+HREF="pdb-mysql.html#AEN2585"
 >Configuring</A
 ></DT
 ><DT
 >17.3. <A
-HREF="pdb-mysql.html#AEN2611"
+HREF="pdb-mysql.html#AEN2600"
 >Using plaintext passwords or encrypted password</A
 ></DT
 ><DT
 >17.4. <A
-HREF="pdb-mysql.html#AEN2616"
+HREF="pdb-mysql.html#AEN2605"
 >Getting non-column data from the table</A
 ></DT
 ></DL
@@ -730,189 +721,213 @@ HREF="pdb-xml.html"
 ><DL
 ><DT
 >18.1. <A
-HREF="pdb-xml.html#AEN2635"
+HREF="pdb-xml.html#AEN2624"
 >Building</A
 ></DT
 ><DT
 >18.2. <A
-HREF="pdb-xml.html#AEN2641"
+HREF="pdb-xml.html#AEN2630"
 >Usage</A
 ></DT
 ></DL
 ></DD
 ><DT
 >19. <A
+HREF="vfs.html"
+>Stackable VFS modules</A
+></DT
+><DD
+><DL
+><DT
+>19.1. <A
+HREF="vfs.html#AEN2651"
+>Introduction and configuration</A
+></DT
+><DT
+>19.2. <A
+HREF="vfs.html#AEN2659"
+>Included modules</A
+></DT
+><DT
+>19.3. <A
+HREF="vfs.html#AEN2713"
+>VFS modules available elsewhere</A
+></DT
+></DL
+></DD
+><DT
+>20. <A
 HREF="samba-ldap-howto.html"
 >Storing Samba's User/Machine Account information in an LDAP Directory</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.1. <A
-HREF="samba-ldap-howto.html#AEN2664"
+>20.1. <A
+HREF="samba-ldap-howto.html#AEN2747"
 >Purpose</A
 ></DT
 ><DT
->19.2. <A
-HREF="samba-ldap-howto.html#AEN2684"
+>20.2. <A
+HREF="samba-ldap-howto.html#AEN2767"
 >Introduction</A
 ></DT
 ><DT
->19.3. <A
-HREF="samba-ldap-howto.html#AEN2713"
+>20.3. <A
+HREF="samba-ldap-howto.html#AEN2796"
 >Supported LDAP Servers</A
 ></DT
 ><DT
->19.4. <A
-HREF="samba-ldap-howto.html#AEN2718"
+>20.4. <A
+HREF="samba-ldap-howto.html#AEN2801"
 >Schema and Relationship to the RFC 2307 posixAccount</A
 ></DT
 ><DT
->19.5. <A
-HREF="samba-ldap-howto.html#AEN2730"
+>20.5. <A
+HREF="samba-ldap-howto.html#AEN2813"
 >Configuring Samba with LDAP</A
 ></DT
 ><DT
->19.6. <A
-HREF="samba-ldap-howto.html#AEN2777"
+>20.6. <A
+HREF="samba-ldap-howto.html#AEN2860"
 >Accounts and Groups management</A
 ></DT
 ><DT
->19.7. <A
-HREF="samba-ldap-howto.html#AEN2782"
+>20.7. <A
+HREF="samba-ldap-howto.html#AEN2865"
 >Security and sambaAccount</A
 ></DT
 ><DT
->19.8. <A
-HREF="samba-ldap-howto.html#AEN2802"
+>20.8. <A
+HREF="samba-ldap-howto.html#AEN2885"
 >LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
->19.9. <A
-HREF="samba-ldap-howto.html#AEN2872"
+>20.9. <A
+HREF="samba-ldap-howto.html#AEN2955"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ><DT
->19.10. <A
-HREF="samba-ldap-howto.html#AEN2880"
+>20.10. <A
+HREF="samba-ldap-howto.html#AEN2963"
 >Comments</A
 ></DT
 ></DL
 ></DD
 ><DT
->20. <A
+>21. <A
 HREF="cvs-access.html"
 >HOWTO Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.1. <A
-HREF="cvs-access.html#AEN2891"
+>21.1. <A
+HREF="cvs-access.html#AEN2974"
 >Introduction</A
 ></DT
 ><DT
->20.2. <A
-HREF="cvs-access.html#AEN2896"
+>21.2. <A
+HREF="cvs-access.html#AEN2979"
 >CVS Access to samba.org</A
 ></DT
 ></DL
 ></DD
 ><DT
->21. <A
+>22. <A
 HREF="groupmapping.html"
 >Group mapping HOWTO</A
 ></DT
 ><DT
->22. <A
+>23. <A
 HREF="speed.html"
 >Samba performance issues</A
 ></DT
 ><DD
 ><DL
 ><DT
->22.1. <A
-HREF="speed.html#AEN2982"
+>23.1. <A
+HREF="speed.html#AEN3065"
 >Comparisons</A
 ></DT
 ><DT
->22.2. <A
-HREF="speed.html#AEN2988"
+>23.2. <A
+HREF="speed.html#AEN3071"
 >Oplocks</A
 ></DT
 ><DT
->22.3. <A
-HREF="speed.html#AEN3008"
+>23.3. <A
+HREF="speed.html#AEN3091"
 >Socket options</A
 ></DT
 ><DT
->22.4. <A
-HREF="speed.html#AEN3015"
+>23.4. <A
+HREF="speed.html#AEN3098"
 >Read size</A
 ></DT
 ><DT
->22.5. <A
-HREF="speed.html#AEN3020"
+>23.5. <A
+HREF="speed.html#AEN3103"
 >Max xmit</A
 ></DT
 ><DT
->22.6. <A
-HREF="speed.html#AEN3025"
+>23.6. <A
+HREF="speed.html#AEN3108"
 >Locking</A
 ></DT
 ><DT
->22.7. <A
-HREF="speed.html#AEN3029"
+>23.7. <A
+HREF="speed.html#AEN3112"
 >Share modes</A
 ></DT
 ><DT
->22.8. <A
-HREF="speed.html#AEN3034"
+>23.8. <A
+HREF="speed.html#AEN3117"
 >Log level</A
 ></DT
 ><DT
->22.9. <A
-HREF="speed.html#AEN3037"
+>23.9. <A
+HREF="speed.html#AEN3120"
 >Wide lines</A
 ></DT
 ><DT
->22.10. <A
-HREF="speed.html#AEN3040"
+>23.10. <A
+HREF="speed.html#AEN3123"
 >Read raw</A
 ></DT
 ><DT
->22.11. <A
-HREF="speed.html#AEN3045"
+>23.11. <A
+HREF="speed.html#AEN3128"
 >Write raw</A
 ></DT
 ><DT
->22.12. <A
-HREF="speed.html#AEN3049"
+>23.12. <A
+HREF="speed.html#AEN3132"
 >Read prediction</A
 ></DT
 ><DT
->22.13. <A
-HREF="speed.html#AEN3056"
+>23.13. <A
+HREF="speed.html#AEN3139"
 >Memory mapping</A
 ></DT
 ><DT
->22.14. <A
-HREF="speed.html#AEN3061"
+>23.14. <A
+HREF="speed.html#AEN3144"
 >Slow Clients</A
 ></DT
 ><DT
->22.15. <A
-HREF="speed.html#AEN3065"
+>23.15. <A
+HREF="speed.html#AEN3148"
 >Slow Logins</A
 ></DT
 ><DT
->22.16. <A
-HREF="speed.html#AEN3068"
+>23.16. <A
+HREF="speed.html#AEN3151"
 >Client tuning</A
 ></DT
 ><DT
->22.17. <A
-HREF="speed.html#AEN3100"
+>23.17. <A
+HREF="speed.html#AEN3183"
 >My Results</A
 ></DT
 ></DL
@@ -921,138 +936,138 @@ HREF="speed.html#AEN3100"
 ></DD
 ><DT
 >IV. <A
-HREF="p3106.html"
+HREF="appendixes.html"
 >Appendixes</A
 ></DT
 ><DD
 ><DL
 ><DT
->23. <A
+>24. <A
 HREF="portability.html"
 >Portability</A
 ></DT
 ><DD
 ><DL
 ><DT
->23.1. <A
-HREF="portability.html#AEN3115"
+>24.1. <A
+HREF="portability.html#AEN3198"
 >HPUX</A
 ></DT
 ><DT
->23.2. <A
-HREF="portability.html#AEN3121"
+>24.2. <A
+HREF="portability.html#AEN3204"
 >SCO Unix</A
 ></DT
 ><DT
->23.3. <A
-HREF="portability.html#AEN3125"
+>24.3. <A
+HREF="portability.html#AEN3208"
 >DNIX</A
 ></DT
 ><DT
->23.4. <A
-HREF="portability.html#AEN3154"
+>24.4. <A
+HREF="portability.html#AEN3237"
 >RedHat Linux Rembrandt-II</A
 ></DT
 ></DL
 ></DD
 ><DT
->24. <A
+>25. <A
 HREF="other-clients.html"
 >Samba and other CIFS clients</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.1. <A
-HREF="other-clients.html#AEN3175"
+>25.1. <A
+HREF="other-clients.html#AEN3258"
 >Macintosh clients?</A
 ></DT
 ><DT
->24.2. <A
-HREF="other-clients.html#AEN3184"
+>25.2. <A
+HREF="other-clients.html#AEN3267"
 >OS2 Client</A
 ></DT
 ><DT
->24.3. <A
-HREF="other-clients.html#AEN3224"
+>25.3. <A
+HREF="other-clients.html#AEN3307"
 >Windows for Workgroups</A
 ></DT
 ><DT
->24.4. <A
-HREF="other-clients.html#AEN3245"
+>25.4. <A
+HREF="other-clients.html#AEN3328"
 >Windows '95/'98</A
 ></DT
 ><DT
->24.5. <A
-HREF="other-clients.html#AEN3261"
+>25.5. <A
+HREF="other-clients.html#AEN3344"
 >Windows 2000 Service Pack 2</A
 ></DT
 ></DL
 ></DD
 ><DT
->25. <A
+>26. <A
 HREF="bugreport.html"
 >Reporting Bugs</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.1. <A
-HREF="bugreport.html#AEN3285"
+>26.1. <A
+HREF="bugreport.html#AEN3368"
 >Introduction</A
 ></DT
 ><DT
->25.2. <A
-HREF="bugreport.html#AEN3295"
+>26.2. <A
+HREF="bugreport.html#AEN3378"
 >General info</A
 ></DT
 ><DT
->25.3. <A
-HREF="bugreport.html#AEN3301"
+>26.3. <A
+HREF="bugreport.html#AEN3384"
 >Debug levels</A
 ></DT
 ><DT
->25.4. <A
-HREF="bugreport.html#AEN3318"
+>26.4. <A
+HREF="bugreport.html#AEN3401"
 >Internal errors</A
 ></DT
 ><DT
->25.5. <A
-HREF="bugreport.html#AEN3328"
+>26.5. <A
+HREF="bugreport.html#AEN3411"
 >Attaching to a running process</A
 ></DT
 ><DT
->25.6. <A
-HREF="bugreport.html#AEN3331"
+>26.6. <A
+HREF="bugreport.html#AEN3414"
 >Patches</A
 ></DT
 ></DL
 ></DD
 ><DT
->26. <A
+>27. <A
 HREF="diagnosis.html"
 >Diagnosing your samba server</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1. <A
-HREF="diagnosis.html#AEN3354"
+>27.1. <A
+HREF="diagnosis.html#AEN3437"
 >Introduction</A
 ></DT
 ><DT
->26.2. <A
-HREF="diagnosis.html#AEN3359"
+>27.2. <A
+HREF="diagnosis.html#AEN3442"
 >Assumptions</A
 ></DT
 ><DT
->26.3. <A
-HREF="diagnosis.html#AEN3369"
+>27.3. <A
+HREF="diagnosis.html#AEN3452"
 >Tests</A
 ></DT
 ><DT
->26.4. <A
-HREF="diagnosis.html#AEN3479"
+>27.4. <A
+HREF="diagnosis.html#AEN3562"
 >Still having troubles?</A
 ></DT
 ></DL
@@ -1088,7 +1103,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="p18.html"
+HREF="introduction.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
diff --git a/docs/htmldocs/samba-ldap-howto.html b/docs/htmldocs/samba-ldap-howto.html
index df8f32fe32..17f74b9bbc 100644
--- a/docs/htmldocs/samba-ldap-howto.html
+++ b/docs/htmldocs/samba-ldap-howto.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Passdb XML plugin"
-HREF="pdb-xml.html"><LINK
+TITLE="Stackable VFS modules"
+HREF="vfs.html"><LINK
 REL="NEXT"
 TITLE="HOWTO Access Samba source code via CVS"
 HREF="cvs-access.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="pdb-xml.html"
+HREF="vfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SAMBA-LDAP-HOWTO"
 ></A
->Chapter 19. Storing Samba's User/Machine Account information in an LDAP Directory</H1
+>Chapter 20. Storing Samba's User/Machine Account information in an LDAP Directory</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2664"
+NAME="AEN2747"
 ></A
->19.1. Purpose</H1
+>20.1. Purpose</H1
 ><P
 >This document describes how to use an LDAP directory for storing Samba user
 account information traditionally stored in the smbpasswd(5) file.  It is
@@ -148,9 +148,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2684"
+NAME="AEN2767"
 ></A
->19.2. Introduction</H1
+>20.2. Introduction</H1
 ><P
 >Traditionally, when configuring <A
 HREF="smb.conf.5.html#ENCRYPTPASSWORDS"
@@ -265,9 +265,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2713"
+NAME="AEN2796"
 ></A
->19.3. Supported LDAP Servers</H1
+>20.3. Supported LDAP Servers</H1
 ><P
 >The LDAP samdb code in 2.2.3 has been developed and tested using the OpenLDAP
 2.0 server and client libraries.  The same code should be able to work with
@@ -290,9 +290,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2718"
+NAME="AEN2801"
 ></A
->19.4. Schema and Relationship to the RFC 2307 posixAccount</H1
+>20.4. Schema and Relationship to the RFC 2307 posixAccount</H1
 ><P
 >Samba 2.2.3 includes the necessary schema file for OpenLDAP 2.0 in
 <TT
@@ -349,17 +349,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2730"
+NAME="AEN2813"
 ></A
->19.5. Configuring Samba with LDAP</H1
+>20.5. Configuring Samba with LDAP</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2732"
+NAME="AEN2815"
 ></A
->19.5.1. OpenLDAP configuration</H2
+>20.5.1. OpenLDAP configuration</H2
 ><P
 >To include support for the sambaAccount object in an OpenLDAP directory
 server, first copy the samba.schema file to slapd's configuration directory.</P
@@ -439,9 +439,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2749"
+NAME="AEN2832"
 ></A
->19.5.2. Configuring Samba</H2
+>20.5.2. Configuring Samba</H2
 ><P
 >The following parameters are available in smb.conf only with <TT
 CLASS="PARAMETER"
@@ -559,9 +559,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2777"
+NAME="AEN2860"
 ></A
->19.6. Accounts and Groups management</H1
+>20.6. Accounts and Groups management</H1
 ><P
 >As users accounts are managed thru the sambaAccount objectclass, you should
 modify you existing administration tools to deal with sambaAccount attributes.</P
@@ -584,9 +584,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2782"
+NAME="AEN2865"
 ></A
->19.7. Security and sambaAccount</H1
+>20.7. Security and sambaAccount</H1
 ><P
 >There are two important points to remember when discussing the security
 of sambaAccount entries in the directory.</P
@@ -663,9 +663,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2802"
+NAME="AEN2885"
 ></A
->19.8. LDAP specials attributes for sambaAccounts</H1
+>20.8. LDAP specials attributes for sambaAccounts</H1
 ><P
 >The sambaAccount objectclass is composed of the following attributes:</P
 ><P
@@ -874,9 +874,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2872"
+NAME="AEN2955"
 ></A
->19.9. Example LDIF Entries for a sambaAccount</H1
+>20.9. Example LDIF Entries for a sambaAccount</H1
 ><P
 >The following is a working LDIF with the inclusion of the posixAccount objectclass:</P
 ><P
@@ -932,9 +932,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2880"
+NAME="AEN2963"
 ></A
->19.10. Comments</H1
+>20.10. Comments</H1
 ><P
 >Please mail all comments regarding this HOWTO to <A
 HREF="mailto:jerry@samba.org"
@@ -960,7 +960,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="pdb-xml.html"
+HREF="vfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -988,13 +988,13 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Passdb XML plugin</TD
+>Stackable VFS modules</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/samba-pdc.html b/docs/htmldocs/samba-pdc.html
index ebf6e85674..daab00fba9 100644
--- a/docs/htmldocs/samba-pdc.html
+++ b/docs/htmldocs/samba-pdc.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Type of installation"
-HREF="p544.html"><LINK
+HREF="type.html"><LINK
 REL="PREVIOUS"
-TITLE="Type of installation"
-HREF="p544.html"><LINK
+TITLE="User and Share security level (for servers not in a domain)"
+HREF="securitylevels.html"><LINK
 REL="NEXT"
 TITLE="How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain"
 HREF="samba-bdc.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="p544.html"
+HREF="securitylevels.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SAMBA-PDC"
 ></A
->Chapter 6. How to Configure Samba as a NT4 Primary Domain Controller</H1
+>Chapter 7. How to Configure Samba as a NT4 Primary Domain Controller</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN566"
+NAME="AEN591"
 ></A
->6.1. Prerequisite Reading</H1
+>7.1. Prerequisite Reading</H1
 ><P
 >Before you continue reading in this chapter, please make sure 
 that you are comfortable with configuring basic files services
@@ -108,9 +108,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN572"
+NAME="AEN597"
 ></A
->6.2. Background</H1
+>7.2. Background</H1
 ><DIV
 CLASS="NOTE"
 ><P
@@ -260,9 +260,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN611"
+NAME="AEN636"
 ></A
->6.3. Configuring the Samba Domain Controller</H1
+>7.3. Configuring the Samba Domain Controller</H1
 ><P
 >The first step in creating a working Samba PDC is to 
 understand the parameters necessary in smb.conf.  I will not
@@ -472,9 +472,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN654"
+NAME="AEN679"
 ></A
->6.4. Creating Machine Trust Accounts and Joining Clients to the
+>7.4. Creating Machine Trust Accounts and Joining Clients to the
 Domain</H1
 ><P
 >A machine trust account is a Samba account that is used to
@@ -546,9 +546,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN673"
+NAME="AEN698"
 ></A
->6.4.1. Manual Creation of Machine Trust Accounts</H2
+>7.4.1. Manual Creation of Machine Trust Accounts</H2
 ><P
 >The first step in manually creating a machine trust account is to
 manually create the corresponding Unix account in
@@ -736,9 +736,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN714"
+NAME="AEN739"
 ></A
->6.4.2. "On-the-Fly" Creation of Machine Trust Accounts</H2
+>7.4.2. "On-the-Fly" Creation of Machine Trust Accounts</H2
 ><P
 >The second (and recommended) way of creating machine trust accounts is
 simply to allow the Samba server to create them as needed when the client
@@ -773,9 +773,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN723"
+NAME="AEN748"
 ></A
->6.4.3. Joining the Client to the Domain</H2
+>7.4.3. Joining the Client to the Domain</H2
 ><P
 >The procedure for joining a client to the domain varies with the
 version of Windows.</P
@@ -841,9 +841,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN738"
+NAME="AEN763"
 ></A
->6.5. Common Problems and Errors</H1
+>7.5. Common Problems and Errors</H1
 ><P
 ></P
 ><P
@@ -1051,9 +1051,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN786"
+NAME="AEN811"
 ></A
->6.6. System Policies and Profiles</H1
+>7.6. System Policies and Profiles</H1
 ><P
 >Much of the information necessary to implement System Policies and
 Roving User Profiles in a Samba domain is the same as that for 
@@ -1228,9 +1228,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN830"
+NAME="AEN855"
 ></A
->6.7. What other help can I get?</H1
+>7.7. What other help can I get?</H1
 ><P
 >There are many sources of information available in the form 
 of mailing lists, RFC's and documentation.  The docs that come 
@@ -1648,9 +1648,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN944"
+NAME="AEN969"
 ></A
->6.8. Domain Control for Windows 9x/ME</H1
+>7.8. Domain Control for Windows 9x/ME</H1
 ><DIV
 CLASS="NOTE"
 ><P
@@ -1782,9 +1782,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN970"
+NAME="AEN995"
 ></A
->6.8.1. Configuration Instructions:	Network Logons</H2
+>7.8.1. Configuration Instructions:	Network Logons</H2
 ><P
 >The main difference between a PDC and a Windows 9x logon 
 server configuration is that</P
@@ -1888,9 +1888,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN989"
+NAME="AEN1014"
 ></A
->6.8.2. Configuration Instructions:	Setting up Roaming User Profiles</H2
+>7.8.2. Configuration Instructions:	Setting up Roaming User Profiles</H2
 ><DIV
 CLASS="WARNING"
 ><P
@@ -1941,9 +1941,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN997"
+NAME="AEN1022"
 ></A
->6.8.2.1. Windows NT Configuration</H3
+>7.8.2.1. Windows NT Configuration</H3
 ><P
 >To support WinNT clients, in the [global] section of smb.conf set the
 following (for example):</P
@@ -1992,9 +1992,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1005"
+NAME="AEN1030"
 ></A
->6.8.2.2. Windows 9X Configuration</H3
+>7.8.2.2. Windows 9X Configuration</H3
 ><P
 >To support Win9X clients, you must use the "logon home" parameter. Samba has
 now been fixed so that "net use/home" now works as well, and it, too, relies
@@ -2023,9 +2023,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1013"
+NAME="AEN1038"
 ></A
->6.8.2.3. Win9X and WinNT Configuration</H3
+>7.8.2.3. Win9X and WinNT Configuration</H3
 ><P
 >You can support profiles for both Win9X and WinNT clients by setting both the
 "logon home" and "logon path" parameters. For example:</P
@@ -2068,9 +2068,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1020"
+NAME="AEN1045"
 ></A
->6.8.2.4. Windows 9X Profile Setup</H3
+>7.8.2.4. Windows 9X Profile Setup</H3
 ><P
 >When a user first logs in on Windows 9X, the file user.DAT is created,
 as are folders "Start Menu", "Desktop", "Programs" and "Nethood".  
@@ -2228,9 +2228,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1056"
+NAME="AEN1081"
 ></A
->6.8.2.5. Windows NT Workstation 4.0</H3
+>7.8.2.5. Windows NT Workstation 4.0</H3
 ><P
 >When a user first logs in to a Windows NT Workstation, the profile
 NTuser.DAT is created.  The profile location can be now specified
@@ -2342,9 +2342,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1069"
+NAME="AEN1094"
 ></A
->6.8.2.6. Windows NT Server</H3
+>7.8.2.6. Windows NT Server</H3
 ><P
 >There is nothing to stop you specifying any path that you like for the
 location of users' profiles.  Therefore, you could specify that the
@@ -2356,9 +2356,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1072"
+NAME="AEN1097"
 ></A
->6.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</H3
+>7.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</H3
 ><DIV
 CLASS="WARNING"
 ><P
@@ -2449,9 +2449,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1082"
+NAME="AEN1107"
 ></A
->6.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</H1
+>7.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</H1
 ><DIV
 CLASS="WARNING"
 ><P
@@ -2598,7 +2598,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="securitylevels.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -2626,13 +2626,13 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Type of installation</TD
+>User and Share security level (for servers not in a domain)</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p544.html"
+HREF="type.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/securitylevels.html b/docs/htmldocs/securitylevels.html
index 6613e07d5d..f1e9297fca 100644
--- a/docs/htmldocs/securitylevels.html
+++ b/docs/htmldocs/securitylevels.html
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Security levels</TITLE
+>User and Share security level (for servers not in a domain)</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
@@ -10,14 +10,14 @@ REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
-TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+TITLE="Type of installation"
+HREF="type.html"><LINK
 REL="PREVIOUS"
-TITLE="Printing Support"
-HREF="printing.html"><LINK
+TITLE="Type of installation"
+HREF="type.html"><LINK
 REL="NEXT"
-TITLE="Unified Logons between Windows NT and UNIX using Winbind"
-HREF="winbind.html"></HEAD
+TITLE="How to Configure Samba as a NT4 Primary Domain Controller"
+HREF="samba-pdc.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="printing.html"
+HREF="type.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="winbind.html"
+HREF="samba-pdc.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,61 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="SECURITYLEVELS"
 ></A
->Chapter 15. Security levels</H1
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN2186"
-></A
->15.1. Introduction</H1
-><P
->Samba supports the following options to the global smb.conf parameter</P
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->[global]
-<A
-HREF="smb.conf.5.html#SECURITY"
-TARGET="_top"
-><TT
-CLASS="PARAMETER"
-><I
->security</I
-></TT
-></A
-> = [share|user(default)|server|domain|ads]</PRE
-></P
-><P
->Please refer to the smb.conf man page for usage information and to the document
-<A
-HREF="DOMAIN_MEMBER.html"
-TARGET="_top"
->DOMAIN_MEMBER.html</A
-> for further background details
-on domain mode security.  The Windows 2000 Kerberos domain security model
-(security = ads) is described in the <A
-HREF="ADS-HOWTO.html"
-TARGET="_top"
->ADS-HOWTO.html</A
->.</P
-><P
->Of the above, "security = server" means that Samba reports to clients that
-it is running in "user mode" but actually passes off all authentication
-requests to another "user mode" server. This requires an additional
-parameter "password server =" that points to the real authentication server.
-That real authentication server can be another Samba server or can be a
-Windows NT server, the later natively capable of encrypted password support.</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN2197"
-></A
->15.2. More complete description of security levels</H1
+>Chapter 6. User and Share security level (for servers not in a domain)</H1
 ><P
 >A SMB server tells the client at startup what "security level" it is
 running. There are two options "share level" and "user level". Which
@@ -214,7 +160,13 @@ smbpasswd file with SMB style encrypted passwords. It is
 cryptographically impossible to translate from unix style encryption
 to SMB style encryption, although there are some fairly simple management
 schemes by which the two could be kept in sync.</P
-></DIV
+><P
+>"security = server" means that Samba reports to clients that
+it is running in "user mode" but actually passes off all authentication
+requests to another "user mode" server. This requires an additional
+parameter "password server =" that points to the real authentication server.
+That real authentication server can be another Samba server or can be a
+Windows NT server, the later natively capable of encrypted password support.</P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
@@ -232,7 +184,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="printing.html"
+HREF="type.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -250,7 +202,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="winbind.html"
+HREF="samba-pdc.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -260,13 +212,13 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Printing Support</TD
+>Type of installation</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="type.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -274,7 +226,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Unified Logons between Windows NT and UNIX using Winbind</TD
+>How to Configure Samba as a NT4 Primary Domain Controller</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/speed.html b/docs/htmldocs/speed.html
index 9df2a6d6af..85562e3e89 100644
--- a/docs/htmldocs/speed.html
+++ b/docs/htmldocs/speed.html
@@ -11,13 +11,13 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Group mapping HOWTO"
 HREF="groupmapping.html"><LINK
 REL="NEXT"
 TITLE="Appendixes"
-HREF="p3106.html"></HEAD
+HREF="appendixes.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,15 +74,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SPEED"
 ></A
->Chapter 22. Samba performance issues</H1
+>Chapter 23. Samba performance issues</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2982"
+NAME="AEN3065"
 ></A
->22.1. Comparisons</H1
+>23.1. Comparisons</H1
 ><P
 >The Samba server uses TCP to talk to the client. Thus if you are
 trying to see if it performs well you should really compare it to
@@ -111,17 +111,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2988"
+NAME="AEN3071"
 ></A
->22.2. Oplocks</H1
+>23.2. Oplocks</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2990"
+NAME="AEN3073"
 ></A
->22.2.1. Overview</H2
+>23.2.1. Overview</H2
 ><P
 >Oplocks are the way that SMB clients get permission from a server to
 locally cache file operations. If a server grants an oplock
@@ -155,9 +155,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2998"
+NAME="AEN3081"
 ></A
->22.2.2. Level2 Oplocks</H2
+>23.2.2. Level2 Oplocks</H2
 ><P
 >With Samba 2.0.5 a new capability - level2 (read only) oplocks is
 supported (although the option is off by default - see the smb.conf
@@ -179,9 +179,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3004"
+NAME="AEN3087"
 ></A
->22.2.3. Old 'fake oplocks' option - deprecated</H2
+>23.2.3. Old 'fake oplocks' option - deprecated</H2
 ><P
 >Samba can also fake oplocks, by granting a oplock whenever a client 
 asks for one. This is controlled using the smb.conf option "fake 
@@ -200,9 +200,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3008"
+NAME="AEN3091"
 ></A
->22.3. Socket options</H1
+>23.3. Socket options</H1
 ><P
 >There are a number of socket options that can greatly affect the
 performance of a TCP based server like Samba.</P
@@ -228,9 +228,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3015"
+NAME="AEN3098"
 ></A
->22.4. Read size</H1
+>23.4. Read size</H1
 ><P
 >The option "read size" affects the overlap of disk reads/writes with
 network reads/writes. If the amount of data being transferred in
@@ -254,9 +254,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3020"
+NAME="AEN3103"
 ></A
->22.5. Max xmit</H1
+>23.5. Max xmit</H1
 ><P
 >At startup the client and server negotiate a "maximum transmit" size,
 which limits the size of nearly all SMB commands. You can set the
@@ -277,9 +277,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3025"
+NAME="AEN3108"
 ></A
->22.6. Locking</H1
+>23.6. Locking</H1
 ><P
 >By default Samba does not implement strict locking on each read/write
 call (although it did in previous versions). If you enable strict
@@ -294,9 +294,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3029"
+NAME="AEN3112"
 ></A
->22.7. Share modes</H1
+>23.7. Share modes</H1
 ><P
 >Some people find that opening files is very slow. This is often
 because of the "share modes" code needed to fully implement the dos
@@ -324,9 +324,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3034"
+NAME="AEN3117"
 ></A
->22.8. Log level</H1
+>23.8. Log level</H1
 ><P
 >If you set the log level (also known as "debug level") higher than 2
 then you may suffer a large drop in performance. This is because the
@@ -338,9 +338,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3037"
+NAME="AEN3120"
 ></A
->22.9. Wide lines</H1
+>23.9. Wide lines</H1
 ><P
 >The "wide links" option is now enabled by default, but if you disable
 it (for better security) then you may suffer a performance hit in
@@ -352,9 +352,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3040"
+NAME="AEN3123"
 ></A
->22.10. Read raw</H1
+>23.10. Read raw</H1
 ><P
 >The "read raw" operation is designed to be an optimised, low-latency
 file read operation. A server may choose to not support it,
@@ -374,9 +374,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3045"
+NAME="AEN3128"
 ></A
->22.11. Write raw</H1
+>23.11. Write raw</H1
 ><P
 >The "write raw" operation is designed to be an optimised, low-latency
 file write operation. A server may choose to not support it,
@@ -391,9 +391,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3049"
+NAME="AEN3132"
 ></A
->22.12. Read prediction</H1
+>23.12. Read prediction</H1
 ><P
 >Samba can do read prediction on some of the SMB commands. Read
 prediction means that Samba reads some extra data on the last file it
@@ -417,9 +417,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3056"
+NAME="AEN3139"
 ></A
->22.13. Memory mapping</H1
+>23.13. Memory mapping</H1
 ><P
 >Samba supports reading files via memory mapping them. One some
 machines this can give a large boost to performance, on others it
@@ -438,9 +438,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3061"
+NAME="AEN3144"
 ></A
->22.14. Slow Clients</H1
+>23.14. Slow Clients</H1
 ><P
 >One person has reported that setting the protocol to COREPLUS rather
 than LANMAN2 gave a dramatic speed improvement (from 10k/s to 150k/s).</P
@@ -455,9 +455,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3065"
+NAME="AEN3148"
 ></A
->22.15. Slow Logins</H1
+>23.15. Slow Logins</H1
 ><P
 >Slow logins are almost always due to the password checking time. Using
 the lowest practical "password level" will improve things a lot. You
@@ -468,9 +468,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3068"
+NAME="AEN3151"
 ></A
->22.16. Client tuning</H1
+>23.16. Client tuning</H1
 ><P
 >Often a speed problem can be traced to the client. The client (for
 example Windows for Workgroups) can often be tuned for better TCP
@@ -572,9 +572,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3100"
+NAME="AEN3183"
 ></A
->22.17. My Results</H1
+>23.17. My Results</H1
 ><P
 >Some people want to see real numbers in a document like this, so here
 they are. I have a 486sx33 client running WfWg 3.11 with the 3.11b
@@ -631,7 +631,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="p3106.html"
+HREF="appendixes.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -647,7 +647,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/type.html b/docs/htmldocs/type.html
new file mode 100644
index 0000000000..ec6aa6df6c
--- /dev/null
+++ b/docs/htmldocs/type.html
@@ -0,0 +1,392 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Type of installation</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+REL="HOME"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="PREVIOUS"
+TITLE="LanMan and NT Password Encryption in Samba"
+HREF="pwencrypt.html"><LINK
+REL="NEXT"
+TITLE="User and Share security level (for servers not in a domain)"
+HREF="securitylevels.html"></HEAD
+><BODY
+CLASS="PART"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SAMBA Project Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="pwencrypt.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="securitylevels.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="PART"
+><A
+NAME="TYPE"
+></A
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+>II. Type of installation</H1
+><DIV
+CLASS="PARTINTRO"
+><A
+NAME="AEN547"
+></A
+><H1
+>Introduction</H1
+><P
+>Samba can operate in various SMB networks. This part contains information on configuring samba 
+for various environments.</P
+></DIV
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>6. <A
+HREF="securitylevels.html"
+>User and Share security level (for servers not in a domain)</A
+></DT
+><DT
+>7. <A
+HREF="samba-pdc.html"
+>How to Configure Samba as a NT4 Primary Domain Controller</A
+></DT
+><DD
+><DL
+><DT
+>7.1. <A
+HREF="samba-pdc.html#AEN591"
+>Prerequisite Reading</A
+></DT
+><DT
+>7.2. <A
+HREF="samba-pdc.html#AEN597"
+>Background</A
+></DT
+><DT
+>7.3. <A
+HREF="samba-pdc.html#AEN636"
+>Configuring the Samba Domain Controller</A
+></DT
+><DT
+>7.4. <A
+HREF="samba-pdc.html#AEN679"
+>Creating Machine Trust Accounts and Joining Clients to the
+Domain</A
+></DT
+><DD
+><DL
+><DT
+>7.4.1. <A
+HREF="samba-pdc.html#AEN698"
+>Manual Creation of Machine Trust Accounts</A
+></DT
+><DT
+>7.4.2. <A
+HREF="samba-pdc.html#AEN739"
+>"On-the-Fly" Creation of Machine Trust Accounts</A
+></DT
+><DT
+>7.4.3. <A
+HREF="samba-pdc.html#AEN748"
+>Joining the Client to the Domain</A
+></DT
+></DL
+></DD
+><DT
+>7.5. <A
+HREF="samba-pdc.html#AEN763"
+>Common Problems and Errors</A
+></DT
+><DT
+>7.6. <A
+HREF="samba-pdc.html#AEN811"
+>System Policies and Profiles</A
+></DT
+><DT
+>7.7. <A
+HREF="samba-pdc.html#AEN855"
+>What other help can I get?</A
+></DT
+><DT
+>7.8. <A
+HREF="samba-pdc.html#AEN969"
+>Domain Control for Windows 9x/ME</A
+></DT
+><DD
+><DL
+><DT
+>7.8.1. <A
+HREF="samba-pdc.html#AEN995"
+>Configuration Instructions:	Network Logons</A
+></DT
+><DT
+>7.8.2. <A
+HREF="samba-pdc.html#AEN1014"
+>Configuration Instructions:	Setting up Roaming User Profiles</A
+></DT
+></DL
+></DD
+><DT
+>7.9. <A
+HREF="samba-pdc.html#AEN1107"
+>DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
+></DT
+></DL
+></DD
+><DT
+>8. <A
+HREF="samba-bdc.html"
+>How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
+></DT
+><DD
+><DL
+><DT
+>8.1. <A
+HREF="samba-bdc.html#AEN1143"
+>Prerequisite Reading</A
+></DT
+><DT
+>8.2. <A
+HREF="samba-bdc.html#AEN1147"
+>Background</A
+></DT
+><DT
+>8.3. <A
+HREF="samba-bdc.html#AEN1155"
+>What qualifies a Domain Controller on the network?</A
+></DT
+><DD
+><DL
+><DT
+>8.3.1. <A
+HREF="samba-bdc.html#AEN1158"
+>How does a Workstation find its domain controller?</A
+></DT
+><DT
+>8.3.2. <A
+HREF="samba-bdc.html#AEN1161"
+>When is the PDC needed?</A
+></DT
+></DL
+></DD
+><DT
+>8.4. <A
+HREF="samba-bdc.html#AEN1164"
+>Can Samba be a Backup Domain Controller?</A
+></DT
+><DT
+>8.5. <A
+HREF="samba-bdc.html#AEN1168"
+>How do I set up a Samba BDC?</A
+></DT
+><DD
+><DL
+><DT
+>8.5.1. <A
+HREF="samba-bdc.html#AEN1185"
+>How do I replicate the smbpasswd file?</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>9. <A
+HREF="ads.html"
+>Samba as a ADS domain member</A
+></DT
+><DD
+><DL
+><DT
+>9.1. <A
+HREF="ads.html#AEN1203"
+>Installing the required packages for Debian</A
+></DT
+><DT
+>9.2. <A
+HREF="ads.html#AEN1209"
+>Installing the required packages for RedHat</A
+></DT
+><DT
+>9.3. <A
+HREF="ads.html#AEN1218"
+>Compile Samba</A
+></DT
+><DT
+>9.4. <A
+HREF="ads.html#AEN1230"
+>Setup your /etc/krb5.conf</A
+></DT
+><DT
+>9.5. <A
+HREF="ads.html#AEN1240"
+>Create the computer account</A
+></DT
+><DD
+><DL
+><DT
+>9.5.1. <A
+HREF="ads.html#AEN1244"
+>Possible errors</A
+></DT
+></DL
+></DD
+><DT
+>9.6. <A
+HREF="ads.html#AEN1256"
+>Test your server setup</A
+></DT
+><DT
+>9.7. <A
+HREF="ads.html#AEN1261"
+>Testing with smbclient</A
+></DT
+><DT
+>9.8. <A
+HREF="ads.html#AEN1264"
+>Notes</A
+></DT
+></DL
+></DD
+><DT
+>10. <A
+HREF="domain-security.html"
+>Samba as a NT4 domain member</A
+></DT
+><DD
+><DL
+><DT
+>10.1. <A
+HREF="domain-security.html#AEN1286"
+>Joining an NT Domain with Samba 2.2</A
+></DT
+><DT
+>10.2. <A
+HREF="domain-security.html#AEN1350"
+>Samba and Windows 2000 Domains</A
+></DT
+><DT
+>10.3. <A
+HREF="domain-security.html#AEN1355"
+>Why is this better than security = server?</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="pwencrypt.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="securitylevels.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>LanMan and NT Password Encryption in Samba</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>User and Share security level (for servers not in a domain)</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/unix-permissions.html b/docs/htmldocs/unix-permissions.html
index 153a0e82bc..864fedea7b 100644
--- a/docs/htmldocs/unix-permissions.html
+++ b/docs/htmldocs/unix-permissions.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
 TITLE="Integrating MS Windows networks with Samba"
 HREF="integrate-ms-networks.html"><LINK
@@ -75,15 +75,15 @@ CLASS="CHAPTER"
 ><A
 NAME="UNIX-PERMISSIONS"
 ></A
->Chapter 11. UNIX Permission Bits and Windows NT Access Control Lists</H1
+>Chapter 12. UNIX Permission Bits and Windows NT Access Control Lists</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1593"
+NAME="AEN1618"
 ></A
->11.1. Viewing and changing UNIX permissions using the NT 
+>12.1. Viewing and changing UNIX permissions using the NT 
 	security dialogs</H1
 ><P
 >New in the Samba 2.0.4 release is the ability for Windows 
@@ -120,9 +120,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1602"
+NAME="AEN1627"
 ></A
->11.2. How to view file security on a Samba share</H1
+>12.2. How to view file security on a Samba share</H1
 ><P
 >From an NT 4.0 client, single-click with the right 
 	mouse button on any file or directory in a Samba mounted 
@@ -190,9 +190,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1613"
+NAME="AEN1638"
 ></A
->11.3. Viewing file ownership</H1
+>12.3. Viewing file ownership</H1
 ><P
 >Clicking on the <B
 CLASS="COMMAND"
@@ -284,9 +284,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1633"
+NAME="AEN1658"
 ></A
->11.4. Viewing file or directory permissions</H1
+>12.4. Viewing file or directory permissions</H1
 ><P
 >The third button is the <B
 CLASS="COMMAND"
@@ -346,9 +346,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1648"
+NAME="AEN1673"
 ></A
->11.4.1. File Permissions</H2
+>12.4.1. File Permissions</H2
 ><P
 >The standard UNIX user/group/world triple and 
 		the corresponding "read", "write", "execute" permissions 
@@ -408,9 +408,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1662"
+NAME="AEN1687"
 ></A
->11.4.2. Directory Permissions</H2
+>12.4.2. Directory Permissions</H2
 ><P
 >Directories on an NT NTFS file system have two 
 		different sets of permissions. The first set of permissions 
@@ -440,9 +440,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1669"
+NAME="AEN1694"
 ></A
->11.5. Modifying file or directory permissions</H1
+>12.5. Modifying file or directory permissions</H1
 ><P
 >Modifying file and directory permissions is as simple 
 	as changing the displayed permissions in the dialog box, and 
@@ -538,9 +538,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1691"
+NAME="AEN1716"
 ></A
->11.6. Interaction with the standard Samba create mask 
+>12.6. Interaction with the standard Samba create mask 
 	parameters</H1
 ><P
 >Note that with Samba 2.0.5 there are four new parameters 
@@ -815,9 +815,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1755"
+NAME="AEN1780"
 ></A
->11.7. Interaction with the standard Samba file attribute 
+>12.7. Interaction with the standard Samba file attribute 
 	mapping</H1
 ><P
 >Samba maps some of the DOS attribute bits (such as "read 
@@ -908,7 +908,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/docs/htmldocs/vfs.html b/docs/htmldocs/vfs.html
new file mode 100644
index 0000000000..fb0554e10c
--- /dev/null
+++ b/docs/htmldocs/vfs.html
@@ -0,0 +1,403 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Stackable VFS modules</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+REL="HOME"
+TITLE="SAMBA Project Documentation"
+HREF="samba-howto-collection.html"><LINK
+REL="UP"
+TITLE="Optional configuration"
+HREF="optional.html"><LINK
+REL="PREVIOUS"
+TITLE="Passdb XML plugin"
+HREF="pdb-xml.html"><LINK
+REL="NEXT"
+TITLE="Storing Samba's User/Machine Account information in an LDAP Directory"
+HREF="samba-ldap-howto.html"></HEAD
+><BODY
+CLASS="CHAPTER"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>SAMBA Project Documentation</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="pdb-xml.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="samba-ldap-howto.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="VFS"
+></A
+>Chapter 19. Stackable VFS modules</H1
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2651"
+></A
+>19.1. Introduction and configuration</H1
+><P
+>Since samba 3.0, samba supports stackable VFS(Virtual File System) modules. 
+Samba passes each request to access the unix file system thru the loaded VFS modules. 
+This chapter covers all the modules that come with the samba source and references to 
+some external modules.</P
+><P
+>You may have problems to compile these modules, as shared libraries are
+compiled and linked in different ways on different systems.
+I currently tested them against GNU/linux and IRIX.</P
+><P
+>To use the VFS modules, create a share similar to the one below.  The
+important parameter is the <B
+CLASS="COMMAND"
+>vfs object</B
+> parameter which must point to
+the exact pathname of the shared library object. For example, to use audit.so:
+
+<PRE
+CLASS="PROGRAMLISTING"
+>       [audit]
+                comment = Audited /data directory
+                path = /data
+                vfs object = /path/to/audit.so
+                writeable = yes
+                browseable = yes</PRE
+></P
+><P
+>Further documentation on writing VFS modules for Samba can be found in
+docs directory of the Samba source distribution.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2659"
+></A
+>19.2. Included modules</H1
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN2661"
+></A
+>19.2.1. audit</H2
+><P
+>A simple module to audit file access to the syslog
+facility.  The following operations are logged:
+<P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+>share</TD
+></TR
+><TR
+><TD
+>connect/disconnect</TD
+></TR
+><TR
+><TD
+>directory opens/create/remove</TD
+></TR
+><TR
+><TD
+>file open/close/rename/unlink/chmod</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN2669"
+></A
+>19.2.2. recycle</H2
+><P
+>A recycle-bin like modules. When used any unlink call
+will be intercepted and files moved to the recycle
+directory instead of beeing deleted.</P
+><P
+>Supported options:
+<P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>vfs_recycle_bin:repository</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:keeptree</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:versions</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:touch</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:maxsize</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:exclude</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:exclude_dir</DT
+><DD
+><P
+>FIXME</P
+></DD
+><DT
+>vfs_recycle_bin:noversions</DT
+><DD
+><P
+>FIXME</P
+></DD
+></DL
+></DIV
+></P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN2706"
+></A
+>19.2.3. netatalk</H2
+><P
+>A netatalk module, that will ease co-existence of samba and
+netatalk file sharing services.</P
+><P
+>Advantages compared to the old netatalk module:
+<P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+>it doesn't care about creating of .AppleDouble forks, just keeps ones in sync</TD
+></TR
+><TR
+><TD
+>if share in smb.conf doesn't contain .AppleDouble item in hide or veto list, it will be added automatically</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2713"
+></A
+>19.3. VFS modules available elsewhere</H1
+><P
+>This section contains a listing of various other VFS modules that 
+have been posted but don't currently reside in the Samba CVS 
+tree for one reason ot another (e.g. it is easy for the maintainer 
+to have his or her own CVS tree).</P
+><P
+>No statemets about the stability or functionality any module
+should be implied due to its presence here.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN2717"
+></A
+>19.3.1. DatabaseFS</H2
+><P
+>URL: <A
+HREF="http://www.css.tayloru.edu/~elorimer/databasefs/index.php"
+TARGET="_top"
+>http://www.css.tayloru.edu/~elorimer/databasefs/index.php</A
+></P
+><P
+>By <A
+HREF="mailto:elorimer@css.tayloru.edu"
+TARGET="_top"
+>Eric Lorimer</A
+>.</P
+><P
+>I have created a VFS module which implements a fairly complete read-only
+filesystem.  It presents information from a database as a filesystem in
+a modular and generic way to allow different databases to be used
+(originally designed for organizing MP3s under directories such as
+"Artists," "Song Keywords," etc... I have since applied it to a student
+roster database very easily).  The directory structure is stored in the
+database itself and the module makes no assumptions about the database
+structure beyond the table it requires to run.</P
+><P
+>Any feedback would be appreciated: comments, suggestions, patches,
+etc...  If nothing else, hopefully it might prove useful for someone
+else who wishes to create a virtual filesystem.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN2725"
+></A
+>19.3.2. vscan</H2
+><P
+>URL: <A
+HREF="http://www.openantivirus.org/"
+TARGET="_top"
+>http://www.openantivirus.org/</A
+></P
+><P
+>samba-vscan is a proof-of-concept module for Samba, which
+uses the VFS (virtual file system) features of Samba 2.2.x/3.0
+alphaX. Of couse, Samba has to be compiled with VFS support. 
+samba-vscan supports various virus scanners and is maintained 
+by Rainer Link.</P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="pdb-xml.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="samba-howto-collection.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="samba-ldap-howto.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Passdb XML plugin</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="optional.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Storing Samba's User/Machine Account information in an LDAP Directory</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index 016d77cac1..df5a59f771 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -11,10 +11,10 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="UP"
 TITLE="Optional configuration"
-HREF="p1346.html"><LINK
+HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Security levels"
-HREF="securitylevels.html"><LINK
+TITLE="Printing Support"
+HREF="printing.html"><LINK
 REL="NEXT"
 TITLE="Passdb MySQL plugin"
 HREF="pdb-mysql.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="securitylevels.html"
+HREF="printing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2249"
+NAME="AEN2238"
 ></A
 >16.1. Abstract</H1
 ><P
@@ -107,7 +107,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2253"
+NAME="AEN2242"
 ></A
 >16.2. Introduction</H1
 ><P
@@ -161,7 +161,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2266"
+NAME="AEN2255"
 ></A
 >16.3. What Winbind Provides</H1
 ><P
@@ -203,7 +203,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2273"
+NAME="AEN2262"
 ></A
 >16.3.1. Target Uses</H2
 ><P
@@ -227,7 +227,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2277"
+NAME="AEN2266"
 ></A
 >16.4. How Winbind Works</H1
 ><P
@@ -247,7 +247,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2282"
+NAME="AEN2271"
 ></A
 >16.4.1. Microsoft Remote Procedure Calls</H2
 ><P
@@ -273,7 +273,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2286"
+NAME="AEN2275"
 ></A
 >16.4.2. Name Service Switch</H2
 ><P
@@ -353,7 +353,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2302"
+NAME="AEN2291"
 ></A
 >16.4.3. Pluggable Authentication Modules</H2
 ><P
@@ -402,7 +402,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2310"
+NAME="AEN2299"
 ></A
 >16.4.4. User and Group ID Allocation</H2
 ><P
@@ -428,7 +428,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2314"
+NAME="AEN2303"
 ></A
 >16.4.5. Result Caching</H2
 ><P
@@ -451,7 +451,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2317"
+NAME="AEN2306"
 ></A
 >16.5. Installation and Configuration</H1
 ><P
@@ -478,7 +478,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2324"
+NAME="AEN2313"
 ></A
 >16.5.1. Introduction</H2
 ><P
@@ -537,7 +537,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2337"
+NAME="AEN2326"
 ></A
 >16.5.2. Requirements</H2
 ><P
@@ -607,7 +607,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2351"
+NAME="AEN2340"
 ></A
 >16.5.3. Testing Things Out</H2
 ><P
@@ -652,7 +652,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2362"
+NAME="AEN2351"
 ></A
 >16.5.3.1. Configure and compile SAMBA</H3
 ><P
@@ -718,7 +718,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2381"
+NAME="AEN2370"
 ></A
 >16.5.3.2. Configure <TT
 CLASS="FILENAME"
@@ -823,7 +823,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2414"
+NAME="AEN2403"
 ></A
 >16.5.3.3. Configure smb.conf</H3
 ><P
@@ -898,7 +898,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2430"
+NAME="AEN2419"
 ></A
 >16.5.3.4. Join the SAMBA server to the PDC domain</H3
 ><P
@@ -944,7 +944,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2441"
+NAME="AEN2430"
 ></A
 >16.5.3.5. Start up the winbindd daemon and test it!</H3
 ><P
@@ -1067,7 +1067,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2477"
+NAME="AEN2466"
 ></A
 >16.5.3.6. Fix the init.d startup scripts</H3
 ><DIV
@@ -1075,7 +1075,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2479"
+NAME="AEN2468"
 ></A
 >16.5.3.6.1. Linux</H4
 ><P
@@ -1171,7 +1171,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2496"
+NAME="AEN2485"
 ></A
 >16.5.3.6.2. Solaris</H4
 ><P
@@ -1242,7 +1242,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2503"
+NAME="AEN2492"
 ></A
 >16.5.3.6.3. Restarting</H4
 ><P
@@ -1266,7 +1266,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2509"
+NAME="AEN2498"
 ></A
 >16.5.3.7. Configure Winbind and PAM</H3
 ><P
@@ -1324,7 +1324,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2526"
+NAME="AEN2515"
 ></A
 >16.5.3.7.1. Linux/FreeBSD-specific PAM configuration</H4
 ><P
@@ -1453,7 +1453,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2559"
+NAME="AEN2548"
 ></A
 >16.5.3.7.2. Solaris-specific configuration</H4
 ><P
@@ -1540,7 +1540,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2566"
+NAME="AEN2555"
 ></A
 >16.6. Limitations</H1
 ><P
@@ -1581,7 +1581,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2576"
+NAME="AEN2565"
 ></A
 >16.7. Conclusion</H1
 ><P
@@ -1609,7 +1609,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="securitylevels.html"
+HREF="printing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -1637,13 +1637,13 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Security levels</TD
+>Printing Support</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="p1346.html"
+HREF="optional.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
-- 
cgit 


From 94c857fe25dcf8c8295779fae4de9dfe7eae446a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 14 Nov 2002 17:37:44 +0000
Subject: Update documentation to cover cascaded VFS modules (This used to be
 commit 218395ac7e5963a773691fb5a0539cce9e3b92f2)

---
 docs/docbook/manpages/smb.conf.5.sgml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 0cdf2bbcd6..ca4de18cfd 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -2300,7 +2300,7 @@
 		<term><anchor id="DOMAINLOGONS">domain logons (G)</term>
 		<listitem><para>If set to <constant>yes</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 
+		<parameter>workgroup</parameter></link> it is in. Samba 2.2
 		has limited capability to act as a domain controller for Windows 
 		NT 4 Domains.  For more details on setting up this feature see 
 		the Samba-PDC-HOWTO included in the <filename>htmldocs/</filename>
@@ -3791,7 +3791,7 @@
 		<listitem><para>The value of the parameter (a astring) allows 
 		the debug level (logging level) to be specified in the 
 		<filename>smb.conf</filename> file. This parameter has been
-		extended since 2.2.x series, now it allow to specify the debug
+		extended since the 2.2.x series, now it allow to specify the debug
 		level for multiple debug classes. This is to give greater 
 		flexibility in the configuration of the system.</para>
 
@@ -8055,11 +8055,10 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 		<varlistentry>
 		<term><anchor id="VFSOBJECT">vfs object (S)</term>
-		<listitem><para>This parameter specifies a shared object file that 
-		is used for Samba VFS I/O operations.  By default, normal 
+		<listitem><para>This parameter specifies a shared object files that 
+		are used for Samba VFS I/O operations.  By default, normal 
 		disk I/O operations are used but these can be overloaded 
-		with a VFS object.  The Samba VFS layer is new to Samba 2.2 and 
-		must be enabled at compile time with --with-vfs.</para>
+		with one or more VFS objects. </para>
 		
 		<para>Default : <emphasis>no value</emphasis></para>
 		</listitem>
@@ -8071,9 +8070,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		<varlistentry>
 		<term><anchor id="VFSOPTIONS">vfs options (S)</term>
 		<listitem><para>This parameter allows parameters to be passed 
-		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>
+		to the vfs layer at initialization time. 
+		See also <link linkend="VFSOBJECT"><parameter>
 		vfs object</parameter></link>.</para>
 		
 		<para>Default : <emphasis>no value</emphasis></para>
-- 
cgit 


From b75212077de08670a449d1f2192aded400559c6e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 14 Nov 2002 21:04:12 +0000
Subject: Update testparm for 3.0 (This used to be commit
 f01fad02d75975f25235eeeba8262bf11657e54a)

---
 docs/docbook/manpages/testparm.1.sgml | 12 +++++++++---
 docs/docs-status                      |  3 ---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml
index 350683eb57..254ede7265 100644
--- a/docs/docbook/manpages/testparm.1.sgml
+++ b/docs/docbook/manpages/testparm.1.sgml
@@ -20,8 +20,9 @@
 		<arg choice="opt">-h</arg>
 		<arg choice="opt">-v</arg>
 		<arg choice="opt">-L &lt;servername&gt;</arg>
+		<arg choice="opt">-t &lt;encoding&gt;</arg>
 		<arg choice="req">config filename</arg>
-		<arg choice="opt">hostname  hostIP</arg>
+		<arg choice="opt">hostname hostIP</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -86,6 +87,12 @@
 		their defaults.</para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>-t encoding</term>
+		<listitem><para>
+		Output data in specified encoding.
+		</para></listitem>
+
 		<varlistentry>
 		<term>configfilename</term>
 		<listitem><para>This is the name of the configuration file 
@@ -144,7 +151,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 2.2 of 
+	<para>This man page is correct for version 3.0 of 
 	the Samba suite.</para>
 </refsect1>
 
@@ -173,4 +180,3 @@
 </refsect1>
 
 </refentry>
-
diff --git a/docs/docs-status b/docs/docs-status
index 23a0127c3b..7dc301e9ec 100644
--- a/docs/docs-status
+++ b/docs/docs-status
@@ -40,13 +40,10 @@ docs/docbook/manpages/smbstatus.1.sgml
 docs/docbook/manpages/smbtar.1.sgml
 docs/docbook/manpages/smbumount.8.sgml
 docs/docbook/manpages/swat.8.sgml
-docs/docbook/manpages/testparm.1.sgml
 docs/docbook/manpages/testprns.1.sgml
 
 Stuff that needs to be documented:
 Doc for package maintainers
-Some kind of introduction to the various terms used (locking, wins, browsing, domain, ... )
-Merge the various docs about wins and browsing
 Windows NT 4.0 Style Trust Relationship
 One Time Migration script from a Windows NT 4.0 PDC to a Samba PDC
 ldap passwd sync
-- 
cgit 


From 77f45f5e530600d01f57a7fedbaa272ecd2f8c65 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 14 Nov 2002 21:18:22 +0000
Subject: Add more info about stackable VFS objects (This used to be commit
 2dcb295d8eceea7e92e7e8f2e2ffc3583db833fd)

---
 docs/docbook/projdoc/VFS.sgml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/projdoc/VFS.sgml b/docs/docbook/projdoc/VFS.sgml
index 4c228dfa87..66b9be1dbd 100644
--- a/docs/docbook/projdoc/VFS.sgml
+++ b/docs/docbook/projdoc/VFS.sgml
@@ -11,7 +11,7 @@
 <title>Introduction and configuration</title>
 
 <para>
-Since samba 3.0, samba supports stackable VFS(Virtual File System) modules. 
+Since samba 3.0, samba supports stackable VFS(Virtual File System) modules.  
 Samba passes each request to access the unix file system thru the loaded VFS modules. 
 This chapter covers all the modules that come with the samba source and references to 
 some external modules.
@@ -20,27 +20,32 @@ some external modules.
 <para>
 You may have problems to compile these modules, as shared libraries are
 compiled and linked in different ways on different systems.
-I currently tested them against GNU/linux and IRIX.
+They currently have been tested against GNU/linux and IRIX.
 </para>
 
 <para>
 To use the VFS modules, create a share similar to the one below.  The
 important parameter is the <command>vfs object</command> parameter which must point to
-the exact pathname of the shared library object. For example, to use audit.so:
+the exact pathname of the shared library objects. For example, to log all access 
+to files and use a recycle bin:
 
 <programlisting>
        [audit]
                 comment = Audited /data directory
                 path = /data
-                vfs object = /path/to/audit.so
+                vfs object = /path/to/audit.so /path/to/recycle.so
                 writeable = yes
                 browseable = yes
 </programlisting>
 </para>
 
+<para>
+The modules are used in the order they are specified.
+</para>
+
 <para>
 Further documentation on writing VFS modules for Samba can be found in
-docs directory of the Samba source distribution.
+the Samba Developers Guide.
 </para>
 
 </sect1>
-- 
cgit 


From 2b799b56f4d37d2baec44088c096a5a34ac8a968 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 14 Nov 2002 21:36:46 +0000
Subject: Remove some obsolete info (This used to be commit
 ffd2d3a0ba56f967112aaa63efd4221fad2cee70)

---
 docs/docbook/projdoc/Speed.sgml | 238 +---------------------------------------
 1 file changed, 2 insertions(+), 236 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/projdoc/Speed.sgml b/docs/docbook/projdoc/Speed.sgml
index 17adf10429..55d8b9492b 100644
--- a/docs/docbook/projdoc/Speed.sgml
+++ b/docs/docbook/projdoc/Speed.sgml
@@ -53,92 +53,6 @@ systems.
 
 </sect1>
 
-<sect1>
-<title>Oplocks</title>
-
-<sect2>
-<title>Overview</title>
-
-<para>
-Oplocks are the way that SMB clients get permission from a server to
-locally cache file operations. If a server grants an oplock
-(opportunistic lock) then the client is free to assume that it is the
-only one accessing the file and it will agressively cache file
-data. With some oplock types the client may even cache file open/close
-operations. This can give enormous performance benefits.
-</para>
-
-<para>
-With the release of Samba 1.9.18 we now correctly support opportunistic 
-locks. This is turned on by default, and can be turned off on a share-
-by-share basis by setting the parameter :
-</para>
-
-<para>
-<command>oplocks = False</command>
-</para>
-
-<para>
-We recommend that you leave oplocks on however, as current benchmark
-tests with NetBench seem to give approximately a 30% improvement in
-speed with them on. This is on average however, and the actual 
-improvement seen can be orders of magnitude greater, depending on
-what the client redirector is doing.
-</para>
-
-<para>
-Previous to Samba 1.9.18 there was a 'fake oplocks' option. This
-option has been left in the code for backwards compatibility reasons
-but it's use is now deprecated. A short summary of what the old
-code did follows.
-</para>
-
-</sect2>
-
-<sect2>
-<title>Level2 Oplocks</title>
-
-<para>
-With Samba 2.0.5 a new capability - level2 (read only) oplocks is
-supported (although the option is off by default - see the smb.conf
-man page for details). Turning on level2 oplocks (on a share-by-share basis)
-by setting the parameter :
-</para>
-
-<para>
-<command>level2 oplocks = true</command>
-</para>
-
-<para>
-should speed concurrent access to files that are not commonly written
-to, such as application serving shares (ie. shares that contain common
-.EXE files - such as a Microsoft Office share) as it allows clients to
-read-ahread cache copies of these files.
-</para>
-
-</sect2>
-
-<sect2>
-<title>Old 'fake oplocks' option - deprecated</title>
-
-<para>
-Samba can also fake oplocks, by granting a oplock whenever a client 
-asks for one. This is controlled using the smb.conf option "fake 
-oplocks". If you set "fake oplocks = yes" then you are telling the 
-client that it may agressively cache the file data for all opens.
-</para>
-
-<para>
-Enabling 'fake oplocks' on all read-only shares or shares that you know
-will only be accessed from one client at a time you will see a big
-performance improvement on many operations. If you enable this option
-on shares where multiple clients may be accessing the files read-write
-at the same time you can get data corruption.
-</para>
-
-</sect2>
-</sect1>
-
 <sect1>
 <title>Socket options</title>
 
@@ -226,55 +140,6 @@ In most cases the default is the best option.
 
 </sect1>
 
-<sect1>
-<title>Locking</title>
-
-<para>
-By default Samba does not implement strict locking on each read/write
-call (although it did in previous versions). If you enable strict
-locking (using "strict locking = yes") then you may find that you
-suffer a severe performance hit on some systems.
-</para>
-
-<para>
-The performance hit will probably be greater on NFS mounted
-filesystems, but could be quite high even on local disks.
-</para>
-
-</sect1>
-
-<sect1>
-<title>Share modes</title>
-
-<para>
-Some people find that opening files is very slow. This is often
-because of the "share modes" code needed to fully implement the dos
-share modes stuff. You can disable this code using "share modes =
-no". This will gain you a lot in opening and closing files but will
-mean that (in some cases) the system won't force a second user of a
-file to open the file read-only if the first has it open
-read-write. For many applications that do their own locking this
-doesn't matter, but for some it may. Most Windows applications
-depend heavily on "share modes" working correctly and it is
-recommended that the Samba share mode support be left at the
-default of "on".
-</para>
-
-<para>
-The share mode code in Samba has been re-written in the 1.9.17
-release following tests with the Ziff-Davis NetBench PC Benchmarking
-tool. It is now believed that Samba 1.9.17 implements share modes
-similarly to Windows NT.
-</para>
-
-<para>
-NOTE: In the most recent versions of Samba there is an option to use
-shared memory via mmap() to implement the share modes. This makes
-things much faster. See the Makefile for how to enable this.
-</para>
-
-</sect1>
-
 <sect1>
 <title>Log level</title>
 
@@ -286,18 +151,6 @@ expensive.
 </para>
 </sect1>
 
-<sect1>
-<title>Wide lines</title>
-
-<para>
-The "wide links" option is now enabled by default, but if you disable
-it (for better security) then you may suffer a performance hit in
-resolving filenames. The performance loss is lessened if you have
-"getwd cache = yes", which is now the default.
-</para>
-
-</sect1>
-
 <sect1>
 <title>Read raw</title>
 
@@ -339,61 +192,6 @@ case you may wish to change this option.
 
 </sect1>
 
-<sect1>
-<title>Read prediction</title>
-
-<para>
-Samba can do read prediction on some of the SMB commands. Read
-prediction means that Samba reads some extra data on the last file it
-read while waiting for the next SMB command to arrive. It can then
-respond more quickly when the next read request arrives.
-</para>
-
-<para>
-This is disabled by default. You can enable it by using "read
-prediction = yes".
-</para>
-
-<para>
-Note that read prediction is only used on files that were opened read
-only.
-</para>
-
-<para>
-Read prediction should particularly help for those silly clients (such
-as "Write" under NT) which do lots of very small reads on a file.
-</para>
-
-<para>
-Samba will not read ahead more data than the amount specified in the
-"read size" option. It always reads ahead on 1k block boundaries.
-</para>
-
-</sect1>
-
-<sect1>
-<title>Memory mapping</title>
-
-<para>
-Samba supports reading files via memory mapping them. One some
-machines this can give a large boost to performance, on others it
-makes not difference at all, and on some it may reduce performance.
-</para>
-
-<para>
-To enable you you have to recompile Samba with the -DUSE_MMAP option
-on the FLAGS line of the Makefile.
-</para>
-
-<para>
-Note that memory mapping is only used on files opened read only, and
-is not used by the "read raw" operation. Thus you may find memory
-mapping is more effective if you disable "read raw" using "read raw =
-no".
-</para>
-
-</sect1>
-
 <sect1>
 <title>Slow Clients</title>
 
@@ -510,11 +308,12 @@ drive (Kernel 2.0.30). The transfer rate was reasonable for 10 baseT.
 </para>
 
 <para>
-FIXME
+<programlisting>
 The figures are:          Put              Get 
 P166 client 3Com card:    420-440kB/s      500-520kB/s
 P100 client 3Com card:    390-410kB/s      490-510kB/s
 DX4-75 client NE2000:     370-380kB/s      330-350kB/s
+</programlisting>
 </para>
 
 <para>
@@ -541,38 +340,5 @@ if it could get up to the rate of FTP the perfomance would be quite
 staggering.
 </para>
 
-</sect1>
-
-<sect1>
-<title>My Results</title>
-
-<para>
-Some people want to see real numbers in a document like this, so here
-they are. I have a 486sx33 client running WfWg 3.11 with the 3.11b
-tcp/ip stack. It has a slow IDE drive and 20Mb of ram. It has a SMC
-Elite-16 ISA bus ethernet card. The only WfWg tuning I've done is to
-set DefaultRcvWindow in the [MSTCP] section of system.ini to 16384. My
-server is a 486dx3-66 running Linux. It also has 20Mb of ram and a SMC
-Elite-16 card. You can see my server config in the examples/tridge/
-subdirectory of the distribution.
-</para>
-
-<para>
-I get 490k/s on reading a 8Mb file with copy.
-I get 441k/s writing the same file to the samba server.
-</para>
-
-<para>
-Of course, there's a lot more to benchmarks than 2 raw throughput
-figures, but it gives you a ballpark figure.
-</para>
-
-<para>
-I've also tested Win95 and WinNT, and found WinNT gave me the best
-speed as a samba client. The fastest client of all (for me) is
-smbclient running on another linux box. Maybe I'll add those results
-here someday ...
-</para>
-
 </sect1>
 </chapter>
-- 
cgit 


From ae23dfd427bc69b747e20f2217163cb863aa2c71 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 14 Nov 2002 22:54:23 +0000
Subject: Some small updates - 'ads server' is no longer required for example
 (This used to be commit b8f9930f62db8b997a0d6126e79212a113f8b29c)

---
 docs/docbook/projdoc/ADS-HOWTO.sgml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'docs')

diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.sgml
index 83bb2dc85d..3e34d53c0a 100644
--- a/docs/docbook/projdoc/ADS-HOWTO.sgml
+++ b/docs/docbook/projdoc/ADS-HOWTO.sgml
@@ -10,10 +10,8 @@
 <title>Samba as a ADS domain member</title>
 
 <para>
-This is a VERY ROUGH guide to setting up the current (November 2001)
-pre-alpha version of Samba 3.0 with kerberos authentication against a
-Windows2000 KDC. The procedures listed here are likely to change as
-the code develops.
+This is a rough guide to setting up Samba 3.0 with kerberos authentication against a
+Windows2000 KDC. 
 </para>
 
 <para>Pieces you need before you begin:
@@ -76,13 +74,17 @@ to get them off CD2.</para>
 
 <para><programlisting>
   realm = YOUR.KERBEROS.REALM
-  ads server = your.kerberos.server
   security = ADS
   encrypt passwords = yes
 </programlisting></para>
 
-<para>Strictly speaking, you can omit the realm name and you can use an IP
-  address for the ads server. In that case Samba will auto-detect these.</para>
+<para>
+In case samba can't figure out your ads server using your realm name, use the 
+<command>ads server</command> option in <filename>smb.conf</filename>:
+<programlisting>
+  ads server = your.kerberos.server
+</programlisting>
+</para>
 
 <para>You do *not* need a smbpasswd file, although it won't do any harm
   and if you have one then Samba will be able to fall back to normal
-- 
cgit