[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1a59014 docs-xml: Remove duplicate listing of configfile option in man pages
      from  0383034 WHATSNEW: CTDB updates

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


- Log -----------------------------------------------------------------
commit 1a5901440272158025a01a4619c1d178dfefc732
Author: Anoop C S <anoopcs at redhat.com>
Date:   Thu Dec 15 16:06:35 2016 +0530

    docs-xml: Remove duplicate listing of configfile option in man pages
    
    stdarg.configfile option is hierarchically included within
    common.samba.client entity. So explicit inclusion of this
    term will generate man pages with configfile option listed
    twice.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed Dec 21 13:13:16 CET 2016 on sn-devel-144

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

Summary of changes:
 docs-xml/manpages/net.8.xml        | 1 -
 docs-xml/manpages/smbcontrol.1.xml | 1 -
 2 files changed, 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 6e852fd..8ce2413 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -108,7 +108,6 @@
 		</varlistentry>
 
 		&stdarg.netbios.name;
-		&stdarg.configfile;
 
 		<varlistentry>
 		<term>-S|--server server</term>
diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml
index 03836aa..ebbb8dc 100644
--- a/docs-xml/manpages/smbcontrol.1.xml
+++ b/docs-xml/manpages/smbcontrol.1.xml
@@ -50,7 +50,6 @@
 
 	<variablelist>
 		&popt.autohelp;
-		&stdarg.configfile;
 		&popt.common.samba.client;
 		<varlistentry>
 		<term>-t|--timeout</term>


-- 
Samba Shared Repository