1 files changed, 45 insertions, 53 deletions
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 5175bd4c8d..5b44d17968 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -878,29 +878,29 @@ HREF="#AEN2015"
 ><DL
 ><DT
 >11.5.1. <A
-HREF="#AEN2022"
+HREF="#AEN2020"
 >Introduction</A
 ></DT
 ><DT
 >11.5.2. <A
-HREF="#AEN2035"
+HREF="#AEN2033"
 >Requirements</A
 ></DT
 ><DT
 >11.5.3. <A
-HREF="#AEN2049"
+HREF="#AEN2047"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.5.3.1. <A
-HREF="#AEN2060"
+HREF="#AEN2058"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >11.5.3.2. <A
-HREF="#AEN2079"
+HREF="#AEN2077"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -909,22 +909,22 @@ winbind libraries</A
 ></DT
 ><DT
 >11.5.3.3. <A
-HREF="#AEN2104"
+HREF="#AEN2102"
 >Configure smb.conf</A
 ></DT
 ><DT
 >11.5.3.4. <A
-HREF="#AEN2120"
+HREF="#AEN2118"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >11.5.3.5. <A
-HREF="#AEN2131"
+HREF="#AEN2129"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >11.5.3.6. <A
-HREF="#AEN2167"
+HREF="#AEN2165"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -932,7 +932,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >11.5.3.7. <A
-HREF="#AEN2189"
+HREF="#AEN2187"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -941,12 +941,12 @@ HREF="#AEN2189"
 ></DD
 ><DT
 >11.6. <A
-HREF="#AEN2236"
+HREF="#AEN2234"
 >Limitations</A
 ></DT
 ><DT
 >11.7. <A
-HREF="#AEN2246"
+HREF="#AEN2244"
 >Conclusion</A
 ></DT
 ></DL
@@ -960,32 +960,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >12.1. <A
-HREF="#AEN2260"
+HREF="#AEN2258"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1.1. <A
-HREF="#AEN2262"
+HREF="#AEN2260"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
 >12.1.2. <A
-HREF="#AEN2277"
+HREF="#AEN2275"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
 >12.1.3. <A
-HREF="#AEN2286"
+HREF="#AEN2284"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >12.1.4. <A
-HREF="#AEN2290"
+HREF="#AEN2288"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -1002,24 +1002,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >13.1. <A
-HREF="#AEN2306"
+HREF="#AEN2304"
 >Introduction</A
 ></DT
 ><DT
 >13.2. <A
-HREF="#AEN2311"
+HREF="#AEN2309"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >13.2.1. <A
-HREF="#AEN2314"
+HREF="#AEN2312"
 >Access via CVSweb</A
 ></DT
 ><DT
 >13.2.2. <A
-HREF="#AEN2319"
+HREF="#AEN2317"
 >Access via cvs</A
 ></DT
 ></DL
@@ -1028,7 +1028,7 @@ HREF="#AEN2319"
 ></DD
 ><DT
 ><A
-HREF="#AEN2347"
+HREF="#AEN2345"
 >Index</A
 ></DT
 ></DL
@@ -8347,7 +8347,7 @@ Identified (RID).</P
 >As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
 is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <TT
 CLASS="PARAMETER"
 ><I
@@ -9535,20 +9535,12 @@ for providing the HOWTO for this section.</P
 >This HOWTO describes how to get winbind services up and running 
 to control access and authenticate users on your Linux box using 
 the winbind services which come with SAMBA 2.2.2.</P
-><P
->There is also some Solaris specific information in 
-<TT
-CLASS="FILENAME"
->docs/textdocs/Solaris-Winbind-HOWTO.txt</TT
->.
-Future revisions of this document will incorporate that
-information.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2022"
+NAME="AEN2020"
 >11.5.1. Introduction</A
 ></H2
 ><P
@@ -9599,7 +9591,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2035"
+NAME="AEN2033"
 >11.5.2. Requirements</A
 ></H2
 ><P
@@ -9657,7 +9649,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2049"
+NAME="AEN2047"
 >11.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -9702,7 +9694,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2060"
+NAME="AEN2058"
 >11.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -9777,7 +9769,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2079"
+NAME="AEN2077"
 >11.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -9867,7 +9859,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2104"
+NAME="AEN2102"
 >11.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -9951,7 +9943,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2120"
+NAME="AEN2118"
 >11.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -9997,7 +9989,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2131"
+NAME="AEN2129"
 >11.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -10138,7 +10130,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2167"
+NAME="AEN2165"
 >11.5.3.6. Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -10268,7 +10260,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2189"
+NAME="AEN2187"
 >11.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -10490,7 +10482,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2236"
+NAME="AEN2234"
 >11.6. Limitations</A
 ></H1
 ><P
@@ -10531,7 +10523,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2246"
+NAME="AEN2244"
 >11.7. Conclusion</A
 ></H1
 ><P
@@ -10555,7 +10547,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2260"
+NAME="AEN2258"
 >12.1. FAQs</A
 ></H1
 ><DIV
@@ -10563,7 +10555,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2262"
+NAME="AEN2260"
 >12.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -10622,7 +10614,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2277"
+NAME="AEN2275"
 >12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
@@ -10675,7 +10667,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2286"
+NAME="AEN2284"
 >12.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -10697,7 +10689,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2290"
+NAME="AEN2288"
 >12.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -10753,7 +10745,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2306"
+NAME="AEN2304"
 >13.1. Introduction</A
 ></H1
 ><P
@@ -10775,7 +10767,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2311"
+NAME="AEN2309"
 >13.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -10788,7 +10780,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2314"
+NAME="AEN2312"
 >13.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -10809,7 +10801,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2319"
+NAME="AEN2317"
 >13.2.2. Access via cvs</A
 ></H2
 ><P
@@ -10915,7 +10907,7 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2347"
+NAME="AEN2345"
 >Index</A
 ></H1
 ><DL