diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/configuration.rb | 4 | ||||
| -rwxr-xr-x | lib/puppet/network/handler/report.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions.rb | 10 | ||||
| -rw-r--r-- | lib/puppet/reports/rrdgraph.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/reports/tagmail.rb | 4 |
5 files changed, 14 insertions, 10 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb index 67c772eac..f711ce3ec 100644 --- a/lib/puppet/configuration.rb +++ b/lib/puppet/configuration.rb @@ -18,7 +18,7 @@ module Puppet :confdir => [conf, "The main Puppet configuration directory."], :vardir => [var, "Where Puppet stores dynamic and growing data."], :name => [name, "The name of the service, if we are running as one. The - default is essentially $0 without the path or '.rb'."] + default is essentially $0 without the path or ``.rb``."] ) if name == "puppetmasterd" @@ -208,7 +208,7 @@ module Puppet :puppetport => [8139, "Which port puppetd listens on."], :noop => [false, "Whether puppetd should be run in noop mode."], :runinterval => [1800, # 30 minutes - "How often puppetd applies the client configuration; in seconds"], + "How often puppetd applies the client configuration; in seconds."], :listen => [false, "Whether puppetd should listen for connections. If this is true, then by default only the ``runner`` server is started, which allows remote authorized diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb index 77e31f04a..574970fc4 100755 --- a/lib/puppet/network/handler/report.rb +++ b/lib/puppet/network/handler/report.rb @@ -68,7 +68,7 @@ class Puppet::Network::Handler # Use this method so they all get loaded reports.sort { |a,b| a.to_s <=> b.to_s }.each do |name| mod = self.report(name) - docs += "## %s\n\n" % name + docs += "%s\n%s\n" % [name, "-" * name.to_s.length] docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n" end diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 21de7b6c0..c3208c4c9 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -75,13 +75,15 @@ module Functions ret = "" @functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash| - ret += "* **%s** (*%s*)" % [name, hash[:type]] + #ret += "%s\n%s\n" % [name, hash[:type]] + ret += "%s\n%s\n" % [name, "-" * name.to_s.length] if hash[:doc] - ret += ": " + hash[:doc].gsub(/\n\s*/, ' ') + ret += hash[:doc].gsub(/\n\s*/, ' ') else - ret += ": ``undocumented``" + ret += "Undocumented.\n" end - ret += "\n\n" + + ret += "\n\n- **Type**: %s\n\n" % hash[:type] end return ret diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index ce8414191..5371f8247 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -3,7 +3,9 @@ require 'puppet' Puppet::Network::Handler.report.newreport(:rrdgraph) do desc "Graph all available data about hosts using the RRD library. You must have the RRD binary ruby library installed to use this report, which - you can get from [Tobias Oetiker's site](http://oss.oetiker.ch/rrdtool/pub/contrib/). + you can get from `Tobias Oetiker's site`_. + + .. _tobias oetiker's site: http://oss.oetiker.ch/rrdtool/pub/contrib/ This report will create, manage, and graph RRD database files for each of the metrics generated during transactions, and it will create a diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index ba327bc85..c2225bf7d 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -6,7 +6,7 @@ require 'net/smtp' Puppet::Network::Handler.report.newreport(:tagmail) do desc "This report sends specific log messages to specific email addresses based on the tags in the log messages. See the - [tag documentation](/trac/puppet/wiki/UsingTags) for more information + `UsingTags tag documentation`:trac: for more information on tags. To use this report, you must create a ``tagmail.conf`` (in the location @@ -21,7 +21,7 @@ Puppet::Network::Handler.report.newreport(:tagmail) do Lastly, there is an ``all`` tag that will always match all log messages. - Here is an example tagmail.conf: + Here is an example tagmail.conf:: all: me@domain.com webserver, !mailserver: httpadmins@domain.com |