[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  313da9d smb.conf(5): update list of available protocols (bug #9552)
      from  3a7c277 s3-lib: Use new strict directory create function in create_pipe_sock().

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


- Log -----------------------------------------------------------------
commit 313da9dc7d8cb16f943ea7bde1c1d7bf8f02c0f0
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Dec 11 13:39:11 2012 +0100

    smb.conf(5): update list of available protocols (bug #9552)
    
    Update protocol listing in variable substitution list.
    
    Signed-off-by: Bjoern Baumbach <bb at sernet.de>
    Reviewed by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jan  9 21:22:18 CET 2013 on sn-devel-104

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

Summary of changes:
 docs-xml/manpages/smb.conf.5.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 71b097b..44411b0 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -473,7 +473,7 @@ chmod 1770 /usr/local/samba/lib/usershares
 		<varlistentry>
 		<term>%R</term>
 		<listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS, 
-			LANMAN1, LANMAN2 or NT1.</para></listitem>
+			LANMAN1, LANMAN2, NT1, SMB2_02, SMB2_10, SMB2_22, SMB2_24, SMB3_00 or SMB2_FF.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>


-- 
Samba Shared Repository