summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-03-04 07:02:38 +0100
committerMichael Adam <obnox@samba.org>2015-05-08 13:00:28 +0200
commita554f02bc16068d3a42050e6e39608c65565c5f9 (patch)
tree1ffbb5158863cf9b98a7a1cb07a1de063380b49e /docs-xml
parentc29ff00fe4b2e9295c9796901452af06a4d15653 (diff)
downloadsamba-a554f02bc16068d3a42050e6e39608c65565c5f9.tar.gz
libcli/smb: add PROTOCOL_SMB3_11 and SMB3_DIALECT_REVISION_311
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/manpages/smb.conf.5.xml7
-rw-r--r--docs-xml/smbdotconf/protocol/clientmaxprotocol.xml5
2 files changed, 9 insertions, 3 deletions
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e98d18332ce..cb2f40b260b 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -470,8 +470,11 @@ 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, NT1, SMB2_02, SMB2_10, SMB2_22, SMB2_24, SMB3_00, SMB3_02, SMB3_10 or SMB2_FF.</para></listitem>
+ <listitem><para>the selected protocol level after protocol negotiation. It can be one of
+ CORE, COREPLUS, LANMAN1, LANMAN2, NT1,
+ SMB2_02, SMB2_10, SMB2_22, SMB2_24,
+ SMB3_00, SMB3_02, SMB3_10, SMB3_11
+ or SMB2_FF.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 1b1681478c3..1ca9b93667a 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -64,7 +64,10 @@
<para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para>
</listitem>
<listitem>
- <para><constant>SMB3_10</constant>: Windows 10 technical preview SMB3 version.</para>
+ <para><constant>SMB3_10</constant>: early Windows 10 technical preview SMB3 version.</para>
+ </listitem>
+ <listitem>
+ <para><constant>SMB3_11</constant>: Windows 10 technical preview SMB3 version (maybe final).</para>
</listitem>
</itemizedlist>
<para>By default SMB3 selects the SMB3_00 variant.</para>