lce14: content

[obnox/slides/2014-10-lce.git] / base-wiki.wiki

diff --git a/base-wiki.wiki b/base-wiki.wiki
index d2711cb4f80a61eade1eb11a7aaae3f513cb9e2e..eef43ee99605b3f552601ac6cbabbc780f775c76 100644 (file)
--- a/base-wiki.wiki
+++ b/base-wiki.wiki
@@ -4,32 +4,27 @@
 %  _red_text text_
 %
 
-==== Samba File Serving Topics ====
-
-* SMB features (SMB3...)
-* Clustering (CTDB)
-* Performance
-* Interop (Protocols, NFS, AFP, ...)
-* special file systems support
-* ...
+==== ====[plain]
 
-==== Other Samba Topics ====
+%%\transdissolve
 
-* Auth/Domain Member
-* RPC server
-* AD Sever
-* ...
+<[center]
+<[columns]
+[[[.3\textwidth]]]
+<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+[[[.3\textwidth]]]
+<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+[[[.3\textwidth]]]
+<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+[columns]>
+[center]>
 
-==== File Server Habitat ====
 
-* scalable file server
-** scale-out: powerful clusters
-** scale-down: low-end boxes
-* server workloads
-** hyper-v
-* cloud / openstack?
-* (samba $\leftrightarrow$ cifs.ko alternative to nfs?...)
+==== Samba... ====
 
+<[center]
+<<<samba-kisses-better-selection.jpg,height=.8\textheight>>>
+[center]>
 
 
 ==== Short History ====
@@ -45,7 +40,7 @@
 * 3.6: 2011/09: SMB 2.0
 * 4.0: 2012/12: AD/DC, SMB 2.0 durable handles, 2.1, 3.0
 * 4.1: 2013/10: stability
-* 4.2: soon:    performance, scalability, CTDB included
+* 4.2: soon: AD trusts, performance, scalability, CTDB included
 
 ==== Release Stream ====
 
@@ -55,6 +50,40 @@
 [center]>
 
 
+==== ====[plain]
+
+%%\transdissolve
+
+<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+
+
+==== Samba File Serving Topics ====
+
+* SMB features (SMB3...)
+* Clustering (CTDB)
+* Performance
+* Interop (Protocols, NFS, AFP, ...)
+* special file systems support
+* ...
+
+%%==== Other Samba Topics ====
+%%
+%%* Auth/Domain Member
+%%* RPC server
+%%* AD Sever
+%%* ...
+
+==== File Server Habitat ====
+
+* scalable file server
+** scale-out: powerful clusters
+** scale-down: low-end boxes
+* server workloads
+** hyper-v
+* cloud / openstack?
+* (samba $\leftrightarrow$ cifs.ko alternative to nfs?...)
+
+
 ==== Performance ====
 
 * cpu usage