merge from 2.2 and regenerate

(This used to be commit 55c53ef08974947cf10a79882b63d6d8e8baad4c)

1 files changed, 9 insertions, 9 deletions

diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index 7194e1154e..35b1d9b01b 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -260,15 +260,15 @@ NAME="AEN63"
 >Step 5: Starting the smbd and nmbd</A
 ></H1
 ><P
->You must choose to start smbd and nmbd either 
+>You must choose to start smbd and nmbd either
 	as daemons or from <B
 CLASS="COMMAND"
 >inetd</B
->. Don't try 
+>. Don't try
 	to do both!  Either you can put them in <TT
 CLASS="FILENAME"
 >	inetd.conf</TT
-> and have them started on demand 
+> and have them started on demand
 	by <B
 CLASS="COMMAND"
 >inetd</B
@@ -276,9 +276,9 @@ CLASS="COMMAND"
 	daemons either from the command line or in <TT
 CLASS="FILENAME"
 >	/etc/rc.local</TT
->. See the man pages for details 
-	on the command line options. Take particular care to read 
-	the bit about what user you need to be in order to start 
+>. See the man pages for details
+	on the command line options. Take particular care to read
+	the bit about what user you need to be in order to start
 	Samba.  In many cases you must be root.</P
 ><P
 >The main advantage of starting <B
@@ -288,9 +288,9 @@ CLASS="COMMAND"
 	and <B
 CLASS="COMMAND"
 >nmbd</B
-> as a daemon is that they will 
-	respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</P
+> using the recommended daemon method
+	is that they will respond slightly more quickly to an initial connection
+	request.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2