summaryrefslogtreecommitdiffstats
path: root/lib/puppet/reference
diff options
context:
space:
mode:
authorIan Taylor <ian@lorf.org>2009-06-05 12:39:04 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-06-06 09:12:00 +1000
commit4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch)
tree126540beec3c65448e01e1b48d27275ec4ee6ea4 /lib/puppet/reference
parent97e6975d69f239e24993315a25a3117b1daa48c3 (diff)
downloadpuppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz
puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz
puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip
Removed extra whitespace from end of lines
Diffstat (limited to 'lib/puppet/reference')
-rw-r--r--lib/puppet/reference/configuration.rb28
-rw-r--r--lib/puppet/reference/function.rb2
-rw-r--r--lib/puppet/reference/metaparameter.rb10
-rw-r--r--lib/puppet/reference/providers.rb2
-rw-r--r--lib/puppet/reference/type.rb2
5 files changed, 22 insertions, 22 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index 6c40c86ba..60cbb8639 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -53,20 +53,20 @@ the parameters below, but not all of the arguments make sense for every executab
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.
-These parameters can be supplied to the executables either as command-line
+These parameters can be supplied to the executables either as command-line
options or in the configuration file. For instance, the command-line
invocation below would set the configuration directory to ``/private/puppet``::
-
+
$ puppetd --confdir=/private/puppet
-
+
Note that boolean options are turned on and off with a slightly different
syntax on the command line::
$ puppetd --storeconfigs
-
+
$ puppetd --no-storeconfigs
-The invocations above will enable and disable, respectively, the storage of
+The invocations above will enable and disable, respectively, the storage of
the client configuration.
Configuration Files
@@ -95,7 +95,7 @@ The file follows INI-style formatting. Here is an example of a very simple
[main]
confdir = /private/puppet
storeconfigs = true
-
+
Note that boolean parameters must be explicitly specified as `true` or
`false` as seen above.
@@ -112,13 +112,13 @@ will print a template configuration to standard output, which can be
redirected to a file like so::
$ puppetd --genconfig > /etc/puppet/puppet.conf
-
+
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.
Like the `--genconfig` argument, the executables also accept a `--genmanifest`
-argument, which will generate a manifest that can be used to manage all of
+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
likewise be redirected to a file::
@@ -128,16 +128,16 @@ Puppet can also create user and group accounts for itself (one `puppet` group
and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument::
$ puppetd --mkusers
-
+
Signals
-------
-The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special
-handling. Both daemons catch (``SIGHUP``), which forces the server to restart
-tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut
+The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special
+handling. Both daemons catch (``SIGHUP``), which forces the server to restart
+tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut
down the server, whether it be an instance of ``puppetd`` or ``puppetmasterd``.
-Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to
-immediately begin a new configuration transaction with the server. This
+Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to
+immediately begin a new configuration transaction with the server. This
signal has no effect on ``puppetmasterd``.
Configuration Parameter Reference
diff --git a/lib/puppet/reference/function.rb b/lib/puppet/reference/function.rb
index 5c62c88d5..0dc2f7967 100644
--- a/lib/puppet/reference/function.rb
+++ b/lib/puppet/reference/function.rb
@@ -6,7 +6,7 @@ There are two types of functions in Puppet: Statements and rvalues.
Statements stand on their own and do not return arguments; they are used for
performing stand-alone work like importing. Rvalues return values and can
only be used in a statement requiring a value, such as an assignment or a case
-statement.
+statement.
Here are the functions available in Puppet:
diff --git a/lib/puppet/reference/metaparameter.rb b/lib/puppet/reference/metaparameter.rb
index 45e5ea4e6..2d24a4209 100644
--- a/lib/puppet/reference/metaparameter.rb
+++ b/lib/puppet/reference/metaparameter.rb
@@ -6,7 +6,7 @@ metaparameter = Puppet::Util::Reference.newreference :metaparameter, :doc => "Al
next if type.name == :puppet
next if type.name == :component
types[type.name] = type
- }
+ }
str = %{
Metaparameters
@@ -23,7 +23,7 @@ Available Metaparameters
params = []
Puppet::Type.eachmetaparam { |param|
params << param
- }
+ }
params.sort { |a,b|
a.to_s <=> b.to_s
@@ -37,12 +37,12 @@ Available Metaparameters
#puts "</dd>"
#puts ""
- }
+ }
rescue => detail
puts detail.backtrace
puts "incorrect metaparams: %s" % detail
exit(1)
end
-
- str
+
+ str
end
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index f9f83a0fc..d425d803e 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -80,7 +80,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
end
end
notes << details
-
+
count += 1
end
diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb
index c80b17b0a..6f8d480c6 100644
--- a/lib/puppet/reference/type.rb
+++ b/lib/puppet/reference/type.rb
@@ -17,7 +17,7 @@ Resource Types
This is the parameter that gets assigned when a string is provided before
the colon in a type declaration. In general, only developers will need to
worry about which parameter is the ``namevar``.
-
+
In the following code::
file { "/etc/passwd":