Merge pull request #431 from djalal/slides-review-1

I find typos as a hobby
This commit is contained in:
Jérôme Petazzoni
2019-02-14 23:50:27 +01:00
committed by GitHub
7 changed files with 15 additions and 15 deletions

View File

@@ -82,11 +82,11 @@ class: extra-details
## Installing Docker on macOS and Windows
* On macOS, the recommended method is to use Docker for Mac:
* On macOS, the recommended method is to use Docker Desktop for Mac:
https://docs.docker.com/docker-for-mac/install/
* On Windows 10 Pro, Enterprise, and Education, you can use Docker for Windows:
* On Windows 10 Pro, Enterprise, and Education, you can use Docker Desktop for Windows:
https://docs.docker.com/docker-for-windows/install/
@@ -100,7 +100,7 @@ class: extra-details
---
## Docker for Mac and Docker for Windows
## Docker Desktop for Mac and Docker Desktop for Windows
* Special Docker Editions that integrate well with their respective host OS

View File

@@ -155,7 +155,7 @@ processes or data flows are given access to system resources.*
The scheduler is concerned mainly with:
- throughput (total amount or work done per time unit);
- throughput (total amount of work done per time unit);
- turnaround time (between submission and completion);
- response time (between submission and start);
- waiting time (between job readiness and execution);
@@ -390,7 +390,7 @@ It depends on:
(Marathon = long running processes; Chronos = run at intervals; ...)
- Commercial offering through DC/OS my Mesosphere.
- Commercial offering through DC/OS by Mesosphere.
---

View File

@@ -278,7 +278,7 @@ Docker Engine is running on a different machine. This can be the case if:
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.
work on a local environment, or when using Docker Desktop for Mac or Windows.
How to fix this?

View File

@@ -65,7 +65,7 @@ name: healthchecks
Here is a comprehensive example using the CLI:
.sall[
.small[
```bash
docker service update \
--update-delay 5s \

View File

@@ -454,7 +454,7 @@ class: snap
.exercise[
- Run the following command *on every node:*
- Run the following command *on every node*:
```bash
snapd -t 0 -l 1 --tribe --tribe-seed node1:6000
```
@@ -636,7 +636,7 @@ class: snap
]
Note: this will allow any node to publish metrics data to `localhost:8086`,
and it will allows us to access the admin interface by connecting to any node
and it will allow us to access the admin interface by connecting to any node
on port 8083.
.warning[Make sure to use InfluxDB 0.13; a few things changed in 1.0

View File

@@ -48,7 +48,7 @@ class: btp-manual
- Resource limits are moved to this `deploy` section
- See [here](https://github.com/aanand/docker.github.io/blob/8524552f99e5b58452fcb1403e1c273385988b71/compose/compose-file.md#upgrading) for the complete list of changes
- See [here](https://github.com/docker/docker.github.io/blob/master/compose/compose-file/compose-versioning.md#upgrading) for the complete list of changes
- Supersedes *Distributed Application Bundles*
@@ -149,7 +149,7 @@ Our registry is not *exactly* identical to the one deployed with `docker service
- Each stack gets its own overlay network
- Services of the task are connected to this network
- Services of the stack are connected to this network
<br/>(unless specified differently in the Compose file)
- Services get network aliases matching their name in the Compose file

View File

@@ -1,8 +1,8 @@
## Brand new versions!
- Engine 18.06
- Compose 1.22
- Machine 0.15
- Engine 18.09
- Compose 1.23
- Machine 0.16
.exercise[
@@ -17,7 +17,7 @@
---
## Wait, what, 17.12 ?!?
## Wait, what, 18.09 ?!?
--