diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-25 15:58:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 15:58:25 +0200 |
| commit | a01cb220c8389adaeaa8fb2b4c4fbd65e77c0529 (patch) | |
| tree | 40fab4368adf369e87640c644f92fac5951ce4bf | |
| parent | 77c7a28a7213344e1ce56b5bc7c95b46805c9d9b (diff) | |
| parent | e4566cc2166c6a723c1c4fc868f898d705e1d064 (diff) | |
| download | podman-a01cb220c8389adaeaa8fb2b4c4fbd65e77c0529.tar.gz podman-a01cb220c8389adaeaa8fb2b4c4fbd65e77c0529.tar.bz2 podman-a01cb220c8389adaeaa8fb2b4c4fbd65e77c0529.zip | |
Merge pull request #4342 from sshnaidm/docs_net
Add multiple networks explanation to docs
| -rw-r--r-- | docs/podman-create.1.md | 2 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 626ed9f64..8b2218227 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -519,7 +519,7 @@ Set the Network mode for the container. Invalid if using **--dns**, **--dns-opti 'none': no networking 'container:<name|id>': reuse another container's network stack 'host': use the Podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure. - '<network-name>|<network-id>': connect to a user-defined network + '<network-name>|<network-id>': connect to a user-defined network, multiple networks should be comma separated 'ns:<path>': path to a network namespace to join 'slirp4netns': use slirp4netns to create a user network stack. This is the default for rootless containers diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 9a92aba82..d2e9ffeac 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -530,7 +530,7 @@ Set the Network mode for the container. Invalid if using **--dns**, **--dns-opti - `none`: no networking - `container:<name|id>`: reuse another container's network stack - `host`: use the Podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure. -- `<network-name>|<network-id>`: connect to a user-defined network +- `<network-name>|<network-id>`: connect to a user-defined network, multiple networks should be comma separated - `ns:<path>`: path to a network namespace to join - `slirp4netns`: use slirp4netns to create a user network stack. This is the default for rootless containers |