Merge pull request #9343 from hrvoj3e/patch-1

spelling fix - resoled to resolved
This commit is contained in:
Brian Cain 2018-01-08 08:21:11 -08:00 committed by GitHub
commit 4eefd94a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -164,7 +164,7 @@ The default manifest is the environment's `manifests` directory.
If the environment has an `environment.conf` the manifest path is parsed If the environment has an `environment.conf` the manifest path is parsed
from there. Relative paths are assumed to be relative to the directory of from there. Relative paths are assumed to be relative to the directory of
the environment. If the manifest setting in `environment.conf` use the environment. If the manifest setting in `environment.conf` use
the Puppet variables `$codedir` or `$environment` they are resoled to the Puppet variables `$codedir` or `$environment` they are resolved to
the parent directory of `environment_path` and `environment` respectively. the parent directory of `environment_path` and `environment` respectively.
## Modules ## Modules