Merge branch 'master' into redundant-nil-check-slice

This commit is contained in:
Audrius Butkevicius 2019-06-28 07:55:04 +01:00 committed by GitHub
commit da581b24e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -670,7 +670,7 @@ func main() {
```
Note that default values set from file (e.g. `FilePath`) take precedence over
default values set from the enviornment (e.g. `EnvVar`).
default values set from the environment (e.g. `EnvVar`).
#### Values from alternate input sources (YAML, TOML, and others)