aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-11 16:18:13 -0400
committerGitHub <noreply@github.com>2020-03-11 16:18:13 -0400
commit9cfcf5692bfb2d6236dff3291e794496f28353a1 (patch)
treecce30361b885ad6a44e655e6f6a3d24ba1ea06d3
parent9bc27118b52442f941666b48eb07102a541ada16 (diff)
parent3d1bff6db98ca5af0fad3f4effc379fcccc8664d (diff)
downloadpodman-9cfcf5692bfb2d6236dff3291e794496f28353a1.tar.gz
podman-9cfcf5692bfb2d6236dff3291e794496f28353a1.tar.bz2
podman-9cfcf5692bfb2d6236dff3291e794496f28353a1.zip
Merge pull request #5460 from edsantiago/man_page_xref
man page cross-reference fixes: part 2
-rw-r--r--cmd/podman/runlabel.go2
-rw-r--r--docs/source/markdown/podman-commit.1.md4
-rw-r--r--docs/source/markdown/podman-container-runlabel.1.md7
-rw-r--r--docs/source/markdown/podman-create.1.md8
4 files changed, 1 insertions, 20 deletions
diff --git a/cmd/podman/runlabel.go b/cmd/podman/runlabel.go
index 358538155..1ec4da650 100644
--- a/cmd/podman/runlabel.go
+++ b/cmd/podman/runlabel.go
@@ -49,7 +49,7 @@ func init() {
flags.StringVar(&runlabelCommand.Creds, "creds", "", "`Credentials` (USERNAME:PASSWORD) to use for authenticating to a registry")
flags.BoolVar(&runlabelCommand.Display, "display", false, "Preview the command that the label would run")
flags.BoolVar(&runlabelCommand.Replace, "replace", false, "Replace existing container with a new one from the image")
- flags.StringVar(&runlabelCommand.Name, "name", "", "Assign a name to the container")
+ flags.StringVarP(&runlabelCommand.Name, "name", "n", "", "Assign a name to the container")
flags.StringVar(&runlabelCommand.Opt1, "opt1", "", "Optional parameter to pass for install")
flags.StringVar(&runlabelCommand.Opt2, "opt2", "", "Optional parameter to pass for install")
diff --git a/docs/source/markdown/podman-commit.1.md b/docs/source/markdown/podman-commit.1.md
index 13e46a899..2f1369847 100644
--- a/docs/source/markdown/podman-commit.1.md
+++ b/docs/source/markdown/podman-commit.1.md
@@ -38,10 +38,6 @@ Can be set multiple times
Set the format of the image manifest and metadata. The currently supported formats are _oci_ and _docker_. If
not specifically set, the default format used is _oci_.
-**--iidfile**=*ImageIDfile*
-
-Write the image ID to the file.
-
**--include-volumes**
Include in the committed image any volumes added to the container by the `--volume` or `--mount` options to the `podman create` and `podman run` commands.
diff --git a/docs/source/markdown/podman-container-runlabel.1.md b/docs/source/markdown/podman-container-runlabel.1.md
index aab3e9784..2abbf0b7f 100644
--- a/docs/source/markdown/podman-container-runlabel.1.md
+++ b/docs/source/markdown/podman-container-runlabel.1.md
@@ -81,13 +81,6 @@ Suppress output information when pulling images
If a container exists of the default or given name, as needed it will be stopped, deleted and a new container will be
created from this image.
-**--rootfs**=*ROOTFS*
-
-Set rootfs
-
-**--storage**
-Use storage
-
**--tls-verify**
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to true,
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index af66d7911..aa2456836 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -94,14 +94,6 @@ Write the container ID to the file
Write the pid of the `conmon` process to a file. `conmon` runs in a separate process than Podman, so this is necessary when using systemd to restart Podman containers.
-**--cpu-count**=*limit*
-
-Limit the number of CPUs available for execution by the container.
-
-On Windows Server containers, this is approximated as a percentage of total CPU usage.
-
-On Windows Server containers, the processor resource controls are mutually exclusive, the order of precedence is CPUCount first, then CPUShares, and CPUPercent last.
-
**--cpu-period**=*limit*
Limit the CPU CFS (Completely Fair Scheduler) period