content: comment out unneeded stuff

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/content.wiki b/content.wiki
index 4ab165f5e9c9b1da2be87acc3ea25c4ede755776..60b7493e1d73c5e090fe4ec61b589350f3169eee 100644 (file)
--- a/content.wiki
+++ b/content.wiki
@@ -5,28 +5,28 @@
 %
 
 
 %
 
 

-==== Samba... ====
-
-<[center]
-<<<samba-kisses-better-selection.jpg,height=.8\textheight>>>
-[center]>
-
-
-==== Short History ====
-
-* 1.9.17: 1996/08
-* 2.0: 1999/01: domain-member, +SWAT
-* 2.2: 2001/04: NT4-DC
-* 3.0: 2003/09: AD-member, Samba4 project started
-* 3.2: 2008/07: GPLv3, experimental clustering
-* 3.3: 2009/01: clustering
-* 3.4: 2009/07: merged S3+S4 code
-* 3.5: 2010/03: experimental SMB 2.0
-* 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: 2015/03: AD trusts, leases, performance, scalability, CTDB
-%%%CTDB included
+%%% ==== Samba... ====
+%%% 
+%%% <[center]
+%%% <<<samba-kisses-better-selection.jpg,height=.8\textheight>>>
+%%% [center]>
+%%% 
+%%% 
+%%% ==== Short History ====
+%%% 
+%%% * 1.9.17: 1996/08
+%%% * 2.0: 1999/01: domain-member, +SWAT
+%%% * 2.2: 2001/04: NT4-DC
+%%% * 3.0: 2003/09: AD-member, Samba4 project started
+%%% * 3.2: 2008/07: GPLv3, experimental clustering
+%%% * 3.3: 2009/01: clustering
+%%% * 3.4: 2009/07: merged S3+S4 code
+%%% * 3.5: 2010/03: experimental SMB 2.0
+%%% * 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: 2015/03: AD trusts, leases, performance, scalability, CTDB
+%%% %%%CTDB included

 
 %%% ==== Release Stream ====
 %%% 
 
 %%% ==== Release Stream ====
 %%% 


@@ -42,17 +42,17 @@
 %%% @https://wiki.samba.org/index.php/Samba\_Release\_Planning@
 %%% [center]>
 
 %%% @https://wiki.samba.org/index.php/Samba\_Release\_Planning@
 %%% [center]>
 

-==== Samba Team ====
-
-<[center]
-<<<samba-team-20141011.png,height=.9\textheight>>>
-[center]>
-
-==== Samba Team ====
-
-<[center]
-<<<samba-team-20141011-colorized.png,height=.9\textheight>>>
-[center]>
+%%% ==== Samba Team ====
+%%% 
+%%% <[center]
+%%% <<<samba-team-20141011.png,height=.9\textheight>>>
+%%% [center]>
+%%% 
+%%% ==== Samba Team ====
+%%% 
+%%% <[center]
+%%% <<<samba-team-20141011-colorized.png,height=.9\textheight>>>
+%%% [center]>

 
 
 %%% ==== ====[plain]
 
 
 %%% ==== ====[plain]


@@ -72,20 +72,20 @@
 
 
 
 
 
 

-==== Samba File Server Topics / Challenges ====
-
-# performance: scalable file server
-#* scale-up: exhaust powerful boxes
-#* scale-out: flexible all-active clusters
-#* scale-down: perform well on low-end boxes
-# interop: multi-protocol access (nfs, afp, ...)
-# server workloads / SMB features
-#* tune for: small \# of connections, threaded applications
-#* Hyper-V, ...
-#* SMB3 (clustering, RDMA, ...)
-# special file systems support (gluster, ceph, gpfs, btrfs, ...)
-# cloud / openstack?...
-%* (samba $\leftrightarrow$ cifs.ko alternative to nfs?...)
+%% ==== Samba File Server Topics / Challenges ====
+%% 
+%% # performance: scalable file server
+%% #* scale-up: exhaust powerful boxes
+%% #* scale-out: flexible all-active clusters
+%% #* scale-down: perform well on low-end boxes
+%% # interop: multi-protocol access (nfs, afp, ...)
+%% # server workloads / SMB features
+%% #* tune for: small \# of connections, threaded applications
+%% #* Hyper-V, ...
+%% #* SMB3 (clustering, RDMA, ...)
+%% # special file systems support (gluster, ceph, gpfs, btrfs, ...)
+%% # cloud / openstack?...
+%% %* (samba $\leftrightarrow$ cifs.ko alternative to nfs?...)

 
 
 %% ==== Samba File Serving Topics ====
 
 
 %% ==== Samba File Serving Topics ====


@@ -270,39 +270,39 @@
 %%% Fruit Demo
 %%% [center]>
 
 %%% Fruit Demo
 %%% [center]>
 

-==== SMB features ====[plain]
-
-%\transdissolve
-
-<[center]
-<[columns]
-[[[.6\textwidth]]]
-
-[[[.3\textwidth]]]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[columns]>
-[center]>
-
-
-==== SMB features in Samba - SMB2 ====
-
-
-<[center]
-<[columns]
-[[[.7\textwidth]]]
+%% ==== SMB features ====[plain]
+%% 
+%% %\transdissolve
+%% 
+%% <[center]
+%% <[columns]
+%% [[[.6\textwidth]]]
+%% 
+%% [[[.3\textwidth]]]
+%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%% [columns]>
+%% [center]>

 
 

-* SMB 2.0 (Vista / 2008):
-** durable file handles [4.0]
-* SMB 2.1 (Win7 / 2008R2):
-** multi-credit / large mtu [4.0]
-** dynamic reauthentication [4.0]
-** leasing [WIP++]
-** resilient file handles [WIP-tracer]

 
 

-[[[.3\textwidth]]]
-<<<durable-crop-colormod-1024,width=.9\textwidth>>>
-[columns]>
-[center]>
+%% ==== SMB features in Samba - SMB2 ====
+%% 
+%% 
+%% <[center]
+%% <[columns]
+%% [[[.7\textwidth]]]
+%% 
+%% * SMB 2.0 (Vista / 2008):
+%% ** durable file handles [4.0]
+%% * SMB 2.1 (Win7 / 2008R2):
+%% ** multi-credit / large mtu [4.0]
+%% ** dynamic reauthentication [4.0]
+%% ** leasing [WIP++]
+%% ** resilient file handles [WIP-tracer]
+%% 
+%% [[[.3\textwidth]]]
+%% <<<durable-crop-colormod-1024,width=.9\textwidth>>>
+%% [columns]>
+%% [center]>

 
 
 ==== SMB features in Samba - SMB3 ====
 
 
 ==== SMB features in Samba - SMB3 ====


@@ -322,8 +322,8 @@
 ** cluster features [designing]
 *** witness [WIP]
 ** storage features [WIP]
 ** cluster features [designing]
 *** witness [WIP]
 ** storage features [WIP]

-* SMB 3.02 (Win8.1 / 2012R2): [WIP]
-* SMB 3.1 (Win10 / 2014): [ess.DONE]
+* SMB 3.0.2 (Win8.1 / 2012R2): [base:DONE]
+* SMB 3.1.1 (Win10 / 2014): [base:DONE]

 
 [[[.3\textwidth]]]
 <<<durable-crop-colormod-1024,width=.9\textwidth>>>
 
 [[[.3\textwidth]]]
 <<<durable-crop-colormod-1024,width=.9\textwidth>>>


@@ -778,35 +778,35 @@ Multi-Channel Demo
 %%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
 %%% [center]>
 
 %%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
 %%% [center]>
 

-==== Misc ====
-
-<[block]{File Systems}
-* gpfs, gluster, ceph, btrfs...
-* support through vfs modules
-* fuse-based: avoid context switches
-* instrument SMB3 storage features (fsctls)
-[block]>
-
-==== Misc ====
-
-%%<[block]{Under the hood}
-%%* restructurings, reconsilations
-%%* ctdb moved into samba tree
-%%* published libs: talloc, tdb, tevent ...
-%%[block]>
-
-<[block]{Testing}
-* unprivileged selftest, autobuild
-* selfcontained testing: wrapper
-** socket wrapper
-** nss wrapper
-** uid wrapper
-** resolv wrapper [_red_new_]
-* externalized as separate projects:
-** ==> @http://cwrap.org/@
-** git on samba.org
-** ==> Andreas Schneider's talk
-[block]>
+%%% ==== Misc ====
+%%% 
+%%% <[block]{File Systems}
+%%% * gpfs, gluster, ceph, btrfs...
+%%% * support through vfs modules
+%%% * fuse-based: avoid context switches
+%%% * instrument SMB3 storage features (fsctls)
+%%% [block]>
+%%% 
+%%% ==== Misc ====
+%%% 
+%%% %%<[block]{Under the hood}
+%%% %%* restructurings, reconsilations
+%%% %%* ctdb moved into samba tree
+%%% %%* published libs: talloc, tdb, tevent ...
+%%% %%[block]>
+%%% 
+%%% <[block]{Testing}
+%%% * unprivileged selftest, autobuild
+%%% * selfcontained testing: wrapper
+%%% ** socket wrapper
+%%% ** nss wrapper
+%%% ** uid wrapper
+%%% ** resolv wrapper [_red_new_]
+%%% * externalized as separate projects:
+%%% ** ==> @http://cwrap.org/@
+%%% ** git on samba.org
+%%% ** ==> Andreas Schneider's talk
+%%% [block]>

 
 
 %%% ==== Forecast: Cloudy ====
 
 
 %%% ==== Forecast: Cloudy ====


@@ -817,16 +817,16 @@ Multi-Channel Demo
 %%% * also: chances for AD-integration into auth
 %%% [block]>
 
 %%% * also: chances for AD-integration into auth
 %%% [block]>
 

-==== Credits ====
-
-<[block]{especially but not exclusively}
-* Volker Lendecke
-* Stefan Metzmacher
-* Ralph Böhme
-* Jeremy Allison
-* David Disseldorp
-* Andreas Schneider
-[block]>
+%% ==== Credits ====
+%% 
+%% <[block]{especially but not exclusively}
+%% * Volker Lendecke
+%% * Stefan Metzmacher
+%% * Ralph Böhme
+%% * Jeremy Allison
+%% * David Disseldorp
+%% * Andreas Schneider
+%% [block]>

 
 
 %%% ==== Conclusion ====[plain]
 
 
 %%% ==== Conclusion ====[plain]