summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-14 16:09:51 +0200
committerGitHub <noreply@github.com>2022-09-14 16:09:51 +0200
commite1b3d9811a5655f4468b2b56a93513418e6678a2 (patch)
tree72d60b468d5c5d7cf877073e095ff64498b5646e
parent83c148c4dd9c9ffb1b6a8f8436e86129067e3901 (diff)
parent4df460836c4d90a416eeadd0b72eed43a6b1c4d0 (diff)
downloadpodman-e1b3d9811a5655f4468b2b56a93513418e6678a2.tar.gz
podman-e1b3d9811a5655f4468b2b56a93513418e6678a2.tar.bz2
podman-e1b3d9811a5655f4468b2b56a93513418e6678a2.zip
Merge pull request #15795 from edsantiago/docs_dedup_ip6
[CI:DOCS] Man pages: refactor common options: --ip6
-rw-r--r--docs/source/markdown/options/ip6.md8
-rw-r--r--docs/source/markdown/podman-create.1.md.in10
-rw-r--r--docs/source/markdown/podman-pod-create.1.md.in9
-rw-r--r--docs/source/markdown/podman-run.1.md.in9
4 files changed, 11 insertions, 25 deletions
diff --git a/docs/source/markdown/options/ip6.md b/docs/source/markdown/options/ip6.md
new file mode 100644
index 000000000..feaae7c44
--- /dev/null
+++ b/docs/source/markdown/options/ip6.md
@@ -0,0 +1,8 @@
+#### **--ip6**=*ipv6*
+
+Specify a static IPv6 address for the <<container|pod>>, for example **fd46:db93:aa76:ac37::10**.
+This option can only be used if the <<container|pod>> is joined to only a single network - i.e., **--network=network-name** is used at most once -
+and if the <<container|pod>> is not joining another container's network namespace via **--network=container:_id_**.
+The address must be within the network's IPv6 address pool.
+
+To specify multiple static IPv6 addresses per <<container|pod>>, set multiple networks using the **--network** option with a static IPv6 address specified for each using the `ip6` mode for that option.
diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in
index f94a767a9..e407ff4d4 100644
--- a/docs/source/markdown/podman-create.1.md.in
+++ b/docs/source/markdown/podman-create.1.md.in
@@ -230,15 +230,7 @@ Keep STDIN open even if not attached. The default is *false*.
@@option ip
-#### **--ip6**=*ipv6*
-
-Specify a static IPv6 address for the container, for example **fd46:db93:aa76:ac37::10**.
-This option can only be used if the container is joined to only a single network - i.e., **--network=network-name** is used at most once -
-and if the container is not joining another container's network namespace via **--network=container:_id_**.
-The address must be within the network's IPv6 address pool.
-
-To specify multiple static IPv6 addresses per container, set multiple networks using the **--network** option with a static IPv6 address specified for each using the `ip6` mode for that option.
-
+@@option ip6
@@option ipc
diff --git a/docs/source/markdown/podman-pod-create.1.md.in b/docs/source/markdown/podman-pod-create.1.md.in
index bf4c57d49..b3c13533a 100644
--- a/docs/source/markdown/podman-pod-create.1.md.in
+++ b/docs/source/markdown/podman-pod-create.1.md.in
@@ -101,14 +101,7 @@ The custom image that will be used for the infra container. Unless specified, P
@@option ip
-#### **--ip6**=*ipv6*
-
-Specify a static IPv6 address for the pod, for example **fd46:db93:aa76:ac37::10**.
-This option can only be used if the pod is joined to only a single network - i.e., **--network=network-name** is used at most once -
-and if the pod is not joining another container's network namespace via **--network=container:_id_**.
-The address must be within the network's IPv6 address pool.
-
-To specify multiple static IPv6 addresses per pod, set multiple networks using the **--network** option with a static IPv6 address specified for each using the `ip6` mode for that option.
+@@option ip6
@@option label
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in
index 1369b8963..d9dcd60f9 100644
--- a/docs/source/markdown/podman-run.1.md.in
+++ b/docs/source/markdown/podman-run.1.md.in
@@ -251,14 +251,7 @@ When set to **true**, keep stdin open even if not attached. The default is **fal
@@option ip
-#### **--ip6**=*ipv6*
-
-Specify a static IPv6 address for the container, for example **fd46:db93:aa76:ac37::10**.
-This option can only be used if the container is joined to only a single network - i.e., **--network=network-name** is used at most once -
-and if the container is not joining another container's network namespace via **--network=container:_id_**.
-The address must be within the network's IPv6 address pool.
-
-To specify multiple static IPv6 addresses per container, set multiple networks using the **--network** option with a static IPv6 address specified for each using the `ip6` mode for that option.
+@@option ip6
@@option ipc