Fix typo and add missing vfs_zfsacl manpage
Uri Simchoni
uri at samba.org
Wed Nov 29 06:04:08 UTC 2017
On 11/29/2017 07:53 AM, Timur I. Bakeyev wrote:
> On Tue, Nov 28, 2017 at 9:16 PM, Uri Simchoni <uri at samba.org
> <mailto:uri at samba.org>> wrote:
>
> On 11/28/2017 11:00 AM, Volker Lendecke via samba-technical wrote:
> > On Mon, Nov 27, 2017 at 02:20:19PM +0100, Timur I. Bakeyev via samba-technical wrote:
> >> Can one of the developers review this fixes, please?
> >
> > I would have avoided reordering docs-xml/wscript, but you for sure
> > have your good reasons for this, and it does not destroy anything.
> >
> > RB+.
> >
> > Volker
> >
>
> RB+
>
> If you want this back-ported (because both the build omission and the
> phrasing can be considered as bugs), please:
> 1. open a bug in bugzilla
> 2. split the patch into 3 commits:
> a. Fixing the manpage
> b. Fixing the build
> c. sort (only for master)
>
>
> Apparently I had a bug opened 4 months ago :) So:
>
> https://bugzilla.samba.org/show_bug.cgi?id=12934
>
> I've reworked patch b, so that vfs_zfacl manpage is added only if
> corresponding module is enabled.
>
>
RB+ me on this updated version.
Attaching reworked patch for convenience of the list.
Volker, do I still have your RB+ on this? (I'll add the BUG: to the
first two commit messages)
Thanks,
Uri.
-------------- next part --------------
From 7b3290eb12ae3a675b3fd1a5f172c960cddbcecd Mon Sep 17 00:00:00 2001
From: "Timur I. Bakeyev" <timur at iXsystems.com>
Date: Wed, 29 Nov 2017 05:48:52 +0100
Subject: [PATCH 1/3] Fix typo in the "wide links" description for the getwd
cache.
Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
---
docs-xml/smbdotconf/tuning/getwdcache.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-xml/smbdotconf/tuning/getwdcache.xml b/docs-xml/smbdotconf/tuning/getwdcache.xml
index 93f7a90793d..ec4d9ed51a9 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>
--
2.14.2
From 66b4e03a9ae408c8259f629615626193d3a7822d Mon Sep 17 00:00:00 2001
From: "Timur I. Bakeyev" <timur at iXsystems.com>
Date: Wed, 29 Nov 2017 06:35:37 +0100
Subject: [PATCH 2/3] Add vfs_zfsacl manpage to the list of manpages if we have
this module enabled.
Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
---
docs-xml/wscript_build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 0bd08d11cdb..6c5a74d2c73 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -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')
--
2.14.2
From 83f77a65e3fa85964257ff71d1791b57f5edfd7e Mon Sep 17 00:00:00 2001
From: "Timur I. Bakeyev" <timur at iXsystems.com>
Date: Wed, 29 Nov 2017 06:40:10 +0100
Subject: [PATCH 3/3] 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>
---
docs-xml/wscript_build | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 6c5a74d2c73..f586208b471 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
--
2.14.2
More information about the samba-technical
mailing list