haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7239 from nickbyfleet/master 

Fixed typo: incorrect key name for environment_path option.
This commit is contained in:
Seth Vargo 2016-04-18 15:13:56 +05:30
parent 2c553290b8 cdb62d7977
commit e04bce8607
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/provisioning/puppet_apply.html.md
View File

@ -72,7 +72,7 @@ available below this section.
directory when Puppet is executed. This is usually only set because relative directory when Puppet is executed. This is usually only set because relative
paths are used in the Hiera configuration. paths are used in the Hiera configuration.
~> If only `environment` and `environments_path` are specified, it will parse ~> If only `environment` and `environment_path` are specified, it will parse
and use the manifest specified in the `environment.conf` file. If and use the manifest specified in the `environment.conf` file. If
`manifests_path` and `manifest_file` is specified along with the environment `manifests_path` and `manifest_file` is specified along with the environment
options, the manifest from the environment will be overridden by the specified `manifest_file`. If `manifests_path` and `manifest_file` are specified without options, the manifest from the environment will be overridden by the specified `manifest_file`. If `manifests_path` and `manifest_file` are specified without