smb.conf - Clarified syslog only parameter as Chris suggested.

source/script/makeyodldocs.sh: Don't bother copying html to web directory any more.
Jeremy.

diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 73b0009373792c77824b50d1f4ac99393214fdd7..dd7640f984111f49096f68c182a8ab507f2aeb54 100644 (file)
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -4011,9 +4011,11 @@ set to <code>"yes"</code> in order for this parameter to have any affect.
 <p><br>This parameter maps how Samba debug messages are logged onto the
 system syslog logging levels. Samba debug level zero maps onto syslog
 LOG_ERR, debug level one maps onto LOG_WARNING, debug level two maps
-to LOG_NOTICE, debug level three maps onto LOG_INFO.  The parameter
-sets the threshold for doing the mapping, all Samba debug messages
-above this threshold are mapped to syslog LOG_DEBUG messages.
+onto LOG_NOTICE, debug level three maps onto LOG_INFO. All higher 
+levels are mapped to LOG_DEBUG.
+<p><br>This paramter sets the threshold for sending messages to syslog. 
+Only messages with debug level less than this value will be sent 
+to syslog.
 <p><br><strong>Default:</strong>
 <code> syslog = 1</code>
 <p><br><a name="syslogonly"></a>

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 748f328b25fc9c23d989fe1a755efc60e9276c1f..8903eebb307d07aed723b4f307de31faf4534094 100644 (file)
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -5662,9 +5662,12 @@ See also the \fB"strict sync"\fP parameter\&.
 This parameter maps how Samba debug messages are logged onto the
 system syslog logging levels\&. Samba debug level zero maps onto syslog
 LOG_ERR, debug level one maps onto LOG_WARNING, debug level two maps
-to LOG_NOTICE, debug level three maps onto LOG_INFO\&.  The parameter
-sets the threshold for doing the mapping, all Samba debug messages
-above this threshold are mapped to syslog LOG_DEBUG messages\&.
+onto LOG_NOTICE, debug level three maps onto LOG_INFO\&. All higher 
+levels are mapped to LOG_DEBUG\&.
+.IP 
+This paramter sets the threshold for sending messages to syslog\&. 
+Only messages with debug level less than this value will be sent 
+to syslog\&.
 .IP 
 \fBDefault:\fP
 \f(CW  syslog = 1\fP

diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo
index 4e49da53c7c72620d3712c31a2a18570827cc1a9..360b80595c66a159df5b65fb3f98ecda0516fa6c 100644 (file)
--- a/docs/yodldocs/smb.conf.5.yo
+++ b/docs/yodldocs/smb.conf.5.yo
@@ -5554,9 +5554,12 @@ dit(bf(syslog (G)))
 This parameter maps how Samba debug messages are logged onto the
 system syslog logging levels. Samba debug level zero maps onto syslog
 LOG_ERR, debug level one maps onto LOG_WARNING, debug level two maps
-to LOG_NOTICE, debug level three maps onto LOG_INFO.  The parameter
-sets the threshold for doing the mapping, all Samba debug messages
-above this threshold are mapped to syslog LOG_DEBUG messages.
+onto LOG_NOTICE, debug level three maps onto LOG_INFO. All higher 
+levels are mapped to LOG_DEBUG.
+
+This paramter sets the threshold for sending messages to syslog. 
+Only messages with debug level less than this value will be sent 
+to syslog.
 
   bf(Default:)
 tt(    syslog = 1)

diff --git a/source/script/makeyodldocs.sh b/source/script/makeyodldocs.sh
index c943224fe5b964dea1cb28069c700bf44b8f97ba..609dff1526f44c5f2e2457645974e6505dc84f90 100755 (executable)
--- a/source/script/makeyodldocs.sh
+++ b/source/script/makeyodldocs.sh
@@ -55,16 +55,6 @@ do
                                exit 1
                        fi
                        cp $bn.html ../htmldocs || echo "Cannot create $YODLDIR/../htmldocs/$bn.html"
-#
-# Copy to SWAT directory.
-#
-                       if [ $bn = "smb.conf.5" ]; then
-                               rm -f ../../swat/help/smb.conf.5.html || echo "Cannot remove ../../swat/help/smb.conf.5.html"
-
-                               cp $bn.html ../../swat/help || echo "Cannot copy smb.conf.5.html to ../../swat/help/smb.conf.5.html"
-                       fi
-                       rm -f $bn.html
-                       ;;
                *)
 #
 # Non man-page YODL docs - just make html and text.