make html

(This used to be commit 39034207567c363a257f0aebd8ef22f15d98f451)
author: Jelmer Vernooij <jelmer@samba.org> 2002-10-15 18:14:31 +0000
committer: Jelmer Vernooij <jelmer@samba.org> 2002-10-15 18:14:31 +0000
commit: ca5759f796b153f702669942f7e01e498cc1170f (patch)
tree: 291d7b51d46582b897cd7dbc42991aca48f47db4 /docs
parent: af733342552ca6687a21f0a765993fb0e41059ed (diff)
download: samba-ca5759f796b153f702669942f7e01e498cc1170f.tar.gz
samba-ca5759f796b153f702669942f7e01e498cc1170f.tar.bz2
samba-ca5759f796b153f702669942f7e01e498cc1170f.zip
21 files changed, 915 insertions, 470 deletions
diff --git a/docs/htmldocs/browsing-quick.html b/docs/htmldocs/browsing-quick.html
new file mode 100644
index 0000000000..340302a102
--- /dev/null
+++ b/docs/htmldocs/browsing-quick.html
@@ -0,0 +1,445 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</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="Improved browsing in samba"
+HREF="improved-browsing.html"><LINK
+REL="NEXT"
+TITLE="Samba performance issues"
+HREF="speed.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="improved-browsing.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="speed.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="CHAPTER"
+><H1
+><A
+NAME="BROWSING-QUICK"
+></A
+>Chapter 16. Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</H1
+><P
+>This document should be read in conjunction with Browsing and may
+be taken as the fast track guide to implementing browsing across subnets
+and / or across workgroups (or domains). WINS is the best tool for resolution
+of NetBIOS names to IP addesses. WINS is NOT involved in browse list handling
+except by way of name to address mapping.</P
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2665"
+></A
+>16.1. Discussion</H1
+><P
+>Firstly, all MS Windows networking is based on SMB (Server Message
+Block) based messaging. SMB messaging is implemented using NetBIOS. Samba
+implements NetBIOS by encapsulating it over TCP/IP. MS Windows products can
+do likewise. NetBIOS based networking uses broadcast messaging to affect
+browse list management. When running NetBIOS over TCP/IP this uses UDP
+based messaging. UDP messages can be broadcast or unicast.</P
+><P
+>Normally, only unicast UDP messaging can be forwarded by routers. The
+"remote announce" parameter to smb.conf helps to project browse announcements
+to remote network segments via unicast UDP. Similarly, the "remote browse sync"
+parameter of smb.conf implements browse list collation using unicast UDP.</P
+><P
+>Secondly, in those networks where Samba is the only SMB server technology
+wherever possible nmbd should be configured on one (1) machine as the WINS
+server. This makes it easy to manage the browsing environment. If each network
+segment is configured with it's own Samba WINS server, then the only way to
+get cross segment browsing to work is by using the "remote announce" and
+the "remote browse sync" parameters to your smb.conf file.</P
+><P
+>If only one WINS server is used then the use of the "remote announce" and the
+"remote browse sync" parameters should NOT be necessary.</P
+><P
+>Samba WINS does not support MS-WINS replication. This means that when setting up
+Samba as a WINS server there must only be one nmbd configured as a WINS server
+on the network. Some sites have used multiple Samba WINS servers for redundancy
+(one server per subnet) and then used "remote browse sync" and "remote announce"
+to affect browse list collation across all segments. Note that this means
+clients will only resolve local names, and must be configured to use DNS to
+resolve names on other subnets in order to resolve the IP addresses of the
+servers they can see on other subnets. This setup is not recommended, but is
+mentioned as a practical consideration (ie: an 'if all else fails' scenario).</P
+><P
+>Lastly, take note that browse lists are a collection of unreliable broadcast
+messages that are repeated at intervals of not more than 15 minutes. This means
+that it will take time to establish a browse list and it can take up to 45
+minutes to stabilise, particularly across network segments.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2673"
+></A
+>16.2. Use of the "Remote Announce" parameter</H1
+><P
+>The "remote announce" parameter of smb.conf can be used to forcibly ensure
+that all the NetBIOS names on a network get announced to a remote network.
+The syntax of the "remote announce" parameter is:
+<PRE
+CLASS="PROGRAMLISTING"
+>	remote announce = a.b.c.d [e.f.g.h] ...</PRE
+>
+_or_
+<PRE
+CLASS="PROGRAMLISTING"
+>	remote announce = a.b.c.d/WORKGROUP [e.f.g.h/WORKGROUP] ...</PRE
+>
+
+where:
+<P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>a.b.c.d and e.f.g.h</DT
+><DD
+><P
+>is either the LMB (Local Master Browser) IP address
+or the broadcst address of the remote network.
+ie: the LMB is at 192.168.1.10, or the address
+could be given as 192.168.1.255 where the netmask
+is assumed to be 24 bits (255.255.255.0).
+When the remote announcement is made to the broadcast
+address of the remote network every host will receive
+our announcements. This is noisy and therefore
+undesirable but may be necessary if we do NOT know
+the IP address of the remote LMB.</P
+></DD
+><DT
+>WORKGROUP</DT
+><DD
+><P
+>is optional and can be either our own workgroup
+or that of the remote network. If you use the
+workgroup name of the remote network then our
+NetBIOS machine names will end up looking like
+they belong to that workgroup, this may cause
+name resolution problems and should be avoided.</P
+></DD
+></DL
+></DIV
+>&#13;</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2687"
+></A
+>16.3. Use of the "Remote Browse Sync" parameter</H1
+><P
+>The "remote browse sync" parameter of smb.conf is used to announce to
+another LMB that it must synchronise it's NetBIOS name list with our
+Samba LMB. It works ONLY if the Samba server that has this option is
+simultaneously the LMB on it's network segment.</P
+><P
+>The syntax of the "remote browse  sync" parameter is:
+<PRE
+CLASS="PROGRAMLISTING"
+>	remote browse sync = a.b.c.d</PRE
+>
+
+where a.b.c.d is either the IP address of the remote LMB or else is the network broadcast address of the remote segment.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2692"
+></A
+>16.4. Use of WINS</H1
+><P
+>Use of WINS (either Samba WINS _or_ MS Windows NT Server WINS) is highly
+recommended. Every NetBIOS machine registers it's name together with a
+name_type value for each of of several types of service it has available.
+eg: It registers it's name directly as a unique (the type 0x03) name.
+It also registers it's name if it is running the lanmanager compatible
+server service (used to make shares and printers available to other users)
+by registering the server (the type 0x20) name.</P
+><P
+>All NetBIOS names are up to 15 characters in length. The name_type variable
+is added to the end of the name - thus creating a 16 character name. Any
+name that is shorter than 15 characters is padded with spaces to the 15th
+character. ie: All NetBIOS names are 16 characters long (including the
+name_type information).</P
+><P
+>WINS can store these 16 character names as they get registered. A client
+that wants to log onto the network can ask the WINS server for a list
+of all names that have registered the NetLogon service name_type. This saves
+broadcast traffic and greatly expedites logon processing. Since broadcast
+name resolution can not be used across network segments this type of
+information can only be provided via WINS _or_ via statically configured
+"lmhosts" files that must reside on all clients in the absence of WINS.</P
+><P
+>WINS also serves the purpose of forcing browse list synchronisation by all
+LMB's. LMB's must synchronise their browse list with the DMB (domain master
+browser) and WINS helps the LMB to identify it's DMB. By definition this
+will work only within a single workgroup. Note that the domain master browser
+has NOTHING to do with what is referred to as an MS Windows NT Domain. The
+later is a reference to a security environment while the DMB refers to the
+master controller for browse list information only.</P
+><P
+>Use of WINS will work correctly only if EVERY client TCP/IP protocol stack
+has been configured to use the WINS server/s. Any client that has not been
+configured to use the WINS server will continue to use only broadcast based
+name registration so that WINS may NEVER get to know about it. In any case,
+machines that have not registered with a WINS server will fail name to address
+lookup attempts by other clients and will therefore cause workstation access
+errors.</P
+><P
+>To configure Samba as a WINS server just add "wins support = yes" to the
+smb.conf file [globals] section.</P
+><P
+>To configure Samba to register with a WINS server just add
+"wins server = a.b.c.d" to your smb.conf file [globals] section.</P
+><P
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>DO NOT EVER</I
+></SPAN
+> use both "wins support = yes" together with "wins server = a.b.c.d"
+particularly not using it's own IP address.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2703"
+></A
+>16.5. Do NOT use more than one (1) protocol on MS Windows machines</H1
+><P
+>A very common cause of browsing problems results from installing more than
+one protocol on an MS Windows machine.</P
+><P
+>Every NetBIOS machine take part in a process of electing the LMB (and DMB)
+every 15 minutes. A set of election criteria is used to determine the order
+of precidence for winning this election process. A machine running Samba or
+Windows NT will be biased so that the most suitable machine will predictably
+win and thus retain it's role.</P
+><P
+>The election process is "fought out" so to speak over every NetBIOS network
+interface. In the case of a Windows 9x machine that has both TCP/IP and IPX
+installed and has NetBIOS enabled over both protocols the election will be
+decided over both protocols. As often happens, if the Windows 9x machine is
+the only one with both protocols then the LMB may be won on the NetBIOS
+interface over the IPX protocol. Samba will then lose the LMB role as Windows
+9x will insist it knows who the LMB is. Samba will then cease to function
+as an LMB and thus browse list operation on all TCP/IP only machines will
+fail.</P
+><P
+>The safest rule of all to follow it this - USE ONLY ONE PROTOCOL!</P
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN2709"
+></A
+>16.6. Name Resolution Order</H1
+><P
+>Resolution of NetBIOS names to IP addresses can take place using a number
+of methods. The only ones that can provide NetBIOS name_type information
+are:
+<P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+>WINS: the best tool!</TD
+></TR
+><TR
+><TD
+>LMHOSTS: is static and hard to maintain.</TD
+></TR
+><TR
+><TD
+>Broadcast: uses UDP and can not resolve names across remote segments.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></P
+><P
+>Alternative means of name resolution includes:
+<P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+>/etc/hosts: is static, hard to maintain, and lacks name_type info</TD
+></TR
+><TR
+><TD
+>DNS: is a good choice but lacks essential name_type info.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></P
+><P
+>Many sites want to restrict DNS lookups and want to avoid broadcast name
+resolution traffic. The "name resolve order" parameter is of great help here.
+The syntax of the "name resolve order" parameter is:
+<PRE
+CLASS="PROGRAMLISTING"
+>	name resolve order = wins lmhosts bcast host</PRE
+>
+_or_
+<PRE
+CLASS="PROGRAMLISTING"
+>	name resolve order = wins lmhosts  	(eliminates bcast and host)</PRE
+>
+The default is:
+<PRE
+CLASS="PROGRAMLISTING"
+>	name  resolve order = host lmhost wins bcast</PRE
+>.
+where "host" refers the the native methods used by the Unix system
+to implement the gethostbyname() function call. This is normally
+controlled by <TT
+CLASS="FILENAME"
+>/etc/host.conf</TT
+>, <TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf</TT
+> and <TT
+CLASS="FILENAME"
+>/etc/resolv.conf</TT
+>.</P
+></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="improved-browsing.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="speed.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Improved browsing in samba</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Samba performance issues</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
+\ No newline at end of file
diff --git a/docs/htmldocs/bugreport.html b/docs/htmldocs/bugreport.html
index 53f34c9f0a..b5058f0d61 100644
--- a/docs/htmldocs/bugreport.html
+++ b/docs/htmldocs/bugreport.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="HOWTO Access Samba source code via CVS"
 HREF="cvs-access.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="BUGREPORT"
 ></A
->Chapter 20. Reporting Bugs</H1
+>Chapter 19. Reporting Bugs</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3111"
+NAME="AEN2921"
 ></A
->20.1. Introduction</H1
+>19.1. Introduction</H1
 ><P
 >The email address for bug reports is samba@samba.org</P
 ><P
@@ -109,9 +109,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3118"
+NAME="AEN2928"
 ></A
->20.2. General info</H1
+>19.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
@@ -134,9 +134,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3124"
+NAME="AEN2934"
 ></A
->20.3. Debug levels</H1
+>19.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
@@ -204,9 +204,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3141"
+NAME="AEN2951"
 ></A
->20.4. Internal errors</H1
+>19.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
@@ -248,9 +248,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3151"
+NAME="AEN2961"
 ></A
->20.5. Attaching to a running process</H1
+>19.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
@@ -265,9 +265,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3154"
+NAME="AEN2964"
 ></A
->20.6. Patches</H1
+>19.6. Patches</H1
 ><P
 >The best sort of bug report is one that includes a fix! If you send us
 patches please use <B
@@ -307,7 +307,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/cvs-access.html b/docs/htmldocs/cvs-access.html
index 6cfe99f94b..fba42db7b4 100644
--- a/docs/htmldocs/cvs-access.html
+++ b/docs/htmldocs/cvs-access.html
@@ -8,10 +8,10 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
-TITLE="Samba and other CIFS clients"
-HREF="other-clients.html"><LINK
+TITLE="Samba performance issues"
+HREF="speed.html"><LINK
 REL="NEXT"
 TITLE="Reporting Bugs"
 HREF="bugreport.html"></HEAD
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="other-clients.html"
+HREF="speed.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="CVS-ACCESS"
 ></A
->Chapter 19. HOWTO Access Samba source code via CVS</H1
+>Chapter 18. HOWTO Access Samba source code via CVS</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3063"
+NAME="AEN2873"
 ></A
->19.1. Introduction</H1
+>18.1. Introduction</H1
 ><P
 >Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
@@ -99,9 +99,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3068"
+NAME="AEN2878"
 ></A
->19.2. CVS Access to samba.org</H1
+>18.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, 
@@ -112,9 +112,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3071"
+NAME="AEN2881"
 ></A
->19.2.1. Access via CVSweb</H2
+>18.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 
@@ -133,9 +133,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3076"
+NAME="AEN2886"
 ></A
->19.2.2. Access via cvs</H2
+>18.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 
@@ -253,7 +253,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="other-clients.html"
+HREF="speed.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -262,7 +262,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -281,7 +281,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Samba and other CIFS clients</TD
+>Samba performance issues</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/diagnosis.html b/docs/htmldocs/diagnosis.html
index 9cab114e49..5ddf6b7a49 100644
--- a/docs/htmldocs/diagnosis.html
+++ b/docs/htmldocs/diagnosis.html
@@ -8,13 +8,10 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
-TITLE="How to Install and Test SAMBA"
-HREF="install.html"><LINK
-REL="NEXT"
-TITLE="Integrating MS Windows networks with Samba"
-HREF="integrate-ms-networks.html"></HEAD
+TITLE="Samba and other CIFS clients"
+HREF="other-clients.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -42,7 +39,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="install.html"
+HREF="other-clients.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -55,11 +52,7 @@ VALIGN="bottom"
 WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
-><A
-HREF="integrate-ms-networks.html"
-ACCESSKEY="N"
->Next</A
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><HR
@@ -71,15 +64,15 @@ CLASS="CHAPTER"
 ><A
 NAME="DIAGNOSIS"
 ></A
->Chapter 2. Diagnosing your samba server</H1
+>Chapter 23. Diagnosing your samba server</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN223"
+NAME="AEN3184"
 ></A
->2.1. Introduction</H1
+>23.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
@@ -99,9 +92,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN228"
+NAME="AEN3189"
 ></A
->2.2. Assumptions</H1
+>23.2. Assumptions</H1
 ><P
 >In all of the tests I assume you have a Samba server called BIGSERVER
 and a PC called ACLIENT both in workgroup TESTGROUP. I also assume the
@@ -140,17 +133,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN238"
+NAME="AEN3199"
 ></A
->2.3. Tests</H1
+>23.3. Tests</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN240"
+NAME="AEN3201"
 ></A
->2.3.1. Test 1</H2
+>23.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
@@ -170,9 +163,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN246"
+NAME="AEN3207"
 ></A
->2.3.2. Test 2</H2
+>23.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
@@ -196,9 +189,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN252"
+NAME="AEN3213"
 ></A
->2.3.3. Test 3</H2
+>23.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
@@ -267,9 +260,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN267"
+NAME="AEN3228"
 ></A
->2.3.4. Test 4</H2
+>23.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
@@ -288,9 +281,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN272"
+NAME="AEN3233"
 ></A
->2.3.5. Test 5</H2
+>23.3.5. Test 5</H2
 ><P
 >run the command <B
 CLASS="COMMAND"
@@ -309,9 +302,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN278"
+NAME="AEN3239"
 ></A
->2.3.6. Test 6</H2
+>23.3.6. Test 6</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -343,9 +336,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN286"
+NAME="AEN3247"
 ></A
->2.3.7. Test 7</H2
+>23.3.7. Test 7</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -432,9 +425,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN312"
+NAME="AEN3273"
 ></A
->2.3.8. Test 8</H2
+>23.3.8. Test 8</H2
 ><P
 >On the PC type the command <B
 CLASS="COMMAND"
@@ -492,9 +485,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN329"
+NAME="AEN3290"
 ></A
->2.3.9. Test 9</H2
+>23.3.9. Test 9</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -526,9 +519,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN337"
+NAME="AEN3298"
 ></A
->2.3.10. Test 10</H2
+>23.3.10. Test 10</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -552,9 +545,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN343"
+NAME="AEN3304"
 ></A
->2.3.11. Test 11</H2
+>23.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
@@ -580,9 +573,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN348"
+NAME="AEN3309"
 ></A
->2.4. Still having troubles?</H1
+>23.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
@@ -618,7 +611,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="install.html"
+HREF="other-clients.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -627,7 +620,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -635,18 +628,14 @@ ACCESSKEY="H"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
-><A
-HREF="integrate-ms-networks.html"
-ACCESSKEY="N"
->Next</A
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->How to Install and Test SAMBA</TD
+>Samba and other CIFS clients</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -656,7 +645,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Integrating MS Windows networks with Samba</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/domain-security.html b/docs/htmldocs/domain-security.html
index 9e311a03eb..8273525710 100644
--- a/docs/htmldocs/domain-security.html
+++ b/docs/htmldocs/domain-security.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Security levels"
 HREF="securitylevels.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="DOMAIN-SECURITY"
 ></A
->Chapter 10. security = domain in Samba 2.x</H1
+>Chapter 9. security = domain in Samba 2.x</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1275"
+NAME="AEN1133"
 ></A
->10.1. Joining an NT Domain with Samba 2.2</H1
+>9.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
@@ -308,9 +308,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1339"
+NAME="AEN1197"
 ></A
->10.2. Samba and Windows 2000 Domains</H1
+>9.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 2.2 is able to act as a member server of a Windows
@@ -333,9 +333,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1344"
+NAME="AEN1202"
 ></A
->10.3. Why is this better than security = server?</H1
+>9.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 
@@ -444,7 +444,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/groupmapping.html b/docs/htmldocs/groupmapping.html
index be308505bd..6ad9a3ad63 100644
--- a/docs/htmldocs/groupmapping.html
+++ b/docs/htmldocs/groupmapping.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Reporting Bugs"
 HREF="bugreport.html"><LINK
@@ -71,7 +71,7 @@ CLASS="CHAPTER"
 ><A
 NAME="GROUPMAPPING"
 ></A
->Chapter 21. Group mapping HOWTO</H1
+>Chapter 20. Group mapping HOWTO</H1
 ><P
 > 
 Starting with Samba 3.0 alpha 2, a new group mapping function is available. The
@@ -191,7 +191,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/improved-browsing.html b/docs/htmldocs/improved-browsing.html
index 831abe6d25..3fad127ef0 100644
--- a/docs/htmldocs/improved-browsing.html
+++ b/docs/htmldocs/improved-browsing.html
@@ -8,13 +8,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Using samba 3.0 with ActiveDirectory support"
 HREF="ads.html"><LINK
 REL="NEXT"
-TITLE="Samba performance issues"
-HREF="speed.html"></HEAD
+TITLE="Quick Cross Subnet Browsing / Cross Workgroup Browsing guide"
+HREF="browsing-quick.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="speed.html"
+HREF="browsing-quick.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="IMPROVED-BROWSING"
 ></A
->Chapter 16. Improved browsing in samba</H1
+>Chapter 15. Improved browsing in samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2659"
+NAME="AEN2517"
 ></A
->16.1. Overview of browsing</H1
+>15.1. Overview of browsing</H1
 ><P
 >SMB networking provides a mechanism by which clients can access a list
 of machines in a network, a so-called "browse list".  This list
@@ -101,9 +101,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2663"
+NAME="AEN2521"
 ></A
->16.2. Browsing support in samba</H1
+>15.2. Browsing support in samba</H1
 ><P
 >Samba now fully supports browsing.  The browsing is supported by nmbd
 and is also controlled by options in the smb.conf file (see smb.conf(5)).</P
@@ -146,9 +146,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2672"
+NAME="AEN2530"
 ></A
->16.3. Problem resolution</H1
+>15.3. Problem resolution</H1
 ><P
 >If something doesn't work then hopefully the log.nmb file will help
 you track down the problem.  Try a debug level of 2 or 3 for finding
@@ -180,9 +180,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2679"
+NAME="AEN2537"
 ></A
->16.4. Browsing across subnets</H1
+>15.4. Browsing across subnets</H1
 ><P
 >With the release of Samba 1.9.17(alpha1 and above) Samba has been
 updated to enable it to support the replication of browse lists
@@ -211,9 +211,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2684"
+NAME="AEN2542"
 ></A
->16.4.1. How does cross subnet browsing work ?</H2
+>15.4.1. How does cross subnet browsing work ?</H2
 ><P
 >Cross subnet browsing is a complicated dance, containing multiple
 moving parts.  It has taken Microsoft several years to get the code
@@ -423,9 +423,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2719"
+NAME="AEN2577"
 ></A
->16.5. Setting up a WINS server</H1
+>15.5. Setting up a WINS server</H1
 ><P
 >Either a Samba machine or a Windows NT Server machine may be set up
 as a WINS server.  To set a Samba machine to be a WINS server you must
@@ -506,9 +506,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2738"
+NAME="AEN2596"
 ></A
->16.6. Setting up Browsing in a WORKGROUP</H1
+>15.6. Setting up Browsing in a WORKGROUP</H1
 ><P
 >To set up cross subnet browsing on a network containing machines
 in up to be in a WORKGROUP, not an NT Domain you need to set up one
@@ -590,9 +590,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2756"
+NAME="AEN2614"
 ></A
->16.7. Setting up Browsing in a DOMAIN</H1
+>15.7. Setting up Browsing in a DOMAIN</H1
 ><P
 >If you are adding Samba servers to a Windows NT Domain then
 you must not set up a Samba server as a domain master browser.
@@ -641,9 +641,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2766"
+NAME="AEN2624"
 ></A
->16.8. Forcing samba to be the master</H1
+>15.8. Forcing samba to be the master</H1
 ><P
 >Who becomes the "master browser" is determined by an election process
 using broadcasts.  Each election packet contains a number of parameters
@@ -689,9 +689,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2775"
+NAME="AEN2633"
 ></A
->16.9. Making samba the domain master</H1
+>15.9. Making samba the domain master</H1
 ><P
 >The domain master is responsible for collating the browse lists of
 multiple subnets so that browsing can occur between subnets.  You can
@@ -762,9 +762,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2793"
+NAME="AEN2651"
 ></A
->16.10. Note about broadcast addresses</H1
+>15.10. Note about broadcast addresses</H1
 ><P
 >If your network uses a "0" based broadcast address (for example if it
 ends in a 0) then you will strike problems.  Windows for Workgroups
@@ -776,9 +776,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2796"
+NAME="AEN2654"
 ></A
->16.11. Multiple interfaces</H1
+>15.11. Multiple interfaces</H1
 ><P
 >Samba now supports machines with multiple network interfaces.  If you
 have multiple interfaces then you will need to use the "interfaces"
@@ -810,7 +810,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -819,7 +819,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="speed.html"
+HREF="browsing-quick.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -839,7 +839,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Samba performance issues</TD
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/install.html b/docs/htmldocs/install.html
index 4b5bf486b9..f78a6f85bd 100644
--- a/docs/htmldocs/install.html
+++ b/docs/htmldocs/install.html
@@ -8,13 +8,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="NEXT"
-TITLE="Diagnosing your samba server"
-HREF="diagnosis.html"></HEAD
+TITLE="Integrating MS Windows networks with Samba"
+HREF="integrate-ms-networks.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="diagnosis.html"
+HREF="integrate-ms-networks.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -862,7 +862,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -871,7 +871,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -880,7 +880,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="diagnosis.html"
+HREF="integrate-ms-networks.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -900,7 +900,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Diagnosing your samba server</TD
+>Integrating MS Windows networks with Samba</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/integrate-ms-networks.html b/docs/htmldocs/integrate-ms-networks.html
index a78d59196d..2412da9c4a 100644
--- a/docs/htmldocs/integrate-ms-networks.html
+++ b/docs/htmldocs/integrate-ms-networks.html
@@ -8,10 +8,10 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
-TITLE="Diagnosing your samba server"
-HREF="diagnosis.html"><LINK
+TITLE="How to Install and Test SAMBA"
+HREF="install.html"><LINK
 REL="NEXT"
 TITLE="Configuring PAM for distributed but centrally 
 managed authentication"
@@ -43,7 +43,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="diagnosis.html"
+HREF="install.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -72,15 +72,15 @@ CLASS="CHAPTER"
 ><A
 NAME="INTEGRATE-MS-NETWORKS"
 ></A
->Chapter 3. Integrating MS Windows networks with Samba</H1
+>Chapter 2. Integrating MS Windows networks with Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN365"
+NAME="AEN223"
 ></A
->3.1. Agenda</H1
+>2.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 
@@ -145,9 +145,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN387"
+NAME="AEN245"
 ></A
->3.2. Name Resolution in a pure Unix/Linux world</H1
+>2.2. Name Resolution in a pure Unix/Linux world</H1
 ><P
 >The key configuration files covered in this section are:</P
 ><P
@@ -187,9 +187,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN403"
+NAME="AEN261"
 ></A
->3.2.1. <TT
+>2.2.1. <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 ></H2
@@ -268,9 +268,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN419"
+NAME="AEN277"
 ></A
->3.2.2. <TT
+>2.2.2. <TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
 ></H2
@@ -306,9 +306,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN430"
+NAME="AEN288"
 ></A
->3.2.3. <TT
+>2.2.3. <TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
 ></H2
@@ -335,9 +335,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN438"
+NAME="AEN296"
 ></A
->3.2.4. <TT
+>2.2.4. <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
 ></H2
@@ -404,9 +404,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN450"
+NAME="AEN308"
 ></A
->3.3. Name resolution as used within MS Windows networking</H1
+>2.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 
@@ -489,9 +489,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN462"
+NAME="AEN320"
 ></A
->3.3.1. The NetBIOS Name Cache</H2
+>2.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 
@@ -516,9 +516,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN467"
+NAME="AEN325"
 ></A
->3.3.2. The LMHOSTS file</H2
+>2.3.2. The LMHOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 
 2000 in <TT
@@ -619,9 +619,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN475"
+NAME="AEN333"
 ></A
->3.3.3. HOSTS file</H2
+>2.3.3. HOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 2000 in 
 <TT
@@ -641,9 +641,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN480"
+NAME="AEN338"
 ></A
->3.3.4. DNS Lookup</H2
+>2.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 
@@ -661,9 +661,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN483"
+NAME="AEN341"
 ></A
->3.3.5. WINS Lookup</H2
+>2.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 
@@ -704,9 +704,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN495"
+NAME="AEN353"
 ></A
->3.4. How browsing functions and how to deploy stable and 
+>2.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 
@@ -771,9 +771,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN505"
+NAME="AEN363"
 ></A
->3.5. MS Windows security options and how to configure 
+>2.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 
@@ -908,9 +908,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN533"
+NAME="AEN391"
 ></A
->3.5.1. Use MS Windows NT as an authentication server</H2
+>2.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
@@ -944,9 +944,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN541"
+NAME="AEN399"
 ></A
->3.5.2. Make Samba a member of an MS Windows NT security domain</H2
+>2.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
@@ -1007,9 +1007,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN558"
+NAME="AEN416"
 ></A
->3.5.3. Configure Samba as an authentication server</H2
+>2.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 
@@ -1044,9 +1044,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN565"
+NAME="AEN423"
 ></A
->3.5.3.1. Users</H3
+>2.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 
@@ -1067,9 +1067,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN570"
+NAME="AEN428"
 ></A
->3.5.3.2. MS Windows NT Machine Accounts</H3
+>2.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
@@ -1088,9 +1088,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN575"
+NAME="AEN433"
 ></A
->3.6. Conclusions</H1
+>2.6. Conclusions</H1
 ><P
 >Samba provides a flexible means to operate as...</P
 ><P
@@ -1136,7 +1136,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="diagnosis.html"
+HREF="install.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -1145,7 +1145,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -1164,7 +1164,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Diagnosing your samba server</TD
+>How to Install and Test SAMBA</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/msdfs.html b/docs/htmldocs/msdfs.html
index 7db1a94d72..47628ccf85 100644
--- a/docs/htmldocs/msdfs.html
+++ b/docs/htmldocs/msdfs.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Configuring PAM for distributed but centrally 
 managed authentication"
@@ -72,15 +72,15 @@ CLASS="CHAPTER"
 ><A
 NAME="MSDFS"
 ></A
->Chapter 5. Hosting a Microsoft Distributed File System tree on Samba</H1
+>Chapter 4. Hosting a Microsoft Distributed File System tree on Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN667"
+NAME="AEN525"
 ></A
->5.1. Instructions</H1
+>4.1. Instructions</H1
 ><P
 >The Distributed File System (or Dfs) provides a means of 
 	separating the logical view of files and directories that users 
@@ -226,9 +226,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN702"
+NAME="AEN560"
 ></A
->5.1.1. Notes</H2
+>4.1.1. Notes</H2
 ><P
 ></P
 ><UL
@@ -280,7 +280,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/other-clients.html b/docs/htmldocs/other-clients.html
index b2a0ff23b2..4f6c5fe70a 100644
--- a/docs/htmldocs/other-clients.html
+++ b/docs/htmldocs/other-clients.html
@@ -8,13 +8,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
-TITLE="Samba performance issues"
-HREF="speed.html"><LINK
+TITLE="Portability"
+HREF="portability.html"><LINK
 REL="NEXT"
-TITLE="HOWTO Access Samba source code via CVS"
-HREF="cvs-access.html"></HEAD
+TITLE="Diagnosing your samba server"
+HREF="diagnosis.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="speed.html"
+HREF="portability.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="cvs-access.html"
+HREF="diagnosis.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -71,7 +71,7 @@ CLASS="CHAPTER"
 ><A
 NAME="OTHER-CLIENTS"
 ></A
->Chapter 18. Samba and other CIFS clients</H1
+>Chapter 22. Samba and other CIFS clients</H1
 ><P
 >This chapter contains client-specific information.</P
 ><DIV
@@ -79,9 +79,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2953"
+NAME="AEN3070"
 ></A
->18.1. Macintosh clients?</H1
+>22.1. Macintosh clients?</H1
 ><P
 >Yes. <A
 HREF="http://www.thursby.com/"
@@ -125,17 +125,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2962"
+NAME="AEN3079"
 ></A
->18.2. OS2 Client</H1
+>22.2. OS2 Client</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2964"
+NAME="AEN3081"
 ></A
->18.2.1. How can I configure OS/2 Warp Connect or 
+>22.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 
@@ -192,9 +192,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2979"
+NAME="AEN3096"
 ></A
->18.2.2. How can I configure OS/2 Warp 3 (not Connect), 
+>22.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 
@@ -236,9 +236,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2988"
+NAME="AEN3105"
 ></A
->18.2.3. Are there any other issues when OS/2 (any version) 
+>22.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 
@@ -258,9 +258,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2992"
+NAME="AEN3109"
 ></A
->18.2.4. How do I get printer driver download working 
+>22.2.4. How do I get printer driver download working 
 		for OS/2 clients?</H2
 ><P
 >First, create a share called [PRINTDRV] that is 
@@ -309,17 +309,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3002"
+NAME="AEN3119"
 ></A
->18.3. Windows for Workgroups</H1
+>22.3. Windows for Workgroups</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3004"
+NAME="AEN3121"
 ></A
->18.3.1. Use latest TCP/IP stack from Microsoft</H2
+>22.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
@@ -339,9 +339,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3009"
+NAME="AEN3126"
 ></A
->18.3.2. Delete .pwl files after password change</H2
+>22.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
@@ -359,9 +359,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3014"
+NAME="AEN3131"
 ></A
->18.3.3. Configure WfW password handling</H2
+>22.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
@@ -378,9 +378,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3018"
+NAME="AEN3135"
 ></A
->18.3.4. Case handling of passwords</H2
+>22.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"
@@ -397,9 +397,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3023"
+NAME="AEN3140"
 ></A
->18.4. Windows '95/'98</H1
+>22.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
@@ -445,9 +445,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3039"
+NAME="AEN3156"
 ></A
->18.5. Windows 2000 Service Pack 2</H1
+>22.5. Windows 2000 Service Pack 2</H1
 ><P
 > 
 There are several annoyances with Windows 2000 SP2. One of which
@@ -539,7 +539,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="speed.html"
+HREF="portability.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -548,7 +548,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -557,7 +557,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="cvs-access.html"
+HREF="diagnosis.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -567,7 +567,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Samba performance issues</TD
+>Portability</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -577,7 +577,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->HOWTO Access Samba source code via CVS</TD
+>Diagnosing your samba server</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/pam.html b/docs/htmldocs/pam.html
index 8504804e11..3caf52d456 100644
--- a/docs/htmldocs/pam.html
+++ b/docs/htmldocs/pam.html
@@ -9,7 +9,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Integrating MS Windows networks with Samba"
 HREF="integrate-ms-networks.html"><LINK
@@ -72,16 +72,16 @@ CLASS="CHAPTER"
 ><A
 NAME="PAM"
 ></A
->Chapter 4. Configuring PAM for distributed but centrally 
+>Chapter 3. Configuring PAM for distributed but centrally 
 managed authentication</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN596"
+NAME="AEN454"
 ></A
->4.1. Samba and PAM</H1
+>3.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 
@@ -293,9 +293,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN640"
+NAME="AEN498"
 ></A
->4.2. Distributed Authentication</H1
+>3.2. Distributed Authentication</H1
 ><P
 >The astute administrator will realize from this that the 
 combination of <TT
@@ -326,9 +326,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN647"
+NAME="AEN505"
 ></A
->4.3. PAM Configuration in smb.conf</H1
+>3.3. PAM Configuration in smb.conf</H1
 ><P
 >There is an option in smb.conf called <A
 HREF="smb.conf.5.html#OBEYPAMRESTRICTIONS"
@@ -387,7 +387,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/portability.html b/docs/htmldocs/portability.html
index bb5fb3c59c..cc83f61694 100644
--- a/docs/htmldocs/portability.html
+++ b/docs/htmldocs/portability.html
@@ -8,10 +8,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Group mapping HOWTO"
-HREF="groupmapping.html"></HEAD
+HREF="groupmapping.html"><LINK
+REL="NEXT"
+TITLE="Samba and other CIFS clients"
+HREF="other-clients.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -52,7 +55,11 @@ VALIGN="bottom"
 WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
->&nbsp;</TD
+><A
+HREF="other-clients.html"
+ACCESSKEY="N"
+>Next</A
+></TD
 ></TR
 ></TABLE
 ><HR
@@ -64,7 +71,7 @@ CLASS="CHAPTER"
 ><A
 NAME="PORTABILITY"
 ></A
->Chapter 22. Portability</H1
+>Chapter 21. 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 
@@ -74,9 +81,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3201"
+NAME="AEN3011"
 ></A
->22.1. HPUX</H1
+>21.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
@@ -100,9 +107,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3206"
+NAME="AEN3016"
 ></A
->22.2. SCO Unix</H1
+>21.2. SCO Unix</H1
 ><P
 > 
 If you run an old version of  SCO Unix then you may need to get important 
@@ -117,9 +124,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3210"
+NAME="AEN3020"
 ></A
->22.3. DNIX</H1
+>21.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
@@ -224,9 +231,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3239"
+NAME="AEN3049"
 ></A
->22.4. RedHat Linux Rembrandt-II</H1
+>21.4. RedHat Linux Rembrandt-II</H1
 ><P
 >By default RedHat Rembrandt-II during installation adds an
 entry to /etc/hosts as follows:
@@ -269,7 +276,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -277,7 +284,11 @@ ACCESSKEY="H"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+><A
+HREF="other-clients.html"
+ACCESSKEY="N"
+>Next</A
+></TD
 ></TR
 ><TR
 ><TD
@@ -294,7 +305,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+>Samba and other CIFS clients</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/printing.html b/docs/htmldocs/printing.html
index b6f5fb78ce..7ae20acb43 100644
--- a/docs/htmldocs/printing.html
+++ b/docs/htmldocs/printing.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
 HREF="unix-permissions.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="PRINTING"
 ></A
->Chapter 7. Printing Support in Samba 2.2.x</H1
+>Chapter 6. Printing Support in Samba 2.2.x</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN905"
+NAME="AEN763"
 ></A
->7.1. Introduction</H1
+>6.1. Introduction</H1
 ><P
 >Beginning with the 2.2.0 release, Samba supports 
 the native Windows NT printing mechanisms implemented via 
@@ -165,9 +165,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN927"
+NAME="AEN785"
 ></A
->7.2. Configuration</H1
+>6.2. Configuration</H1
 ><DIV
 CLASS="WARNING"
 ><P
@@ -245,9 +245,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN938"
+NAME="AEN796"
 ></A
->7.2.1. Creating [print$]</H2
+>6.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$].  
@@ -468,9 +468,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN973"
+NAME="AEN831"
 ></A
->7.2.2. Setting Drivers for Existing Printers</H2
+>6.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 
@@ -548,9 +548,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN990"
+NAME="AEN848"
 ></A
->7.2.3. Support a large number of printers</H2
+>6.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
@@ -614,9 +614,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1001"
+NAME="AEN859"
 ></A
->7.2.4. Adding New Printers via the Windows NT APW</H2
+>6.2.4. Adding New Printers via the Windows NT APW</H2
 ><P
 >By default, Samba offers all printer shares defined in <TT
 CLASS="FILENAME"
@@ -783,9 +783,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1031"
+NAME="AEN889"
 ></A
->7.2.5. Samba and Printer Ports</H2
+>6.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
@@ -820,9 +820,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1039"
+NAME="AEN897"
 ></A
->7.3. The Imprints Toolset</H1
+>6.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 
@@ -838,9 +838,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1043"
+NAME="AEN901"
 ></A
->7.3.1. What is Imprints?</H2
+>6.3.1. What is Imprints?</H2
 ><P
 >Imprints is a collection of tools for supporting the goals 
 		of</P
@@ -870,9 +870,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1053"
+NAME="AEN911"
 ></A
->7.3.2. Creating Printer Driver Packages</H2
+>6.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
@@ -886,9 +886,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1056"
+NAME="AEN914"
 ></A
->7.3.3. The Imprints server</H2
+>6.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 
@@ -910,9 +910,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1060"
+NAME="AEN918"
 ></A
->7.3.4. The Installation Client</H2
+>6.3.4. The Installation Client</H2
 ><P
 >More information regarding the Imprints installation client 
 		is available in the <TT
@@ -1004,9 +1004,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1082"
+NAME="AEN940"
 ></A
->7.4. <A
+>6.4. <A
 NAME="MIGRATION"
 ></A
 >Migration to from Samba 2.0.x to 2.2.x</H1
@@ -1193,7 +1193,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/printingdebug.html b/docs/htmldocs/printingdebug.html
index acc81fdc00..abb83cb692 100644
--- a/docs/htmldocs/printingdebug.html
+++ b/docs/htmldocs/printingdebug.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Printing Support in Samba 2.2.x"
 HREF="printing.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="PRINTINGDEBUG"
 ></A
->Chapter 8. Debugging Printing Problems</H1
+>Chapter 7. Debugging Printing Problems</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1128"
+NAME="AEN986"
 ></A
->8.1. Introduction</H1
+>7.1. Introduction</H1
 ><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
@@ -152,9 +152,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1144"
+NAME="AEN1002"
 ></A
->8.2. Debugging printer problems</H1
+>7.2. Debugging printer problems</H1
 ><P
 >One way to debug printing problems is to start by replacing these
 command with shell scripts that record the arguments and the contents
@@ -209,9 +209,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1153"
+NAME="AEN1011"
 ></A
->8.3. What printers do I have?</H1
+>7.3. What printers do I have?</H1
 ><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
@@ -238,9 +238,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1161"
+NAME="AEN1019"
 ></A
->8.4. Setting up printcap and print servers</H1
+>7.4. Setting up printcap and print servers</H1
 ><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
@@ -322,9 +322,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1189"
+NAME="AEN1047"
 ></A
->8.5. Job sent, no output</H1
+>7.5. Job sent, no output</H1
 ><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
@@ -367,9 +367,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1200"
+NAME="AEN1058"
 ></A
->8.6. Job sent, strange output</H1
+>7.6. Job sent, strange output</H1
 ><P
 >Once you have the job printing, you can then start worrying about
 making it print nicely.</P
@@ -413,9 +413,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1212"
+NAME="AEN1070"
 ></A
->8.7. Raw PostScript printed</H1
+>7.7. Raw PostScript printed</H1
 ><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
@@ -428,9 +428,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1215"
+NAME="AEN1073"
 ></A
->8.8. Advanced Printing</H1
+>7.8. Advanced Printing</H1
 ><P
 >Note that you can do some pretty magic things by using your
 imagination with the "print command" option and some shell scripts.
@@ -444,9 +444,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1218"
+NAME="AEN1076"
 ></A
->8.9. Real debugging</H1
+>7.9. Real debugging</H1
 ><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
@@ -477,7 +477,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/samba-bdc.html b/docs/htmldocs/samba-bdc.html
index c4c62305d4..553e9d70d0 100644
--- a/docs/htmldocs/samba-bdc.html
+++ b/docs/htmldocs/samba-bdc.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="How to Configure Samba 2.2 as a Primary Domain Controller"
 HREF="samba-pdc.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SAMBA-BDC"
 ></A
->Chapter 13. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
+>Chapter 12. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2290"
+NAME="AEN2148"
 ></A
->13.1. Prerequisite Reading</H1
+>12.1. Prerequisite Reading</H1
 ><P
 >Before you continue reading in this chapter, please make sure
 that you are comfortable with configuring a Samba PDC
@@ -94,9 +94,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2294"
+NAME="AEN2152"
 ></A
->13.2. Background</H1
+>12.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
@@ -139,9 +139,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2302"
+NAME="AEN2160"
 ></A
->13.3. What qualifies a Domain Controller on the network?</H1
+>12.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
@@ -156,9 +156,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2305"
+NAME="AEN2163"
 ></A
->13.3.1. How does a Workstation find its domain controller?</H2
+>12.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
@@ -175,9 +175,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2308"
+NAME="AEN2166"
 ></A
->13.3.2. When is the PDC needed?</H2
+>12.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
@@ -191,9 +191,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2311"
+NAME="AEN2169"
 ></A
->13.4. Can Samba be a Backup Domain Controller?</H1
+>12.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
@@ -210,9 +210,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2315"
+NAME="AEN2173"
 ></A
->13.5. How do I set up a Samba BDC?</H1
+>12.5. How do I set up a Samba BDC?</H1
 ><P
 >Several things have to be done:</P
 ><P
@@ -277,9 +277,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2332"
+NAME="AEN2190"
 ></A
->13.5.1. How do I replicate the smbpasswd file?</H2
+>12.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
@@ -320,7 +320,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/samba-ldap-howto.html b/docs/htmldocs/samba-ldap-howto.html
index 895fcda3c4..cefde0356d 100644
--- a/docs/htmldocs/samba-ldap-howto.html
+++ b/docs/htmldocs/samba-ldap-howto.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain"
 HREF="samba-bdc.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SAMBA-LDAP-HOWTO"
 ></A
->Chapter 14. Storing Samba's User/Machine Account information in an LDAP Directory</H1
+>Chapter 13. Storing Samba's User/Machine Account information in an LDAP Directory</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2353"
+NAME="AEN2211"
 ></A
->14.1. Purpose</H1
+>13.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
@@ -145,9 +145,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2373"
+NAME="AEN2231"
 ></A
->14.2. Introduction</H1
+>13.2. Introduction</H1
 ><P
 >Traditionally, when configuring <A
 HREF="smb.conf.5.html#ENCRYPTPASSWORDS"
@@ -262,9 +262,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2402"
+NAME="AEN2260"
 ></A
->14.3. Supported LDAP Servers</H1
+>13.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
@@ -287,9 +287,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2407"
+NAME="AEN2265"
 ></A
->14.4. Schema and Relationship to the RFC 2307 posixAccount</H1
+>13.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
@@ -346,17 +346,17 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2419"
+NAME="AEN2277"
 ></A
->14.5. Configuring Samba with LDAP</H1
+>13.5. Configuring Samba with LDAP</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2421"
+NAME="AEN2279"
 ></A
->14.5.1. OpenLDAP configuration</H2
+>13.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
@@ -436,9 +436,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2438"
+NAME="AEN2296"
 ></A
->14.5.2. Configuring Samba</H2
+>13.5.2. Configuring Samba</H2
 ><P
 >The following parameters are available in smb.conf only with <TT
 CLASS="PARAMETER"
@@ -556,9 +556,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2466"
+NAME="AEN2324"
 ></A
->14.6. Accounts and Groups management</H1
+>13.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
@@ -581,9 +581,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2471"
+NAME="AEN2329"
 ></A
->14.7. Security and sambaAccount</H1
+>13.7. Security and sambaAccount</H1
 ><P
 >There are two important points to remember when discussing the security
 of sambaAccount entries in the directory.</P
@@ -660,9 +660,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2491"
+NAME="AEN2349"
 ></A
->14.8. LDAP specials attributes for sambaAccounts</H1
+>13.8. LDAP specials attributes for sambaAccounts</H1
 ><P
 >The sambaAccount objectclass is composed of the following attributes:</P
 ><P
@@ -871,9 +871,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2561"
+NAME="AEN2419"
 ></A
->14.9. Example LDIF Entries for a sambaAccount</H1
+>13.9. Example LDIF Entries for a sambaAccount</H1
 ><P
 >The following is a working LDIF with the inclusion of the posixAccount objectclass:</P
 ><P
@@ -929,9 +929,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2569"
+NAME="AEN2427"
 ></A
->14.10. Comments</H1
+>13.10. Comments</H1
 ><P
 >Please mail all comments regarding this HOWTO to <A
 HREF="mailto:jerry@samba.org"
@@ -966,7 +966,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/securitylevels.html b/docs/htmldocs/securitylevels.html
index 20850b99d3..b984426855 100644
--- a/docs/htmldocs/securitylevels.html
+++ b/docs/htmldocs/securitylevels.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Debugging Printing Problems"
 HREF="printingdebug.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="SECURITYLEVELS"
 ></A
->Chapter 9. Security levels</H1
+>Chapter 8. Security levels</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1231"
+NAME="AEN1089"
 ></A
->9.1. Introduction</H1
+>8.1. Introduction</H1
 ><P
 >Samba supports the following options to the global smb.conf parameter</P
 ><P
@@ -123,9 +123,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1242"
+NAME="AEN1100"
 ></A
->9.2. More complete description of security levels</H1
+>8.2. More complete description of security levels</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
@@ -238,7 +238,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/speed.html b/docs/htmldocs/speed.html
index c3d7017914..047929af48 100644
--- a/docs/htmldocs/speed.html
+++ b/docs/htmldocs/speed.html
@@ -8,13 +8,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
-TITLE="Improved browsing in samba"
-HREF="improved-browsing.html"><LINK
+TITLE="Quick Cross Subnet Browsing / Cross Workgroup Browsing guide"
+HREF="browsing-quick.html"><LINK
 REL="NEXT"
-TITLE="Samba and other CIFS clients"
-HREF="other-clients.html"></HEAD
+TITLE="HOWTO Access Samba source code via CVS"
+HREF="cvs-access.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="improved-browsing.html"
+HREF="browsing-quick.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="other-clients.html"
+HREF="cvs-access.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -77,7 +77,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2814"
+NAME="AEN2742"
 ></A
 >17.1. Comparisons</H1
 ><P
@@ -108,7 +108,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2820"
+NAME="AEN2748"
 ></A
 >17.2. Oplocks</H1
 ><DIV
@@ -116,7 +116,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2822"
+NAME="AEN2750"
 ></A
 >17.2.1. Overview</H2
 ><P
@@ -152,7 +152,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2830"
+NAME="AEN2758"
 ></A
 >17.2.2. Level2 Oplocks</H2
 ><P
@@ -176,7 +176,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2836"
+NAME="AEN2764"
 ></A
 >17.2.3. Old 'fake oplocks' option - deprecated</H2
 ><P
@@ -197,7 +197,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2840"
+NAME="AEN2768"
 ></A
 >17.3. Socket options</H1
 ><P
@@ -225,7 +225,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2847"
+NAME="AEN2775"
 ></A
 >17.4. Read size</H1
 ><P
@@ -251,7 +251,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2852"
+NAME="AEN2780"
 ></A
 >17.5. Max xmit</H1
 ><P
@@ -274,7 +274,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2857"
+NAME="AEN2785"
 ></A
 >17.6. Locking</H1
 ><P
@@ -291,7 +291,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2861"
+NAME="AEN2789"
 ></A
 >17.7. Share modes</H1
 ><P
@@ -321,7 +321,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2866"
+NAME="AEN2794"
 ></A
 >17.8. Log level</H1
 ><P
@@ -335,7 +335,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2869"
+NAME="AEN2797"
 ></A
 >17.9. Wide lines</H1
 ><P
@@ -349,7 +349,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2872"
+NAME="AEN2800"
 ></A
 >17.10. Read raw</H1
 ><P
@@ -371,7 +371,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2877"
+NAME="AEN2805"
 ></A
 >17.11. Write raw</H1
 ><P
@@ -388,7 +388,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2881"
+NAME="AEN2809"
 ></A
 >17.12. Read prediction</H1
 ><P
@@ -414,7 +414,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2888"
+NAME="AEN2816"
 ></A
 >17.13. Memory mapping</H1
 ><P
@@ -435,7 +435,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2893"
+NAME="AEN2821"
 ></A
 >17.14. Slow Clients</H1
 ><P
@@ -452,7 +452,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2897"
+NAME="AEN2825"
 ></A
 >17.15. Slow Logins</H1
 ><P
@@ -465,7 +465,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2900"
+NAME="AEN2828"
 ></A
 >17.16. Client tuning</H1
 ><P
@@ -569,7 +569,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2932"
+NAME="AEN2860"
 ></A
 >17.17. My Results</H1
 ><P
@@ -610,7 +610,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="improved-browsing.html"
+HREF="browsing-quick.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -619,7 +619,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -628,7 +628,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="other-clients.html"
+HREF="cvs-access.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -638,7 +638,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Improved browsing in samba</TD
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -648,7 +648,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Samba and other CIFS clients</TD
+>HOWTO Access Samba source code via CVS</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/unix-permissions.html b/docs/htmldocs/unix-permissions.html
index 5be1571532..9faf0eba28 100644
--- a/docs/htmldocs/unix-permissions.html
+++ b/docs/htmldocs/unix-permissions.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Hosting a Microsoft Distributed File System tree on Samba"
 HREF="msdfs.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="UNIX-PERMISSIONS"
 ></A
->Chapter 6. UNIX Permission Bits and Windows NT Access Control Lists</H1
+>Chapter 5. UNIX Permission Bits and Windows NT Access Control Lists</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN722"
+NAME="AEN580"
 ></A
->6.1. Viewing and changing UNIX permissions using the NT 
+>5.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 
@@ -116,9 +116,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN731"
+NAME="AEN589"
 ></A
->6.2. How to view file security on a Samba share</H1
+>5.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 
@@ -186,9 +186,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN742"
+NAME="AEN600"
 ></A
->6.3. Viewing file ownership</H1
+>5.3. Viewing file ownership</H1
 ><P
 >Clicking on the <B
 CLASS="COMMAND"
@@ -280,9 +280,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN762"
+NAME="AEN620"
 ></A
->6.4. Viewing file or directory permissions</H1
+>5.4. Viewing file or directory permissions</H1
 ><P
 >The third button is the <B
 CLASS="COMMAND"
@@ -342,9 +342,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN777"
+NAME="AEN635"
 ></A
->6.4.1. File Permissions</H2
+>5.4.1. File Permissions</H2
 ><P
 >The standard UNIX user/group/world triple and 
 		the corresponding "read", "write", "execute" permissions 
@@ -404,9 +404,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN791"
+NAME="AEN649"
 ></A
->6.4.2. Directory Permissions</H2
+>5.4.2. Directory Permissions</H2
 ><P
 >Directories on an NT NTFS file system have two 
 		different sets of permissions. The first set of permissions 
@@ -436,9 +436,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN798"
+NAME="AEN656"
 ></A
->6.5. Modifying file or directory permissions</H1
+>5.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 
@@ -534,9 +534,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN820"
+NAME="AEN678"
 ></A
->6.6. Interaction with the standard Samba create mask 
+>5.6. Interaction with the standard Samba create mask 
 	parameters</H1
 ><P
 >Note that with Samba 2.0.5 there are four new parameters 
@@ -811,9 +811,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN884"
+NAME="AEN742"
 ></A
->6.7. Interaction with the standard Samba file attribute 
+>5.7. Interaction with the standard Samba file attribute 
 	mapping</H1
 ><P
 >Samba maps some of the DOS attribute bits (such as "read 
@@ -879,7 +879,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index 0d816ef052..cbec6e39a6 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
-HREF="samba-project-documentation.html"><LINK
+HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="security = domain in Samba 2.x"
 HREF="domain-security.html"><LINK
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="WINBIND"
 ></A
->Chapter 11. Unified Logons between Windows NT and UNIX using Winbind</H1
+>Chapter 10. Unified Logons between Windows NT and UNIX using Winbind</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1397"
+NAME="AEN1255"
 ></A
->11.1. Abstract</H1
+>10.1. Abstract</H1
 ><P
 >Integration of UNIX and Microsoft Windows NT through 
 	a unified logon has been considered a "holy grail" in heterogeneous 
@@ -104,9 +104,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1401"
+NAME="AEN1259"
 ></A
->11.2. Introduction</H1
+>10.2. Introduction</H1
 ><P
 >It is well known that UNIX and Microsoft Windows NT have 
 	different models for representing user and group information and 
@@ -158,9 +158,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1414"
+NAME="AEN1272"
 ></A
->11.3. What Winbind Provides</H1
+>10.3. What Winbind Provides</H1
 ><P
 >Winbind unifies UNIX and Windows NT account management by 
 	allowing a UNIX box to become a full member of a NT domain. Once 
@@ -200,9 +200,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1421"
+NAME="AEN1279"
 ></A
->11.3.1. Target Uses</H2
+>10.3.1. Target Uses</H2
 ><P
 >Winbind is targeted at organizations that have an 
 		existing NT based domain infrastructure into which they wish 
@@ -224,9 +224,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1425"
+NAME="AEN1283"
 ></A
->11.4. How Winbind Works</H1
+>10.4. How Winbind Works</H1
 ><P
 >The winbind system is designed around a client/server 
 	architecture. A long running <B
@@ -244,9 +244,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1430"
+NAME="AEN1288"
 ></A
->11.4.1. Microsoft Remote Procedure Calls</H2
+>10.4.1. Microsoft Remote Procedure Calls</H2
 ><P
 >Over the last two years, efforts have been underway 
 		by various Samba Team members to decode various aspects of 
@@ -270,9 +270,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1434"
+NAME="AEN1292"
 ></A
->11.4.2. Name Service Switch</H2
+>10.4.2. Name Service Switch</H2
 ><P
 >The Name Service Switch, or NSS, is a feature that is 
 		present in many UNIX operating systems. It allows system 
@@ -350,9 +350,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1450"
+NAME="AEN1308"
 ></A
->11.4.3. Pluggable Authentication Modules</H2
+>10.4.3. Pluggable Authentication Modules</H2
 ><P
 >Pluggable Authentication Modules, also known as PAM, 
 		is a system for abstracting authentication and authorization 
@@ -399,9 +399,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1458"
+NAME="AEN1316"
 ></A
->11.4.4. User and Group ID Allocation</H2
+>10.4.4. User and Group ID Allocation</H2
 ><P
 >When a user or group is created under Windows NT 
 		is it allocated a numerical relative identifier (RID). This is 
@@ -425,9 +425,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1462"
+NAME="AEN1320"
 ></A
->11.4.5. Result Caching</H2
+>10.4.5. Result Caching</H2
 ><P
 >An active system can generate a lot of user and group 
 		name lookups. To reduce the network cost of these lookups winbind 
@@ -448,9 +448,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1465"
+NAME="AEN1323"
 ></A
->11.5. Installation and Configuration</H1
+>10.5. Installation and Configuration</H1
 ><P
 >Many thanks to John Trostel <A
 HREF="mailto:jtrostel@snapserver.com"
@@ -475,9 +475,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1472"
+NAME="AEN1330"
 ></A
->11.5.1. Introduction</H2
+>10.5.1. Introduction</H2
 ><P
 >This HOWTO describes the procedures used to get winbind up and 
 running on my RedHat 7.1 system.  Winbind is capable of providing access 
@@ -534,9 +534,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1485"
+NAME="AEN1343"
 ></A
->11.5.2. Requirements</H2
+>10.5.2. Requirements</H2
 ><P
 >If you have a samba configuration file that you are currently 
 using... <SPAN
@@ -604,9 +604,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1499"
+NAME="AEN1357"
 ></A
->11.5.3. Testing Things Out</H2
+>10.5.3. Testing Things Out</H2
 ><P
 >Before starting, it is probably best to kill off all the SAMBA 
 related daemons running on your server.  Kill off all <B
@@ -649,9 +649,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1510"
+NAME="AEN1368"
 ></A
->11.5.3.1. Configure and compile SAMBA</H3
+>10.5.3.1. Configure and compile SAMBA</H3
 ><P
 >The configuration and compilation of SAMBA is pretty straightforward.
 The first three steps may not be necessary depending upon
@@ -715,9 +715,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1529"
+NAME="AEN1387"
 ></A
->11.5.3.2. Configure <TT
+>10.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
 > and the 
@@ -820,9 +820,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1562"
+NAME="AEN1420"
 ></A
->11.5.3.3. Configure smb.conf</H3
+>10.5.3.3. Configure smb.conf</H3
 ><P
 >Several parameters are needed in the smb.conf file to control 
 the behavior of <B
@@ -895,9 +895,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1578"
+NAME="AEN1436"
 ></A
->11.5.3.4. Join the SAMBA server to the PDC domain</H3
+>10.5.3.4. Join the SAMBA server to the PDC domain</H3
 ><P
 >Enter the following command to make the SAMBA server join the 
 PDC domain, where <TT
@@ -941,9 +941,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1589"
+NAME="AEN1447"
 ></A
->11.5.3.5. Start up the winbindd daemon and test it!</H3
+>10.5.3.5. Start up the winbindd daemon and test it!</H3
 ><P
 >Eventually, you will want to modify your smb startup script to 
 automatically invoke the winbindd daemon when the other parts of 
@@ -1064,17 +1064,17 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1625"
+NAME="AEN1483"
 ></A
->11.5.3.6. Fix the init.d startup scripts</H3
+>10.5.3.6. Fix the init.d startup scripts</H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN1627"
+NAME="AEN1485"
 ></A
->11.5.3.6.1. Linux</H4
+>10.5.3.6.1. Linux</H4
 ><P
 >The <B
 CLASS="COMMAND"
@@ -1168,9 +1168,9 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN1644"
+NAME="AEN1502"
 ></A
->11.5.3.6.2. Solaris</H4
+>10.5.3.6.2. Solaris</H4
 ><P
 >On solaris, you need to modify the 
 <TT
@@ -1239,9 +1239,9 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN1651"
+NAME="AEN1509"
 ></A
->11.5.3.6.3. Restarting</H4
+>10.5.3.6.3. Restarting</H4
 ><P
 >If you restart the <B
 CLASS="COMMAND"
@@ -1263,9 +1263,9 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1657"
+NAME="AEN1515"
 ></A
->11.5.3.7. Configure Winbind and PAM</H3
+>10.5.3.7. Configure Winbind and PAM</H3
 ><P
 >If you have made it this far, you know that winbindd and samba are working
 together.  If you want to use winbind to provide authentication for other 
@@ -1321,9 +1321,9 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN1674"
+NAME="AEN1532"
 ></A
->11.5.3.7.1. Linux/FreeBSD-specific PAM configuration</H4
+>10.5.3.7.1. Linux/FreeBSD-specific PAM configuration</H4
 ><P
 >The <TT
 CLASS="FILENAME"
@@ -1450,9 +1450,9 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN1707"
+NAME="AEN1565"
 ></A
->11.5.3.7.2. Solaris-specific configuration</H4
+>10.5.3.7.2. Solaris-specific configuration</H4
 ><P
 >The /etc/pam.conf needs to be changed. I changed this file so that my Domain
 users can logon both locally as well as telnet.The following are the changes
@@ -1537,9 +1537,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1714"
+NAME="AEN1572"
 ></A
->11.6. Limitations</H1
+>10.6. Limitations</H1
 ><P
 >Winbind has a number of limitations in its current 
 	released version that we hope to overcome in future 
@@ -1578,9 +1578,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1724"
+NAME="AEN1582"
 ></A
->11.7. Conclusion</H1
+>10.7. Conclusion</H1
 ><P
 >The winbind system, through the use of the Name Service 
 	Switch, Pluggable Authentication Modules, and appropriate 
@@ -1615,7 +1615,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="samba-project-documentation.html"
+HREF="samba-howto-collection.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
author	Jelmer Vernooij <jelmer@samba.org>	2002-10-15 18:14:31 +0000
committer	Jelmer Vernooij <jelmer@samba.org>	2002-10-15 18:14:31 +0000
commit	ca5759f796b153f702669942f7e01e498cc1170f (patch)
tree	291d7b51d46582b897cd7dbc42991aca48f47db4 /docs
parent	af733342552ca6687a21f0a765993fb0e41059ed (diff)
download	samba-ca5759f796b153f702669942f7e01e498cc1170f.tar.gz samba-ca5759f796b153f702669942f7e01e498cc1170f.tar.bz2 samba-ca5759f796b153f702669942f7e01e498cc1170f.zip