X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=docs-xml%2Fwscript_build;h=0bc3f54807d6497f8ea58a7ccf8776bc40a66ac2;hb=8d0729daf06c99f48f2bc545d22f47e5f0d2786f;hp=a75ae055bed1c055936c05d1dffec98784a65a2e;hpb=30b2f74ffc8f7c38e132eddede7884c5195b634a;p=samba.git

diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index a75ae055bed..0bc3f54807d 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -26,6 +26,7 @@ manpages='''
          manpages/samba.7
          manpages/samba.8
          manpages/samba-tool.8
+         manpages/samba-regedit.8
          manpages/sharesec.1
          manpages/smbcacls.1
          manpages/smbclient.1
@@ -41,7 +42,6 @@ manpages='''
          manpages/smbta-util.8
          manpages/smbtar.1
          manpages/smbtree.1
-         manpages/swat.8
          manpages/testparm.1
          manpages/vfs_acl_tdb.8
          manpages/vfs_acl_xattr.8
@@ -60,8 +60,11 @@ manpages='''
          manpages/vfs_extd_audit.8
          manpages/vfs_fake_perms.8
          manpages/vfs_fileid.8
+         manpages/vfs_fruit.8
          manpages/vfs_full_audit.8
+         manpages/vfs_glusterfs.8
          manpages/vfs_gpfs.8
+         manpages/vfs_linux_xfs_sgid.8
          manpages/vfs_media_harmony.8
          manpages/vfs_netatalk.8
          manpages/vfs_notify_fam.8
@@ -74,10 +77,13 @@ manpages='''
          manpages/vfs_shadow_copy.8
          manpages/vfs_shadow_copy2.8
          manpages/vfs_smb_traffic_analyzer.8
+	 manpages/vfs_snapper.8
          manpages/vfs_streams_depot.8
          manpages/vfs_streams_xattr.8
+         manpages/vfs_syncops.8
          manpages/vfs_time_audit.8
          manpages/vfs_tsmsm.8
+         manpages/vfs_worm.8
          manpages/vfs_xattr_tdb.8
          manpages/vfstest.1
          manpages/wbinfo.1
@@ -95,22 +101,34 @@ def smbdotconf_generate_parameter_list(task):
     parameter_all = task.outputs[0].bldpath(task.env)
     articles = task.inputs
 
-    t = '<section xmlns:xi="http://www.w3.org/2003/XInclude">\n'
+    entities = bld.pathconfig_entities()
+    t = "<!DOCTYPE section [\n"
+
+    for entity in entities:
+        t += "%s\n" % entity
+
+    t += "]>\n"
+    t += "<section>\n"
     for article in articles:
-        t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n"
+        f = open(article.abspath(task.env), 'r')
+        t += f.read()
+        f.close()
+
     t += "</section>\n"
     save_file(parameter_all, t , create_dir=True)
     return 0
 
+articles = bld.path.ant_glob("smbdotconf/**/*.xml")
+parameter_all = 'smbdotconf/parameters.all.xml'
+bld.SAMBA_GENERATOR(parameter_all,
+                    source=articles,
+                    target=parameter_all,
+                    rule=smbdotconf_generate_parameter_list,
+                    dep_vars=bld.dynconfig_varnames())
+
 def SMBDOTCONF_MANPAGE(bld, target):
     ''' assemble and build smb.conf.5 manual page'''
-    articles = bld.path.ant_glob("smbdotconf/**/*.xml")
-    parameter_all = 'smbdotconf/parameters.all.xml'
-    bld.SAMBA_GENERATOR(parameter_all,
-                        source=articles,
-                        target=parameter_all,
-                        rule=smbdotconf_generate_parameter_list)
-    bld.SAMBAMANPAGES(target)
+    bld.SAMBAMANPAGES(target, parameter_all)
 
 if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):