From efd052eb85a2523a91d3987f4ad606a8588327a8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 28 Aug 2023 12:22:22 +0200 Subject: [PATCH 1/2] docs/reference: run.md: remove stray whitespace Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3d2aac6a0d51374dfb6edbfeaec13a39156a9de8) Signed-off-by: Sebastiaan van Stijn --- docs/reference/run.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index e9a671c279..5737bb3dc5 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -672,7 +672,7 @@ the container exits**, you can add the `--rm` flag: > ```console > $ docker run --rm -v /foo -v awesome:/bar busybox top > ``` -> +> > the volume for `/foo` will be removed, but the volume for `/bar` will not. > Volumes inherited via `--volumes-from` will be removed with the same logic: if > the original volume was specified with a name it will **not** be removed. @@ -1418,7 +1418,7 @@ container's logging driver. The following options are supported: | `fluentd` | Fluentd logging driver for Docker. Writes log messages to `fluentd` (forward input). | | `awslogs` | Amazon CloudWatch Logs logging driver for Docker. Writes log messages to Amazon CloudWatch Logs. | | `splunk` | Splunk logging driver for Docker. Writes log messages to `splunk` using Event Http Collector. | -| `etwlogs` | Event Tracing for Windows (ETW) events. Writes log messages as Event Tracing for Windows (ETW) events. Only Windows platforms. | +| `etwlogs` | Event Tracing for Windows (ETW) events. Writes log messages as Event Tracing for Windows (ETW) events. Only Windows platforms. | | `gcplogs` | Google Cloud Platform (GCP) Logging. Writes log messages to Google Cloud Platform (GCP) Logging. | | `logentries` | Rapid7 Logentries. Writes log messages to Rapid7 Logentries. | From 8e0393932b65db9737f3d485db32f59700be8191 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 28 Aug 2023 01:58:06 +0200 Subject: [PATCH 2/2] update cli-docs-tool to v0.6.0 release notes: https://github.com/docker/cli-docs-tool/releases/tag/v0.6.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 17f4c8259ba1ca04d1a9a293b94a5b47eab80947) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/system.md | 13 ++++++------- scripts/docs/generate-md.sh | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/reference/commandline/system.md b/docs/reference/commandline/system.md index 2e27b7a3dc..f0e55f7af4 100644 --- a/docs/reference/commandline/system.md +++ b/docs/reference/commandline/system.md @@ -5,13 +5,12 @@ Manage Docker ### Subcommands -| Name | Description | -|:-------------------------------------|:---------------------------------------------------------------------------------| -| [`df`](system_df.md) | Show docker disk usage | -| [`dial-stdio`](system_dial-stdio.md) | Proxy the stdio stream to the daemon connection. Should not be invoked manually. | -| [`events`](system_events.md) | Get real time events from the server | -| [`info`](system_info.md) | Display system-wide information | -| [`prune`](system_prune.md) | Remove unused data | +| Name | Description | +|:-----------------------------|:-------------------------------------| +| [`df`](system_df.md) | Show docker disk usage | +| [`events`](system_events.md) | Get real time events from the server | +| [`info`](system_info.md) | Display system-wide information | +| [`prune`](system_prune.md) | Remove unused data | diff --git a/scripts/docs/generate-md.sh b/scripts/docs/generate-md.sh index a947bb9696..7b49c39341 100755 --- a/scripts/docs/generate-md.sh +++ b/scripts/docs/generate-md.sh @@ -2,7 +2,7 @@ set -eu -: "${CLI_DOCS_TOOL_VERSION=v0.5.1}" +: "${CLI_DOCS_TOOL_VERSION=v0.6.0}" export GO111MODULE=auto