[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  a2625c4 docs/smbget: Fix typo in options within man page
      from  e74081c lib: auth: Store the netlogon_creds_cli_global_db pointer on the NULL context.

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


- Log -----------------------------------------------------------------
commit a2625c444554fc347b8339dbb9fc2243127ffb21
Author: Anoop C S <anoopcs at redhat.com>
Date:   Wed Jul 26 17:54:52 2017 +0530

    docs/smbget: Fix typo in options within man page
    
    `smbget` utility accepts '--user' as a valid argument. But still the man
    page specifies it as '--username'. So fixing the man page to reflect the
    current behaviour.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jul 27 06:35:10 CEST 2017 on sn-devel-144

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

Summary of changes:
 docs-xml/manpages/smbget.1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml
index f254b10..c12b03d 100644
--- a/docs-xml/manpages/smbget.1.xml
+++ b/docs-xml/manpages/smbget.1.xml
@@ -22,7 +22,7 @@
 		<arg choice="opt">-a, --guest</arg>
 		<arg choice="opt">-r, --resume</arg>
 		<arg choice="opt">-R, --recursive</arg>
-		<arg choice="opt">-U, --username=STRING</arg>
+		<arg choice="opt">-U, --user=STRING</arg>
 		<arg choice="opt">-w, --workgroup=STRING</arg>
 		<arg choice="opt">-n, --nonprompt</arg>
 		<arg choice="opt">-d, --debuglevel=INT</arg>
@@ -76,7 +76,7 @@
 	</varlistentry>
 
 	<varlistentry>
-		<term> -U, --username=<replaceable>username[%password]</replaceable></term>
+		<term> -U, --user=<replaceable>username[%password]</replaceable></term>
 		<listitem><para>Username (and password) to use</para></listitem>
 	</varlistentry>
 


-- 
Samba Shared Repository