1 files changed, 282 insertions, 13 deletions
diff --git a/docs/htmldocs/introduction.html b/docs/htmldocs/introduction.html
index f45e60b5c5..762d56ba6a 100644
--- a/docs/htmldocs/introduction.html
+++ b/docs/htmldocs/introduction.html
@@ -5,7 +5,8 @@
 >General installation</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -13,8 +14,8 @@ REL="PREVIOUS"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="NEXT"
-TITLE="Introduction to Samba"
-HREF="introsmb.html"></HEAD
+TITLE="How to Install and Test SAMBA"
+HREF="install.html"></HEAD
 ><BODY
 CLASS="PART"
 BGCOLOR="#FFFFFF"
@@ -56,7 +57,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="introsmb.html"
+HREF="install.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -68,26 +69,294 @@ WIDTH="100%"></DIV
 ><DIV
 CLASS="PART"
 ><A
-NAME="INTRODUCTION"
-></A
-><DIV
+NAME="INTRODUCTION"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 >I. General installation</H1
-></DIV
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN44"
-></A
-><H1
+NAME="AEN21"><H1
 >Introduction</H1
 ><P
 >This part contains general info on how to install samba 
 and how to configure the parts of samba you will most likely need.
 PLEASE read this.</P
 ></DIV
+><DIV
+CLASS="TOC"
+><DL
+><DT
+><B
+>Table of Contents</B
+></DT
+><DT
+>1. <A
+HREF="install.html"
+>How to Install and Test SAMBA</A
+></DT
+><DD
+><DL
+><DT
+>1.1. <A
+HREF="install.html#AEN26"
+>Read the man pages</A
+></DT
+><DT
+>1.2. <A
+HREF="install.html#AEN36"
+>Building the Binaries</A
+></DT
+><DT
+>1.3. <A
+HREF="install.html#AEN64"
+>The all important step</A
+></DT
+><DT
+>1.4. <A
+HREF="install.html#AEN68"
+>Create the smb configuration file.</A
+></DT
+><DT
+>1.5. <A
+HREF="install.html#AEN82"
+>Test your config file with 
+	<B
+CLASS="COMMAND"
+>testparm</B
+></A
+></DT
+><DT
+>1.6. <A
+HREF="install.html#AEN90"
+>Starting the smbd and nmbd</A
+></DT
+><DD
+><DL
+><DT
+>1.6.1. <A
+HREF="install.html#AEN100"
+>Starting from inetd.conf</A
+></DT
+><DT
+>1.6.2. <A
+HREF="install.html#AEN129"
+>Alternative: starting it as a daemon</A
+></DT
+></DL
+></DD
+><DT
+>1.7. <A
+HREF="install.html#AEN145"
+>Try listing the shares available on your 
+	server</A
+></DT
+><DT
+>1.8. <A
+HREF="install.html#AEN154"
+>Try connecting with the unix client</A
+></DT
+><DT
+>1.9. <A
+HREF="install.html#AEN170"
+>Try connecting from a DOS, WfWg, Win9x, WinNT, 
+	Win2k, OS/2, etc... client</A
+></DT
+><DT
+>1.10. <A
+HREF="install.html#AEN184"
+>What If Things Don't Work?</A
+></DT
+><DD
+><DL
+><DT
+>1.10.1. <A
+HREF="install.html#AEN189"
+>Diagnosing Problems</A
+></DT
+><DT
+>1.10.2. <A
+HREF="install.html#AEN193"
+>Scope IDs</A
+></DT
+><DT
+>1.10.3. <A
+HREF="install.html#AEN196"
+>Choosing the Protocol Level</A
+></DT
+><DT
+>1.10.4. <A
+HREF="install.html#AEN205"
+>Printing from UNIX to a Client PC</A
+></DT
+><DT
+>1.10.5. <A
+HREF="install.html#AEN210"
+>Locking</A
+></DT
+><DT
+>1.10.6. <A
+HREF="install.html#AEN219"
+>Mapping Usernames</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>2. <A
+HREF="improved-browsing.html"
+>Improved browsing in samba</A
+></DT
+><DD
+><DL
+><DT
+>2.1. <A
+HREF="improved-browsing.html#AEN229"
+>Overview of browsing</A
+></DT
+><DT
+>2.2. <A
+HREF="improved-browsing.html#AEN233"
+>Browsing support in samba</A
+></DT
+><DT
+>2.3. <A
+HREF="improved-browsing.html#AEN242"
+>Problem resolution</A
+></DT
+><DT
+>2.4. <A
+HREF="improved-browsing.html#AEN249"
+>Browsing across subnets</A
+></DT
+><DD
+><DL
+><DT
+>2.4.1. <A
+HREF="improved-browsing.html#AEN254"
+>How does cross subnet browsing work ?</A
+></DT
+></DL
+></DD
+><DT
+>2.5. <A
+HREF="improved-browsing.html#AEN289"
+>Setting up a WINS server</A
+></DT
+><DT
+>2.6. <A
+HREF="improved-browsing.html#AEN308"
+>Setting up Browsing in a WORKGROUP</A
+></DT
+><DT
+>2.7. <A
+HREF="improved-browsing.html#AEN326"
+>Setting up Browsing in a DOMAIN</A
+></DT
+><DT
+>2.8. <A
+HREF="improved-browsing.html#AEN336"
+>Forcing samba to be the master</A
+></DT
+><DT
+>2.9. <A
+HREF="improved-browsing.html#AEN345"
+>Making samba the domain master</A
+></DT
+><DT
+>2.10. <A
+HREF="improved-browsing.html#AEN363"
+>Note about broadcast addresses</A
+></DT
+><DT
+>2.11. <A
+HREF="improved-browsing.html#AEN366"
+>Multiple interfaces</A
+></DT
+></DL
+></DD
+><DT
+>3. <A
+HREF="browsing-quick.html"
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</A
+></DT
+><DD
+><DL
+><DT
+>3.1. <A
+HREF="browsing-quick.html#AEN377"
+>Discussion</A
+></DT
+><DT
+>3.2. <A
+HREF="browsing-quick.html#AEN385"
+>Use of the "Remote Announce" parameter</A
+></DT
+><DT
+>3.3. <A
+HREF="browsing-quick.html#AEN399"
+>Use of the "Remote Browse Sync" parameter</A
+></DT
+><DT
+>3.4. <A
+HREF="browsing-quick.html#AEN404"
+>Use of WINS</A
+></DT
+><DT
+>3.5. <A
+HREF="browsing-quick.html#AEN415"
+>Do NOT use more than one (1) protocol on MS Windows machines</A
+></DT
+><DT
+>3.6. <A
+HREF="browsing-quick.html#AEN421"
+>Name Resolution Order</A
+></DT
+></DL
+></DD
+><DT
+>4. <A
+HREF="pwencrypt.html"
+>LanMan and NT Password Encryption in Samba</A
+></DT
+><DD
+><DL
+><DT
+>4.1. <A
+HREF="pwencrypt.html#AEN457"
+>Introduction</A
+></DT
+><DT
+>4.2. <A
+HREF="pwencrypt.html#AEN462"
+>Important Notes About Security</A
+></DT
+><DD
+><DL
+><DT
+>4.2.1. <A
+HREF="pwencrypt.html#AEN481"
+>Advantages of SMB Encryption</A
+></DT
+><DT
+>4.2.2. <A
+HREF="pwencrypt.html#AEN488"
+>Advantages of non-encrypted passwords</A
+></DT
+></DL
+></DD
+><DT
+>4.3. <A
+HREF="pwencrypt.html#AEN497"
+>The smbpasswd Command</A
+></DT
+></DL
+></DD
+></DL
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
@@ -123,7 +392,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="introsmb.html"
+HREF="install.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -143,7 +412,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Introduction to Samba</TD
+>How to Install and Test SAMBA</TD
 ></TR
 ></TABLE
 ></DIV