After merging the notify stuff to 3_0_25, check in the docs

(This used to be commit ee532da6c8eb7c21937702e942e2755cf0aac042)

diff --git a/docs/smbdotconf/misc/changenotify.xml b/docs/smbdotconf/misc/changenotify.xml
new file mode 100644 (file)
index 0000000..ad9d5eb
--- /dev/null
+++ b/docs/smbdotconf/misc/changenotify.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="change notify"
+                 context="S"
+                                type="boolean"
+                 advanced="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+       <para>This parameter specifies whether Samba should reply
+       to a client's file change notify requests.
+       </para>
+
+       <para>You should never need to change this parameter</para>
+</description>
+<value type="default">no</value>
+</samba:parameter>

diff --git a/docs/smbdotconf/misc/famchangenotify.xml b/docs/smbdotconf/misc/famchangenotify.xml
deleted file mode 100644 (file)
index 9a0f4bc..0000000
--- a/docs/smbdotconf/misc/famchangenotify.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<samba:parameter name="fam change notify"
-                 context="G"
-                                type="boolean"
-                 advanced="1" developer="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>This parameter specifies whether Samba should ask the 
-       FAM daemon change notifications in directories so that
-       SMB clients can refresh whenever the data on the server changes.
-       </para>
-
-       <para>This parameter is only used when your system supports 
-       change notification to user programs, using the FAM daemon. If the FAM
-       daemon is not running, this parameter is automatically disabled. The
-       <parameter moreinfo="none">kernel change notify</parameter>
-       parameter will take precedence if it is also enabled.
-       </para>
-</description>
-<value type="default">yes</value>
-</samba:parameter>

diff --git a/docs/smbdotconf/misc/kernelchangenotify.xml b/docs/smbdotconf/misc/kernelchangenotify.xml
index 068583fad8e2bc296ca73087c53bc0ac3cc47f08..ef932201a10b524cc98e8de2a58c40fb0058467a 100644 (file)
--- a/docs/smbdotconf/misc/kernelchangenotify.xml
+++ b/docs/smbdotconf/misc/kernelchangenotify.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="kernel change notify"
-                 context="G"
+                 context="S"
                                 type="boolean"
-                 advanced="1" developer="1"
+                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>This parameter specifies whether Samba should ask the 
@@ -10,7 +10,7 @@
        </para>
 
        <para>This parameter is only used when your kernel supports 
-       change notification to user programs, using the F_NOTIFY fcntl.
+       change notification to user programs using the inotify interface.
        </para>
 </description>
 <value type="default">yes</value>

diff --git a/docs/smbdotconf/tuning/changenotifytimeout.xml b/docs/smbdotconf/tuning/changenotifytimeout.xml
deleted file mode 100644 (file)
index c450a17..0000000
--- a/docs/smbdotconf/tuning/changenotifytimeout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<samba:parameter name="change notify timeout"
-       type="integer"
-                 context="S"
-                 developer="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>This SMB allows a client to tell a server to 
-    &quot;watch&quot; a particular directory for any changes and only reply to
-    the SMB request when a change has occurred. Such constant scanning of
-    a directory is expensive under UNIX, hence an <citerefentry><refentrytitle>smbd</refentrytitle>
-    <manvolnum>8</manvolnum></citerefentry> daemon only performs such a scan 
-    on each requested directory once every <parameter moreinfo="none">change notify 
-    timeout</parameter> seconds. Note that in 3.0.23 this has been changed to a
-    per-share parameter and setting this to zero prevents any change notify directory
-    scans completely on a share. This is to allow this paramter to be set to zero on
-    shares configured for very large directories, where a Windows client will re-scan
-    the entire directory after every delete operation (when deleting many files) due to
-    the change notify triggering. This is an extremely expensive operation on some
-    systems.</para>
-</description>
-
-<value type="default">60</value>
-<value type="example">300<comment>Would change the scan time to every 5 minutes.</comment></value>
-</samba:parameter>