diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=tdbsam2_parse_info.h --exclude=config.* --exclude=bin --exclude=*.configure --exclude=autom4te.cache --exclude=build_options.c* 3_0/docs/docbook/projdoc/VFS.xml 3_0-vfs/docs/docbook/projdoc/VFS.xml
--- 3_0/docs/docbook/projdoc/VFS.xml	Thu May  1 15:57:30 2003
+++ 3_0-vfs/docs/docbook/projdoc/VFS.xml	Mon May 19 08:08:27 2003
@@ -26,15 +26,15 @@ They currently have been tested against 
 
 <para>
 To use the VFS modules, create a share similar to the one below.  The
-important parameter is the <command>vfs object</command> parameter which must point to
-the exact pathname of the shared library objects. For example, to log all access 
+important parameter is the <command>vfs objects</command> parameter where
+you can list one or more VFS modules by name. For example, to log all access 
 to files and use a recycle bin:
 
 <programlisting>
        [audit]
                 comment = Audited /data directory
                 path = /data
-                vfs object = /path/to/audit.so /path/to/recycle.so
+                vfs objects = audit recycle
                 writeable = yes
                 browseable = yes
 </programlisting>
@@ -45,6 +45,29 @@ The modules are used in the order they a
 </para>
 
 <para>
+The modules can be static or shared samba modules.
+If no module with the specified name can be found,
+a shared module in $LIBDIR/vfs/name.so will be loaded.
+</para>
+
+<para>
+Some modules allow multiple instances of them.
+You can specify this similar to the example below:
+
+<programlisting>
+       [test]
+                comment = VFS TEST
+                path = /data
+                writeable = yes
+                browseable = yes
+                vfs objects = example:example1 example example:test
+		example1: log level = 1
+		example:  log level = 5
+		test:	  log level = 7
+</programlisting>
+</para>
+
+<para>
 Further documentation on writing VFS modules for Samba can be found in
 the Samba Developers Guide.
 </para>
@@ -72,77 +95,72 @@ facility.  The following operations are 
 <para>
 This module is identical with the <emphasis>audit</emphasis> module above except
 that it sends audit logs to both syslog as well as the smbd log file/s. The 
-loglevel for this module is set in the smb.conf file.
+loglevel for this module is set in the smb.conf file. This module has its own
+DEBUG_CLASS named "extd_audit". At loglevel = extd_audit:0, only file
+and directory deletions and directory and file creations are logged. At loglevel = extd_audit:1
+file opens are renames and permission changes are logged , while at loglevel = extd_audit:2 file
+open and close calls are logged also.
 </para>
+</sect2>
 
+<sect2>
+<title>fake_perms</title>
 <para>
-The logging information that will be written to the smbd log file is controlled by
-the <emphasis>log level</emphasis> parameter in <filename>smb.conf</filename>. The
-following information will be recorded:
-</para>
-
-<table frame="all"><title>Extended Auditing Log Information</title>
-<tgroup cols="2" align="center">
-	<thead>
-	<row><entry align="center">Log Level</entry><entry>Log Details - File and Directory Operations</entry></row>
-	</thead>
-	<tbody>
-	<row><entry align="center">0</entry><entry align="left">Creation / Deletion</entry></row>
-	<row><entry align="center">1</entry><entry align="left">Create / Delete / Rename / Permission Changes</entry></row>
-	<row><entry align="center">2</entry><entry align="left">Create / Delete / Rename / Perm Change / Open / Close</entry></row>
-	</tbody>
-</tgroup>
-</table>
-
+This module fakes the owner uid and primary group gid to the uid/gid of the current user.
+This is usefull when you provide roaming profiles for Windows XP clients
+and you didn't want the user to change his profile.
+Windows XP clients require that the currently logged in user is the owner of his
+roaming profile and that the user has write permissions.
+</para>
 </sect2>
 
 <sect2>
 <title>recycle</title>
 <para>
-A recycle-bin like module. When used any unlink call
+A recycle-bin like modules. When used any unlink call
 will be intercepted and files moved to the recycle
-directory instead of being deleted.
+directory instead of beeing deleted.
 </para>
 
 <para>Supported options:
 <variablelist>
 	<varlistentry>
-	<term>vfs_recycle_bin:repository</term>
+	<term>recycle:repository</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:keeptree</term>
+	<term>recycle:keeptree</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 	
 	<varlistentry>
-	<term>vfs_recycle_bin:versions</term>
+	<term>recycle:versions</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:touch</term>
+	<term>recycle:touch</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:maxsize</term>
+	<term>recycle:maxsize</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:exclude</term>
+	<term>recycle:exclude</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:exclude_dir</term>
+	<term>recycle:exclude_dir</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
-	<term>vfs_recycle_bin:noversions</term>
+	<term>recycle:noversions</term>
 	<listitem><para>FIXME</para></listitem>
 	</varlistentry>
 </variablelist>
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=tdbsam2_parse_info.h --exclude=config.* --exclude=bin --exclude=*.configure --exclude=autom4te.cache --exclude=build_options.c* 3_0/docs/docbook/smbdotconf/vfs/vfsobject.xml 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsobject.xml
--- 3_0/docs/docbook/smbdotconf/vfs/vfsobject.xml	Thu May  1 16:04:06 2003
+++ 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsobject.xml	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-<samba:parameter name="vfs object"
-                 context="S"
-                 xmlns:samba="http://samba.org/common">
-<listitem>
-	<para>This parameter specifies a shared object files that 
-	are used for Samba VFS I/O operations.  By default, normal 
-	disk I/O operations are used but these can be overloaded 
-	with one or more VFS objects. </para>
-		
-	<para>Default: <emphasis>no value</emphasis></para>
-</listitem>
-</samba:parameter>
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=tdbsam2_parse_info.h --exclude=config.* --exclude=bin --exclude=*.configure --exclude=autom4te.cache --exclude=build_options.c* 3_0/docs/docbook/smbdotconf/vfs/vfsobjects.xml 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsobjects.xml
--- 3_0/docs/docbook/smbdotconf/vfs/vfsobjects.xml	Thu Jan  1 01:00:00 1970
+++ 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsobjects.xml	Mon May 19 12:06:40 2003
@@ -0,0 +1,18 @@
+<samba:parameter xmlns:samba="http://samba.org/common">
+		<term><anchor id="VFSOBJECTS"/>vfs objects (S)</term>
+		<listitem><para>This parameter specifies the backend names which 
+		are used for Samba VFS I/O operations.  By default, normal 
+		disk I/O operations are used but these can be overloaded 
+		with one or more VFS objects. </para>
+		
+		<para>Default : <emphasis>no value</emphasis></para>
+		</listitem>
+		</samba:parameter>
+
+<samba:parameter xmlns:samba="http://samba.org/common">
+		<term><anchor id="VFSOBJECT"/>vfs object (S)</term>
+		<listitem><para>An alias for 
+		<link linked="VFSOBJECTS"><parameter moreinfo="none">vfs objects. </para>
+		</parameter></link>
+		</listitem>
+		</samba:parameter>
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=tdbsam2_parse_info.h --exclude=config.* --exclude=bin --exclude=*.configure --exclude=autom4te.cache --exclude=build_options.c* 3_0/docs/docbook/smbdotconf/vfs/vfsoptions.xml 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsoptions.xml
--- 3_0/docs/docbook/smbdotconf/vfs/vfsoptions.xml	Thu May  1 16:04:06 2003
+++ 3_0-vfs/docs/docbook/smbdotconf/vfs/vfsoptions.xml	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-<samba:parameter name="vfs options"
-                 context="S"
-                 xmlns:samba="http://samba.org/common">
-<listitem>
-	<para>This parameter allows parameters to be passed 
-	to the vfs layer at initialization time. 
-	See also <link linkend="VFSOBJECT"><parameter moreinfo="none">
-	vfs object</parameter></link>.</para>
-		
-	<para>Default: <emphasis>no value</emphasis></para>
-</listitem>
-</samba:parameter>
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=tdbsam2_parse_info.h --exclude=config.* --exclude=bin --exclude=*.configure --exclude=autom4te.cache --exclude=build_options.c* 3_0/docs/docbook/smbdotconf/vfs/vfspath.xml 3_0-vfs/docs/docbook/smbdotconf/vfs/vfspath.xml
--- 3_0/docs/docbook/smbdotconf/vfs/vfspath.xml	Thu May  1 16:04:06 2003
+++ 3_0-vfs/docs/docbook/smbdotconf/vfs/vfspath.xml	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-<samba:parameter name="vfs path"
-                 context="S"
-                 xmlns:samba="http://samba.org/common">
-<listitem>
-	<para>This parameter specifies the directory
-	to look in for vfs modules. The name of every <command moreinfo="none">vfs object
-	</command> will be prepended by this directory.</para>
-
-	<para>Default: <command moreinfo="none">vfs path = </command></para>
-
-	<para>Example: <command moreinfo="none">vfs path = /usr/lib/samba/vfs</command></para>
-</listitem>
-</samba:parameter>