fix-redirects.sh: adding forced redirect

bringing branch up to date

slides/common/about-slides.md

@@ -35,7 +35,7 @@ class: extra-details
 
 - This slide has a little magnifying glass in the top left corner
 
-- This magnifying glass indicates slides that provide extra details
+- This magnifiying glass indicates slides that provide extra details
 
 - Feel free to skip them if:
 

slides/index.yaml

@@ -28,7 +28,6 @@
   event: devopsdays
   title: Kubernetes 101
   speaker: bridgetkromhout
-  slides: https://devopsdaysams2018.container.training
   attend: https://www.devopsdays.org/events/2018-amsterdam/registration/
 
 - date: 2018-06-12

slides/intro/Advanced_Dockerfiles.md

@@ -355,7 +355,7 @@ class: extra-details
 
 ## Overriding the `ENTRYPOINT` instruction
 
-The entry point can be overridden as well.
+The entry point can be overriden as well.
 
 ```bash
 $ docker run -it training/ls

slides/intro/Background_Containers.md

@@ -117,7 +117,7 @@ CONTAINER ID  IMAGE           ...  CREATED        STATUS        ...
 
 Many Docker commands will work on container IDs: `docker stop`, `docker rm`...
 
-If we want to list only the IDs of our containers (without the other columns
+If we want to list only the IDs of our containers (without the other colums
 or the header line),
 we can use the `-q` ("Quiet", "Quick") flag:
 

slides/intro/Container_Networking_Basics.md

@@ -98,7 +98,7 @@ $ curl localhost:32768
 * We can see that metadata with `docker inspect`:
 
 ```bash
-$ docker inspect --format '{{.Config.ExposedPorts}}' nginx
+$ docker inspect nginx --format {{.Config.ExposedPorts}}
 map[80/tcp:{}]
 ```
 

slides/intro/Copying_Files_During_Build.md

@@ -64,7 +64,7 @@ Create this Dockerfile.
 
 ## Testing our C program
 
-* Create `hello.c` and `Dockerfile` in the same directory.
+* Create `hello.c` and `Dockerfile` in the same direcotry.
 
 * Run `docker build -t hello .` in this directory.
 

slides/intro/Docker_Machine.md

@@ -30,7 +30,7 @@
 
 ## Environment variables
 
-- Most of the tools (CLI, libraries...) connecting to the Docker API can use environment variables.
+- Most of the tools (CLI, libraries...) connecting to the Docker API can use ennvironment variables.
 
 - These variables are:
 
@@ -40,7 +40,7 @@
 
   - `DOCKER_CERT_PATH` (path to the keypair and certificate to use for auth)
 
-- `docker-machine env ...` will generate the variables needed to connect to a host.
+- `docker-machine env ...` will generate the variables needed to connect to an host.
 
 - `$(eval docker-machine env ...)` sets these variables in the current shell.
 
@@ -50,7 +50,7 @@
 
 With `docker-machine`, we can:
 
-- upgrade a host to the latest version of the Docker Engine,
+- upgrade an host to the latest version of the Docker Engine,
 
 - start/stop/restart hosts,
 

slides/intro/Local_Development_Workflow.md

@@ -176,7 +176,7 @@ $ docker run -d -v $(pwd):/src -P namer
 
 * `namer` is the name of the image we will run.
 
-* We don't specify a command to run because it is already set in the Dockerfile.
+* We don't specify a command to run because is is already set in the Dockerfile.
 
 Note: on Windows, replace `$(pwd)` with `%cd%` (or `${pwd}` if you use PowerShell).
 

slides/intro/Multi_Stage_Builds.md

@@ -102,7 +102,7 @@ Cons:
 
 - not very readable
 
-- some unnecessary files might still remain if the cleanup is not thorough
+- some unnecessary files might still remain if the cleanup is not torough
 
 - that layer is expensive (slow to build)
 

slides/intro/Namespaces_Cgroups.md

@@ -144,7 +144,7 @@ class: extra-details, deep-dive
 
 - Also allows to set the NIS domain.
 
-  (If you don't know what a NIS domain is, you don't have to worry about it!)
+  (If you dont' know what a NIS domain is, you don't have to worry about it!)
 
 - If you're wondering: UTS = UNIX time sharing.
 

slides/kube/kubectlexpose.md

@@ -123,7 +123,7 @@ Note: please DO NOT call the service `search`. It would collide with the TLD.
 
 .exercise[
 
-- Let's obtain the IP address that was allocated for our service, *programmatically:*
+- Let's obtain the IP address that was allocated for our service, *programatically:*
   ```bash
   IP=$(kubectl get svc elastic -o go-template --template '{{ .spec.clusterIP }}')
   ```

slides/kube/links-bridget.md

@@ -6,7 +6,7 @@
 
 - [Play With Kubernetes Hands-On Labs](https://medium.com/@marcosnils/introducing-pwk-play-with-k8s-159fcfeb787b)
 
-- [Azure Kubernetes Service](https://docs.microsoft.com/azure/aks/)
+- [Azure Container Service](https://docs.microsoft.com/azure/aks/)
 
 - [Cloud Developer Advocates](https://developer.microsoft.com/advocates/)
 

slides/kube/versions-k8s.md

@@ -1,6 +1,6 @@
 ## Versions installed
 
-- Kubernetes 1.10.5
+- Kubernetes 1.10.4
 - Docker Engine 18.03.1-ce
 - Docker Compose 1.21.1
 

slides/logistics-bridget.md

@@ -1,14 +1,25 @@
 ## Intros
 
- - Hello! We are:
+ - Hello! I am:
 
    - .emoji[✨] Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
 
-   - .emoji[🌟] Joe ([@joelaha](https://twitter.com/joelaha))
+- The workshop will run from 13:30-17:00
 
-- The workshop will run from 14:45 - 17:15
+- There will be a break from 15:00-15:30
 
 - Feel free to interrupt for questions at any time
 
 - *Especially when you see full screen container pictures!*
 
+---
+
+## Say hi!
+
+- We encourage networking at [#velocityconf](https://twitter.com/hashtag/velocityconf?f=tweets&vertical=default&src=hash)
+
+- Take a minute to introduce yourself to your neighbors
+
+- Tell them where you're from (where you're based out of & what org you work at)
+
+- Share what you're hoping to learn in this session!  .emoji[✨]

slides/swarm/extratips.md

@@ -77,7 +77,7 @@ More resources on this topic:
 
 - It won't be scheduled automatically when constraints are satisfiable again
 
-- You will have to update the service; you can do a no-op update with:
+- You will have to update the service; you can do a no-op udate with:
   ```bash
   docker service update ... --force
   ```

slides/swarm/firstservice.md

@@ -386,7 +386,7 @@ class: btw-labels
 
   - owner of a service (for billing, paging...)
 
-  - correlate Swarm objects together (services, volumes, configs, secrets, etc.)
+  - corelate Swarm objects together (services, volumes, configs, secrets, etc.)
 
 ---
 

slides/swarm/metrics.md

@@ -554,7 +554,7 @@ class: snap
 
 ## Instruct all nodes to join the agreement
 
-- We don't need another fancy global service!
+- We dont need another fancy global service!
 
 - We can join nodes from any existing node of the cluster
 

slides/swarm/morenodes.md

@@ -179,7 +179,7 @@ class: self-paced
 
   - one of the main take-aways was *"you're gonna need a bigger manager"*
 
-- Testing by the community: [4700 heterogeneous nodes all over the 'net](https://sematext.com/blog/2016/11/14/docker-swarm-lessons-from-swarm3k/)
+- Testing by the community: [4700 heterogenous nodes all over the 'net](https://sematext.com/blog/2016/11/14/docker-swarm-lessons-from-swarm3k/)
 
   - it just works
 

slides/swarm/namespaces.md

@@ -75,7 +75,7 @@ When enabling user namespaces:
 
 For practical reasons, when enabling user namespaces, the Docker Engine places containers and images (and everything else) in a different directory.
 
-As a result, if you enable user namespaces on an existing installation:
+As a resut, if you enable user namespaces on an existing installation:
 
 -  all containers and images (and e.g. Swarm data) disappear
 

slides/swarm/netshoot.md

@@ -302,7 +302,7 @@ class: extra-details, benchmarking
 
 - Requests are a bit slower in the parallel benchmark
 
-- It looks like `hasher` is better equipped to deal with concurrency than `rng`
+- It looks like `hasher` is better equiped to deal with concurrency than `rng`
 
 ---
 

slides/swarm/versions.md

@@ -69,7 +69,7 @@ class: extra-details
 
   (containerd, libcontainer, SwarmKit...)
 
-- More predictable release schedule (see next slide)
+- More predictible release schedule (see next slide)
 
 ---