Merge branch 'master' into avril2018

slides/common/declarative.md

@@ -8,7 +8,7 @@
 
 - Imperative:
 
-  *Boil some water. Pour it in a teapot. Add tea leaves. Steep for a while. Serve in cup.*
+  *Boil some water. Pour it in a teapot. Add tea leaves. Steep for a while. Serve in a cup.*
 
 --
 

slides/intro/Building_Images_With_Dockerfiles.md

@@ -143,14 +143,14 @@ Removing intermediate container e01b294dbffd
  ---> eb8d9b561b37
 ```
 
-* The `RUN` command is executed in this container.
-
 * A container (`e01b294dbffd`) is created from the base image.
 
-* The build container (`e01b294dbffd`) is removed.
+* The `RUN` command is executed in this container.
 
 * The container is committed into an image (`eb8d9b561b37`).
 
+* The build container (`e01b294dbffd`) is removed.
+
 * The output of this step will be the base image for the next one.
 
 ---

slides/kube/concepts-k8s.md

@@ -221,7 +221,7 @@ Yes!
 
   *Probably not (in the future)*
 
-.footnote[More information about CRI [on the Kubernetes blog](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html)]
+.footnote[More information about CRI [on the Kubernetes blog](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes)
 
 ---
 

slides/kube/kubectlget.md

@@ -265,4 +265,4 @@ The `kube-system` namespace is used for the control plane.
 ]
 --
 
-- `kube-public` is created by kubeadm & [used for security bootstrapping](http://blog.kubernetes.io/2017/01/stronger-foundation-for-creating-and-managing-kubernetes-clusters.html)
+- `kube-public` is created by kubeadm & [used for security bootstrapping](https://kubernetes.io/blog/2017/01/stronger-foundation-for-creating-and-managing-kubernetes-clusters)

slides/kube/setup-k8s.md

@@ -20,6 +20,8 @@
 
     6. Copy the configuration file generated by `kubeadm init`
 
+- Check the [prepare VMs README](https://github.com/jpetazzo/container.training/blob/master/prepare-vms/README.md) for more details
+
 ---
 
 ## `kubeadm` drawbacks