From 14eb19a42b6c2d2fe29abe5c48b3813f6a18cf4a Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 4 Jun 2018 05:43:28 -0500 Subject: [PATCH] Typo fixes --- slides/intro/Dockerfile_Tips.md | 6 +++--- slides/intro/Installing_Docker.md | 2 +- slides/intro/Namespaces_Cgroups.md | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/slides/intro/Dockerfile_Tips.md b/slides/intro/Dockerfile_Tips.md index 6d06fd79..8d9e56f9 100644 --- a/slides/intro/Dockerfile_Tips.md +++ b/slides/intro/Dockerfile_Tips.md @@ -237,13 +237,13 @@ That entrypoint will generally be a script, performing any combination of: #!/bin/sh set -e - # first arg is `-f` or `--some-option` - # or first arg is `something.conf` + # first arg is '-f' or '--some-option' + # or first arg is 'something.conf' if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then set -- redis-server "$@" fi - # allow the container to be started with `--user` + # allow the container to be started with '--user' if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then chown -R redis . exec su-exec redis "$0" "$@" diff --git a/slides/intro/Installing_Docker.md b/slides/intro/Installing_Docker.md index d1f98552..41cfa90b 100644 --- a/slides/intro/Installing_Docker.md +++ b/slides/intro/Installing_Docker.md @@ -85,7 +85,7 @@ class: extra-details https://docs.docker.com/docker-for-mac/install/ -* On Windows 10 Pro, Enterprise, and Eduction, you can use Docker for Windows: +* On Windows 10 Pro, Enterprise, and Education, you can use Docker for Windows: https://docs.docker.com/docker-for-windows/install/ diff --git a/slides/intro/Namespaces_Cgroups.md b/slides/intro/Namespaces_Cgroups.md index f5819678..981ef5ae 100644 --- a/slides/intro/Namespaces_Cgroups.md +++ b/slides/intro/Namespaces_Cgroups.md @@ -913,8 +913,6 @@ Killed - Allows to set relative weights used by the scheduler. -- We cannot set CPU limits (like, "don't use more than 10% of CPU"). - --- ## Cpuset cgroup