merge from 2.2 and regenerate docs

(This used to be commit f7d900873c3553dde88d42d903b74dc49c9a6c71)

1 files changed, 27 insertions, 16 deletions

diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index ba7116704d..bfd3440d7b 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -36,12 +36,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbd</B
->  [-D] [-a] [-o] [-P] [-h] [-V] [-b] [-d &#60;debug level&#62;] [-l &#60;log directory&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
+>  [-D] [-a] [-i] [-o] [-P] [-h] [-V] [-b] [-d &#60;debug level&#62;] [-l &#60;log directory&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23"
+NAME="AEN24"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -106,7 +106,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN37"
+NAME="AEN38"
 ></A
 ><H2
 >OPTIONS</H2
@@ -144,6 +144,17 @@ CLASS="COMMAND"
 		This is the default.</P
 ></DD
 ><DT
+>-i</DT
+><DD
+><P
+>If this parameter is specified it causes the
+		server to run "interactively", not as a daemon, even if the
+		server is executed on the command line of a shell. Setting this
+		parameter negates the implicit deamon mode when run from the
+		command line.
+		</P
+></DD
+><DT
 >-o</DT
 ><DD
 ><P
@@ -343,7 +354,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN115"
+NAME="AEN120"
 ></A
 ><H2
 >FILES</H2
@@ -441,7 +452,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN148"
+NAME="AEN153"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -460,7 +471,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN152"
+NAME="AEN157"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -491,7 +502,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN161"
+NAME="AEN166"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -613,7 +624,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN194"
+NAME="AEN199"
 ></A
 ><H2
 >RUNNING THE SERVER AS A DAEMON</H2
@@ -668,7 +679,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN207"
+NAME="AEN212"
 ></A
 ><H2
 >RUNNING THE SERVER ON REQUEST</H2
@@ -804,7 +815,7 @@ CLASS="COMPUTEROUTPUT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN239"
+NAME="AEN244"
 ></A
 ><H2
 >PAM INTERACTION</H2
@@ -849,7 +860,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN250"
+NAME="AEN255"
 ></A
 ><H2
 >TESTING THE INSTALLATION</H2
@@ -907,7 +918,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN264"
+NAME="AEN269"
 ></A
 ><H2
 >VERSION</H2
@@ -918,7 +929,7 @@ NAME="AEN264"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN267"
+NAME="AEN272"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -941,7 +952,7 @@ NAME="AEN267"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN272"
+NAME="AEN277"
 ></A
 ><H2
 >SIGNALS</H2
@@ -1006,7 +1017,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN289"
+NAME="AEN294"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -1072,7 +1083,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN306"
+NAME="AEN311"
 ></A
 ><H2
 >AUTHOR</H2