Start of merge to 2_2_RELEASE branch for release.

Jeremy.

1 files changed, 17 insertions, 10 deletions

diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 2a7d6d59f8d..368b3d7925e 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -265,7 +265,14 @@ TARGET="_top"
 CLASS="FILENAME"
 >		smb.conf(5)</TT
 ></A
-> file.
+> file. <EM
+>Beware:</EM
+>
+		If the directory specified does not exist, <B
+CLASS="COMMAND"
+>smbd</B
+>
+		will log to the default debug log location defined at compile time.
 		</P
 ><P
 >The default log directory is specified at
@@ -347,7 +354,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN115"
+NAME="AEN117"
 ></A
 ><H2
 >FILES</H2
@@ -459,7 +466,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN151"
+NAME="AEN153"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -478,7 +485,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN155"
+NAME="AEN157"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -509,7 +516,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN164"
+NAME="AEN166"
 ></A
 ><H2
 >PAM INTERACTION</H2
@@ -554,7 +561,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN175"
+NAME="AEN177"
 ></A
 ><H2
 >VERSION</H2
@@ -565,7 +572,7 @@ NAME="AEN175"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN178"
+NAME="AEN180"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -588,7 +595,7 @@ NAME="AEN178"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN183"
+NAME="AEN185"
 ></A
 ><H2
 >SIGNALS</H2
@@ -653,7 +660,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN200"
+NAME="AEN202"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -719,7 +726,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN217"
+NAME="AEN219"
 ></A
 ><H2
 >AUTHOR</H2