syncing files from 3.0 into HEAD again

(This used to be commit bca0bba209255d0effbae6a3d3b6d298f0952c3a)

2 files changed, 16 insertions, 17 deletions

diff --git a/docs/docbook/devdoc/dev-doc.xml b/docs/docbook/devdoc/dev-doc.xml
index 9236b18986..7000d09c98 100644
--- a/docs/docbook/devdoc/dev-doc.xml
+++ b/docs/docbook/devdoc/dev-doc.xml
@@ -27,10 +27,6 @@
 <title>SAMBA Developers Guide</title>
 
 <bookinfo>
-	<author>
-		<surname>SAMBA Team</surname>
-	</author>
-	<address><email>samba@samba.org</email></address>
 <abstract>
 <para>
 <emphasis>Last Update</emphasis> : Fri Jun  6 00:45:54 CEST 2003
@@ -56,18 +52,13 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 
 </abstract>
 
-<legalnotice>
-
-<formalpara>
+</bookinfo>
+<preface>
 	<title>Attributions</title>
 
-	<para>
 	&attributions-dev;
-	</para>
-</formalpara>
+</preface>
 	
-</legalnotice>
-</bookinfo>
 
 <!-- Contents -->
 <toc/>
diff --git a/docs/docbook/devdoc/modules.xml b/docs/docbook/devdoc/modules.xml
index e2eb78d6c9..171ee27f90 100644
--- a/docs/docbook/devdoc/modules.xml
+++ b/docs/docbook/devdoc/modules.xml
@@ -136,13 +136,14 @@ for each module and SMB_SUBSYSTEM() for each subsystem.
 
 <para><programlisting>
 SMB_MODULE(<replaceable>subsystem</replaceable>_<replaceable>backend</replaceable>, <replaceable>object files</replaceable>, <replaceable>plugin name</replaceable>, <replaceable>subsystem name</replaceable>, <replaceable>static_action</replaceable>, <replaceable>shared_action</replaceable>)
-SMB_SUBSYSTEM(<replaceable>subsystem</replaceable>)
+SMB_SUBSYSTEM(<replaceable>subsystem</replaceable>,<replaceable>depfile</replaceable>)
 </programlisting></para>
 
-<para>Also, make sure to add the correct directives to 
-<filename>Makefile.in</filename>. <replaceable>@SUBSYSTEM_STATIC@</replaceable>
-will be replaced with a list of objects files of the modules that need to 
-be linked in statically. <replaceable>@SUBSYSTEM_MODULES@</replaceable> will 
+<para>The depfile for a certain subsystem is the file that calls the 
+initialisation functions for the statically built in modules.</para>
+
+<para>
+<replaceable>@SUBSYSTEM_MODULES@</replaceable> in Makefile.in will 
 be replaced with the names of the plugins to build.
 </para>
 
@@ -151,6 +152,13 @@ be changed by ./configure are rebuilded in the 'modules_clean' make target.
 Practically, this means all c files that contain <command>static_init_subsystem;</command> calls need to be rebuilded.
 </para>
 
+<note>
+<para>
+There currently also is a configure.in command called SMB_MODULE_PROVIVES().
+This is used for modules that register multiple things. It should not 
+be used as probing will most likely disappear in the future.</para>
+</note>
+
 </sect2>
 </sect1>
 </chapter>