summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-23 11:15:24 -0400
committerGitHub <noreply@github.com>2022-08-23 11:15:24 -0400
commitbd3bbb13493cb7a5ca71ef675b54fad307d705d5 (patch)
treef95184c3f77204a84859b6b08da8b1b796cbec71 /docs/source
parent5dea1218a03843f27258528e5f13c6d3dd2b24cd (diff)
parentc6488fe4afc80ad7cc1d98484220f225b7c1cd9a (diff)
downloadpodman-bd3bbb13493cb7a5ca71ef675b54fad307d705d5.tar.gz
podman-bd3bbb13493cb7a5ca71ef675b54fad307d705d5.tar.bz2
podman-bd3bbb13493cb7a5ca71ef675b54fad307d705d5.zip
Merge pull request #15417 from edsantiago/docs_dedup_fix_sloppiness
[CI:DOCS] Man pages: fix sloppiness
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/markdown/options/annotation.container.md2
-rw-r--r--docs/source/markdown/podman-container-runlabel.1.md.in5
-rw-r--r--docs/source/markdown/podman-image-sign.1.md.in5
-rw-r--r--docs/source/markdown/podman-login.1.md.in5
-rw-r--r--docs/source/markdown/podman-manifest-add.1.md.in5
-rw-r--r--docs/source/markdown/podman-manifest-push.1.md.in5
-rw-r--r--docs/source/markdown/podman-push.1.md.in5
7 files changed, 7 insertions, 25 deletions
diff --git a/docs/source/markdown/options/annotation.container.md b/docs/source/markdown/options/annotation.container.md
index bd561a15f..0d155e5e4 100644
--- a/docs/source/markdown/options/annotation.container.md
+++ b/docs/source/markdown/options/annotation.container.md
@@ -1,3 +1,3 @@
#### **--annotation**=*key=value*
-Add an annotation to the container<| or pod>. This option can be set multiple times.
+Add an annotation to the container<<| or pod>>. This option can be set multiple times.
diff --git a/docs/source/markdown/podman-container-runlabel.1.md.in b/docs/source/markdown/podman-container-runlabel.1.md.in
index 59eb48fd3..f5fb8ca60 100644
--- a/docs/source/markdown/podman-container-runlabel.1.md.in
+++ b/docs/source/markdown/podman-container-runlabel.1.md.in
@@ -32,10 +32,7 @@ Will be replaced with the current working directory.
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
@@option creds
diff --git a/docs/source/markdown/podman-image-sign.1.md.in b/docs/source/markdown/podman-image-sign.1.md.in
index 340cdbd21..d5efabc1a 100644
--- a/docs/source/markdown/podman-image-sign.1.md.in
+++ b/docs/source/markdown/podman-image-sign.1.md.in
@@ -21,10 +21,7 @@ Sign all the manifests of the multi-architecture image (default false).
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
#### **--directory**, **-d**=*dir*
diff --git a/docs/source/markdown/podman-login.1.md.in b/docs/source/markdown/podman-login.1.md.in
index 6ec207a1e..4537988eb 100644
--- a/docs/source/markdown/podman-login.1.md.in
+++ b/docs/source/markdown/podman-login.1.md.in
@@ -30,10 +30,7 @@ For more details about format and configurations of the auth.json file, please r
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
#### **--get-login**
diff --git a/docs/source/markdown/podman-manifest-add.1.md.in b/docs/source/markdown/podman-manifest-add.1.md.in
index adffe1875..e82c04985 100644
--- a/docs/source/markdown/podman-manifest-add.1.md.in
+++ b/docs/source/markdown/podman-manifest-add.1.md.in
@@ -35,10 +35,7 @@ retrieved from the image's configuration information.
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
@@option creds
diff --git a/docs/source/markdown/podman-manifest-push.1.md.in b/docs/source/markdown/podman-manifest-push.1.md.in
index 515f07207..88d070c3f 100644
--- a/docs/source/markdown/podman-manifest-push.1.md.in
+++ b/docs/source/markdown/podman-manifest-push.1.md.in
@@ -21,10 +21,7 @@ the list or index itself. (Default true)
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
#### **--compression-format**=**gzip** | *zstd* | *zstd:chunked*
diff --git a/docs/source/markdown/podman-push.1.md.in b/docs/source/markdown/podman-push.1.md.in
index f32261bab..b7d05d988 100644
--- a/docs/source/markdown/podman-push.1.md.in
+++ b/docs/source/markdown/podman-push.1.md.in
@@ -49,10 +49,7 @@ $ podman push myimage oci-archive:/tmp/myimage
@@option authfile
-#### **--cert-dir**=*path*
-
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d)
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
+@@option cert-dir
#### **--compress**