diff options
author | Luke Kanies <luke@madstop.com> | 2008-10-21 19:28:21 +0200 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-10-21 19:28:21 +0200 |
commit | b7d72360f66e36d897cfd4436236a3607a6de5b7 (patch) | |
tree | f0e7be01442451f10574e9499268c2012be81988 /lib/puppet/reference/configuration.rb | |
parent | fe789798cc0ccdc54b3a28d48bf206c9fc187085 (diff) | |
parent | 6d05cbc1e1a22d4316e18fb22d5cff9c7a42d3cf (diff) | |
download | puppet-b7d72360f66e36d897cfd4436236a3607a6de5b7.tar.gz puppet-b7d72360f66e36d897cfd4436236a3607a6de5b7.tar.xz puppet-b7d72360f66e36d897cfd4436236a3607a6de5b7.zip |
Merge branch '0.24.x' of git://github.com/jamtur01/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/reference/configuration.rb')
-rw-r--r-- | lib/puppet/reference/configuration.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 2c424e098..8e82c8adf 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -49,10 +49,6 @@ On The Command-Line +++++++++++++++++++ Every Puppet executable (with the exception of ``puppetdoc``) accepts all of the parameters below, but not all of the arguments make sense for every executable. -Each parameter has a section listed with it in parentheses; often, that section -will map to an executable (e.g., ``puppetd``), in which case it probably only -makes sense for that one executable. If ``main`` is listed as the section, -it is most likely an option that is valid for everyone. I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not. @@ -121,9 +117,6 @@ Note that this invocation will replace the contents of any pre-existing `puppet.conf` file, so make a backup of your present config if it contains valuable information. -All parameters will be under a single section heading matching the name of -the process used to generate the configuraiton ('puppetd', in this case). - Like the `--genconfig` argument, the executables also accept a `--genmanifest` argument, which will generate a manifest that can be used to manage all of Puppet's directories and files and prints it to standard output. This can |