diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-13 15:23:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 15:23:23 +0200 |
| commit | 07c0dd1f24b112c0161f61cafdfc1ab0866ebb9e (patch) | |
| tree | 6ba372c06325adb41da2b5fa1da1374db2955ffc | |
| parent | 51b5d30b10810e88baaff78c22b9747395e705b5 (diff) | |
| parent | 74e0511c962efdad23b44807d8de38955f5d2dcb (diff) | |
| download | podman-07c0dd1f24b112c0161f61cafdfc1ab0866ebb9e.tar.gz podman-07c0dd1f24b112c0161f61cafdfc1ab0866ebb9e.tar.bz2 podman-07c0dd1f24b112c0161f61cafdfc1ab0866ebb9e.zip | |
Merge pull request #15770 from edsantiago/docs_dedup_os.pull
[CI:DOCS] Man pages: refactor common options: --os (pull)
| -rw-r--r-- | docs/source/markdown/options/os.pull.md | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-create.1.md.in | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pull.1.md.in | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md.in | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/docs/source/markdown/options/os.pull.md b/docs/source/markdown/options/os.pull.md new file mode 100644 index 000000000..547a9fff8 --- /dev/null +++ b/docs/source/markdown/options/os.pull.md @@ -0,0 +1,4 @@ +#### **--os**=*OS* + +Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. +Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host. diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in index e2e7644f7..b78db81bf 100644 --- a/docs/source/markdown/podman-create.1.md.in +++ b/docs/source/markdown/podman-create.1.md.in @@ -326,9 +326,7 @@ This option conflicts with **--add-host**. @@option oom-score-adj -#### **--os**=*OS* -Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. -Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host. +@@option os.pull @@option passwd-entry diff --git a/docs/source/markdown/podman-pull.1.md.in b/docs/source/markdown/podman-pull.1.md.in index 5405d7a45..6c2806a54 100644 --- a/docs/source/markdown/podman-pull.1.md.in +++ b/docs/source/markdown/podman-pull.1.md.in @@ -63,10 +63,7 @@ All tagged images in the repository will be pulled. Print the usage statement. -#### **--os**=*OS* - -Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. -Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host. +@@option os.pull @@option platform diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index c360c2e5d..b4ec0c23e 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -346,9 +346,7 @@ This option conflicts with **--add-host**. @@option oom-score-adj -#### **--os**=*OS* -Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. -Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host. +@@option os.pull #### **--passwd** |