syncing files from 3.0 into HEAD again

(This used to be commit bca0bba209255d0effbae6a3d3b6d298f0952c3a)

5 files changed, 123 insertions, 16 deletions

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>
diff --git a/docs/docbook/smbdotconf/vfs/getquotacommand.xml b/docs/docbook/smbdotconf/vfs/getquotacommand.xml
new file mode 100644
index 0000000000..93c9089519
--- /dev/null
+++ b/docs/docbook/smbdotconf/vfs/getquotacommand.xml
@@ -0,0 +1,52 @@
+<samba:parameter name="get quota command"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>The <command>get quota command</command> should only be used 
+	whenever there is no operating system API available from the OS that 
+	samba can use.</para>
+
+	<para>This parameter should specify the path to a script that 
+	queries the quota information for the specified 
+	user/group for the partition that 
+	the specified directory is on.</para>
+
+	<para>Such a script should take 3 arguments:</para>
+
+	<itemizedlist>
+		<listitem><para>directory</para></listitem>
+		<listitem><para>type of query</para></listitem>
+		<listitem><para>uid of user or gid of group</para></listitem>
+	</itemizedlist>
+
+	<para>The type of query can be one of :</para>
+
+	<itemizedlist>
+		<listitem><para>1 - user quotas</para></listitem>
+		<listitem><para>2 - user default quotas (uid = -1)</para></listitem>
+		<listitem><para>3 - group quotas</para></listitem>
+		<listitem><para>4 - group default quotas (gid = -1)</para></listitem>
+	</itemizedlist>
+
+	<para>This script should print its output according to the following format:</para>
+
+	<itemizedlist>
+		<listitem><para>Line 1 - quota flags (0 = no quotas, 1 = quotas enabled, 2 = quotas enabled and enforced)</para></listitem>
+		<listitem><para>Line 2 - number of currently used blocks</para></listitem>
+		<listitem><para>Line 3 - the softlimit number of blocks</para></listitem>
+		<listitem><para>Line 4 - the hardlimit number of blocks</para></listitem>
+		<listitem><para>Line 5 - currently used number of inodes</para></listitem>
+		<listitem><para>Line 6 - the softlimit number of inodes</para></listitem>
+		<listitem><para>Line 7 - the hardlimit number of inodes</para></listitem>
+		<listitem><para>Line 8(optional) - the number of bytes in a block(default is 1024)</para></listitem>
+	</itemizedlist>
+
+	<para>See also the <link linkend="SETQUOTACOMMAND"><parameter moreinfo="none">set quota command</parameter></link> parameter.
+	</para>
+		
+	<para>Default: <command moreinfo="none">get quota command = </command></para>
+
+	<para>Example: <command moreinfo="none">get quota command = /usr/local/sbin/query_quota</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/vfs/hostmsdfs.xml b/docs/docbook/smbdotconf/vfs/hostmsdfs.xml
index c843969e50..d2b64cc68f 100644
--- a/docs/docbook/smbdotconf/vfs/hostmsdfs.xml
+++ b/docs/docbook/smbdotconf/vfs/hostmsdfs.xml
@@ -3,16 +3,14 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
-	<para>This boolean parameter is only available 
-	if Samba has been configured and compiled with the <command moreinfo="none">
-	--with-msdfs</command> option. If set to <constant>yes</constant>, 
-	Samba will act as a Dfs server, and  allow Dfs-aware clients 
-	to browse Dfs trees hosted on the server.</para>
+        <para>If set to <constant>yes</constant>, Samba will act as a Dfs
+	server, and allow Dfs-aware clients to browse Dfs trees hosted
+	on the server.</para>
 
 	<para>See also the <link linkend="MSDFSROOT"><parameter moreinfo="none">
 	msdfs root</parameter></link> share  level  parameter.  For
 	more  information  on  setting  up a Dfs tree on Samba,
-	refer to <ulink url="msdfs_setup.html">msdfs_setup.html</ulink>.
+	refer to <link linkend="msdfs"/>.
 	</para>
 		
 	<para>Default: <command moreinfo="none">host msdfs = no</command></para>
diff --git a/docs/docbook/smbdotconf/vfs/msdfsroot.xml b/docs/docbook/smbdotconf/vfs/msdfsroot.xml
index 35142ff037..059ffff9a0 100644
--- a/docs/docbook/smbdotconf/vfs/msdfsroot.xml
+++ b/docs/docbook/smbdotconf/vfs/msdfsroot.xml
@@ -2,16 +2,14 @@
                  context="S"
                  xmlns:samba="http://samba.org/common">
 <listitem>
-	<para>This boolean parameter is only available if 
-	Samba is configured  and  compiled with the <command moreinfo="none">
-	--with-msdfs</command> option.  If set to <constant>yes</constant>, 
-	Samba treats the share as a Dfs root and  allows clients to browse 
-	the distributed file system tree rooted at the share directory. 
-	Dfs links are specified  in  the share directory by symbolic 
-	links of the form <filename moreinfo="none">msdfs:serverA\\shareA,serverB\\shareB</filename>
-	and so on.  For more information on setting up a Dfs tree 
-	on Samba,  refer to <ulink url="msdfs.html">&quot;Hosting a Microsoft 
-	Distributed File System tree on Samba&quot;</ulink> document.</para>
+	<para>If set to <constant>yes</constant>, Samba treats the
+	share as a Dfs root and allows clients to browse the
+	distributed file system tree rooted at the share directory.
+	Dfs links are specified in the share directory by symbolic
+	links of the form <filename
+	moreinfo="none">msdfs:serverA\\shareA,serverB\\shareB</filename>
+	and so on.  For more information on setting up a Dfs tree on
+	Samba, refer to <link linkend="msdfs"/>.</para>
 		
 	<para>See also <link linkend="HOSTMSDFS"><parameter moreinfo="none">host msdfs</parameter></link></para>
 		
diff --git a/docs/docbook/smbdotconf/vfs/setquotacommand.xml b/docs/docbook/smbdotconf/vfs/setquotacommand.xml
new file mode 100644
index 0000000000..b4b7303a0d
--- /dev/null
+++ b/docs/docbook/smbdotconf/vfs/setquotacommand.xml
@@ -0,0 +1,42 @@
+<samba:parameter name="set quota command"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>The <command>set quota command</command> should only be used 
+	whenever there is no operating system API available from the OS that 
+	samba can use.</para>
+
+	<para>This parameter should specify the path to a script that 
+	can set quota for the specified arguments.</para>
+
+	<para>The specified script should take the following arguments:</para>
+
+	<itemizedlist>
+		<listitem><para>1 - quota type
+			<itemizedlist>
+				<listitem><para>1 - user quotas</para></listitem>
+				<listitem><para>2 - user default quotas (uid = -1)</para></listitem>
+				<listitem><para>3 - group quotas</para></listitem>
+				<listitem><para>4 - group default quotas (gid = -1)</para></listitem>
+			</itemizedlist>
+			</para></listitem>
+		<listitem><para>2 - id (uid for user, gid for group, -1 if N/A)</para></listitem>
+		<listitem><para>3 - quota state (0 = disable, 1 = enable, 2 = enable and enforce)</para></listitem>
+		<listitem><para>4 - block softlimit</para></listitem>
+		<listitem><para>5 - block hardlimit</para></listitem>
+		<listitem><para>6 - inode softlimit</para></listitem>
+		<listitem><para>7 - inode hardlimit</para></listitem>
+		<listitem><para>8(optional) - block size, defaults to 1024</para></listitem>
+	</itemizedlist>
+
+	<para>The script should output at least one line of data.</para>
+
+	<para>See also the <link linkend="GETQUOTACOMMAND"><parameter moreinfo="none">get quota command</parameter></link> parameter.
+	</para>
+		
+	<para>Default: <command moreinfo="none">set quota command = </command></para>
+
+	<para>Example: <command moreinfo="none">set quota command = /usr/local/sbin/set_quota</command></para>
+</listitem>
+</samba:parameter>