summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-09-05 17:37:19 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-09-07 10:48:57 +0200
commit18eb505b895efae8b723ff3ecddc7c528c34b391 (patch)
treefbc937c2983f9b40775396310f06e5a6b443bd87
parent51a3845190ce1a804c82f652029146d432a7f7b2 (diff)
downloadsamba-18eb505b895efae8b723ff3ecddc7c528c34b391.tar.gz
samba-18eb505b895efae8b723ff3ecddc7c528c34b391.tar.bz2
samba-18eb505b895efae8b723ff3ecddc7c528c34b391.zip
wafsamba: Add support for manpages in SAMBA_MODULE.
-rw-r--r--buildtools/wafsamba/wafsamba.py2
-rw-r--r--source3/winbindd/man/idmap_ad.8.xml (renamed from docs-xml/manpages/idmap_ad.8.xml)0
-rw-r--r--source3/winbindd/man/idmap_autorid.8.xml (renamed from docs-xml/manpages/idmap_autorid.8.xml)2
-rw-r--r--source3/winbindd/man/idmap_hash.8.xml (renamed from docs-xml/manpages/idmap_hash.8.xml)0
-rw-r--r--source3/winbindd/man/idmap_ldap.8.xml (renamed from docs-xml/manpages/idmap_ldap.8.xml)4
-rw-r--r--source3/winbindd/man/idmap_nss.8.xml (renamed from docs-xml/manpages/idmap_nss.8.xml)0
-rw-r--r--source3/winbindd/man/idmap_rid.8.xml (renamed from docs-xml/manpages/idmap_rid.8.xml)0
-rw-r--r--source3/winbindd/man/idmap_tdb.8.xml (renamed from docs-xml/manpages/idmap_tdb.8.xml)0
-rw-r--r--source3/winbindd/man/idmap_tdb2.8.xml (renamed from docs-xml/manpages/idmap_tdb2.8.xml)0
9 files changed, 5 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f1e7affbef..1fb1241024 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -404,6 +404,7 @@ def SAMBA_MODULE(bld, modname, source,
subdir=None,
enabled=True,
pyembed=False,
+ manpages=None,
allow_undefined_symbols=False
):
'''define a Samba module.'''
@@ -469,6 +470,7 @@ def SAMBA_MODULE(bld, modname, source,
link_name=build_link_name,
install_path="${MODULESDIR}/%s" % subsystem,
pyembed=pyembed,
+ manpages=manpages,
allow_undefined_symbols=allow_undefined_symbols
)
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/source3/winbindd/man/idmap_ad.8.xml
index 7319f9199f..7319f9199f 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/source3/winbindd/man/idmap_ad.8.xml
diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/source3/winbindd/man/idmap_autorid.8.xml
index 498ef68fb3..3b93861eee 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/source3/winbindd/man/idmap_autorid.8.xml
@@ -118,7 +118,7 @@
This example shows how to configure idmap_autorid as default
for all domains with a potentially large amount of users
plus a specific configuration for a trusted domain
- that uses the SFU mapping scheme. Please note that idmap
+ that uses the SFU mapping scheme. Please note that idmap
ranges and sfu ranges are not allowed to overlap.
</para>
diff --git a/docs-xml/manpages/idmap_hash.8.xml b/source3/winbindd/man/idmap_hash.8.xml
index f3ec6a7bc2..f3ec6a7bc2 100644
--- a/docs-xml/manpages/idmap_hash.8.xml
+++ b/source3/winbindd/man/idmap_hash.8.xml
diff --git a/docs-xml/manpages/idmap_ldap.8.xml b/source3/winbindd/man/idmap_ldap.8.xml
index 2c0fcfd17c..e68f2782bf 100644
--- a/docs-xml/manpages/idmap_ldap.8.xml
+++ b/source3/winbindd/man/idmap_ldap.8.xml
@@ -82,8 +82,8 @@
<title>EXAMPLES</title>
<para>
- The following example shows how an ldap directory is used as the
- default idmap backend. It also configures the idmap range and base
+ The following example shows how an ldap directory is used as the
+ default idmap backend. It also configures the idmap range and base
directory suffix. The secret for the ldap_user_dn has to be set with
&quot;net idmap secret '*' password&quot;.
</para>
diff --git a/docs-xml/manpages/idmap_nss.8.xml b/source3/winbindd/man/idmap_nss.8.xml
index 565019cd3d..565019cd3d 100644
--- a/docs-xml/manpages/idmap_nss.8.xml
+++ b/source3/winbindd/man/idmap_nss.8.xml
diff --git a/docs-xml/manpages/idmap_rid.8.xml b/source3/winbindd/man/idmap_rid.8.xml
index 3f8735288c..3f8735288c 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/source3/winbindd/man/idmap_rid.8.xml
diff --git a/docs-xml/manpages/idmap_tdb.8.xml b/source3/winbindd/man/idmap_tdb.8.xml
index c67d6cb9bc..c67d6cb9bc 100644
--- a/docs-xml/manpages/idmap_tdb.8.xml
+++ b/source3/winbindd/man/idmap_tdb.8.xml
diff --git a/docs-xml/manpages/idmap_tdb2.8.xml b/source3/winbindd/man/idmap_tdb2.8.xml
index 1faf59085f..1faf59085f 100644
--- a/docs-xml/manpages/idmap_tdb2.8.xml
+++ b/source3/winbindd/man/idmap_tdb2.8.xml