lce14: content

diff --git a/base-wiki.wiki b/base-wiki.wiki
index 12df783635c518fe80eb1ce5a0615c6afe8e9d8c..b13a2b25947932f3463dc8f1efe73a4094a46c4c 100644 (file)
--- a/base-wiki.wiki
+++ b/base-wiki.wiki
@@ -274,36 +274,51 @@ Fruit Demo
 [center]>
 
 
-==== SMB features in Samba ====
+==== SMB features in Samba - SMB2 ====
 
 
-%<[center]
-%<[columns]
-%[[[.7\textwidth]]]
+<[center]
+<[columns]
+[[[.7\textwidth]]]
 
-* SMB 2.0:
+* SMB 2.0 (Vista / 2008):
 ** durable file handles [4.0]
-* SMB 2.1:
+* SMB 2.1 (Win7 / 2008R2):
 ** multi-credit / large mtu [4.0]
 ** dynamic reauthentication [4.0]
 ** leasing [WIP++]
-** resilient file handles [tracer]
-* SMB 3.0:
+** resilient file handles [WIP-tracer]
+
+[[[.3\textwidth]]]
+<<<durable-crop-colormod-1024,width=.9\textwidth,right>>>
+[columns]>
+[center]>
+
+
+==== SMB features in Samba - SMB3 ====
+
+
+<[center]
+<[columns]
+[[[.7\textwidth]]]
+
+* SMB 3.0 (Win8 / 2012):
 ** new crypto (sign/encrypt) [4.0]
 ** secure negotiation [4.0]
 ** durable handles v2 [4.0]
-** persistent file handles [tracer]
+** persistent file handles [WIP.tracer]
 ** multi-channel [WIP+]
 ** SMB direct [designed/starting]
 ** cluster features [designing]
 *** witness [WIP]
 ** storage features [WIP]
-* SMB 3.1: [WIP]
+* SMB 3.02 (Win8.1 / 2012R2): [WIP]
+* SMB 3.1 (Win10 / 2014): [ess.DONE]
 
-%[[[.3\textwidth]]]
-%<<<durable-crop-colormod-1024,width=.9\textwidth,right>>>
-%[columns]>
-%[center]>
+[[[.3\textwidth]]]
+<<<durable-crop-colormod-1024,width=.9\textwidth,right>>>
+[columns]>
+[center]>
 
 
 %%==== ====[plain]