Merge branch 'master' into patch-1

2019-08-03 13:25:34 +01:00
parent 3e145076ab 1169906f57
commit b2421d1235
12 changed files with 466 additions and 20 deletions
--- a/README.md
+++ b/README.md
@@ -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)

@@ -875,7 +875,7 @@ Will include:

 ```
 COMMANDS:
-    noop
+  noop

  Template actions:
    add