restructure wiki/includes

diff --git a/Makefile b/Makefile
index 25ed84bd9525521418cfdb552a1645bffa0870b8..6639edd6e58bcefea93a9a10a677687528fdd76f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,8 @@ IMAGES = $(DIAIMAGES_PNG)
 EXTRA_WIKI_FILES = \
                   intro-history.wiki \
                   smb3.wiki \
-                  multichannel.wiki
+                  multichannel.wiki \
+                  thanks.wiki
 
 
 CMN_DEPS = Makefile $(IMAGES)

diff --git a/content.wiki b/content.wiki
index 304387398b1c6985d364db5362f48494162d7267..ee937f0a1e629625810cd482b5346191bc28ee80 100644 (file)
--- a/content.wiki
+++ b/content.wiki
@@ -17,70 +17,10 @@
 
 [frame]>
 
-<[sambabg]
-
-==== ====[plain]
-
-<[center]
-\Large
-'''Intro / History'''
-[center]>
-
-[frame]>
-[sambabg]>
-
-
 >>>intro-history.wiki<<<
 
-[frame]>
-
-<[sambabg]
-
-==== ====[plain]
-
-<[center]
-\Large
-'''SMB3'''
-[center]>
-
-[frame]>
-[sambabg]>
-
 >>>smb3.wiki<<<
 
 >>>multichannel.wiki<<<
 
-
-<[sambabg]
-==== Thanks for your attention! ====[plain]
-
-%\transdissolve
-
-<[center]
-<[columns]
-[[[.6\textwidth]]]
-
-{\Large
-
-Questions?
-
---*3em--
-
-@obnox\@samba.org@
-
-%--*.5em--
-%
-%@madam\@redhat.com@
-
---*.5em--
-
-@obnox\@redhat.com@
-
-}
-[[[.3\textwidth]]]
-<<<feet-sand-1280.png,height=.8\textheight>>>
-
-[columns]>
-[center]>
-[frame]>
-[sambabg]>
+>>>thanks.wiki<<<

diff --git a/intro-history.wiki b/intro-history.wiki
index bed80cbacdbea28ad85817c3d842272c979fdcc8..f9a5e07be4db6c025db1a09764410893d5b7027c 100644 (file)
--- a/intro-history.wiki
+++ b/intro-history.wiki
@@ -1,3 +1,15 @@
+<[sambabg]
+
+==== ====[plain]
+
+<[center]
+\Large
+'''Intro / History'''
+[center]>
+
+[frame]>
+[sambabg]>
+
 ==== SMB - the alien protocol ====
 
 * SMB - Server Message Block
@@ -77,3 +89,5 @@ representing 1,637,229 lines of code"
 * IDL compiler, autogenerated DCE/RPC code \\ %
   ==> another 1,141,095 lines of code % wc -l bin/default/{source3,source4,""}/librpc/gen_ndr/{*.c,*.h}
 * Powerful python(3) bindings, partly autogenerated
+
+[frame]>

diff --git a/multichannel.wiki b/multichannel.wiki
index ed4b75b0b25053abde30a13ada861a32c6d10e3d..9c99aa0601ecc1ae04fbe7aae4d9c35a4aaf600c 100644 (file)
--- a/multichannel.wiki
+++ b/multichannel.wiki
@@ -1,5 +1,3 @@
-[frame]>
-
 <[sambabg]
 
 ==== ====[plain]

diff --git a/smb3.wiki b/smb3.wiki
index 7674543bd40dab8247858830da8ba4500e6e579f..98e829dfd3670f7b1aaca3faa02aa33ed8d1e97d 100644 (file)
--- a/smb3.wiki
+++ b/smb3.wiki
@@ -1,3 +1,15 @@
+<[sambabg]
+
+==== ====[plain]
+
+<[center]
+\Large
+'''SMB3'''
+[center]>
+
+[frame]>
+[sambabg]>
+
 ==== SMB3 ====
 
 <[block]{SMB3 (2012) introduced SMB clustering:}
@@ -35,4 +47,4 @@
 * SMB 3.1.1:
 ** negotiate contexts, preauth: [4.3]
 
-
+[frame]>

diff --git a/thanks.wiki b/thanks.wiki
new file mode 100644 (file)
index 0000000..630ec58
--- /dev/null
+++ b/thanks.wiki
@@ -0,0 +1,33 @@
+<[sambabg]
+==== Thanks for your attention! ====[plain]
+
+%\transdissolve
+
+<[center]
+<[columns]
+[[[.6\textwidth]]]
+
+{\Large
+
+Questions?
+
+--*3em--
+
+@obnox\@samba.org@
+
+%--*.5em--
+%
+%@madam\@redhat.com@
+
+--*.5em--
+
+@obnox\@redhat.com@
+
+}
+[[[.3\textwidth]]]
+<<<feet-sand-1280.png,height=.8\textheight>>>
+
+[columns]>
+[center]>
+[frame]>
+[sambabg]>