diff --git a/slides/common/about-slides.md b/slides/common/about-slides.md index d5ee02a8..bef7a2bc 100644 --- a/slides/common/about-slides.md +++ b/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 magnifiying glass indicates slides that provide extra details +- This magnifying glass indicates slides that provide extra details - Feel free to skip them if: diff --git a/slides/intro/Advanced_Dockerfiles.md b/slides/intro/Advanced_Dockerfiles.md index 428370a3..f581af8c 100644 --- a/slides/intro/Advanced_Dockerfiles.md +++ b/slides/intro/Advanced_Dockerfiles.md @@ -355,7 +355,7 @@ class: extra-details ## Overriding the `ENTRYPOINT` instruction -The entry point can be overriden as well. +The entry point can be overridden as well. ```bash $ docker run -it training/ls diff --git a/slides/intro/Background_Containers.md b/slides/intro/Background_Containers.md index ef34a792..b540d7bf 100644 --- a/slides/intro/Background_Containers.md +++ b/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 colums +If we want to list only the IDs of our containers (without the other columns or the header line), we can use the `-q` ("Quiet", "Quick") flag: diff --git a/slides/intro/Copying_Files_During_Build.md b/slides/intro/Copying_Files_During_Build.md index 4bf5ffe8..486c87ef 100644 --- a/slides/intro/Copying_Files_During_Build.md +++ b/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 direcotry. +* Create `hello.c` and `Dockerfile` in the same directory. * Run `docker build -t hello .` in this directory. diff --git a/slides/intro/Docker_Machine.md b/slides/intro/Docker_Machine.md index e22d8705..a0d6486f 100644 --- a/slides/intro/Docker_Machine.md +++ b/slides/intro/Docker_Machine.md @@ -30,7 +30,7 @@ ## Environment variables -- Most of the tools (CLI, libraries...) connecting to the Docker API can use ennvironment variables. +- Most of the tools (CLI, libraries...) connecting to the Docker API can use environment 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 an host. +- `docker-machine env ...` will generate the variables needed to connect to a host. - `$(eval docker-machine env ...)` sets these variables in the current shell. @@ -50,7 +50,7 @@ With `docker-machine`, we can: -- upgrade an host to the latest version of the Docker Engine, +- upgrade a host to the latest version of the Docker Engine, - start/stop/restart hosts, diff --git a/slides/intro/Local_Development_Workflow.md b/slides/intro/Local_Development_Workflow.md index 648dfe18..206e8e3b 100644 --- a/slides/intro/Local_Development_Workflow.md +++ b/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 is is already set in the Dockerfile. +* We don't specify a command to run because it is already set in the Dockerfile. Note: on Windows, replace `$(pwd)` with `%cd%` (or `${pwd}` if you use PowerShell). diff --git a/slides/intro/Multi_Stage_Builds.md b/slides/intro/Multi_Stage_Builds.md index 7dfa03e6..ed4625cd 100644 --- a/slides/intro/Multi_Stage_Builds.md +++ b/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 torough +- some unnecessary files might still remain if the cleanup is not thorough - that layer is expensive (slow to build) diff --git a/slides/intro/Namespaces_Cgroups.md b/slides/intro/Namespaces_Cgroups.md index ff85a9ac..46d1ac06 100644 --- a/slides/intro/Namespaces_Cgroups.md +++ b/slides/intro/Namespaces_Cgroups.md @@ -144,7 +144,7 @@ class: extra-details, deep-dive - Also allows to set the NIS domain. - (If you dont' know what a NIS domain is, you don't have to worry about it!) + (If you don't know what a NIS domain is, you don't have to worry about it!) - If you're wondering: UTS = UNIX time sharing. diff --git a/slides/kube/kubectlexpose.md b/slides/kube/kubectlexpose.md index 8b91773c..850b678c 100644 --- a/slides/kube/kubectlexpose.md +++ b/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, *programatically:* +- Let's obtain the IP address that was allocated for our service, *programmatically:* ```bash IP=$(kubectl get svc elastic -o go-template --template '{{ .spec.clusterIP }}') ``` diff --git a/slides/swarm/extratips.md b/slides/swarm/extratips.md index 4bdf886b..0a1146db 100644 --- a/slides/swarm/extratips.md +++ b/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 udate with: +- You will have to update the service; you can do a no-op update with: ```bash docker service update ... --force ``` diff --git a/slides/swarm/firstservice.md b/slides/swarm/firstservice.md index 131be148..7bf8f1b1 100644 --- a/slides/swarm/firstservice.md +++ b/slides/swarm/firstservice.md @@ -386,7 +386,7 @@ class: btw-labels - owner of a service (for billing, paging...) - - corelate Swarm objects together (services, volumes, configs, secrets, etc.) + - correlate Swarm objects together (services, volumes, configs, secrets, etc.) --- diff --git a/slides/swarm/metrics.md b/slides/swarm/metrics.md index 6844f5d1..b4008159 100644 --- a/slides/swarm/metrics.md +++ b/slides/swarm/metrics.md @@ -554,7 +554,7 @@ class: snap ## Instruct all nodes to join the agreement -- We dont need another fancy global service! +- We don't need another fancy global service! - We can join nodes from any existing node of the cluster diff --git a/slides/swarm/morenodes.md b/slides/swarm/morenodes.md index bea8d846..8de5deed 100644 --- a/slides/swarm/morenodes.md +++ b/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 heterogenous nodes all over the 'net](https://sematext.com/blog/2016/11/14/docker-swarm-lessons-from-swarm3k/) +- Testing by the community: [4700 heterogeneous nodes all over the 'net](https://sematext.com/blog/2016/11/14/docker-swarm-lessons-from-swarm3k/) - it just works diff --git a/slides/swarm/namespaces.md b/slides/swarm/namespaces.md index f2f43e31..3c1c5fff 100644 --- a/slides/swarm/namespaces.md +++ b/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 resut, if you enable user namespaces on an existing installation: +As a result, if you enable user namespaces on an existing installation: - all containers and images (and e.g. Swarm data) disappear diff --git a/slides/swarm/netshoot.md b/slides/swarm/netshoot.md index 360cc246..62c9363c 100644 --- a/slides/swarm/netshoot.md +++ b/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 equiped to deal with concurrency than `rng` +- It looks like `hasher` is better equipped to deal with concurrency than `rng` --- diff --git a/slides/swarm/versions.md b/slides/swarm/versions.md index 3d2baed9..b5eb5bbe 100644 --- a/slides/swarm/versions.md +++ b/slides/swarm/versions.md @@ -69,7 +69,7 @@ class: extra-details (containerd, libcontainer, SwarmKit...) -- More predictible release schedule (see next slide) +- More predictable release schedule (see next slide) ---