diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-31 09:28:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:28:41 -0400 |
| commit | b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b (patch) | |
| tree | f120dd0db970fc02235bf7a92a9fdea9258e84e6 /docs | |
| parent | eea6bd1cf45746e754e2cceb76f8eb638bcad718 (diff) | |
| parent | c95d2856f86cd8d85284e0b5adf2dd221173c268 (diff) | |
| download | podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.gz podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.bz2 podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.zip | |
Merge pull request #7166 from vrothberg/2.0-backports
2.0 backports
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman.1.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index 790153ac2..01a054ff4 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -214,7 +214,6 @@ the exit codes follow the `chroot` standard, see below: ## FILES **containers.conf** (`/usr/share/containers/containers.conf`) - Podman has builtin defaults for command line options. These defaults can be overridden using the containers.conf configuration files. Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the specified fields from these files, if they exist. Fields specified in the users file override the administrator's file, which overrides the distribution's file, which override the built-in defaults. |