diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-28 04:16:59 +0100 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-28 04:16:59 +0100 |
| commit | c7cd7ecc3b35351de615e369d7d1b91651427bf2 (patch) | |
| tree | e3128361563f19e204b378f700a13fc8e28252c6 | |
| parent | 1e6ba6f9ff74bc1204c59457911621a3ad12e8ae (diff) | |
| download | puppet-c7cd7ecc3b35351de615e369d7d1b91651427bf2.tar.gz puppet-c7cd7ecc3b35351de615e369d7d1b91651427bf2.tar.xz puppet-c7cd7ecc3b35351de615e369d7d1b91651427bf2.zip | |
Fixing the markup on the pkgdmg provider so it is a bit better
| -rw-r--r-- | lib/puppet/provider/package/pkgdmg.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/reference/configuration.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/util/reference.rb | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index c280b6194..b7601cde9 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -76,10 +76,6 @@ file into a temporary directory. If no URL is present, the provider skips straight to step 2. In step two, the source file is mounted, then packages installed, and finally the DMG file is removed. -WARNING: Because I assume files will be downloaded to /tmp, the current -implementation attempts to delete DMG files if you install directly from the -file system and not via a URL method. - If this is a problem for you, please patch the code, or bug Jeff to fix this. Example usage:: @@ -88,6 +84,10 @@ Example usage:: provider => pkgdmg, ensure => present source => 'http://0.0.0.0:8000/packages/Thunderbird-2.0.0.4-1.pkg.dmg', } + +**WARNING**: Because I assume files will be downloaded to /tmp, the current +implementation attempts to delete DMG files if you install directly from the +file system and not via a URL method. " diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index c37b2e7dd..2c424e098 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -29,7 +29,9 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc elsif name.to_s == "confdir" val = "/etc/puppet" end - str += "- **Section**: %s\n" % object.section + + # Leave out the section information; it was apparently confusing people. + #str += "- **Section**: %s\n" % object.section unless val == "" str += "- **Default**: %s\n" % val end diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb index b2186ab64..40e49f45f 100644 --- a/lib/puppet/util/reference.rb +++ b/lib/puppet/util/reference.rb @@ -143,7 +143,7 @@ class Puppet::Util::Reference def to_rest(withcontents = true) # First the header text = h(@title, 1) - text += "\n\n**This page is autogenerated; any changes will get overwritten**\n\n" + text += "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n" if withcontents text += ".. contents:: :depth: %s\n\n" % @depth end |