update content

diff --git a/content.wiki b/content.wiki
index defd4a3b9fde6f63ab651e6e9c20f2e69269b217..1749f4fdb96415596222d887a4839b1e06841f85 100644 (file)
--- a/content.wiki
+++ b/content.wiki
@@ -7,20 +7,20 @@
 ==== ====
 
 <[block]{}
-<[quote]
-\textnormal{We need a lot of VMs and containers for
+%<[quote]
+\textnormal{We use a lot of VMs and containers for
 testing and building Samba. The setup and maintenance
 of these machines requires a lot of work.}
-[quote]>
+%[quote]>
 [block]>
 
 <[block]{}
-<[quote]
+%<[quote]
 \textnormal{%
 How can we reduce this work while making the result
 more reproducible and disposable?
 }
-[quote]>
+%[quote]>
 [block]>
 
 
@@ -90,10 +90,19 @@ more reproducible and disposable?
 ==== Other Useful Plugins ====
 
 * @vagrant-cachier@ - cache packages on the host
-* @vatrant-mutate@ - convert boxes between providers
+* @vagrant-mutate@ - convert boxes between providers
 * ...
 
 
+==== 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
+
+
 ==== @Vagrantfile@ ====
 
 * it is a genuine ruby program
@@ -108,6 +117,26 @@ end
 [quote]>
 [block]>
 
+==== Control ====
+
+<[block]{vagrant [options] [command] [args]}
+<[code]
+up        - create, start and provision
+provision - provision the machine
+reload    - restarts, load new config
+suspend   - suspends the machine
+resume    - resume a suspended machine
+halt      - stops the machine
+destroy   - stops and deletes the machine
+
+status    - outputs status of the machine
+ssh       - connects to machine via SSH
+
+plugin    - manages plugins
+box       - manages boxes
+[code]>
+[block]>
+
 ==== Config Management ====
 
 * called ''provisioners''
@@ -122,6 +151,7 @@ end
 ==== Notes about Installation ====
 
 * ''Upstream'': current packages at vagrantup.com
+** version 1.7.2
 ** installed, under @/opt@
 ** ships ruby and many gems
 ** sometimes problems with system-ruby
@@ -130,13 +160,15 @@ end
 ** no additional plugins shipped
 * ''Fedora'' ($\ge 21$) has recent vagrant package now
 ** version 1.7.2
-** plus vagrant-lxc
-** plus vagrant-libvirt
+** package for vagrant-lxc
+** package for vagrant-libvirt
 
 
 
-%== Demo Time ==[plain]
 
+[frame]>
+
+<[sambabg]
 ==== ====[plain]
 
 <[center]
@@ -144,6 +176,9 @@ end
 Demo Time
 [center]>
 
+[frame]>
+[sambabg]>
+
 ==== Enter VaSaBi ====
 
 <[block]{}
@@ -151,6 +186,9 @@ A tool to build and selftest Samba on various platforms with a single command.
 [block]>
 
 
+[frame]>
+
+<[sambabg]
 ==== ====[plain]
 
 <[center]
@@ -158,6 +196,8 @@ A tool to build and selftest Samba on various platforms with a single command.
 Demo Time
 [center]>
 
+[frame]>
+[sambabg]>
 
 ==== TODOs ====
 
@@ -171,6 +211,9 @@ Demo Time
 * possibly add support for autobuild-like jobs instead of plain @make test@
 
 
+[frame]>
+
+<[sambabg]
 ==== Thanks for your attention! ====[plain]
 
 %\transdissolve
@@ -198,3 +241,7 @@ Questions?
 [columns]>
 [center]>
 
+[frame]>
+[sambabg]>
+
+