[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  3e43f80 Replace tabs with spaces to comply with PEP8, reorder list of manpages in the alphanumeric sort order.
       via  8034b88 Add vfs_zfsacl manpage to the list of manpages if we have this module enabled.
       via  e9e4cd4 Fix typo in the "wide links" description for the getwd cache.
      from  0685954 pam_winbind: avoid non-literal-format warning

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3e43f80ad1f0ce2f0a807da64d1f5e8bd6512526
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date:   Wed Nov 29 06:40:10 2017 +0100

    Replace tabs with spaces to comply with PEP8, reorder list of manpages in the alphanumeric sort order.
    
    Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Wed Nov 29 16:58:32 CET 2017 on sn-devel-144

commit 8034b88d4e771663c4b7b581fb6b1992c33d5d96
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date:   Wed Nov 29 06:35:37 2017 +0100

    Add vfs_zfsacl manpage to the list of manpages if we have this module enabled.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12934
    
    Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>

commit e9e4cd4d2b6ae376cba90fdb56b9c9684f2dc492
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date:   Wed Nov 29 05:48:52 2017 +0100

    Fix typo in the "wide links" description for the getwd cache.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12934
    
    Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/tuning/getwdcache.xml |  2 +-
 docs-xml/wscript_build                    | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/getwdcache.xml b/docs-xml/smbdotconf/tuning/getwdcache.xml
index 93f7a90..ec4d9ed 100644
--- a/docs-xml/smbdotconf/tuning/getwdcache.xml
+++ b/docs-xml/smbdotconf/tuning/getwdcache.xml
@@ -6,7 +6,7 @@
     <para>This is a tuning option. When this is enabled a 
     caching algorithm will be used to reduce the time taken for getwd() 
     calls. This can have a significant impact on performance, especially 
-    when the <smbconfoption name="wide smbconfoptions"/> parameter is set to <constant>no</constant>.</para>
+    when the <smbconfoption name="wide links"/> parameter is set to <constant>no</constant>.</para>
 </description>
 
 <value type="default">yes</value>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 0bd08d1..f586208 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -6,9 +6,6 @@ manpages='''
          manpages/dbwrap_tool.1
          manpages/eventlogadm.8
          manpages/findsmb.1
-         manpages/libsmbclient.7
-         manpages/lmhosts.5
-         manpages/log2pcap.1
          manpages/idmap_ad.8
          manpages/idmap_autorid.8
          manpages/idmap_hash.8
@@ -19,6 +16,9 @@ manpages='''
          manpages/idmap_script.8
          manpages/idmap_tdb.8
          manpages/idmap_tdb2.8
+         manpages/libsmbclient.7
+         manpages/lmhosts.5
+         manpages/log2pcap.1
          manpages/mvxattr.1
          manpages/net.8
          manpages/nmbd.8
@@ -27,10 +27,10 @@ manpages='''
          manpages/pdbedit.8
          manpages/profiles.1
          manpages/rpcclient.1
+         manpages/samba-regedit.8
+         manpages/samba-tool.8
          manpages/samba.7
          manpages/samba.8
-         manpages/samba-tool.8
-         manpages/samba-regedit.8
          manpages/sharesec.1
          manpages/smbcacls.1
          manpages/smbclient.1
@@ -41,20 +41,20 @@ manpages='''
          manpages/smbgetrc.5
          manpages/smbpasswd.5
          manpages/smbpasswd.8
-         manpages/smbspool.8
          manpages/smbspool_krb5_wrapper.8
+         manpages/smbspool.8
          manpages/smbstatus.1
          manpages/smbtar.1
          manpages/smbtree.1
          manpages/testparm.1
-         manpages/traffic_replay.7
          manpages/traffic_learner.7
+         manpages/traffic_replay.7
          manpages/vfs_acl_tdb.8
          manpages/vfs_acl_xattr.8
          manpages/vfs_aio_fork.8
          manpages/vfs_aio_pthread.8
          manpages/vfs_audit.8
-	 manpages/vfs_btrfs.8
+         manpages/vfs_btrfs.8
          manpages/vfs_cacheprime.8
          manpages/vfs_cap.8
          manpages/vfs_catia.8
@@ -82,8 +82,8 @@ manpages='''
          manpages/vfs_recycle.8
          manpages/vfs_shadow_copy.8
          manpages/vfs_shadow_copy2.8
-	 manpages/vfs_shell_snap.8
-	 manpages/vfs_snapper.8
+         manpages/vfs_shell_snap.8
+         manpages/vfs_snapper.8
          manpages/vfs_streams_depot.8
          manpages/vfs_streams_xattr.8
          manpages/vfs_syncops.8
@@ -160,3 +160,6 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
 
     if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
         bld.SAMBAMANPAGES(krb5_locator_manpages)
+
+    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')


-- 
Samba Shared Repository