diff --git a/slides/common/intro.md b/slides/common/intro.md
index 0048853f..1660fa1f 100644
--- a/slides/common/intro.md
+++ b/slides/common/intro.md
@@ -9,12 +9,10 @@
- We recommend having a mentor to help you ...
-- ... Or be comfortable spending some time reading the Docker
- [documentation](https://docs.docker.com/) ...
+- ... Or be comfortable spending some time reading the Kubernetes
+ [documentation](https://kubernetes.io/docs/) ...
-- ... And looking for answers in the [Docker forums](forums.docker.com),
- [StackOverflow](http://stackoverflow.com/questions/tagged/docker),
- and other outlets
+- ... And looking for answers on [StackOverflow](http://stackoverflow.com/questions/tagged/kubernetes) and other outlets
---
diff --git a/slides/common/prereqs.md b/slides/common/prereqs.md
index 28e6770d..d18cb730 100644
--- a/slides/common/prereqs.md
+++ b/slides/common/prereqs.md
@@ -26,7 +26,7 @@ class: extra-details
- This slide should have a little magnifying glass in the top left corner
- (If it doesn't, it's because CSS is hard — Jérôme is only a backend person, alas)
+ (If it doesn't, it's because CSS is hard — we're only backend people, alas!)
- Slides with that magnifying glass indicate slides providing extra details
@@ -62,7 +62,7 @@ Misattributed to Benjamin Franklin
- This is the stuff you're supposed to do!
-- Go to [container.training](http://container.training/) to view these slides
+- Go to [indexconf2018.container.training](http://indexconf2018.container.training/) to view these slides
- Join the chat room on @@CHAT@@
@@ -78,17 +78,11 @@ class: in-person
---
-class: in-person, pic
-
-
-
----
-
class: in-person
-## You get five VMs
+## You get three VMs
-- Each person gets 5 private VMs (not shared with anybody else)
+- Each person gets 3 private VMs (not shared with anybody else)
- They'll remain up for the duration of the workshop
@@ -153,7 +147,7 @@ class: in-person
-
-]
-
-Tip: use `^S` and `^Q` to pause/resume log output.
-
----
-
-class: extra-details
-
-## Upgrading from Compose 1.6
-
-.warning[The `logs` command has changed between Compose 1.6 and 1.7!]
-
-- Up to 1.6
-
- - `docker-compose logs` is the equivalent of `logs --follow`
-
- - `docker-compose logs` must be restarted if containers are added
-
-- Since 1.7
-
- - `--follow` must be specified explicitly
-
- - new containers are automatically picked up by `docker-compose logs`
-
----
-
## Connecting to the web UI
- The `webui` container exposes a web dashboard; let's view it
@@ -275,245 +145,6 @@ graph will appear.
---
-class: self-paced, extra-details
-
-## If the graph doesn't load
-
-If you just see a `Page not found` error, it might be because your
-Docker Engine is running on a different machine. This can be the case if:
-
-- you are using the Docker Toolbox
-
-- you are using a VM (local or remote) created with Docker Machine
-
-- you are controlling a remote Docker Engine
-
-When you run DockerCoins in development mode, the web UI static files
-are mapped to the container using a volume. Alas, volumes can only
-work on a local environment, or when using Docker4Mac or Docker4Windows.
-
-How to fix this?
-
-Edit `dockercoins.yml` and comment out the `volumes` section, and try again.
-
----
-
-class: extra-details
-
-## Why does the speed seem irregular?
-
-- It *looks like* the speed is approximately 4 hashes/second
-
-- Or more precisely: 4 hashes/second, with regular dips down to zero
-
-- Why?
-
---
-
-class: extra-details
-
-- The app actually has a constant, steady speed: 3.33 hashes/second
-
- (which corresponds to 1 hash every 0.3 seconds, for *reasons*)
-
-- Yes, and?
-
----
-
-class: extra-details
-
-## The reason why this graph is *not awesome*
-
-- The worker doesn't update the counter after every loop, but up to once per second
-
-- The speed is computed by the browser, checking the counter about once per second
-
-- Between two consecutive updates, the counter will increase either by 4, or by 0
-
-- The perceived speed will therefore be 4 - 4 - 4 - 0 - 4 - 4 - 0 etc.
-
-- What can we conclude from this?
-
---
-
-class: extra-details
-
-- Jérôme is clearly incapable of writing good frontend code
-
----
-
-## Scaling up the application
-
-- Our goal is to make that performance graph go up (without changing a line of code!)
-
---
-
-- Before trying to scale the application, we'll figure out if we need more resources
-
- (CPU, RAM...)
-
-- For that, we will use good old UNIX tools on our Docker node
-
----
-
-## Looking at resource usage
-
-- Let's look at CPU, memory, and I/O usage
-
-.exercise[
-
-- run `top` to see CPU and memory usage (you should see idle cycles)
-
-
-
-- run `vmstat 1` to see I/O usage (si/so/bi/bo)
-
(the 4 numbers should be almost zero, except `bo` for logging)
-
-
-
-]
-
-We have available resources.
-
-- Why?
-- How can we use them?
-
----
-
-## Scaling workers on a single node
-
-- Docker Compose supports scaling
-- Let's scale `worker` and see what happens!
-
-.exercise[
-
-- Start one more `worker` container:
- ```bash
- docker-compose scale worker=2
- ```
-
-- Look at the performance graph (it should show a x2 improvement)
-
-- Look at the aggregated logs of our containers (`worker_2` should show up)
-
-- Look at the impact on CPU load with e.g. top (it should be negligible)
-
-]
-
----
-
-## Adding more workers
-
-- Great, let's add more workers and call it a day, then!
-
-.exercise[
-
-- Start eight more `worker` containers:
- ```bash
- docker-compose scale worker=10
- ```
-
-- Look at the performance graph: does it show a x10 improvement?
-
-- Look at the aggregated logs of our containers
-
-- Look at the impact on CPU load and memory usage
-
-]
-
----
-
-# Identifying bottlenecks
-
-- You should have seen a 3x speed bump (not 10x)
-
-- Adding workers didn't result in linear improvement
-
-- *Something else* is slowing us down
-
---
-
-- ... But what?
-
---
-
-- The code doesn't have instrumentation
-
-- Let's use state-of-the-art HTTP performance analysis!
-
(i.e. good old tools like `ab`, `httping`...)
-
----
-
-## Accessing internal services
-
-- `rng` and `hasher` are exposed on ports 8001 and 8002
-
-- This is declared in the Compose file:
-
- ```yaml
- ...
- rng:
- build: rng
- ports:
- - "8001:80"
-
- hasher:
- build: hasher
- ports:
- - "8002:80"
- ...
- ```
-
----
-
-## Measuring latency under load
-
-We will use `httping`.
-
-.exercise[
-
-- Check the latency of `rng`:
- ```bash
- httping -c 3 localhost:8001
- ```
-
-- Check the latency of `hasher`:
- ```bash
- httping -c 3 localhost:8002
- ```
-
-]
-
-`rng` has a much higher latency than `hasher`.
-
----
-
-## Let's draw hasty conclusions
-
-- The bottleneck seems to be `rng`
-
-- *What if* we don't have enough entropy and can't generate enough random numbers?
-
-- We need to scale out the `rng` service on multiple machines!
-
-Note: this is a fiction! We have enough entropy. But we need a pretext to scale out.
-
-(In fact, the code of `rng` uses `/dev/urandom`, which never runs out of entropy...
-
-...and is [just as good as `/dev/random`](http://www.slideshare.net/PacSecJP/filippo-plain-simple-reality-of-entropy).)
-
----
-
## Clean up
- Before moving on, let's remove those containers
diff --git a/slides/common/thankyou.md b/slides/common/thankyou.md
index af8fc431..696feaaa 100644
--- a/slides/common/thankyou.md
+++ b/slides/common/thankyou.md
@@ -6,7 +6,7 @@ Thank you!
class: title, in-person
-That's all folks!
Questions?
+That's all, folks!
Questions?

@@ -14,13 +14,9 @@ That's all folks!
Questions?
# Links and resources
-- [Docker Community Slack](https://community.docker.com/registrations/groups/4316)
-- [Docker Community Forums](https://forums.docker.com/)
-- [Docker Hub](https://hub.docker.com)
-- [Docker Blog](http://blog.docker.com/)
-- [Docker documentation](http://docs.docker.com/)
-- [Docker on StackOverflow](https://stackoverflow.com/questions/tagged/docker)
-- [Docker on Twitter](http://twitter.com/docker)
-- [Play With Docker Hands-On Labs](http://training.play-with-docker.com/)
+- [Kubernetes Community](https://kubernetes.io/community/) - Slack, Google Groups, meetups
+- [Play With Kubernetes Hands-On Labs](https://medium.com/@marcosnils/introducing-pwk-play-with-k8s-159fcfeb787b)
+- [Local meetups](https://www.meetup.com/)
+- [Microsoft Cloud Developer Advocates](https://developer.microsoft.com/en-us/advocates/)
.footnote[These slides (and future updates) are on → http://container.training/]
diff --git a/slides/common/title.md b/slides/common/title.md
index 1d7755d4..d7e36ce5 100644
--- a/slides/common/title.md
+++ b/slides/common/title.md
@@ -17,5 +17,5 @@ class: title, in-person
*Don't stream videos or download big files during the workshop.*
*Thank you!*
-**Slides: http://container.training/**
-]
\ No newline at end of file
+**Slides: http://indexconf2018.container.training/**
+]
diff --git a/slides/index.html b/slides/index.html
index 7a2500a9..c4abfae3 100644
--- a/slides/index.html
+++ b/slides/index.html
@@ -66,14 +66,10 @@