aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-23 14:58:57 -0400
committerGitHub <noreply@github.com>2022-08-23 14:58:57 -0400
commitcf9c04ae2b61d1eed32a73aad2172d3455a5a9fa (patch)
tree8a79b6342dda56560b1e667257885d49b352b138
parent3bcd8047cff076d34887bd3be7ed0e5701a41a02 (diff)
parent2c03681b2c04c28add7b0d8eafbfce37937ce653 (diff)
downloadpodman-cf9c04ae2b61d1eed32a73aad2172d3455a5a9fa.tar.gz
podman-cf9c04ae2b61d1eed32a73aad2172d3455a5a9fa.tar.bz2
podman-cf9c04ae2b61d1eed32a73aad2172d3455a5a9fa.zip
Merge pull request #15435 from edsantiago/docs_dedup_disablecontenttrust
[CI:DOCS] Man pages: refactor common options: --disable-content-trust
-rw-r--r--docs/source/markdown/options/disable-content-trust.md5
-rw-r--r--docs/source/markdown/podman-build.1.md.in6
-rw-r--r--docs/source/markdown/podman-create.1.md.in6
-rw-r--r--docs/source/markdown/podman-pull.1.md.in6
-rw-r--r--docs/source/markdown/podman-push.1.md.in6
-rw-r--r--docs/source/markdown/podman-run.1.md.in6
6 files changed, 10 insertions, 25 deletions
diff --git a/docs/source/markdown/options/disable-content-trust.md b/docs/source/markdown/options/disable-content-trust.md
new file mode 100644
index 000000000..a2d1d8ad7
--- /dev/null
+++ b/docs/source/markdown/options/disable-content-trust.md
@@ -0,0 +1,5 @@
+#### **--disable-content-trust**
+
+This is a Docker-specific option to disable image verification to a container
+registry and is not supported by Podman. This option is a NOOP and provided
+solely for scripting compatibility.
diff --git a/docs/source/markdown/podman-build.1.md.in b/docs/source/markdown/podman-build.1.md.in
index dab705f94..87a21a7ae 100644
--- a/docs/source/markdown/podman-build.1.md.in
+++ b/docs/source/markdown/podman-build.1.md.in
@@ -230,11 +230,7 @@ registries, and images being written to local storage would only need to be
decompressed again to be stored. Compression can be forced in all cases by
specifying **--disable-compression=false**.
-#### **--disable-content-trust**
-
-This is a Docker specific option to disable image verification to a container
-registry and is not supported by Podman. This option is a NOOP and provided
-solely for scripting compatibility. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option disable-content-trust
#### **--dns**=*dns*
diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in
index 3ae558996..c83083674 100644
--- a/docs/source/markdown/podman-create.1.md.in
+++ b/docs/source/markdown/podman-create.1.md.in
@@ -175,11 +175,7 @@ Limit write rate (IO per second) to a device (e.g. --device-write-iops=/dev/sda:
This option is not supported on cgroups V1 rootless systems.
-#### **--disable-content-trust**
-
-This is a Docker specific option to disable image verification to a Docker
-registry and is not supported by Podman. This flag is a NOOP and provided
-solely for scripting compatibility.
+@@option disable-content-trust
#### **--dns**=*dns*
diff --git a/docs/source/markdown/podman-pull.1.md.in b/docs/source/markdown/podman-pull.1.md.in
index db041298e..03f9b8fd7 100644
--- a/docs/source/markdown/podman-pull.1.md.in
+++ b/docs/source/markdown/podman-pull.1.md.in
@@ -57,11 +57,7 @@ All tagged images in the repository will be pulled.
@@option creds
-#### **--disable-content-trust**
-
-This is a Docker specific option to disable image verification to a Docker
-registry and is not supported by Podman. This flag is a NOOP and provided
-solely for scripting compatibility.
+@@option disable-content-trust
#### **--help**, **-h**
diff --git a/docs/source/markdown/podman-push.1.md.in b/docs/source/markdown/podman-push.1.md.in
index b7d05d988..a98964e45 100644
--- a/docs/source/markdown/podman-push.1.md.in
+++ b/docs/source/markdown/podman-push.1.md.in
@@ -66,11 +66,7 @@ Specifies the compression format to use. Supported values are: `gzip`, `zstd` a
After copying the image, write the digest of the resulting image to the file. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
-#### **--disable-content-trust**
-
-This is a Docker specific option to disable image verification to a Docker
-registry and is not supported by Podman. This flag is a NOOP and provided
-solely for scripting compatibility.
+@@option disable-content-trust
#### **--format**, **-f**=*format*
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in
index 4fae69241..7fb7a455b 100644
--- a/docs/source/markdown/podman-run.1.md.in
+++ b/docs/source/markdown/podman-run.1.md.in
@@ -206,11 +206,7 @@ Limit write rate (in IO operations per second) to a device (e.g. **--device-writ
This option is not supported on cgroups V1 rootless systems.
-#### **--disable-content-trust**
-
-This is a Docker specific option to disable image verification to a Docker
-registry and is not supported by Podman. This flag is a NOOP and provided
-solely for scripting compatibility.
+@@option disable-content-trust
#### **--dns**=*ipaddr*