syncing up changes in 2.2

(This used to be commit ffbbe67dbfde7f7ce4bb70becfc696c395dbf6b2)

1 files changed, 27 insertions, 23 deletions

diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 33af0242e5..35520b05af 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -36,7 +36,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbd</B
->  [-D] [-a] [-o] [-P] [-h] [-V] [-d &lt;debug level&gt;] [-l &lt;log file&gt;] [-p &lt;port number&gt;] [-O &lt;socket option&gt;] [-s &lt;configuration file&gt;]</P
+>  [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-l &#60;log file&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -178,7 +178,7 @@ CLASS="COMMAND"
 >.</P
 ></DD
 ><DT
->-d &lt;debug level&gt;</DT
+>-d &#60;debug level&#62;</DT
 ><DD
 ><P
 >debuglevel is an integer 
@@ -214,12 +214,11 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-l &lt;log file&gt;</DT
+>-l &#60;log file&#62;</DT
 ><DD
 ><P
->If specified, <I
-CLASS="EMPHASIS"
->log file</I
+>If specified, <EM
+>log file</EM
 > 
 		specifies a log filename into which informational and debug 
 		messages from the running server will be logged. The log 
@@ -240,7 +239,7 @@ CLASS="FILENAME"
 		file name is specified at compile time.</P
 ></DD
 ><DT
->-O &lt;socket options&gt;</DT
+>-O &#60;socket options&#62;</DT
 ><DD
 ><P
 >See the <A
@@ -259,7 +258,7 @@ CLASS="FILENAME"
 > file for details.</P
 ></DD
 ><DT
->-p &lt;port number&gt;</DT
+>-p &#60;port number&#62;</DT
 ><DD
 ><P
 >port number is a positive integer 
@@ -285,7 +284,7 @@ CLASS="FILENAME"
 		in the above situation.</P
 ></DD
 ><DT
->-s &lt;configuration file&gt;</DT
+>-s &#60;configuration file&#62;</DT
 ><DD
 ><P
 >The file specified contains the 
@@ -574,14 +573,12 @@ NAME="AEN179"
 >RUNNING THE SERVER AS A DAEMON</H2
 ><P
 >To run the server as a daemon from the command 
-	line, simply put the <I
-CLASS="EMPHASIS"
->-D</I
+	line, simply put the <EM
+>-D</EM
 > option on the 
 	command line. There is no need to place an ampersand at 
-	the end of the command line - the <I
-CLASS="EMPHASIS"
->-D</I
+	the end of the command line - the <EM
+>-D</EM
 > 
 	option causes the server to detach itself from the tty 
 	anyway.</P
@@ -617,9 +614,8 @@ CLASS="COMMAND"
 	as a single space or TAB character.)</P
 ><P
 >If the options used at compile time are appropriate for 
-	your system, all parameters except <I
-CLASS="EMPHASIS"
->-D</I
+	your system, all parameters except <EM
+>-D</EM
 > may 
 	be omitted. See the section OPTIONS above.</P
 ></DIV
@@ -727,6 +723,12 @@ CLASS="FILENAME"
 >Lastly, edit the configuration file to provide suitable 
 	services. To start with, the following two services should be 
 	all you need:</P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="SCREEN"
 >	<TT
@@ -742,6 +744,9 @@ CLASS="COMPUTEROUTPUT"
 	</TT
 >
 	</PRE
+></TD
+></TR
+></TABLE
 ><P
 >This will allow you to connect to your home directory 
 	and print to any printer supported by the host (user privileges 
@@ -848,9 +853,8 @@ CLASS="FILENAME"
 	that <B
 CLASS="COMMAND"
 >SIGKILL (-9)</B
-> <I
-CLASS="EMPHASIS"
->NOT</I
+> <EM
+>NOT</EM
 > 
 	be used, except as a last resort, as this may leave the shared
 	memory area in an inconsistent state. The safe way to terminate 
@@ -860,11 +864,11 @@ CLASS="EMPHASIS"
 >The debug log level of smbd may be raised by sending 
 	it a SIGUSR1 (<B
 CLASS="COMMAND"
->kill -USR1 &lt;smbd-pid&gt;</B
+>kill -USR1 &#60;smbd-pid&#62;</B
 >)
 	and lowered by sending it a SIGUSR2 (<B
 CLASS="COMMAND"
->kill -USR2 &lt;smbd-pid&gt;
+>kill -USR2 &#60;smbd-pid&#62;
 	</B
 >). This is to allow transient problems to be diagnosed, 
 	whilst still running at a normally low log level.</P