From 5b0c43b130c9496eb90d2701f27224936ef113b3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 19 Jul 2020 07:20:03 -0400 Subject: [PATCH] Update docs/source/markdown/podman.1.md Co-authored-by: Tom Sweeney --- docs/source/markdown/podman.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index 3dd83721bfe0..a35ad7d0a343 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -221,7 +221,7 @@ the exit codes follow the `chroot` standard, see below: Podman has builtin defaults for command line options. These defualts can be overridden using the containers.conf configuration files. -Distributions ship the `/usr/share/containers/containers.conf` file with their defaults. 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 it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution files, which override the builtin defaults. +Distributions ship the `/usr/share/containers/containers.conf` file with the default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify the defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the fields from these files, if they exist. Fields specified in the user's file override the administrator's file, which overrides the distribution's file, which override the built-in defaults. Podman uses builtin defaults if no containers.conf file is found.