summaryrefslogtreecommitdiff
path: root/docs-xml/manpages
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-09-17 13:07:26 +0300
committerAlexander Bokovoy <ab@samba.org>2012-09-17 14:18:31 +0200
commit73ed1533105ac3f90813e5a0e7888a095eff4b75 (patch)
tree74ec0f4b2878b3d6a9ebf37c6d08be4a601c2100 /docs-xml/manpages
parent57990cbcbbdf83d7b9997ac1fd33528c63c96226 (diff)
downloadsamba-73ed1533105ac3f90813e5a0e7888a095eff4b75.tar.gz
samba-73ed1533105ac3f90813e5a0e7888a095eff4b75.tar.bz2
samba-73ed1533105ac3f90813e5a0e7888a095eff4b75.zip
docs-xml: convert smb.conf.5 build to waf
smb.conf(5) is different from other manpages because before it is built, it gets merged together from a number of smaller files, one per parameter. So we first create a parameters.all.xml file that references all these files and then include it into master smb.conf.5.xml One small issue is how to handle generated files in WAF build from xi:include perspective as the files are generated in bin/default/docs-xml rather than in docs-xml. We solve this by further expanding use of XML catalogs and rewriting virtual path http://www.samba.org/samba/smbdotconf/ to proper location. Both docs-xml autoconf and waf builds work correctly now. Autobuild-User(master): Alexander Bokovoy <ab@samba.org> Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104
Diffstat (limited to 'docs-xml/manpages')
-rw-r--r--docs-xml/manpages/smb.conf.5.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e09eee0d55..a73382f54a 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -757,7 +757,10 @@ chmod 1770 /usr/local/samba/lib/usershares
<title>EXPLANATION OF EACH PARAMETER</title>
<samba:parameterlist>
- <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
+ <!-- The URI below is resolved to local generated version of parameters.all.xml //-->
+ <!-- WAF build places it in bin/default/docs-xml/smbdotconf/parameters.all.xml //-->
+ <!-- and we redirect there via use of XML_CATALOG_FILES, see docs-xml/build/catalog.xml.in //-->
+ <xi:include href="http://www.samba.org/samba/smbdotconf/parameters.all.xml" parse="xml"/>
</samba:parameterlist>
</refsect1>