4 files changed, 51 insertions, 1 deletions
diff --git a/docs/docbook/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/docbook/smbdotconf/ldap/ldapgroupsuffix.xml
index 6786ff4532..5e6b9cc886 100644
--- a/docs/docbook/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs/docbook/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -4,7 +4,8 @@
                  xmlns:samba="http://samba.org/common">
 <listitem>
 	<para>This parameters specifies the suffix that is 
-	used for groups when these are added to the LDAP directory.</para>
+	used for groups when these are added to the LDAP directory.
+	If this parameter is unset, the value of <parameter>ldap suffix</parameter> will be used instead.</para>
 
 	<para>Default: <emphasis>none</emphasis></para>
 
diff --git a/docs/docbook/smbdotconf/ldap/ldapidmapsuffix.xml b/docs/docbook/smbdotconf/ldap/ldapidmapsuffix.xml
new file mode 100644
index 0000000000..f826183c33
--- /dev/null
+++ b/docs/docbook/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="ldap idmap suffix"
+                 context="G"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameters specifies the suffix that is 
+	used when storing idmap mappings. If this parameter 
+	is unset, the value of <parameter>ldap suffix</parameter>
+	will be used instead.</para>
+
+	<para>Default: <emphasis>none</emphasis></para>
+
+	<para>Example: <emphasis>dc=samba,ou=Idmap</emphasis></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/misc/kernelchangenotify.xml b/docs/docbook/smbdotconf/misc/kernelchangenotify.xml
new file mode 100644
index 0000000000..c6dc215b94
--- /dev/null
+++ b/docs/docbook/smbdotconf/misc/kernelchangenotify.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="kernel change notify"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter specifies whether Samba should ask the 
+	kernel for change notifications in directories so that
+	SMB clients can refresh whenever the data on the server changes.
+	</para>
+
+	<para>This parameter is only usd when your kernel supports 
+	change notification to user programs, using the F_NOTIFY fcntl.
+	</para>
+	
+	<para>Default: <emphasis>Yes</emphasis></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/vfs/aclcompatibility.xml b/docs/docbook/smbdotconf/vfs/aclcompatibility.xml
new file mode 100644
index 0000000000..ca3f39512d
--- /dev/null
+++ b/docs/docbook/smbdotconf/vfs/aclcompatibility.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="acl compatibility"
+                 context="S"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter specifies what OS ACL semantics should 
+	be compatible with. Possible values are <emphasis>winnt</emphasis> for Windows NT 4, 
+	<emphasis>win2k</emphasis> for Windows 2000 and above and <emphasis>auto</emphasis>.
+	If you specify <emphasis>auto</emphasis>, the value for this parameter 
+	will be based upon the version of the client. There should 
+	be no reason to change this parameter from the default.</para>
+		
+	<para>Default: <command moreinfo="none">acl compatibility = Auto</command></para>
+
+	<para>Example: <command moreinfo="none">acl compatibility = win2k</command></para>
+</listitem>
+</samba:parameter>