Skip to content

Commit 2141e9a

Browse files
authored
Merge pull request #21971 from docker/published-update
publish updates from main
2 parents fa3c59f + 65585fd commit 2141e9a

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

content/get-started/docker-concepts/the-basics/what-is-docker-compose.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ Follow the instructions to run the to-do list app on your system.
5959
When you run this command, you should see an output like this:
6060

6161
```console
62-
[+] Running 4/4
63-
✔ app 3 layers [⣿⣿⣿] 0B/0B Pulled 7.1s
62+
[+] Running 5/5
63+
✔ app 3 layers [⣿⣿⣿] 0B/0B Pulled 7.1s
6464
✔ e6f4e57cc59e Download complete 0.9s
6565
✔ df998480d81d Download complete 1.0s
6666
✔ 31e174fedd23 Download complete 2.5s
67-
[+] Running 2/4
67+
✔ 43c47a581c29 Download complete 2.0s
68+
[+] Running 4/4
6869
⠸ Network todo-list-app_default Created 0.3s
6970
⠸ Volume "todo-list-app_todo-mysql-data" Created 0.3s
7071
✔ Container todo-list-app-app-1 Started 0.3s
@@ -102,7 +103,7 @@ Since this application was started using Docker Compose, it's easy to tear it al
102103
You'll see output similar to the following:
103104

104105
```console
105-
[+] Running 2/2
106+
[+] Running 3/3
106107
✔ Container todo-list-app-mysql-1 Removed 2.9s
107108
✔ Container todo-list-app-app-1 Removed 0.1s
108109
✔ Network todo-list-app_default Removed 0.1s
@@ -116,6 +117,8 @@ Since this application was started using Docker Compose, it's easy to tear it al
116117
>
117118
> ```console
118119
> docker compose down --volumes
120+
> [+] Running 1/0
121+
> ✔ Volume todo-list-app_todo-mysql-data Removed
119122
> ```
120123

121124
2. Alternatively, you can use the Docker Desktop GUI to remove the containers by selecting the application stack and selecting the **Delete** button.

content/manuals/engine/network/drivers/bridge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ flag.
103103
## Options
104104

105105
The following table describes the driver-specific options that you can pass to
106-
`--option` when creating a custom network using the `bridge` driver.
106+
`--opt` when creating a custom network using the `bridge` driver.
107107

108108
| Option | Default | Description |
109109
|-------------------------------------------------------------------------------------------------|-----------------------------|------------------------------------------------------------------------------------------------|

content/manuals/engine/network/drivers/ipvlan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ is no need for port mappings in these scenarios.
3232
## Options
3333

3434
The following table describes the driver-specific options that you can pass to
35-
`--option` when creating a network using the `ipvlan` driver.
35+
`--opt` when creating a network using the `ipvlan` driver.
3636

3737
| Option | Default | Description |
3838
| ------------- | -------- | --------------------------------------------------------------------- |

content/manuals/engine/network/drivers/macvlan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Keep the following things in mind:
3535
## Options
3636

3737
The following table describes the driver-specific options that you can pass to
38-
`--option` when creating a network using the `macvlan` driver.
38+
`--opt` when creating a network using the `macvlan` driver.
3939

4040
| Option | Default | Description |
4141
| -------------- | -------- | ----------------------------------------------------------------------------- |

content/manuals/engine/storage/volumes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ If your container generates non-persistent state data, consider using a
5656
increase the container's performance by avoiding writing into the container's
5757
writable layer.
5858

59-
Volumes use `rprivate` bind propagation, and bind propagation isn't
59+
Volumes use `rprivate` (recursive private) bind propagation, and bind propagation isn't
6060
configurable for volumes.
6161

6262
## A volume's lifecycle

0 commit comments

Comments
 (0)