Update outline + last round of minor fixes

dockercoins/webui/files/index.html

@@ -50,7 +50,7 @@
             points.push({ x: s2.now, y: speed });
         }
         $("#speed").text("~" + speed.toFixed(1) + " hashes/second");
-        var msg = ("I'm attending the @docker workshop at @neofonie, "
+        var msg = ("I'm attending the @docker workshop at @scaleconf, "
                    + "and my #DockerCoins mining rig is crunching "
                    + speed.toFixed(1) + " hashes/second! W00T!");
         $("#tweet").attr(

prepare-vms/settings/orchestration.yaml

@@ -8,7 +8,7 @@ instance_login: docker
 instance_password: training
 
 clustersize: 5  # Number of VMs per cluster
-pagesize: 15    # Number of cards to print per page
+pagesize: 12    # Number of cards to print per page
 
 #background_image: https://myapps.developer.ubuntu.com/site_media/appmedia/2014/12/swarm.png
 background_image: http://www.yellosoft.us/public/images/docker.png

www/htdocs/index.html

@@ -169,6 +169,7 @@
 
 - Docker for ops
 - Backups
+- Starting more containers from your container
 - Docker events stream
 - Attaching labels
 - Logs
@@ -184,18 +185,18 @@
 - Hands-on Swarm
 - Deploying Swarm
 - Cluster discovery
-- Building our app on Swarm
+- Resource allocation
 - Connecting containers with ambassadors
 - Setting up Consul and overlay networks
 - Multi-host networking
-- Using overlay networks with Compose
-- Load balancing with overlay networks
+- Building images with Swarm
+- Deploying a local registry
+- Scaling workers
 
 ---
 
 ## Outline (4/4)
 
-- Here be dragons
 - Distributing Machine credentials
 - Highly available Swarm managers
 - Highly available containers