4 files changed, 64 insertions, 99 deletions
diff --git a/docs/faq/clientapp.html b/docs/faq/clientapp.html
index b48e236377..3196fd285e 100644
--- a/docs/faq/clientapp.html
+++ b/docs/faq/clientapp.html
@@ -10,8 +10,8 @@ REL="HOME"
 TITLE="Samba FAQ"
 HREF="samba-faq.html"><LINK
 REL="PREVIOUS"
-TITLE="Configuration problems"
-HREF="config.html"><LINK
+TITLE="Compiling and installing Samba on a Unix host"
+HREF="install.html"><LINK
 REL="NEXT"
 TITLE="Common errors"
 HREF="errors.html"></HEAD
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="config.html"
+HREF="install.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="CLIENTAPP"
 ></A
->Chapter 4. Specific client application problems</H1
+>Chapter 3. Specific client application problems</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN175"
+NAME="AEN170"
 ></A
->4.1. MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</H1
+>3.1. MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</H1
 ><P
 >When installing MS Office on a Samba drive for which you have admin
 user permissions, ie. admin users = username, you will find the
@@ -98,9 +98,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN180"
+NAME="AEN175"
 ></A
->4.2. How to use a Samba share as an administrative share for MS Office, etc.</H1
+>3.2. How to use a Samba share as an administrative share for MS Office, etc.</H1
 ><P
 >Microsoft Office products can be installed as an administrative installation
 from which the application can either be run off the administratively installed
@@ -160,9 +160,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN195"
+NAME="AEN190"
 ></A
->4.3. Microsoft Access database opening errors</H1
+>3.3. Microsoft Access database opening errors</H1
 ><P
 >Here are some notes on running MS-Access on a Samba drive from <A
 HREF="stefank@esi.com.au"
@@ -210,7 +210,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="config.html"
+HREF="install.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -238,7 +238,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Configuration problems</TD
+>Compiling and installing Samba on a Unix host</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/faq/errors.html b/docs/faq/errors.html
index 08da5e5db0..b36251ec13 100644
--- a/docs/faq/errors.html
+++ b/docs/faq/errors.html
@@ -71,15 +71,15 @@ CLASS="CHAPTER"
 ><A
 NAME="ERRORS"
 ></A
->Chapter 5. Common errors</H1
+>Chapter 4. Common errors</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN206"
+NAME="AEN201"
 ></A
->5.1. Not listening for calling name</H1
+>4.1. Not listening for calling name</H1
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -103,9 +103,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN213"
+NAME="AEN208"
 ></A
->5.2. System Error 1240</H1
+>4.2. System Error 1240</H1
 ><P
 >System error 1240 means that the client is refusing to talk
 to a non-encrypting server. Microsoft changed WinNT in service
@@ -139,9 +139,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN220"
+NAME="AEN215"
 ></A
->5.3. smbclient ignores -N !</H1
+>4.3. smbclient ignores -N !</H1
 ><P
 ><SPAN
 CLASS="QUOTE"
@@ -174,9 +174,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN229"
+NAME="AEN224"
 ></A
->5.4. The data on the CD-Drive I've shared seems to be corrupted!</H1
+>4.4. The data on the CD-Drive I've shared seems to be corrupted!</H1
 ><P
 >Some OSes (notably Linux) default to auto detection of file type on
 cdroms and do cr/lf translation. This is a very bad idea when use with
@@ -190,9 +190,9 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN233"
+NAME="AEN228"
 ></A
->5.5. Why can users access home directories of other users?</H1
+>4.5. Why can users access home directories of other users?</H1
 ><P
 ><SPAN
 CLASS="QUOTE"
@@ -243,17 +243,6 @@ CLASS="PROGRAMLISTING"
 to the definition of the [homes] share, as recommended in
 the smb.conf man page.</P
 ></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN246"
-></A
->5.6. Until a few minutes after samba has started, clients get the error "Domain Controller Unavailable"</H1
-><P
->A domain controller has to announce on the network who it is. This usually takes a while.</P
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/docs/faq/install.html b/docs/faq/install.html
index 23403ab96b..f9ecac1384 100644
--- a/docs/faq/install.html
+++ b/docs/faq/install.html
@@ -13,8 +13,8 @@ REL="PREVIOUS"
 TITLE="General Information"
 HREF="general.html"><LINK
 REL="NEXT"
-TITLE="Configuration problems"
-HREF="config.html"></HEAD
+TITLE="Specific client application problems"
+HREF="clientapp.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="config.html"
+HREF="clientapp.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -496,7 +496,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="config.html"
+HREF="clientapp.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -516,7 +516,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Configuration problems</TD
+>Specific client application problems</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/faq/samba-faq.html b/docs/faq/samba-faq.html
index f6a9d83128..ed74a3be31 100644
--- a/docs/faq/samba-faq.html
+++ b/docs/faq/samba-faq.html
@@ -156,142 +156,118 @@ HREF="install.html#AEN155"
 ></DD
 ><DT
 >3. <A
-HREF="config.html"
->Configuration problems</A
-></DT
-><DD
-><DL
-><DT
->3.1. <A
-HREF="config.html#AEN170"
->I have set 'force user' and samba still makes 'root' the owner of all the files I touch!</A
-></DT
-></DL
-></DD
-><DT
->4. <A
 HREF="clientapp.html"
 >Specific client application problems</A
 ></DT
 ><DD
 ><DL
 ><DT
->4.1. <A
-HREF="clientapp.html#AEN175"
+>3.1. <A
+HREF="clientapp.html#AEN170"
 >MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</A
 ></DT
 ><DT
->4.2. <A
-HREF="clientapp.html#AEN180"
+>3.2. <A
+HREF="clientapp.html#AEN175"
 >How to use a Samba share as an administrative share for MS Office, etc.</A
 ></DT
 ><DT
->4.3. <A
-HREF="clientapp.html#AEN195"
+>3.3. <A
+HREF="clientapp.html#AEN190"
 >Microsoft Access database opening errors</A
 ></DT
 ></DL
 ></DD
 ><DT
->5. <A
+>4. <A
 HREF="errors.html"
 >Common errors</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.1. <A
-HREF="errors.html#AEN206"
+>4.1. <A
+HREF="errors.html#AEN201"
 >Not listening for calling name</A
 ></DT
 ><DT
->5.2. <A
-HREF="errors.html#AEN213"
+>4.2. <A
+HREF="errors.html#AEN208"
 >System Error 1240</A
 ></DT
 ><DT
->5.3. <A
-HREF="errors.html#AEN220"
+>4.3. <A
+HREF="errors.html#AEN215"
 >smbclient ignores -N !</A
 ></DT
 ><DT
->5.4. <A
-HREF="errors.html#AEN229"
+>4.4. <A
+HREF="errors.html#AEN224"
 >The data on the CD-Drive I've shared seems to be corrupted!</A
 ></DT
 ><DT
->5.5. <A
-HREF="errors.html#AEN233"
+>4.5. <A
+HREF="errors.html#AEN228"
 >Why can users access home directories of other users?</A
 ></DT
-><DT
->5.6. <A
-HREF="errors.html#AEN246"
->Until a few minutes after samba has started, clients get the error "Domain Controller Unavailable"</A
-></DT
 ></DL
 ></DD
 ><DT
->6. <A
+>5. <A
 HREF="features.html"
 >Features</A
 ></DT
 ><DD
 ><DL
 ><DT
->6.1. <A
-HREF="features.html#AEN251"
+>5.1. <A
+HREF="features.html#AEN243"
 >How can I prevent my samba server from being used to distribute the Nimda worm?</A
 ></DT
 ><DT
->6.2. <A
-HREF="features.html#AEN265"
+>5.2. <A
+HREF="features.html#AEN257"
 >How can I use samba as a fax server?</A
 ></DT
 ><DD
 ><DL
 ><DT
->6.2.1. <A
-HREF="features.html#AEN276"
+>5.2.1. <A
+HREF="features.html#AEN268"
 >Tools for printing faxes</A
 ></DT
 ><DT
->6.2.2. <A
-HREF="features.html#AEN286"
+>5.2.2. <A
+HREF="features.html#AEN278"
 >Making the fax-server</A
 ></DT
 ><DT
->6.2.3. <A
-HREF="features.html#AEN302"
+>5.2.3. <A
+HREF="features.html#AEN294"
 >Installing the client drivers</A
 ></DT
 ><DT
->6.2.4. <A
-HREF="features.html#AEN316"
+>5.2.4. <A
+HREF="features.html#AEN308"
 >Example smb.conf</A
 ></DT
 ></DL
 ></DD
 ><DT
->6.3. <A
-HREF="features.html#AEN320"
+>5.3. <A
+HREF="features.html#AEN312"
 >Samba doesn't work well together with DHCP!</A
 ></DT
 ><DT
->6.4. <A
-HREF="features.html#AEN333"
+>5.4. <A
+HREF="features.html#AEN325"
 >How can I assign NetBIOS names to clients with DHCP?</A
 ></DT
 ><DT
->6.5. <A
-HREF="features.html#AEN340"
+>5.5. <A
+HREF="features.html#AEN332"
 >How do I convert between unix and dos text formats?</A
 ></DT
-><DT
->6.6. <A
-HREF="features.html#AEN345"
->Does samba have wins replication support?</A
-></DT
 ></DL
 ></DD
 ></DL