The branch, master has been updated via bc69a9d... Avoid use of Samba DTD, which requires net access. via aa74b6a... wafsamba: fix CHECK_XSLTPROC_MANPAGES(). via 3dc7203... Use DocBook DTD rather than Samba one, as no Samba-specific things are used in the tdb manpages. from d7d19fd... s4-net: better error message on net setpassword
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bc69a9d0d8aa746c2db88484ebf48f9aa7d73de6 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Aug 22 05:24:55 2010 +0200 Avoid use of Samba DTD, which requires net access. commit aa74b6ade4af5da962acd1ebf43b9e719ebe1f51 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Aug 22 05:02:00 2010 +0200 wafsamba: fix CHECK_XSLTPROC_MANPAGES(). commit 3dc720371368b670635f986f9a7bd412b00255a8 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Aug 22 05:00:57 2010 +0200 Use DocBook DTD rather than Samba one, as no Samba-specific things are used in the tdb manpages. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_conftests.py | 17 +++++------------ lib/tdb/manpages/tdbbackup.8.xml | 2 +- lib/tdb/manpages/tdbdump.8.xml | 2 +- lib/tdb/manpages/tdbtool.8.xml | 2 +- source4/lib/registry/man/regdiff.1.xml | 2 +- source4/lib/registry/man/regpatch.1.xml | 2 +- source4/lib/registry/man/regshell.1.xml | 2 +- source4/lib/registry/man/regtree.1.xml | 2 +- source4/smbd/samba.8.xml | 2 +- source4/torture/man/gentest.1.xml | 3 +-- source4/torture/man/locktest.1.xml | 2 +- source4/torture/man/masktest.1.xml | 2 +- source4/torture/man/smbtorture.1.xml | 2 +- source4/utils/man/ntlm_auth.1.xml | 5 +---- 14 files changed, 18 insertions(+), 29 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index c6f8901..8a57d20 100644 --- a/buildtools/wafsamba/samba_conftests.py +++ b/buildtools/wafsamba/samba_conftests.py @@ -313,21 +313,14 @@ def CHECK_INLINE(conf): def CHECK_XSLTPROC_MANPAGES(conf): '''check if xsltproc can run with the given stylesheets''' - stylesheets='http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' if not conf.CONFIG_SET('XSLTPROC'): conf.find_program('xsltproc', var='XSLTPROC') if not conf.CONFIG_SET('XSLTPROC'): return False - for s in TO_LIST(stylesheets): - if not conf.CONFIG_SET('XSLTPROC_%s' % s): - ret = conf.CHECK_COMMAND('%s --nonet %s 2> /dev/null' % (conf.env.XSLTPROC, s), - msg='Checking for stylesheet %s' % s, - define=None, on_target=False, - boolean=True) - if not ret: - return False - conf.env['XSLTPROC_%s' % s] = True - conf.env['XSLTPROC_MANPAGES'] = True - return True + s='http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' + conf.CHECK_COMMAND('%s --nonet %s 2> /dev/null' % (conf.env.XSLTPROC, s), + msg='Checking for stylesheet %s' % s, + define='XSLTPROC_MANPAGES', on_target=False, + boolean=True) diff --git a/lib/tdb/manpages/tdbbackup.8.xml b/lib/tdb/manpages/tdbbackup.8.xml index 5c42371..78fe32e 100644 --- a/lib/tdb/manpages/tdbbackup.8.xml +++ b/lib/tdb/manpages/tdbbackup.8.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="tdbbackup.8"> <refmeta> diff --git a/lib/tdb/manpages/tdbdump.8.xml b/lib/tdb/manpages/tdbdump.8.xml index 8e42e08..90465e5 100644 --- a/lib/tdb/manpages/tdbdump.8.xml +++ b/lib/tdb/manpages/tdbdump.8.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="tdbdump.8"> <refmeta> diff --git a/lib/tdb/manpages/tdbtool.8.xml b/lib/tdb/manpages/tdbtool.8.xml index 042c88c..9f96db2 100644 --- a/lib/tdb/manpages/tdbtool.8.xml +++ b/lib/tdb/manpages/tdbtool.8.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="tdbtool.8"> <refmeta> diff --git a/source4/lib/registry/man/regdiff.1.xml b/source4/lib/registry/man/regdiff.1.xml index 7bcaa15..59ef459 100644 --- a/source4/lib/registry/man/regdiff.1.xml +++ b/source4/lib/registry/man/regdiff.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="regdiff.1"> <refmeta> diff --git a/source4/lib/registry/man/regpatch.1.xml b/source4/lib/registry/man/regpatch.1.xml index d9dcdcb..7293f5d 100644 --- a/source4/lib/registry/man/regpatch.1.xml +++ b/source4/lib/registry/man/regpatch.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="regpatch.1"> <refmeta> diff --git a/source4/lib/registry/man/regshell.1.xml b/source4/lib/registry/man/regshell.1.xml index 9f16d8c..ed91b1b 100644 --- a/source4/lib/registry/man/regshell.1.xml +++ b/source4/lib/registry/man/regshell.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="regshell.1"> <refmeta> diff --git a/source4/lib/registry/man/regtree.1.xml b/source4/lib/registry/man/regtree.1.xml index 93f15e1..197091c 100644 --- a/source4/lib/registry/man/regtree.1.xml +++ b/source4/lib/registry/man/regtree.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="regtree.1"> <refmeta> diff --git a/source4/smbd/samba.8.xml b/source4/smbd/samba.8.xml index e1ec8ca..e0dd28c 100644 --- a/source4/smbd/samba.8.xml +++ b/source4/smbd/samba.8.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="samba.8"> <refmeta> diff --git a/source4/torture/man/gentest.1.xml b/source4/torture/man/gentest.1.xml index 8f7f314..729d318 100644 --- a/source4/torture/man/gentest.1.xml +++ b/source4/torture/man/gentest.1.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> - +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="gentest.1"> <refmeta> diff --git a/source4/torture/man/locktest.1.xml b/source4/torture/man/locktest.1.xml index 37d056a..cfc18a4 100644 --- a/source4/torture/man/locktest.1.xml +++ b/source4/torture/man/locktest.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="locktest.1"> <refmeta> diff --git a/source4/torture/man/masktest.1.xml b/source4/torture/man/masktest.1.xml index 170450b..3abd5d4 100644 --- a/source4/torture/man/masktest.1.xml +++ b/source4/torture/man/masktest.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="masktest.1"> <refmeta> diff --git a/source4/torture/man/smbtorture.1.xml b/source4/torture/man/smbtorture.1.xml index 44984b0..10febf3 100644 --- a/source4/torture/man/smbtorture.1.xml +++ b/source4/torture/man/smbtorture.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="smbtorture.1"> <refmeta> diff --git a/source4/utils/man/ntlm_auth.1.xml b/source4/utils/man/ntlm_auth.1.xml index 1677500..09a8961 100644 --- a/source4/utils/man/ntlm_auth.1.xml +++ b/source4/utils/man/ntlm_auth.1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <refentry id="ntlm-auth.1"> <refmeta> @@ -203,9 +203,6 @@ </listitem> </varlistentry> - &popt.common.samba; - &stdarg.help; - </variablelist> </refsect1> -- Samba Shared Repository