content update

diff --git a/content.wiki b/content.wiki
index 58dd650333e68f6546f8f5e54840eb0f32477f4f..02b671af6a911591eb0d72835b06b1b14e8ac447 100644 (file)
--- a/content.wiki
+++ b/content.wiki
@@ -7,6 +7,8 @@
 
 ==== ====
 
+<[columns]
+[[[.6\textwidth]]]
 <[block]{}
 %<[quote]
 \textnormal{We use a lot of VMs and containers for
@@ -23,6 +25,9 @@ more reproducible and disposable?
 }
 %[quote]>
 [block]>
+[[[.4\textwidth]]]
+<<<klo2-1280.png,width=\textwidth>>>
+[columns]>
 
 
 ==== Enter Vagrant... ====
@@ -58,6 +63,8 @@ more reproducible and disposable?
 
 ==== Providers - via Plugins ====
 
+<[columns]
+[[[.6\textwidth]]]
 <[block]{local}
 * '''lxc'''
 * '''libvirt''' (qemu/kvm)
@@ -74,6 +81,9 @@ more reproducible and disposable?
 * rackspace
 * ...
 [block]>
+[[[.4\textwidth]]]
+<<<klo1-1280.png,width=\textwidth>>>
+[columns]>
 
 
 ==== $\Rightarrow$ Hey, we can use LXC! \smiley ====
@@ -100,7 +110,6 @@ more reproducible and disposable?
 ==== Base Boxes ====
 
 * Many on hashicorp's atlas (atlas.hashicorp.com).
-* Found in other locations as well.
 * Mostly virtualbox and vmware images.
 * libvirt: convert vbox ==> libvirt with @vagrant-mutate@
 * lxc: there are a few boxes ==> need to create on your own
@@ -110,6 +119,10 @@ more reproducible and disposable?
 vagrant-lxc-base-boxes.git@
 ** more boxes needed!
 
+<[center]
+<<<katze-koffer-1280.png,width=.3\textwidth>>>
+[center]>
+
 
 ==== @Vagrantfile@ ====
 
@@ -197,11 +210,16 @@ Enter VaSaBi ...
 
 ==== VaSaBi ====
 
+<[columns]
+[[[.7\textwidth]]]
 * '''Va'''grant '''Sa'''mba '''B'''(u)'''i'''ld ... \smiley
 * a tool to build and selftest Samba on various platforms with a single command
 * making use of vagrant
 * including an out-of-tree samba build wrapper (using symlinks)
 * @git://git.samba.org/obnox/vasabi.git@
+[[[.3\textwidth]]]
+<<<justus-cut-1280.png,width=\textwidth>>>
+[columns]>
 
 [frame]>