summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-21 13:16:05 -0400
committerGitHub <noreply@github.com>2020-07-21 13:16:05 -0400
commit5abf33de326f27e7ebcd04d6a789693a42ae249b (patch)
treee5e3e1e38d0d6d392a279bf0f73927e3ed8e6e14 /docs
parentbe5219ab9529c596421dd19bb61cdd2ced267ece (diff)
parent111a1fe082ba50c5aa81f3a46a407fb2d6412b91 (diff)
downloadpodman-5abf33de326f27e7ebcd04d6a789693a42ae249b.tar.gz
podman-5abf33de326f27e7ebcd04d6a789693a42ae249b.tar.bz2
podman-5abf33de326f27e7ebcd04d6a789693a42ae249b.zip
Merge pull request #7028 from xordspar0/patch-1
docs: Fix formatting mistake
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-create.1.md13
-rw-r--r--docs/source/markdown/podman-run.1.md3
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index a422dd184..94d2628b2 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -1120,14 +1120,13 @@ required for VPN, without it containers need to be run with the --network=host f
Environment variables within containers can be set using multiple different options: This section describes the precedence.
-Precedence Order:
- **--env-host** : Host environment of the process executing Podman is added.
+Precedence order (later entries override earlier entries):
- Container image : Any environment variables specified in the container image.
-
- **--env-file** : Any environment variables specified via env-files. If multiple files specified, then they override each other in order of entry.
-
- **--env** : Any environment variables specified will override previous settings.
+- **--env-host** : Host environment of the process executing Podman is added.
+- **--http-proxy**: By default, several environment variables will be passed in from the host, such as **http_proxy** and **no_proxy**. See **--http-proxy** for details.
+- Container image : Any environment variables specified in the container image.
+- **--env-file** : Any environment variables specified via env-files. If multiple files specified, then they override each other in order of entry.
+- **--env** : Any environment variables specified will override previous settings.
Create containers and set the environment ending with a __*__ and a *****
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index a7fd5a7eb..b565cdfab 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -1399,9 +1399,10 @@ required for VPN, without it containers need to be run with the **--network=host
## ENVIRONMENT
Environment variables within containers can be set using multiple different options,
-in the following order of precedence:
+in the following order of precedence (later entries override earlier entries):
- **--env-host**: Host environment of the process executing Podman is added.
+- **--http-proxy**: By default, several environment variables will be passed in from the host, such as **http_proxy** and **no_proxy**. See **--http-proxy** for details.
- Container image: Any environment variables specified in the container image.
- **--env-file**: Any environment variables specified via env-files. If multiple files specified, then they override each other in order of entry.
- **--env**: Any environment variables specified will override previous settings.