Update.

(This used to be commit 9144f87a2973c9cb5383878e46bfb0031351e3d8)

3 files changed, 92 insertions, 73 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
index 4b50978831..f64a677159 100644
--- a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
@@ -11,6 +11,8 @@
 <title>Features and Benefits</title>
 
 <para>
+<indexterm><primary>Dynamic Host Configuration Protocol</primary><see>DHCP</see></indexterm>
+<indexterm><primary>Domain Name System</primary><see>DNS</see></indexterm>
 There are few subjects in the UNIX world that might raise as much contention as
 Domain Name System (DNS) and Dynamic Host Configuration Protocol (DHCP).
 Not all opinions held for or against particular implementations of DNS and DHCP
@@ -24,6 +26,7 @@ notebook computer into a network port and have things <quote>just work.</quote>
 </para>
 
 <para>
+<indexterm><primary>ADS</primary></indexterm>
 UNIX administrators have a point. Many of the normative practices in the Microsoft
 Windows world at best border on bad practice from a security perspective.
 Microsoft Windows networking protocols allow workstations to arbitrarily register
@@ -35,26 +38,28 @@ that are equally perplexing to UNIX administrators. Welcome to the new world!
 <para>
 <indexterm><primary>ISC</primary><secondary>DNS</secondary></indexterm>
 <indexterm><primary>ISC</primary><secondary>DHCP</secondary></indexterm>
+<indexterm><primary>Dynamic DNS</primary><see>DDNS</see></indexterm>
 The purpose of this chapter is to demonstrate the configuration of the Internet
 Software Consortium (ISC) DNS and DHCP servers to provide dynamic services that are
 compatible with their equivalents in the Microsoft Windows 2000 Server products.
 </para>
 
 <para>
-This chapter provides no more than a working example of
-configuration files for both DNS and DHCP servers. The examples used match
-configuration examples used elsewhere in this document.
+This chapter provides no more than a working example of configuration files for both DNS and DHCP servers. The
+examples used match configuration examples used elsewhere in this document.
 </para>
 
 <para>
-This chapter explicitly does not provide a tutorial, nor does it pretend to be
-a reference guide on DNS and DHCP, as this is well beyond the scope and intent
-of this document as a whole. Anyone who wants more detailed reference materials
-on DNS or DHCP should visit the ISC Web site at
-<ulink noescape="1" url="http://www.isc.org"> http://www.isc.org</ulink>.
-Those wanting a written text might also be interested in the O'Reilly publications on DNS, see the
-<ulink url="http://www.oreilly.com/catalog/dns/index.htm">O'Reilly</ulink> web site, and the
-<ulink url="http://www.bind9.net/books-dhcp">BIND9.NET</ulink> web site for details.
+<indexterm><primary>DNS</primary></indexterm>
+<indexterm><primary>DHCP</primary></indexterm>
+<indexterm><primary>BIND9.NET</primary></indexterm>
+This chapter explicitly does not provide a tutorial, nor does it pretend to be a reference guide on DNS and
+DHCP, as this is well beyond the scope and intent of this document as a whole. Anyone who wants more detailed
+reference materials on DNS or DHCP should visit the ISC Web site at <ulink noescape="1"
+url="http://www.isc.org"> http://www.isc.org</ulink>.  Those wanting a written text might also be interested
+in the O'Reilly publications on DNS, see the <ulink
+url="http://www.oreilly.com/catalog/dns/index.htm">O'Reilly</ulink> web site, and the <ulink
+url="http://www.bind9.net/books-dhcp">BIND9.NET</ulink> web site for details.
 The books are:
 </para>
 
@@ -70,17 +75,19 @@ The books are:
 <title>Example Configuration</title>
 
 <para>
-The DNS is to the Internet what water is to life. Nearly all
-information resources (host names) are resolved to their Internet protocol (IP) addresses through DNS.
-Windows networking tried hard to avoid the complexities of DNS, but alas, DNS won.
 <indexterm><primary>WINS</primary></indexterm>
-The alternative to DNS, the Windows Internet Name Service (WINS) &smbmdash; an artifact of
-NetBIOS networking over the TCP/IP protocols &smbmdash; has demonstrated scalability problems as
-well as a flat, nonhierarchical namespace that became unmanageable as the size and
-complexity of information technology networks grew.
+<indexterm><primary>DNS</primary></indexterm>
+The DNS is to the Internet what water is to life. Nearly all information resources (host names) are resolved
+to their Internet protocol (IP) addresses through DNS.  Windows networking tried hard to avoid the
+complexities of DNS, but alas, DNS won.  <indexterm><primary>WINS</primary></indexterm> The alternative to
+DNS, the Windows Internet Name Service (WINS) &smbmdash; an artifact of NetBIOS networking over the TCP/IP
+protocols &smbmdash; has demonstrated scalability problems as well as a flat, nonhierarchical namespace that
+became unmanageable as the size and complexity of information technology networks grew.
 </para>
 
 <para>
+<indexterm><primary>RFC 1001</primary></indexterm>
+<indexterm><primary>RFC 1002</primary></indexterm>
 WINS is a Microsoft implementation of the RFC1001/1002 NetBIOS Name Service (NBNS).
 It allows NetBIOS clients (like Microsoft Windows machines) to register an arbitrary
 machine name that the administrator or user has chosen together with the IP
@@ -283,6 +290,8 @@ $ORIGIN 1.168.192.in-addr.arpa.
 	</para>
 
 	<para>
+<indexterm><primary>BIND</primary></indexterm>
+<indexterm><primary>dynamic registration files</primary></indexterm>
 	The configuration files shown here were copied from a fully working system. All dynamically registered
 	entries have been removed. In addition to these files, BIND version 9 will
 	create for each of the dynamic registration files a file that has a 
diff --git a/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml
index d6a9259118..94c3fcc81a 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml
@@ -17,23 +17,22 @@
 <title>Macintosh Clients</title>
 
 <para>
-Yes. <ulink url="http://www.thursby.com/">Thursby</ulink> has a CIFS client/server called <ulink url="http://www.thursby.com/products/dave.html">DAVE</ulink>.
-They test it against Windows 95, Windows NT/200x/XP, and Samba for
-compatibility issues. At the time of this writing, DAVE was at version
-4.1. Please refer to Thursby's Web site for more information regarding this
-product.
+<indexterm><primary>DAVE</primary></indexterm>
+Yes. <ulink url="http://www.thursby.com/">Thursby</ulink> has a CIFS client/server called <ulink
+url="http://www.thursby.com/products/dave.html">DAVE</ulink>.  They test it against Windows 95, Windows
+NT/200x/XP, and Samba for compatibility issues. At the time of this writing, DAVE was at version 5.1. Please
+refer to Thursby's Web site for more information regarding this product.
 </para>
 
 <para> 
-Alternatives include two free implementations of AppleTalk for
-several kinds of UNIX machines and several more commercial ones.
-These products allow you to run file services and print services
-natively to Macintosh users, with no additional support required on
-the Macintosh. The two free implementations are 
-<ulink url="http://www.umich.edu/~rsug/netatalk/">Netatalk</ulink> and 
-<ulink url="http://www.cs.mu.oz.au/appletalk/atalk.html">CAP</ulink>. 
-What Samba offers MS Windows users, these packages offer to Macs. 
-For more info on these packages, Samba, and Linux (and other UNIX-based systems), see
+<indexterm><primary>Netatalk</primary></indexterm>
+<indexterm><primary>CAP</primary></indexterm>
+Alternatives include two free implementations of AppleTalk for several kinds of UNIX machines and several more
+commercial ones.  These products allow you to run file services and print services natively to Macintosh
+users, with no additional support required on the Macintosh. The two free implementations are <ulink
+url="http://www.umich.edu/~rsug/netatalk/">Netatalk</ulink> and <ulink
+url="http://www.cs.mu.oz.au/appletalk/atalk.html">CAP</ulink>.  What Samba offers MS Windows users, these
+packages offer to Macs.  For more info on these packages, Samba, and Linux (and other UNIX-based systems), see
 <ulink noescape="1" url="http://www.eats.com/linux_mac_win.html">http://www.eats.com/linux_mac_win.html.</ulink>
 </para>
 
@@ -140,21 +139,18 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems)
 for Workgroups. The early TCP/IP stacks had lots of bugs.</para>
 
 <para> 
-Microsoft has released an incremental upgrade to its TCP/IP 32-bit
-VxD drivers. The latest release can be found at
-ftp.microsoft.com, located in <filename>/Softlib/MSLFILES/TCP32B.EXE</filename>.
-There is an update.txt file there that describes the problems that were
-fixed. New files include <filename>WINSOCK.DLL</filename>, 
-<filename>TELNET.EXE</filename>, 
-<filename>WSOCK.386</filename>, 
-<filename>VNBT.386</filename>,
-<filename>WSTCP.386</filename>, 
-<filename>TRACERT.EXE</filename>, 
-<filename>NETSTAT.EXE</filename>, and 
-<filename>NBTSTAT.EXE</filename>.
+Microsoft has released an incremental upgrade to its TCP/IP 32-bit VxD drivers. The latest release can be
+found at ftp.microsoft.com, located in <filename>/Softlib/MSLFILES/TCP32B.EXE</filename>.  There is an
+update.txt file there that describes the problems that were fixed. New files include
+<filename>WINSOCK.DLL</filename>, <filename>TELNET.EXE</filename>, <filename>WSOCK.386</filename>,
+<filename>VNBT.386</filename>, <filename>WSTCP.386</filename>, <filename>TRACERT.EXE</filename>,
+<filename>NETSTAT.EXE</filename>, and <filename>NBTSTAT.EXE</filename>.
 </para>
 
-<para>More information about this patch is available in <ulink url="http://support.microsoft.com/kb/q99891/">Knowledge Base article 99891</ulink>.</para>
+<para>
+More information about this patch is available in <ulink
+url="http://support.microsoft.com/kb/q99891/">Knowledge Base article 99891</ulink>.
+</para>
 
 </sect2>
 
@@ -183,13 +179,12 @@ Often Windows for Workgroups will totally ignore a password you give it in a dia
 <title>Configuring Windows for Workgroups Password Handling</title>
 
 <para>
-There is a program call <filename>admincfg.exe</filename>
-on the last disk (disk 8) of the WFW 3.11 disk set. To install it,
-type <userinput>EXPAND A:\ADMINCFG.EX_ C:\WINDOWS\ADMINCFG.EXE</userinput>.
-Then add an icon for it via the <application>Program Manager</application> <guimenu>New</guimenu> menu. 
-This program allows you to control how WFW handles passwords,
-Disable Password Caching and so on,
-for use with <smbconfoption name="security">user</smbconfoption>.
+<indexterm><primary>admincfg.exe</primary></indexterm>
+There is a program call <filename>admincfg.exe</filename> on the last disk (disk 8) of the WFW 3.11 disk set.
+To install it, type <userinput>EXPAND A:\ADMINCFG.EX_ C:\WINDOWS\ADMINCFG.EXE</userinput>.  Then add an icon
+for it via the <application>Program Manager</application> <guimenu>New</guimenu> menu.  This program allows
+you to control how WFW handles passwords, Disable Password Caching and so on, for use with <smbconfoption
+name="security">user</smbconfoption>.
 </para>
 
 </sect2>
@@ -215,7 +210,7 @@ It is presumably a Windows for Workgroups bug.</para>
 
 </sect2>
 
-<sect2>
+<sect2 id="speedimpr">
 <title>Speed Improvement</title>
 
 <para>
@@ -240,7 +235,8 @@ person even reported a speed drop of a factor of 30 when he went from
 
 <para>
 When using Windows 95 OEM SR2, the following updates are recommended where Samba
-is being used. Please note that the above change (John, specify the change???????) will affect you once these
+is being used. Please note that the changes documented in 
+<link linkend="speedimpr">Speed Improvement</link> will affect you once these
 updates  have been installed.
 </para>
 
diff --git a/docs/Samba3-HOWTO/TOSHARG-Speed.xml b/docs/Samba3-HOWTO/TOSHARG-Speed.xml
index c9707552e8..1221eedfb4 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Speed.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Speed.xml
@@ -218,28 +218,34 @@ performance. Check the sections on the various clients in
 A user wrote the following to the mailing list:
 </para>
 
+<blockquote>
 <para>
-I am running Gentoo on my server and Samba 2.2.8a. Recently
-I changed kernel version from <filename>linux-2.4.19-gentoo-r10</filename> to
-<filename>linux-2.4.20-wolk4.0s</filename>. And now I have a performance issue with Samba. 
-Many of you will probably say,  <quote>Move to vanilla sources!</quote>
-Well, I tried that and it didn't work. I have a 100MB LAN and two computers (Linux and
-Windows 2000). The Linux server shares directories with DivX files, the client
-(Windows 2000) plays them via LAN. Before, when I was running the 2.4.19 kernel,
-everything was fine, but now movies freeze and stop. I tried moving
-files between the server and Windows, and it is terribly slow. (John, should this be set off as an extract???????)
+<indexterm><primary>Gentoo</primary></indexterm>
+<indexterm><primary>slow network</primary></indexterm>
+I am running Gentoo on my server and Samba 2.2.8a. Recently I changed kernel version from
+<filename>linux-2.4.19-gentoo-r10</filename> to <filename>linux-2.4.20-wolk4.0s</filename>. And now I have a
+performance issue with Samba.  Many of you will probably say,  <quote>Move to vanilla sources!</quote> Well, I
+tried that and it didn't work. I have a 100MB LAN and two computers (Linux and Windows 2000). The Linux server
+shares directories with DivX files, the client (Windows 2000) plays them via LAN. Before, when I was running
+the 2.4.19 kernel, everything was fine, but now movies freeze and stop. I tried moving files between the
+server and Windows, and it is terribly slow.
 </para>
+</blockquote>
 
 <para>
 The answer he was given is:
 </para>
 
+<blockquote>
 <para>
-Grab the mii-tool and check the duplex settings on the NIC.
-My guess is that it is a link layer issue, not an application
-layer problem. Also run ifconfig and verify that the framing
-error, collisions, and so on, look normal for ethernet. (John, should this be set off as an extract???????)
+<indexterm><primary>ifconfig</primary></indexterm>
+<indexterm><primary>framing error</primary></indexterm>
+<indexterm><primary>collisions</primary></indexterm>
+Grab the mii-tool and check the duplex settings on the NIC.  My guess is that it is a link layer issue, not an
+application layer problem. Also run ifconfig and verify that the framing error, collisions, and so on, look
+normal for ethernet.
 </para>
+</blockquote>
 
 </sect1>
 
@@ -247,12 +253,13 @@ error, collisions, and so on, look normal for ethernet. (John, should this be se
 <title>Corrupt tdb Files</title>
 
 <para>
-Our Samba PDC server has been hosting three TB of data to our 500+ users
-[Windows NT/XP]  for the last three years using Samba without a problem.
-Today all shares went very slow. Also, the main smbd kept
-spawning new processes, so we had 1600+ running SMDB's (normally we average 250).
-It crashed the SUN E3500 cluster twice. After a lot of searching, I
-decided to <command>rm /var/locks/*.tdb</command>. Happy again.
+<indexterm><primary>PDC</primary></indexterm>
+<indexterm><primary>mbd kept spawning</primary></indexterm>
+<indexterm><primary>/var/locks/*.tdb</primary></indexterm>
+Our Samba PDC server has been hosting three TB of data to our 500+ users [Windows NT/XP]  for the last three
+years using Samba without a problem.  Today all shares went very slow. Also, the main smbd kept spawning new
+processes, so we had 1600+ running SMDB's (normally we average 250).  It crashed the SUN E3500 cluster twice.
+After a lot of searching, I decided to <command>rm /var/locks/*.tdb</command>. Happy again.
 </para>
 
 <para>
@@ -261,6 +268,8 @@ how can I detect early corruption?
 </para>
 
 <para>
+<indexterm><primary>tdbbackup</primary></indexterm>
+<indexterm><primary>nmbd</primary></indexterm>
 <emphasis>Answer:</emphasis> Yes, run <command>tdbbackup</command> each time after stopping nmbd and before starting nmbd.
 </para>
 
@@ -279,18 +288,23 @@ a lot lower than before the locks cleanup. Any ideas on keeping it top notch?
 <title>Samba Performance is Very Slow</title>
 
 <para>
+<indexterm><primary>slow performance</primary></indexterm>
 A site reported experiencing very baffling symptoms with MYOB Premier opening and
 accessing its data files. Some  operations on the file would take between 40 and
 45 seconds.
 </para>
 
 <para>
+<indexterm><primary>printer monitor</primary></indexterm>
+<indexterm><primary>pauses</primary></indexterm>
 It turned out that the printer monitor program running on the Windows
 clients was causing the problems. From the logs, we saw activity coming
 through with pauses of about 1 second.
 </para>
 
 <para>
+<indexterm><primary>networks access</primary></indexterm>
+<indexterm><primary>printing now</primary></indexterm>
 Stopping the monitor software resulted in the networks access at normal
 (quick) speed. Restarting the program caused the speed to slow down
 again. The printer was a Canon LBP-810 and the relevant task was