diff --git a/CHANGELOG b/CHANGELOG
index 421b5136b..d7861e04c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5930 +1,5969 @@
+2.6.1rc2
+========
+252c9b8  Further RST to Markdown fixes for types, values, tests
+1157e8d  Updated all types to Markdown output
+fef8800  Updated reference output to generate valid Markdown
+79e0a2e  Reformatting documentation from RST to MarkDown (#4509) Signed-off-by: Jes Fraser <jes@gadget.geek.nz>
+62435e5  Rewrote functions documentation to Markdown
+e4b2aa6  Removed legacy Trac code
+8ddea2a  Maint.  Passenger fix broke a test
+f43e87b  Fix for #4476 -- rails calling yaml internals
+a23d80a  Fixes #4485 -- single quoted strings should not treat \n as new line
+8e31b52  Passenger needs HTTP headers values to be string
+037bb32  [#4404] Remove requirement for source on Parser::Resource::Param
+0e4bc62  [#4364] Fix failing spec due to incorrect loglevel
+3a6ca54  Fix #4458 - Do not dump the whole environment when instances can't be found
+d909827  Fix for #4465 -- earlier "feature" patch broke ldap
+47005aa  Maint -- tests need to respect RFC-952
+6aac8f0  [#4467] Make Puppet Master respect facts_terminus settings
+1cba9a7  added md5 support as requested in http://serverfault.com/questions/166199/puppet-md5-sum-of-string
+1dfd2b6  [#4381] extlookup shouldn't trigger reparses of .pp files
+be2b1f3  [#4370] Fixes extlookup precedence getting overwritten between runs
+03808fd  Fixed #4364 - Reduced audit msg from info to debug
+539b57c  [#4347] run_mode was colliding with --mode for "puppet doc"
+1faebdd  [#4423] repair parameterized class instantiation
+37568bd  [#4423] class { shouldn't get stored on the namespace stack
+449315a  [#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the AST resources.
+daa801b  [#4344] Temporary fix to stop agent from importing modules
+00ebf01  [#4344] Fix for failing templates when module name matches file in local dir.
+e32320e  [#4336] "reportdir" was in the wrong section
+0f9672a  Fixed #4311 - Typo in defaults.rb
+f54d843  Fix #4461 - attempt to fix another performance issue
+2c21fae  Fix for #4300 Solaris svc files need new pid filenames
+83c2419  [#4284] Fix failing specs run as root due to missing puppet group
+8237f68  [#4242] Fixed (removed) a broken unit test
+d5ad0fb  Removed eventual documentation line ... eventually came
+871e6fd  Fixed #4368 - Updated clean stored configs ext script for new config sections
+cb64477  Updated version to 2.6.1
+
 2.6.1rc1
 ========
+ecf44e4  Updated CHANGELOG for 2.6.1rc1
 bdfcac5  Update Red Hat spec file for 2.6.0
 9f08e7c  Feature: puppet-load - a tool to stress-test master compilation
 ef9a4a6  Fix #4245 - default insertion of ACL is not thread safe
 4065e81  Fix race condition in rack autoloading of request/response
 3163932  Fix #4244 - Cached Attributes is not thread safe
 7d42f77  JRuby doesn't implement Process.maxgroups
 760e418  Fix #4349 - Parsing with ignoreimport=true was always loading site.pp
 67bdf89  Fix #4348 - Puppet doc single manifest broken
 13c71b9  extlookup() is a builtin
 d38e522  [#4333] old optparse doesn't support default_argv=
 86b0882  Fixed #4326 - Updated SUSE packaging
 03313b8  Fix #4319 - source file url sent to the master is invalid
 ac3a0d2  vim: highlight default parameters in definition/classes
 be2141a  vim: match collected resources.
 c047c8d  vim: added elsif
 9569136  Fix for 4314 -- Need to allow '-' in class name for refs
 636079f  Fixed #4304 - Changed logging level for auto import message
 000fd1e  Fix for #4303 -- reverting to old escaping in '-strings
 1d494a3  Tweak to fix for #4302--dangling ref to known_resource_types
 2383050  Fix #4302 - Compilation speed regression compared to 2.6
 63ec207  Minimal fix for #4297, with notes for follow-up
 7ad7eb1  Fix #4286 - rename puppetdoc global module <site> to __site__
 28bb195  Fixed yumrepo type deprecation wanring `
 067a46d  Temporary tweak to tests for #4242
 9778f2a  [#4242] Fixed recursion due to parents including their children
 59a23d6  Fix for #3382 -- Empty classes as graph placeholders
 865282a  Fixed example config.ru
 a0a63c3  Fixed network and indirection reference
 64386cf  Fixed Indirection reference
 
 2.6.0
 =====
 db0b30d  Updated CHANGELOG for 2.6.0
 42a475e  Fixing #4268 - manifests always imported
 06fc40c  [#4269] Undef variables interpolate to empty string
 1288f8c  [#4270] Force inherited classes to load into the correct environment
 539d716  [#4287] Fix the undefined evaluate_match error when comparing functions
 d2da1d4  Tweak to tweak to fix for #4233 -- ":" is valid in type names
 bbc07f2  Bandaid for #4285 -- :name vs <namevar>
 40e6f02  Tweak to fix for #4233 -- only accept word chars in types
 
 2.6.0rc4
 ========
 d87a2e3  Updated CHANGELOG for 2.6.0RC4
 cf597d7  [#4233] Ruby regexps are not multiline by default, but Resource titles can be multiline
 d6cbb21  Fix for #4234 -- ruby DSL fails on second resource
 4822de3  Fix for #4236 -- Only interpolate $ if followed by a variable
 b509032  Fix #4238 - if should match undef as ''
 8c8c146  Minimal fix for #4243 -- import isn't thread safe
 d319da4  [#4247] storeconfigs was calling Puppet::Parser::Resource.new with the wrong arguments
 9f91540  [#4256] External nodes parameters can now be assigned to nodes
 680dd1a  Fix for #4257 -- problems resolving ::-prefixed classes
 6e07a19  Fix #4262 - Puppetmaster used to log compilation time
 5b68afe  Fix for #4255 -- misleading diagnostic message
 dd03ac9  Partial fix for #4278 -- the performance aspects
 4ce33fd  Fixed #4249 - Updated SUSE packaging specifications
 91185c6  New man pages for 2.6.0
 1cda7c5  Fixes errant Trac references in documentation
 
 2.6.0rc3
 ========
 f60b6a0  Updated CHANGELOG for 2.6.0rc3
 9df87e9  [#4219] Install misses command_line dir, puppet $app --help fails
 0422852  conf/redhat: Consistently pass pidfile option to daemon, killproc, and status
 63bf037  conf/redhat: Update conf/init files for single binary
 f72741f  conf/redhat: Rebase rundir-perms patch
 793d7b7  [#4213] -o option for setting onetime now works properly
 2edf7fe  [#3656] Serializing arrays of references
 27d5a47  [#4215] Have rundir depend on vardir
 06cc552  Fix for #4220 -- modules not implicitly loading their init files
 
 2.6.0rc2
 ========
 8747479  Updated CHANGELOG for 2.6.0rc2
 fa74020  [#4209] catalog.resources should return resources
 f5f9a38  Fix for #4210 -- missing require in CA
 1c3e844  Minimal fix for #4205 -- incorrect Import loop messages
 99d8323  Fix #4206 - import "path/*" tries to import files twice
 a2115af  Alt fix for #4207 -- serialize environments as their names
 fe4dcd8  [#4208] Missing parameter breaks multithread compilation
 
 2.6.0rc1
 ========
 e028310  Updated CHANGELOG for 2.6.0rc1
 3180b9d  Code smell: Two space indentation
 5432259  Code smell: Avoid needless decorations
 8f15707  Code smell: Don't restate results directly after assignment
 c3e2353  Code smell: Use &&= for dependent initialization
 42a5390  Code smell: Use ||= for conditional initialization
 a07bbe2  Code smell: Omit needless checks on defined
 07b15bf  Code smell: Avoid unneeded blocks
 8d1fbe4  Code smell: Avoid explicit returns
 889158a  Code smell: Booleans are first class values.
 81e283b  Code smell: Line modifiers are preferred to one-line blocks.
 e8cf063  Code smell: Use string interpolation
 eefccf2  Code smell: English names for special globals rather than line-noise
 184132e  Code smell: Use {} for % notation delimiters wherever practical
 9ee56f2  Code smell: Inconsistent indentation and related formatting issues
 051bd98  Code smell: Miscellaneous oddity removal
 77f8599  Code smell: Win32 --> MS_windows
 3fbc1d5  Updated GPG rake signing task for new Puppet Labs key
 94fa5d5  [#4182] show_diff was broken for streamed file contents
 7009704  Fix for #4117 "Storing newly-audited value" messages
 9cf9788  Manifests with variables were broken when read from STDIN to puppet apply
 835f73c  Use the name in the search path for looking for metadata
 5bab997  maint:rename resource_type to define in internal dsl
 654b564  [#4198] Require 'fileutils' everywhere FileUtils is used
 a07af2b  [#4196] Move the docs into the source directory structure
 3c00591  Fix for #4178 - generalize autoloading to include .rb
 cea2e5b  [#3582] Remove assumption that Puppet.settings would return values of a consistent type
 c58e420  [#4180] Support legacy module structure
 b4593f2  Update RDoc parser to reflect change of custom plugin and fact locations
 dda165a  Fixed #4180 - Updated old module structure to match correct default
 1715f3a  [#2730] mount ensure present shouldn't unmount
 a282cc3  Fixed subscribe example
 2353115  Fix for environments in startup script. - Dropped the forced --manifest switch in the   suse startup script to allow for environments   to re-define this. Otherwise, environments will   not work as puppet override configuration with   command line arguments.
 cfca62b  Redmine: 2474 - Fix for mount fstype documentation
 3ff38df  Fix for #4137 -- Oracle needs text for strings > 255
 62dbae5  Fix for #2807 Puppet settings available as variables
 a5fc364  [#4161] RDoc fails to parse some of our ruby syntax
 b7e2580  [#3169] Adds more debugging to SSL cert verification
 70af43f  Fix for #4167 -- overriding file permissions in conf file
 2c88884  [#4114] Fixes test failures caused by previous 4114 fixes
 4a6428b  saving work for my unit tests. The redhat one still fails...
 1e0d922  [4123] - allows self.instances to correctly report state of services.
 8d3ced5  created init provider method self.get_services which accepts an array of filenames to exclude when processing defpath.
 cdd4382  [#4114] Fix failures in the unit tests
 e419293  [#4114] Added queueing to the log
 4b00c6a  [#4110] Wrap Type#retrieve calls for backwards compatibility
 5f8a242  Fix for #4120 No namevar running puppet doc -r type
 6ac36eb  [#2370] Allow OpenBSD to add packages with versions and flavors
 45a9f37  [#4108] Changed missing Application constant error
 a0ea74b  [#4149] Don't create two Resource::TypeCollections
 7978be5  [#3906] Fixed missing constant Puppet::Rails when using storeconfigs
 fb6f2aa  [#4136] Specs should listen on localhost
 6d4be90  [#3961] Part two: --destroy should also be local
 0598f35  Fix for #4148 (2.6 is greater than 0.25.x)
 5971898  Fix for #4142 stray use of JSON instead of PSON
 74e5bdc  [#3172] Fix the arguments to Application::Kick.new, which I had broken
 4f06e9e  Maint: Explicitly put test sqlite files in a temp directory
 84a9412  maint: fix stub failure in report_spec.rb
 1f48d68  maint: fix stub failures in report_spec.rb
 bee843a  maint: fix stubbing in package_spec.rb
 528b915  maint: fix stubs in transaction_spec.rb
 37277a5  maint: fix stubbing in catalog_spec.rb
 ea55e83  Maint: Improve the speed of setting settings.
 7c7f6da  maint: file_spec heisenbugs
 d6d726b  Heisenbug: settings as catalog trying to create directories
 e579aab  maint: spec_helper should reset settings directories on *every* test
 298a764  maint: Remove a heisentest that wasn't testing what it claimed
 b389392  maint: spec_helper should only get loaded once
 3304068  maint: :mutable_defaults to improve spec consistency
 08b49c6  [#4090] Fix the run_mode for certs and put tests on the applications to assert their run_mode
 e318db6  [#4059] fix the specs to correctly mock the Puppet::Resource.new call signature
 ab3d27c  [#4059] Minor errors preventing ralsh from running
 59bf5e4  [#2713] Enable ELSIF
 ebd0311  [#3172] puppet kick can take hostnames as bare arguments
 697508d  [#4108] Missing constants fail deliberately and with a message
 2639a56  [#4092] Changed notify message to defined instead of changed
 223157d  Fix for #4091 -- require loop in executables
 174e02a  [#4090] Change how RunMode instances are created so that an object for each RunMode is only created once instead of every time it's called
 62e3b61  [#4090] Fix last few tests and renames of mode to run_mode
 2a25883  [#4090] Git rid of the idea that run_mode is a configurable option with defaults
 75e0662  [#4090] Rename mode (:master, :agent, :user) to run_mode
 3cd48d8  [#4089] Replace internal usage of :check with :audit
 e848d41  [#3961] puppet cert --generate implies ca_location = :local
 255628e  [#3961] Rename cert's @mode to @cert_mode to reduce confusion
 b2bd05d  maint:  Confine a test that depends on sqlite
 fdc8c35  [#3994-part 3] rename spec tests from *_spec_spec to *_spec.rb
 9a94ee2  Fix for test ordering sporadic failure
 9ceb454  [#3994-part 2] rename integration tests to *_spec.rb
 06dffc1  maint: A test specified that a file wasn't writeable, but was writeable when run as root, which caused the test to fail.  Changing the test so that a directory is in place of the writeable file so not even root can write to it.
 2baf74e  maint: Fixes some noisy specs
 0aae5a7  maint: Fixing tests that fail when run as root
 0fa10a6  Cleaning up various warnings in specs
 2ab123f  Removing obsolete nodescope concept
 153d7cd  Fix #3665 - part 2, node inheritance fixes
 dd4fa66  Fix failing tests in spec/unit/resources/type.rb
 770a8ea  Fix #3665 - main class shouldn't be a subscope of itself
 76953d8  maint: Fixes broken order-dependent Tidy specs
 9afc67a  Fix for pre 1.8.7 compatibility in namvar patch
 d62a391  Breaking require-loop
 b4af238  Fix for #3985 typo causing warning
 9169ef0  Fix: puppet apply trying to use XMLRPC constant
 af41beb  Remove an old test that had been unintentionally reintroduced by a mistake in a conflict resolution
 6a8e6fe  Tweak an old test due to new error handling.
 5f53bfa  Restore error handling for value=
 e817ad1  Fix tests broken by level-violation fix
 e5478d4  Simplify the newattr method by removing a level violation
 4ef40b8  maint: Rework testing of Reports http processor to be self contained
 edfcbf9  [#3139] Fixed a problem with the value method for parameters
 61e978b  [#3139] Fixed a broken integration spec in type tidy
 cf9bcad  maint: Fixing test to reflect that host environment assignment now takes an object instead of a string
 c70c96b  Fix some tests broken by changing the call to newattr
 a72fb14  Fixing oversensitive test
 15004f3  maint: Fix failing test that needed more methods stubbed
 60932e1  Fixed require warning documentation
 6fcb87d  Fixed mcx documentation error
 15ae389  Documentation fixes
 f95169b  [#4006] Fix test failures caused by reverting ticket 2890
 b5572ae  Bug 3731. Applied Fix suggested by Doug Warner to always flatten out the array
 117e6b6  maint: Have 'rake spec' output in color
 a7e4fe8  [#3810] Do not create a reports settings block
 db44a32  Tweak for fix for #1175 to fix test failures
 3bd6f11  maint: Fixing a test typo s/stub/stubs/
 ebc3e78  maint: Fixing a failing spec by stubbing a method on a stubbed object that should have been stubbed.
 3b4d33c  remove tests for removed code
 c8089f1  [#2646] Fixes the change to onetime made in b96cd6c
 4bf6950  [#3139] Make newattr idempotent
 51b70c0  [#3994] rename the specs to have _spec.rb at the end
 9958c80  [#4064]  Modify the Rails spec to use the block form of confine
 af8bd77  [#4064]  Modify confine to also allow a message and a block containing the test.
 182c003  Fixing #3988 - adding support for watchr
 3a44f0e  Fix #3932 - Add --charset to puppetdoc for RDoc mode
 fb5c1d7  Fix #3907 - Hash couldn't be initialized with an empty hash
 9592dd8  Fix #3871 - Add the 'in' operator
 3696d95  [#3865] External subcommands
 0fc41ae  [#3802] Replace rug with zypper
 dc1a977  [#3766] Remove YAML fixups
 e0e6b64  Provides #3723. Add ability for execs to have several attempts at a successful execution and fix minor bug with logoutput and returns as an array..
 c8ca19a  [#3674] Make sure that failing to load a feature isn't fatal
 2a73b5d  [#3674] Part 2: Autoloader load method should propagate failures
 7952af5  [#3674] Autoloader should propagate failures
 f35c59f  Fix #3667 - Fix class namespace
 938fbe9  Removing obsolete nodescope concept
 49cf2f2  Fixing #3651 failing to pop comment stack for some constructs
 0dd4201  Fixing #3072 - Resource generation is recursive
 b96cd6c  Fixes #2646. Move onetime option from the agent to global defaults so we can specify it in the config file.
 0a21e1b  [#2522] authorized keys owner is verified
 738802e  Fixing #2337 - Adding 'freeze_main' setting
 50a626d  Fixing #1545 - Adding 'caller_module_name' variable
 5d1934b  Fixing #1545 - module_name is now a variable
 bba45f1  [#4055] Confine CouchDB-related specs to the couchdb feature
 1c5b67d  [#4055] Refactor of abstract Couch terminus, more specs
 432db25  [#4055] Add CouchDB terminus for facts
 35636e9  [#3921] Fix typo "fact_terminus" -> "facts_terminus"
 45ca669  Targeted fix for #3851
 c00285c  [#3810] Add http reports processor and `reporturl` setting
 1d49def  [#3804] Fixed one failing spec for RackREST
 1e89bff  Fixes #3514 - CR/LF line ending in puppet.conf cause silent failure
 e6709da  [#3409] fix test failures from ldap environment patch
 a7884b4  [#3409] environment is not checked when nodes are in ldap
 c75b219  Fixes #3395 - CR+LF line endings in manifests cause syntax error
 8b127b1  [#3388] Setting host_aliases from [] to [] no longer results in any changes
 be7112a  Fixing #3139 - all properties can now be audited
 986298b  Working #3139 - Adding Settings.clear Spec#after
 32f6a9d  Working #3139 - Removing Property#checkable
 58cf8d9  Working #3139 - Catalogs default to host_config
 8f3e8bb  Working #3139 - ResourceHarness does caching
 d6407f4  Working #3139 - removing obsolete checking in Storage
 0b95a85  Working #3139 - scheduling moved to resource harness
 4627b8f  Improving fix for #1175; tightening thread safety
 ccc869e  Part 2 of fix for #1175 (functions in environments)
 7c6b883  [#1621] Composite keys for resources
 2396eba  Use the 'root' feature rather than directly checking the uid
 8128311  fix tests to reflect methods moved from type/file/owner to provider/file/posix
 28702a4  variable name error in refactor
 19c70b5  Remove over-eager error branch in a complicated If
 09881cf  Confine out a lib that puppet was failing to load on non-win32
 d72fd9d  Confine out tests that fail on unix
 d1b86ec  Behavior change for //UNC_Paths broke an old test
 ba506c1  Resolving conflicts with jes5199:ticket/master/2935-settings-mode
 f15a324  Fix Exec type
 86bd838  Move syslog into a feature
 fc92408  Adapt Util::Storage specs and avoid trying to lock on directories
 58100ed  Relax path qualification check on FileServing::Fileset
 1c016a1  Implement quoting on the exec commands and repair specs
 6a92894  Avoid trying to symlink() on windows
 47c9dd1  Implement "forking" for Windows
 c59d864  Avoid non-win32 signals on win32 runtime
 bbba9f9  Avoid trying to set uid/gid on windows
 a90bcb0  Start extracting the owner managment for files into providers
 b51be28  Expand file type to be able to handle Win32 and UNC paths
 17a9ad1  Updated version to 2.6.0
 a2e809b  Fixed RSpec deprecation notice in lexer tests
 f054d5b  Make specs work on win32
 54c4538  Delete tempfiles on win32
 97c043f  Fix path handling
 f80b4c7  Print stacktraces if requested
 1d98e67  Adapt defaults to Win32 environment
 ea9bb49  More win32? feature def
 1645d8e  Define posix and win32 features
 b3aa3ec  Improve error message
 d67f60f  Fix ProviderDpkg specs to avoid any real executions
 e119b04  Avoid setting the timeout before we know which timeout we should set.
 d40e6d4  Bug: tidy specs need FileBucket::Dipper
 a6b52bb  Avoid trying to lock on non-files
 533ef68  Removing obsolete FCollection stub from Functions
 bc90df6  Functions are added to a module instead of Scope
 17e40e7  Slightly restructuring "Functions" file
 9d0a38e  [#3921] Add facts_terminus setting to Puppet settings
 2874729  [#3921] Remove unnecessary require 'puppet/resource'
 58a3d27  Fix for #3949 and related
 b755f7f  Fixed #3912 - Added client certificate name as an internal fact called "clientcert"
 b5f14c6  {#3866] Rename the method metaclass to singleton_class to avoid the deprecation warnings from Rails ActiveSupport
 2b5bd49  Fixing #3822 - checksums will be loaded from filebuckets
 94390de  foo
 3b7aac5  For #3822 - Reducing checksum code duplication
 ca7b166  Fixed unsupported perlstyle regex and few other minor bugs
 85f2565  Signed-off-by: Ross West <westr@connection.ca>
 a4eb5d5  Signed-off-by: Ross West <westr@connection.ca>
 970fd87  Fixing #3791 - client environment is used
 cce63d8  Bug #3748 LDAP group membership
 4ba3dc2  Fixing #2655 - Adding default parameter values to resources
 20a74bc  Refactoring tests - replacing stubs with instances
 b5db33b  Fix for 3664: interpolating qualified variables.
 9ddee72  Fix #3664 - qualified variable parsing in string interpolation
 a32381e  Feature #2935 remove misleading comment
 5937af4  Feature #2935 Unify the codepaths for setting settings
 b7d387e  Feature #2935 Puppet[:mode] and Puppet[:name] are read-only
 342298c  Bug: Broken codepath in util/settings
 6d5566a  Feature #2935 settings are in Mode sections instead of executable names
 9536723  Feature #2935: method extract require_application
 c338fef  Feature #2935: Test for if we're "puppet cert"
 cbb2802  Code cleanup: remove "self." from setdefaults
 37a5530  Feature #2935 Modes: root? predicate
 ac7efc8  Feature #2935 Puppet::Mode#master?
 5665e39  Feature #2276 Single Executable: Update docstrings
 fc29049  feature #2276 Single Executable: use new names for settings sections
 631552c  Feature #2935: Applications should declare modes
 8f4d644  Feature #2935: lazify require graph for applications
 6b26a7c  Feature #2935: Puppet::Mode
 b65d1af  Feature #2276 Single Executable: usage message
 76304f8  feature #2276 Single Executable: move CommandLine methods
 e9627a0  Fixing #2658 - adding backward compatibility for 0.24
 61a719f  Adding #2658 - Adding support for run stages
 d13f8ac  Fixing #3671 - --compile Catalogs are pretty-printed
 89e8745  Fixing #2655 - Adding default parameter values to resources
 edcf429  Refactoring tests - replacing stubs with instances
 3dfb762  Fixing Catalog conversion
 0d4fd60  Fixing #1903 - metaparam inheritance is much faster
 047ebfe  Fixing Parser::Resource param validation
 2fae0bd  Fixes #1999 - Allows the 'apt' provider to downgrade packages.
 b10d35d  Fixes #3745 Catch unhandled exception in ssh_authorized_key provider
 584961a  Fixed #3721 - Removed -u option from crontab on HP-UX
 a15a70c  Fixing tests broken by conceptual merge conflicts
 5988f76  Fixes #3663 - It should be possible to list signed hosts only
 2c153b1  Fixing #448 - relationships have their own syntax
 052f98f  Fix #3408 - enable puppetd http compression
 3eaf69c  Fix for conflict between fileserving streams and none-checksums
 2cf7222  Fix #3373 - Client side file streaming
 ee5d7f1  Add master side file content streaming
 63c122f  Fixing tests broken by Luke's CRL flag patch.
 91e6022  Fixes incorrect line in partial CRL fix
 379bda0  WIP - trying to fix #3460
 3947574  Updated Template documentation link
 5fd6e54  Change the main spec to an apply spec
 009629f  Feature #2276 Single Executable: usage message
 5b64d3b  feature #2276 Single Executable: optparser should get CommandLine#args instead of ARGV
 5683fd9  Feature #2276 Single Executable: Pass a commandline object to the application
 d038a1d  Refactor #3706 Reify eigenclasses of Applications
 7656ba7  feature #2276 Single Executable: CommandLine can be instantiated
 63e2e56  feature #2276 Single Executable: subcommand method
 b6e2ce6  feature #2276 Single Executable: help info
 b073722  feature #2276 Single Executable: help for apply
 bfad735  feature #2276 Single Executable: rdoc paths on ubuntu
 7103378  feature #2276 Single Executable: legacy settings
 54c1cc5  feature #2276 Single Executable: "puppet describe"
 c79b228  feature #2276 Single Executable: "puppet kick"
 6bdda8c  feature #2276 Single Executable: "puppet cert"
 f9783fc  feature #2276 Single Executable: "puppet master"
 1d8bd0d  Fix #3552 single executable should display usage
 722a27f  Fixes #3702: the 'log' report now sends the host name as the log source again.
 ddd40bb  Fix for #3690 failing to calculate error codes
 d61a69a  Fixing #3668 - fixed autoloading classes from modules
 f66095d  Fix #3656 JSON serialization of dependencies
 f0a0084  Fixes #3582 - Adds dbport configuration option for specifying database port
 8b99367  Adding indirector support to Resource Types
 748aed9  Fix #3552 single executable should display usage
 eafde5c  Added support for flat packages in the pkgdmg package provider. Added a test in: ./spec/unit/provider/package/pkgdmg.rb
 c9e3d75  Fix: the rcvar name is not necessarily the same as the service name. (More and more I get the feeling that FreeBSD's rc system is totally unsuitable for Puppet. What about porting Upstart or SMF to FreeBSD ... ?)
 861c177  Added proper status command
 5f72eb9  Re-included old BSD service provider, made new one default for FreeBSD
 c3cd24b  Rewrote FreeBSD service provider
 1250f80  Fixed documentation issues exposed in #3772
 211782f  Updated CHANGELOG for 0.25.5rc3
 7c59acf  Renamed all references to Reductive Labs to Puppet Labs
 e82f5de  Fix for #3107 Changing users on AIX
 44f1465  Fixing #2864 Added support for AIX System Resource Controller (SRC) - service start stop
 02ed8db  Fixes #2836. Add hold support to dpkg provider
 0f2d3ce  Fixes #1223 Add Zypper support for SuSE machines
 a166d50  Fix for #3399 zone type should handle exclusive IP stacks
 af521fa  Adding #3518 - basic dot format support
 9b2b0ec  Fix #3551 rake spec fails to run integration specs
 6a66d5e  Update Red Hat spec file for 0.25.5
 46c72bb  Updated CHANGELOG for 0.25.5rc2
 ee0cc07  Fixing #3533 - Removing all transaction cleanup
 11189fb  Fix for #2910 -- Tidy/matches is too tricky to use
 913b63c  Bug #3451: Don't leak the terminus class setting from Puppet::Resource::Catalog's spec
 a228399  Fix to the fix for #3295
 ae52005  Write ssh_authorized_keys as user
 8c5e80e  Fixing bad test
 088c801  Fix for #3558 -- source file reading speedup
 cd06b87  Fix for #3556 Plussignment value melding
 2de7da4  Fixed #3655  - Puppet doesn't find installed packages with portage provider
 d20d5de  Fixed #3672 - Error message on duplicate fileserver mounts incorrect
 6ae6821  conf/redhat: Add notifempty to logrotate config
 7fc66d5  Fixed stored configuration documentation
 14456b4  Fixes #3653 - Changed default factpath value to better reflect plugins in modules
 f3e466b  Partial fix to #2837 - changed warning message to debug
 686239f  Fix #3555 - fix state of purged lists
 6f8a1e9  Updated Rake tasks to no longer load puppet.rb
 83a8c68  Fix #3540 - name methods correctly
 3d395e8  Fixes #3295 - generate() now sets the working directory to the directory containing the specified command.
 0f077c7  Added YARD task
 b49c60b  Update man pages and partial doc fix to #3491
 115f37d  Fixed #3532 - Typo in lib/puppet/ssl/host.rb
 784dd26  Updated version and CHANGELOG to 0.25.5rc1
 4a6474c  Modify SuSE spec file for 0.25.x and correct shebang lines for puppetd/puppetmasterd
 385506f  Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to /var/lib/puppet
 b494427  Fix for #3101 (bug in MRI 1.8.7)
 966b269  Fixes #3419. OS X 10.6 Ruby doesn't set supplementary groups
 49be54e  Revert the guts of #2890
 e69b7db  Fail gracefully on packages that don't have the HOMEPAGE variable set (e.g. dev-lang/php).
 83ac6b8  Fixed #3443 - Typo in mount type
 dfe5c3a  Fixes #3135 - darwin doesn't support 'mount -o remount'
 2a60e1e  Adding :catalog_terminus setting
 626945b  fixing obsolete comment in puppetd
 9fbb69f  Adding support for only using cached catalogs
 7e1e76e  Refactoring Configurer to enable the next feature
 b28e21a  Fixed changelog Rake task
 e93eab8  Fix #3155 - prevent error when using two matching regex in cascade
 b883272  Fixed puppetlast typo
 67bf142  Fixed README contents to reflect Puppet Labs and docs and wiki changes
 e35e142  Fixed link typo
 d40e24c  Fixed #3384 - Updated broken link
 da00f68  Making a Puppet::Module test more resilient
 9792915  Fixing yumrepo type to use 'flush'
 9ee4c2d  Only trying to retrieve passwords on OS X when root
 8c31ebe  Removing obsolete tests
 aee9c29  Fixing a warning in the aix package provider
 232ad8f  Removing tests for code that was removed in the REST refactor
 94fddbc  Fixing and porting Transaction Report tests
 13d141a  Fixing Property#change_to_s in rare case failures
 66858ef  Fix test in parser.rb due to API change
 0f254be  Fixing Hash functionality with non-constant keys
 41aeba4  Removing vistigial method in ASTHash
 1821187  Porting/removing group test/unit tests
 03532e0  Porting a simple set of tests from test/unit
 006e6af  Removing obsolete test
 1a6e08f  Fixing Transaction integration test
 410b71c  Removing invalid File integration test
 effa719  Cleaning up content/source code
 456447c  Protecting spec_helper chmod from failure
 fa64774  Redeleting puppetmasterd integration test
 797f412  Making SshAuthorizedKeys tests less brittle
 622bb70  Markus's patch concerning string interpolation
 23adec5  Fix tests that use or stub find_by_checksum, which I just changed the signature of.
 4ac8e2c  The pure-ruby YAML lib doesn't accept parameters
 e31fe8c  Fix a failure in new FileBucket where it was impossible to read from a bucket with a non-default path.
 3797c7a  Update YAML dir test to match behavior
 83d8bda  Fix heisenbug in spec/unit/provider/mount/parsed.rb
 dde69c3  Remove test for old RDoc work-around
 c5ce824  Fixing various broken Resource::Type tests
 6cd6c47  Renaming and fixing puppetrun tests.
 a27013a  Fixing calls to "class_scope" in Scope tests
 84d6892  Fixing all 'require' function tests
 b643413  Removing any mentions of :casesensitive setting
 fe140a2  Migrating "puppet" executable integration test
 edef647  Fixing 'puppet' to directly run manifests
 fff8d04  Fixing syntax warning
 7c25317  Moving puppet back to bin
 a4d1ba0  Puppet::Parser::AST::Leaf#evaluate_match "insensitive" renamed to "sensitive"
 404bdfa  Repair validate_checksum codepath, even though it is disabled.
 e895494  Puppet::Parser::Resource.new parameters have changed
 94651df  Add stub to Puppet::Parser::Collector test to prevent runaway stub failures
 40c1fb0  Resolving conflicts with ???
 1059370  Fixing a typo from a regex
 3eeebf5  Fixing change printing for content/ensure
 47c3ca1  Converted File[checksum] to a parameter not property
 44cba9c  Adding "checksum?" helper method to Checksums module
 d05d25c  Refactoring File[source] tests somewhat
 aab2374  Resolving conflicts with luke:tickets/testing/2954
 86cf226  Adding virtual and exported resource support to the DSL
 9d5ba41  Cleaning up ResourceAPI tests
 9060766  s/DSL::ResourceHelper/DSL::ResourceAPI/g
 6d2a10b  Adding simplistic pure ruby interface
 e515513  Adding environment support to parser resources
 30f49bb  Resolving conflicts with ???
 b7015d7  Moving the string interpolation parsing to the parser/lexer
 07cfdd0  Resolving conflicts with jesse:feature/master/3394
 ad148d6  Resolving conflicts with luke:tickets/master/2759
 922cf1a  Resolving conflicts with ???
 0d70468  Finishing renaming :params to :parameters internally
 ad93d0e  Forcing parent evaluation in resource types
 6e4db82  Fixing type/title resource resolution
 aa659f2  Converging the Resource classes further
 5401a7c  Adding strictness checking to resources
 9c867e6  Fixing most of the broken tests in test/
 274d1c5  Adding tmpfile cleanup to tests
 7089446  Removing Resource::Reference classes
 4871c90  Adding support for class parameters
 4709e9b  Removing :paramcheck and :typecheck settings
 744295d  Allowing Environment.new to take an environment
 4f907c6  TypeCollection now supports namespace arrays
 2fa0a48  Adding parameter validation to Puppet::Resource
 aff5992  Fixing failing Environment unit tests
 61636e4  Tuning file load order
 7a99a1d  Removing obsolete Settings comments and require
 af9a920  Adding an environment helper
 c8e89cc  Changing the interface of Puppet::Resource
 b7ea180  Partially fixing #2954 - Adding class parameters
 cbe2c49  Fixing test structure
 4bff506  Indirector/FileBucketFile warnings
 0917248  REST: Fix a state leak causing test failures
 8f9fc30  REST FileBucket: REST barfs on relative paths
 23ccefe  REST: hide Request object
 d8e1b27  Feature #3394 REST runner, execution
 1603f73  Feature #3394 REST Runner, preparation
 16658a0  Feature #3383 Part 2: Remove RAL XMLRPC
 eda649b  Feature #3383 RAL over REST
 09b1412  Fix tests on #3347
 e5a7800  Feature #3347 REST-ified FileBucket
 f838389  Fix a failing test in #3115
 9acd0b2  Feature #3115 REST-ified status()
 b581c23  Fix #3229 - use original value in case/selector regex matching
 490a03d  Cleaning up a test.
 576accd  Removing unused Checksum::File terminus
 58920a0  Converting File terminus to use formats.
 37fd6ae  Fixing datadir defaults to match new standards
 bf3359e  Adding client and server data dirs
 b41d535  Adding filename extension support to formats.
 7504f1e  Resolving conflicts with ???
 d0389f4  Renaming Parser::ResourceType to Resource::Type
 67ef78d  Removing Interpreter class
 b82b4ef  All non-transient parser references are gone
 644ad7e  Fixing callers to Parser to only pass environment
 9f8e0c0  Using the RTC helper to find the known resource types
 1705366  Always warning if autoloading a file fails
 7bef2e0  Adding helper module for finding known resource types
 804105d  Moving Rails initialization to Compiler terminus
 26b272b  Parser now uses Environment resource type collection
 cb16908  Adding 'known_resource_types' to Environment
 201889b  Renaming LoadedCode to ResourceTypeCollection
 2c2b3c2  Storing per-environment LoadedCode instances
 6bf1953  Removing old, never-used DSL code
 df2d392  Adding support for parsing ruby files
 b938edf  Fixing test structure
 847233f  Adding []/[]= support to Parser::Resource
 6e04fba  Fix for #3366 - --tags '' treated as boolean 'true'
 33b565a  Fix for #3424 and tests to prove it.
 4820a1b  Fix for #2604 Pure Ruby yaml generation
 1c5b3d7  Fixes #3113 - When importing a manifest puppet needs to chill
 e6a720b  Fix for #3412 install.rb should not put "." first in the tmp_dirs
 b1b3bcf  Resolving conflicts with testing
 ba2a3af  Fix 2239 (step five): introduce new Puppet::Transaction#stop_processing? flag and associated check thereof within the resource evaluation code.  This should allow for the transaction to bail out of its processing if it finds that a stop has been requested, based on the state of Puppet::Application.stop_requested?.
 9cb6841  Fix 2239 (step four): Refactored Puppet::Daemon's stop/restart methods to set status flags appropriately in Puppet::Application, and removed call to now-deprecated @agent.configure_delayed_restart.  This should get the restart and stop behavior for daemons and their agents working nicely with the new global process status interface of Puppet::Application.
 82f852a  Fix 2239 (step three): Refactored Puppet::Agent to base starting/restarting behaviors and predicates on new run-status interface of Puppet::Application.
 edbe9b6  Fix 2239 (step two): introduce Puppet::Application.controlled_run method to provide simple status-restricted execution of a passed in block; this can replace the process status checks and properly handle delayed restart behavior for Puppet::Agent.
 2cf647c  Fix 2239 (step one): introduce global settings represeting application run state with methods for setting the state and appropriately-named predicates for querying state, all in the Puppet::Application class itself.  To be used by Puppet::Daemon and Puppet::Agent and Puppet::Transaction for better response to TERM, INT, HUP.
 ce944a5  Fix unit tests in file/target.rb
 481ddb8  Name change of event in ral/type/exec.rb
 1ebc91e  Use a helper function to evaluate a resource since the API has changed
 bfb1fa5  Allow skipped resources to process events
 a18b05d  Actually invoke the allow_changes? method in ResourceHarness
 bf2f088  Generated resources' events are actually bound to the resource that generated them.
 50ed75b  Remove test that tests internal class structures which have changed.
 1779079  Remove stale set_trigger
 9154aca  Since the types stored in resource's @parameters have changed, we need to also change include? method to be more robust.
 2a2ab75  Fix test failures due to name changes of event symbols
 0a72a98  Remove rollback test, since rollback was removed.
 010907b  Mark resource/status as failed if they are associated with a failing event.
 17bccb0  Restore noop non-behaviours
 8465cd0  Resolving conflicts with reinh:feature/master/single_executable
 0f768ed  Removing now-obsolete user tests
 7627441  Fixing most failing test/ tests.
 9d9b20f  Fixing Configurer interface to transaction report
 eb0a4b5  Fixing fingerprint tests to work with new log validation
 f4ef039  Changing REST report integration test to use new interface
 fdefb64  Fixing "require" function to use new class interface
 266bc08  Removing now-obsolete "retrieve" method on package type
 67a75db  Fixing broken selinux tests
 2777e1f  Fixing feature validation when passed one item
 5aa26d0  Changing method profile for other event queueing
 ec7ea27  Refactoring event queueing for performance
 68ce086  Changing the method profile of EventManager#queue_event
 9919b14  Moving Metric management to the reports
 a9fc134  Removing mention of @changes in Transaction
 a18769d  Cleaning up the report tests a bit
 386b3e5  Fixing #2759 - reports now have complete change info
 fbd5b0a  ResourceHarness now doesn't check params with no 'should'
 3f6c948  Changing Transaction to use the new ResourceHarness
 6051599  Fixing log message when changes fail
 149d5ef  Fixing some compatibility and old tests
 c30494f  Renaming some methods in Transaction::Change
 8d5f052  Adding Transaction::ResourceHarness class
 6651aa4  Adding first version of Resource::Status class
 4bb35a7  Fixing File type indentation
 796d882  Removing last event collection transaction code
 e838bcc  Solidifying the RAL/Event integration.
 977595b  Refactoring the Change/Event/Property interface
 5776fe4  Cleaning up the Log initialization code.
 2292b76  Refactoring the RAL interface to logging
 d93d80a  Using Logging module in main Puppet module
 c6dd180  Adding tests for "Logging" module
 242209d  Correcting comments and making report timestamp internal
 a4b77f6  Failing in app/puppet if facts are not found
 f925475  Fixing file content logs
 73f57f2  removing extraneous comment
 4be8601  Adding Transaction events to Transaction reports
 2aa579b  Removing a redundant method in Report
 5a8b460  Removing unused code and adding a couple of tests
 9a78bee  Adding tests for the 'report' log destination
 f2ed655  Extracting event management into a separate class
 329527f  Changing SimpleGraph.matching_edges to expect one event
 f8d7c44  Moving event creation to the resource
 ee9cff9  Reorganizing Property class to match current style
 4212f1c  Cleaning up Event creation
 8280987  Adding "type" instance method to enhance Demeterness
 ad90900  Random code cleanup
 32d34e9  Moving Ensure property into separate file
 3c86666  Moving Parameter utility classes into separate files
 2cbd9e8  Switching transactions to callback-based events
 6a450c5  removing never-used code
 379ac8f  Moving log destination code into separate files
 b2d1728  fixed a couple of typos
 7ab29c4  Unit tests for path changes
 a8245d8  Handle path elements with ticks and spaces
 98581ad  Fix builtins glob in single executable
 b4b07f5  Fix failing specs
 e7bc19a  Rename puppet application spec to main
 c014c29  Renaming the old puppet executable
 deff92d  Find both bin and sbin usage docs, fail gracefully
 3c8d012  Fix application name in bin/ralsh
 be0ecf8  Initial puppet single executable
 7a32777  Renaming applications, mostly removing 'puppet'
 b19a044  Some tests were leaking state when the test failed
 5b2802c  Typo in method call in test.
 6a148e2  Supressing warnings (not really failures) in test/unit
 06deee7  Fix test using wrong Puppet util filesetting group
 74f5167  Mock user in SUIDManager tests
 000d37a  Removing resources generate tests
 11379c0  Removing old test for service/debian provider
 2b8125c  Replace test/unit file write test with spec
 164f1ce  Allow adding single key to hashes
 fd427a5  Raise an error when appending not a hash to a hash
 75c32f9  Fix #2389 - Enhance Puppet DSL with Hashes
 9122ac5  Fix #2929 - Allow checksum to be "none"
 73c8d0d  Fix #3186 - require function set relationship only on the last class
 c5a4de2  Fixing #3185 Rakefile is loading puppet.rb twice
 c694c4d  Fix #3150 - require function doesn't like ::class syntax
 075f3c8  Added time module to tagmail report
 dfb8082  Fixed the return types were valid, and removed the copy paste error with the exception logic
 6e16ea1  Resolving conflicts with ???
 bca7e2c  Add AIX package management support (installp&nim)
 b2c9455  Fixing #3148 Settings#without_noop when run with no noop setting
 8bafc37  Move scope parenting & class_scope from Compiler to Scope
 7403c6e  [#3392] Better Rakefile, remove puppetmasterd spec
 de94f68  Fixing tests in pkg provider
 4b55fb0  bug #3407 Part 2
 f891ba2  Fixing #3407 Failing tests in spec/unit/node/environment.rb
 af9c19a  Bug #3406 augeas spec fails if there is not a default provider
 718a87a  Bug #3402 Stub returning invalid type for :noop
 88d6cd5  Bug #3401 Spec failed due to missing manditory setting in mock
 d9920bc  Bug #3400 Bad mocks causing failing tests
 c6f02f2  Fix #3167 Duplicate constant warnings in dpkg.rb
 70c71c5  Fixed Rails database tests
 46f9d00  Fix #3117 - cert fingerprinting uses a method not available in ruby <= 1.8.6
 04842ef  Fixed test error message.
 fcce222  First shot at the OpenSolaris pkg(5) provider
 3e9677f  Feature #2839 - fingerprint certificate
 91c44b4  Fix a few puppetd specs tests
 d77c9ac  Revert "Feature #2839 - fingerprint certificate"
 58a81ba  Fixing #1054 - transaction reports are always sent
 282b4b3  Removing some unneeded validation code from Transaction.new
 66a3e6a  Removing unused configurer code
 2044550  Fix #2894 - exclude .pp files under modules files directories
 d31ff7e  Adapt to method name change since 8971d8
 a9fb82b  Feature #2839 - fingerprint certificate
 a967b93  Feature #2395 - revoke when cleaning a certificate with puppetca
 e26e831  Updated test series
 53869e9  Fix #2818 - scope variable assigned with undef are not "undef"
 4226e01  Fix for #2959 (calling exit status on a nil report)
 8971d8b  Fixing #2596 - Node, Class, Definition are not AST
 39d4a93  Adding a context method to the Errors module
 22c642d  Extracting language doc support into a module
 adc211a  Adding module metadata
 bf40f4f  Upgrading rspec for tests to 1.2.9
 61d1911  Fix 2841 - Puppetdoc/RDoc parses realize function
 e63d23e  Added tickets/master/2596 to the testing branch
 41da962  Feature 2827 Option to disable managing internal files
 c9f40be  Fixed #2568 - Add database option 'dbconnections'
 2d137e2  Fixing #1507 - Adding a :ca_name setting
 089ac3e  Fixing #2617 - using the searched-for REST name
 28e1bc6  Always using the CA_name constant instead of "ca"
 2d4b795  Fix #1934 - detailed-exitcodes for puppetd
 0f61816  Fix #2649 Allow ssl dir creation in --noop mode
 53be6f8  Fix #2796 - Fix puppetdoc rdoc selector parsing
 391786f  Fix #2795 - puppetdoc rdoc reports a better error message
 b832d81  Fix #2784 - puppetdoc/rdoc didn't parse mono-instruction class content
 b1deb89  Covers the RDoc Puppet Parser with specs
 ced5a78  Fix #2376 - Display class/node inheritance in puppetdoc
 8d9fbbd  Fix #2703 - add 'require' to puppetdoc
 41b7c3c  Adding an example yaml node script
 66a44dd  type augeas: add 'incl' and 'lens' parameters
 c61335f  Patch to address feature #2571 to add Oracle support to Puppet
 
 0.25.5
 ======
 d71bd68  Updated CHANGELOG for 0.25.5
 d88b357  Fixes incorrect line in partial CRL fix
 dec84e5  Fixed documentation issues exposed in #3772
 
 0.25.5rc3
 =========
 4daf8c3  Updated CHANGELOG for 0.25.5rc3
 9214400  WIP - trying to fix #3460
 9d3e98b  Minimal footprint fix for #3751 (serialization 0.25.5 <-> 0.24.8)
 d481340  Updated Template documentation link
 5a1a45c  Update Red Hat spec file for 0.25.5
 
 0.25.5rc2
 =========
 2257605  Updated CHANGELOG for 0.25.5rc2
 5258a0a  Fixing #3533 - Removing all transaction cleanup
 bcde541  Fix for #2910 -- Tidy/matches is too tricky to use
 5abe571  Bug #3451: Don't leak the terminus class setting from Puppet::Resource::Catalog's spec
 ebd924c  Fix to the fix for #3295
 ce233aa  Write ssh_authorized_keys as user
 6739bab  Fix for #3558 -- source file reading speedup
 b0e3c61  Fix for #3556 Plussignment value melding
 8a30495  Fixed #3655  - Puppet doesn't find installed packages with portage provider
 e4130af  Fixed #3672 - Error message on duplicate fileserver mounts incorrect
 1275a47  conf/redhat: Add notifempty to logrotate config
 134204d  Fixed stored configuration documentation
 1aa98a6  Fixes #3653 - Changed default factpath value to better reflect plugins in modules
 44f6d64  Partial fix to #2837 - changed warning message to debug
 3a1b178  Fix #3555 - fix state of purged lists
 f6046ab  Fix for #3577 -- to_yaml parameter in 0.25.5rc1
 f351e2d  Renamed all references to Reductive Labs to Puppet Labs
 cf7e696  Updated Rake tasks to no longer load puppet.rb
 b93924e  Fix #3540 - name methods correctly
 9bc2f28  Fixes #3295 - generate() now sets the working directory to the directory containing the specified command.
 3ee6834  Added YARD task
 99818ef  Update man pages and partial doc fix to #3491
 f988af3  Fixed #3532 - Typo in lib/puppet/ssl/host.rb
 f0e12e5  Fix #3496 - suppress transaction debug message
 
 0.25.5rc1
 =========
 0eea2f5  Updated version and CHANGELOG to 0.25.5rc1
 57ae381  Modify SuSE spec file for 0.25.x and correct shebang lines for puppetd/puppetmasterd
 d90ec79  Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to /var/lib/puppet
 ae0b0bf  Fix for #3101 (bug in MRI 1.8.7)
 9db066b  Fixes #3419. OS X 10.6 Ruby doesn't set supplementary groups
 306d082  Revert the guts of #2890
 4eea77a  Fail gracefully on packages that don't have the HOMEPAGE variable set (e.g. dev-lang/php).
 f5b8494  Fixed #3443 - Typo in mount type
 b0ef2c6  Fixes #3135 - darwin doesn't support 'mount -o remount'
 7018cf5  Adding :catalog_terminus setting
 978ab8a  fixing obsolete comment in puppetd
 6d13d0d  Adding support for only using cached catalogs
 bc28715  Refactoring Configurer to enable the next feature
 ba43d7b  Fix for #3366 - --tags '' treated as boolean 'true'
 5ab5e8a  Supressing warnings (not really failures) in test/unit
 e4df0b0  Fix test using wrong Puppet util filesetting group
 eeb3d74  Mock user in SUIDManager tests
 9ea27db  Removing resources generate tests
 218e3e9  Removing old test for service/debian provider
 1556938  Replace test/unit file write test with spec
 2defc00  Fix for #3424 and tests to prove it.
 44798b9  Fixed changelog Rake task
 5d10f65  Fix #3155 - prevent error when using two matching regex in cascade
 fbedb99  Fixing #3148 Settings#without_noop when run with no noop setting
 389c77b  Another trivial follow-up fix for #2604: invalid path to zaml.rb
 56b5753  Fix inefficient SimpleGraph#matching_edge
 4b2b9eb  Fix #3229 - use original value in case/selector regex matching
 19863c0  Fix #2929 - Allow checksum to be "none"
 fd76142  Fixed puppetlast typo
 3b4e782  Follow up for #2604, debug msg left behind.
 e44430b  Fix for #2604 Pure Ruby yaml generation
 74cd55f  Fixes #3113 - When importing a manifest puppet needs to chill
 7ec50a7  Fixes #3387 - Handle path elements with ticks and spaces
 d561a98  Fix for #3412 install.rb should not put "." first in the tmp_dirs
 751df45  Fix #3186 - require function set relationship only on the last class
 a1d216c  Fixed the return types were valid, and removed the copy paste error with the exception logic
 d532e6d  Fixing #3185 Rakefile is loading puppet.rb twice
 5aa596c  Fix #3150 - require function doesn't like ::class syntax
 3457b87  Added time module to tagmail report
 71653a7  Fixed #3162 - tidy does not remove empty files when "size => 0" is set
 efd0f76  Fixed #3128 - Updated man pages and moved puppet.conf.8 to puppet.conf.5
 ad4f94a  Add version number to puppetlast display.
 0533cea  Forgot fakedata called in spec
 6416f91  Fixing #2669 puppetmasterd integration has leaky state
 8a3a205  Fix for #2327, check the return types from augeas and fail where appropriate
 2ae7516  2047: Add a not_include into match
 55f6239  Minor unit test fixes
 b7b7a1c  vim: Improve function matching when functions contain ')'
 b3c363c  vim: puppetDefArguments is contained by puppetDefine
 f9e05a8  Fix for #3094 (libdir should take ":" delimited path)
 b473264  Fix #1842 Net::HTTP#enable_post_connection_check doesn't work anymore
 9419c2b  Fix for #3035 (redhat services use init for source)
 10becce  Fix for #3077 (unit tests broken in 0.25.1-->0.25.4)
 49a7185  Fix for #3085 (user_role_add pulls from same source as useradd)
 1f086c2  Fix for #3114 (ruby's arbitrary limit on process groups too low)
 
 0.25.4
 ======
 c5eef04  Updated CHANGELOG for 0.25.4
 0025e13  Partial reversion of patch for #3088 to fix #3104 (Exception misreported)
 bfc9e45  Updated CHANGELOG for 0.25.4rc3
 
 0.25.4rc3
 =========
 a91c476  Fix for #3088 (catching Exception also traps SystemExit)
 1a263e2  Fix for #3089 (timestamp may now be a time object, not a string)
 75634b7  Fix for #3093 (also need to be able to call pkgget_with_cat on class)
 94e269c  Uncommeniting the fix for #3001
 9636b93  Updated CHANGELOG for 0.24.5rc2
 
 0.25.4rc2
 =========
 d4319a5  Minimal fix for #3001 (failing to fetch metadata on dangling symlink)
 cdcbdc7  Fixing #2914 - pre/post hooks now work for transactions
 67216aa  Fix for #3075 (sshkey host_aliases ignored)
 e4462c0  Updated version and CHANGELOG for 0.25.4
 
 0.25.4rc1
 =========
 441879f  Revert "Fix #2845 Cron entries using "special" parameter lose their title when changed"
 f7e1435  Updated rake task to fix gem build issue
 49013f0  Updated version and CHANGELOG for 0.25.3
 
 0.25.3
 ======
 f8c1b08  Reversion of pipe IO patch for testing on #3025
 7f25805  Fix #1464 Mount complains about missing fields
 c99f394  Fix #2845 Cron entries using "special" parameter lose their title when changed
 0a7e212  Fix #2887 'service' tests paths too early
 dd22b71  Replaced ugly gem creation task with slightly less ugly task
 d0efcc6  Added tasks directory to Rakefile and gem task file lists
 8a6d66e  Added puppetpackages task description
 eada68a  Updated CHANGELOG for 0.25.2
 
 0.25.2
 ======
 6111ba8  Fix for temporary file security whole
 e7d98cc  Fix for #2999 (absent package handling on solaris)
 87136b4  Fix typo in documentation: wheter vs. whether.
 cbc2ef0  Partial rollback of refinements to fix for #2994
 fd631b9  Do not close stdout or stderr in execute.
 f878fe8  Update Red Hat spec file for 0.25.2
 4394c48  Updated CHANGELOG for 0.25.2rc3
 
 0.25.2rc3
 =========
 13cbf04  ReFix 2675 ending slash in directory should get stripped off
 5c6f07b  Use a pipe instead of a temp file for command output.
 7e64393  Additional fix for #2994 (followed symlinks do not have checksums)
 7e2e12b  Fix for #2995 (don't fail to load PSON when UTF-8 missing)
 c84186a  Revert "Fix for #2731 (problem communicating with processes in SELinux)"
 74d9693  Updated man pages for 0.25.2
 7e2b1e9  Fix for #2995 (don't fail to load PSON when UTF-8 missing)
 d1ff4b3  Fix for #2994 (undefined method "_file" message)
 4d81511  fix #2987 - check correct hash entry
 
 0.25.2rc2
 =========
 682000b  Updated CHANGELOG for 0.25.2rc2
 e4bb529  Fix for #2967 (RFC-1123 problem and regression on wildcarded domains)
 776be7c  Updated CHANGELOG
 
 0.25.2rc1
 =========
 a73f799  Updated version
 26e7486  Fixing failing tests
 05e897e  Fix for #2881 (ralsh doesn't find individual parsed resources)
 e04f9e4  Code smell reductions
 24654a2  Making provider/host/parser.rb compatible with host_aliases
 49530ad  Fixing #2964 updated resources cannot be collected until they are exported twice
 6ab2453  Fix for #2731 (problem communicating with processes in SELinux)
 0e5d264  Fix for #2940 (propogating nil rather than reporting the error)
 d60ea0e  A slide down the RFC-1123 slope towards MS Windows compatibility and chaos
 b185801  Fixing #2960 Test Failed: 'Puppet::Type::Mount::ProviderParsed when modifying the filesystem tab should write the mount to disk when :flush is called
 5e5c8b5  Fixing tests
 0cb5e7d  Fix for #2943 (Make puppet --apply respect --preferred_serialization_format)
 0884035  Fix #2970 spec/unit/provider/ssh_authorized_key/parsed.rb has order dependencies
 b86decc  Fix #2816 MySQL server has gone away
 854c065  Fix for #2813 (alias propety v. alias metapram)
 813cb58  Fix for #2765 (--no-fqdn regression in puppetrun)
 e9a0cb7  Fix for #2657 (retain old setting if config has syntax error)
 727ee72  Fix #2966 spec/unit/util/queue.rb can't be run twice
 8c8e921  Fixing #2963 spec/unit/util/autoload.rb depends on global state
 ea90daa  Fix for #2965 (Chatty SELinux message)
 fc221ff  Fixed RSpec deprecation error
 037b99a  Fixing #2958 inconsistent errors in spec/integration/bin/puppetmasterd.rb
 d11c750  Fix for #2951 (SELinux test errors on OS X)
 0dc2dba  Fix for #2890 (the cached certificates that would not die)
 03f37ac  Fix for #2950 (parens needed warning)
 61fd460  Fix #2924 Test Failed: Puppet::Indirector::FileContent::FileServer when finding files should find plugin file content in the environment specified in the request
 2432b23  Fixed test typo
 f5960ce  Closed #2937 - Migrated a number of requires to features
 2d88926  Fix for #2869 (SELinux tests failing under some load orderings)
 18c5165  Adds partial IPv6 support to authstore
 857047d  Fix for #2567 (Authstore does unintended/pointless DNS lookups)
 dddbd28  Enabling steps for #2567 (Authstore does unintended/pointless DNS lookups)
 ea0a43f  Fix 2948 Failing rests in spec/unit/rails.rb
 b6f4291  Fix #2923 failing tests in spec/unit/ssl/host.rb
 bf7c108  Fix #2677 Proper OIDs on puppet.schema for LDAP
 e0488b2  Fix #2808 puppetqd doesn't give an error when no config is given
 7b2e2ba  Fixing 2851 spec/unit/network/rest_authconfig.rb test descriptions change
 1c69af2  Fixing 2855 Inadvertent zlib dependency
 3528a7b  2850 spec/unit/application/puppetd.rb generates warnings if run with certain other tests
 d343af0  2876 spec/unit/indirector/catalog/compiler.rb changes behaviour
 a7fae47  Fix 2936 Insufficient mocks for webrick in spec/unit/network/http/webrick.rb
 b96b757  Fix for #887 (safely setting pager to cat for blastwave)
 d685f44  2633 file and line info on bad params in type/file
 4326eb2  Fix for #2817 (links created even when links property set to follow)
 118adc1  2875 spurious test failure in spec/integration/file_serving/content.rb
 0f63a54  2877 race condition in webrick
 4895329  Fix for #2921 (test not checking for what it really wanted)
 f47fa40  Fix for #2925 (accept higher versions of rspec)
 c261721  Fix for #2911 (Allow capital letters in selinux contexts)
 bf7d650  Fix for #2900 (rug output parsing too specific)
 cccbca4  Fix for #2786 (failed trying to backup directory in recursive purge)
 6dfac97  Fixing 2907 rspec crash when spec/unit/application/puppetrun.rb is run after spec/unit/util/ldap/connection.rb
 1c8d272  Fixing 2870 Spurious failures in spec/integration/ssl/certificate_request.rb
 979440f  Fixing 2862 spec/integration/file_serving/metadata.rb fails unless run with other tests
 e04d299  Fixing 2858 spec/unit/application/puppetmasterd.rb fails if run twice
 53a9805  Minimal fix for #2822
 9ac1ed6  Fix for #2863 (calling each on uninitialized tag list)
 bd9e06f  Feature 2827 Option to disable managing internal files
 8b66998  Fixing 2849 puppet changes sshkey alias every run if it is blank
 7136c85  Fixed spellquote function documentation
 de16fd3  Updated yumrepo type documentation
 d1fa7cf  Fixed --no-ca option in Gentoo also
 8b5b4b6  Fixed incorrect command line in Red Hat sysconfig file
 623d9c7  Fixing 2886: Failing specs in format_handler
 feb021f  Avoiding rspec bug which causes 'be_all' tests to always pass
 228f105  Removed some extraneous files from ext
 01c98f6  Fixed #2798 - Correct issue with crontab provider on AIX
 f7c5ceb  Fixing 2725 Error message when permissions incorrect on file server directory
 07b94b4  2842 Format debugging should be removed
 3abcc89  Fix #2783, take2 - puppetdoc should use environment to get modulepath/manifestdir
 f5dd6c8  Fix #2831 - puppetdoc doesn't cope with regex node
 4a06379  Fixing #2857 (quote nesting error)
 9a41c35  Fixing #2791 fs_find should follow symlinks
 5629092  Added additional documentation to file mode attribute.
 dc8812c  Fixing 2792 selinux tries to set properties on unsupported filesystes
 57632a0  fix #2854 - parse timestamps
 cb6bc27  fix regex for non-installed packages
 9cfe390  Fixing 2812 authorized_keys without comments fail
 53b3b86  Fix for ticket #2844 (file recursion generated vs. explicit prefix)
 8129caa  Fix for ticket #2700 -- check for @explicit_waitforcert in puppetd --test
 e32f980  Fixed #1806 - supplementary groups are not reset
 be7ff82  Fix 2768 maillist resource is broken
 48beaba  simplify and fix portage provider
 0ac0ce9  Implement tasks for git-based workflow.
 bd5dc64  Possible workaround for #2824 (MRI GC bug)
 c1e47a4  Fixing #2789 puppetrun fails without --tag
 106c9a9  Fixing 904 RDoc::usage incompatible with rubygems
 5ed2e26  rack: SSL Env vars can only be in Request.env
 7f2e5fc  Fix #2671, preferred_serialization_format does not complain about invalid values
 f0eaf20  Fixing #2764 ActiveRecord 2.1 support
 eaab789  Fix failing tests introduced by #2797
 55d8ffa  Fix #2810 - adapt tidy to new FileSet api
 236bacc  conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
 41f025c  Fixed ldap typo again
 6c2daa3  Fix #2783 - Puppetdoc rdoc should use environment to get modulepath/manifestdir
 5648666  Add Environment#manifestdir and small refactoring
 74a877e  Minimal fix for #2821 ("rake spec" is needlessly slow)
 cd10e6d  Added package signing task
 ca56aa7  Least kludgy patch for #2675
 adc0a4e  Fix for #2661 and related issues
 65f601a  Fixing 2806 Specifying multiple tags fails to apply any of them
 e2c675e  Updated generate function documentation to make it clear it runs on the master
 53f40bd  Fix #2681 Incorrectly duplicating resources
 3fdc8ef  Ticket #2770 (deserializing Exec[...]s with "\n"s)
 b172287  Fixing #2767 invoke-rc.d warnings
 4013560  Fix #2797 - tags are not inherited by recursed file sub child
 f05a04e  Fix #2784 - puppetdoc/rdoc didn't parse mono-instruction class content
 38ec9fc  Fix #2796 - Fix puppetdoc rdoc selector parsing
 5f7177e  Fix #2795 - puppetdoc rdoc reports a better error message
 136949d  Fixing #2631 show_diff sometimes doesn't happen
 cb3e5e1  Fix #2787 - Storeconfig doesn't store/update node ip and environment anymore
 ff23b57  Fix for #2670, Puppet silently ignores catalog_format
 ee13efa  Add docs to Mac OS X package creation script and clean out old docs in the preflight
 b8470b8  Fix #2757 & CSR 92 (symlinks in recursively managed dirs)
 5b750c2  Fix #2769 - default schedule are not defined
 eca338c  Fix for #2772 (webrick test failures)
 b1c57e9  Al Hoang's patch for #2781, removing obsolete when/: syntax
 50e9c98  Follow-on for #2724 - Adding an external node classifier
 
 0.25.1
 ======
 2f0b1e5  Updated CHANGELOG
 20e5222  Fixing #2689 - file owner warnings are reduced
 09fb3f7  Fixing #2752 - "require" loads "include"
 6846c32  Fixing some recently broken Scope tests
 0043392  Fixed typo in lib/puppet/indirector/ldap.rb
 6b254eb  Fix #2753 - Do not "global allow" plugins/modules mount if some rules have been parsed
 ff3a7bc  Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL
 594c774  Revised partial fix for #2661 and related issues
 73d04c6  Bug #2534 Raise error if property appears twice
 7517572  Bug #1908 cron environment should allow empty vals
 febe707  Bug #1742 Invalid params to --color outputs 'nil'
 d383ab8  Use notice() in the versioncmp() docs
 9dff716  conf/redhat/*.init: Use -p option to killproc
 f47a70f  Ticket #2665: Regexp exception on ++ in package names
 b6e4ef3  Fixed #2750 - Set :cacrl to nil instead of 'false' in puppetd
 2b57e06  Fix #2691 - Collection AR request should not include params if querying with tags
 e8bce7a  Workaround #2668 - Compress facts so that the request size limit triggers less often
 e2ce790  Fixed #2737 - The zone provider needs to get acquainted with OpenSolaris
 aea1e5f  Update Red Hat spec file for 0.25.1
 fbdded7  Ticket #2685 (Type error in ssh_authorized_keys)
 4d9f76a  Fix for #2745 fakedata tests not working
 b4bcfe9  Fix for #2736, target doesn't work for ssh_authorized_keys
 ae528f6  Ticket #2734 PSON/JSON not serializing classes of a catalog
 f59f805  Bug #1900 Parsing of quoted $ in stdin
 6ba122f  Fixing #2735 - node classes are immed. added to classlist
 
 0.25.1rc2
 =========
 bca3b70  Bundling of pure ruby json lib as "pson"
 ce46be5  Proposed alternative solution for #2664 (REGEX / DIV lexing)
 b0518c3  Fix for #2681 (duplicate resource)
 8a73082  Fix #2707 config_version fails more helpfully
 54ded1b  Fixes #1719, this avoids calling the external binary *which* everytime we are looking for a binary
 4c3c279  Updated required Facter version in README
 fcce46a  Fixed #2702 - Set :outputdir to "doc" if not specified
 3940dfb  Fixed #2674 - createpackage.sh: problem finding install.rb
 3b548f4  Fix #2699 - Use --masterport for PUPPET_PORT variable
 a75bf50  This updates the portage provider in three ways:
 ad86e9e  Fixes #2688. Macauthorization provider now handles booleans internally correctly.
 d891f7a  Ticket #2676 (a typo)
 bfba2cd  Fix #2672 - Make sure nodenames keep their underscores when used as classname
 db67e5f  Added rcov exclusion to Rakefile
 
 0.25.1rc1
 =========
 6912a7e  Incremented version to 0.25.1
 fd322da  Fixes #1538 - Fixes the yumrepo backtrace in noop mode.
 6551e86  Fix #2664 - Mathematic expressions mis-lexed as Regex
 a595033  Fix for #2654 (error generating error message)
 a951163  Fix #2642 - Runit provider rework
 96b5087  Fix for ticket #2639 (Puppet[:user]/Puppet[:group] vs. 'service')
 af57483  Fixing #2632 - 'require' works for 0.25 clients
 d42bda1  Fixing relationship metaparam backward compatibility
 d53bc16  Adding version information to the catalog for compat
 5f25589  Ticket #2626 (unhelpfull error messages)
 a1d3b04  Fixing #2617 - use the cert name as specified
 8987509  Refactored Puppet packaging and gem creation
 5c2ba47  FIXES 2616: Remove sync.syncronize and Puppet.info
 a53a77c  Renamed test branch to testing in rake task
 d054fd9  Fixing #2656 - puppet parseonly tests don't hang
 cde70cf  Fixes #2648. Spurious macauthorization parameter changes
 dcf0d0d  Fix #2652 - Fix SELinux syntax error
 ba269f2  Fixed #2651 - Corrected install permissions on man page directories.
 361c502  Fix #2638 - Allow creating several nodes with matching names
 2283605  Added automatically constructed test branch task and file
 fd2a190  Fix for #2621 (JSON serialization of exec)
 577a45b  Fix #2622 - Puppetdoc in single manifest to console is broken
 d2d7070  Fix #2640 - Daemontools and Runit were not creating the enable symlink
 d21b266  Fix #2627 - regex node name could lead to invalid tag
 cb90528  Merged fix for #2601
 b1554a1  Updated changelog task and CHANGELOG to version aware
 f5a106d  Fix for #2637 (Webrick accpting connections on dead sockets)
 19e98f9  Fixed #2608 - install.rb will not run on ruby 1.9.1 due to ftools being deprecated
 40cd6d4  Fix for #2605 by falling back to alternative solution to #1963
 630407d  Make regsubst() function operate on arrays (feature #2491).
 a45c435  Fix for #2600 (wrong number of arguments under older mongrel)
 f2bc8aa  Fixed #2634 - Added servicegroup_name parameter to serviceescalation type
 7404e31  Fixs #2620 authconf interpolation, #2570 0-9 in domain names
 4344339  Fix for ticket #2618 (stubbing so redhat tests run under debian)
 c2e26b9  vim: match regexp language features
 1494bd7  Require active_record/version to support ActiveRecord < 2.3
 a5c56fc  Fixed #2607 - Added Facter dependency for Puppet Gem
 
 0.25.0
 ======
 b1eddbb  Updated and created new CHANGELOG format
 994d6e0  Adding tests for the #2599 fix
 42ab73f  Ticket #2525 don't fail find_manifest on invalid module names
 a0f0dcc  Updated permissions on test files
 d45812b  Refactoring tests to reduce code size, increase coverage, and make Luke happy.
 aba2f66  This further normalizes the handling of init-style services (including the redhat "service" wrapper script).  Removes special case handling of non-zero exit code in redhat (base already did this) and centralizes scattered @resource[:has_____] checks.  Tests that proper versions of each are called and one level of fallbacks.
 fb236a0  Combined fix for #2525, #2552 -- RedHat service issues
 d40b942  Fixed #2589 - Renamed zfs delete to destroy and added tests
 4aa7fce  Monkey patch to improve yaml compatibility between ruby versions
 1f6c74d  Fixed typo in parser test
 2e9b706  Updated Red Hat spec file and RH patches for 0.25.0.
 19815dd  Fixing #2592 - you can escape slashes in regexes
 ea58478  Fixing #2590 - modulepath is not cached inappropriately
 1a3d0c8  Fixed #2593: puppet init script status command not returning proper exit code
 8dabc72  Update documentation string to reflect actual intent of Puppet::Node::Facts::Rest
 b30a3c7  Fixes #2581. Use new 10.6 global launchd overrides file for service status/enabled
 7f05469  Fixed Naginator link
 e589cd3  Fixing #2582 - / no longer autorequires /
 3342b73  Fixing #2577 - clarifying and demoting the deprecation notice
 d397f8d  Fixing #2574 - autoloading finds plugins in modules
 800a78b  The first regex node now matches first
 6750aeb  Fixing #2563 - multiple regex nodes now work together
 b728b93  Fixes #724 - false is equivalent to 'ruby -W1'
 a9d5863  Fix parser error output
 ee4f6ba  Fixing #2551 - fixing content changed logs
 c8f859e  Fix for test isolation portion of Ticket #2511
 6fa9271  Fixing #2549 - autoloading of top-level classes works again
 c752680  Fixing a heisenbug resulting from a race condition
 ea417d6  Fixing #2460 - puppetmasterd can now read the cert and key
 a49915a  Not using the service user in settings when it's unavailable
 14ec838  Explicitly loading all facts in the directory service provider
 5ee6602  Adding an 'exists?' delegator from user type to provider
 06fcece  Switching the owner/group settings to use symbolic values
 4eb325a  Fixing the yamldir group to be a group instead of user
 058514a  Moving Setting classes into separate files
 b0f219a  Removing chuser on darwin restriction
 7f749cb  Fixing a ruby warning in the authstore test
 c0da3bf  Fixing #2558 - propagating recent fileserving changes
 ff39bc7  Fixes #2550 Handles case where metadata is nil
 47dee83  Ticket 2559 -- parseonly ignored specified file
 a4f6896  Fixed #2562 - Recognize the usecacheonfailure option again Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>
 e408d6c  Refactoring the Module/Environment co-interface
 796ba5c  Fixing #1544 - plugins in modules now works again
 6bd3627  Adding a global cleanup to the spec_helper
 0ef5f22  Removed misguided case sensitivity tests
 c1967bb  Fixes #2513. debian service provider now uses invoke-rc.d to determine enabled? status
 7e09247  Fixing fact-missing problem when puppet.conf is reparsed
 a35e9bf  Fix for #2531; adds tests to confirm problem and related cases, notes fixes specific issue by eliminating the specal case for opaque strings which caused them to be strings when everything else was arrays; adds nots and pending tests where FQDN support could be added but stops short of a full refactor.
 299eadb  Fixed #2530 - Fixed status setting in the SMF provider
 e6a7e82  Fixed spec typo
 75c6e4a  Fixes #2493
 b62d966  conf/redhat/*.init: Fix condrestart/try-restart
 e9fbd4c  conf/redhat/client.init: Fix #2123, status options on older RHEL
 0461a02  Updates to Solaris smf files to reflect new binary locations
 55a9cdb  Fix #2517 - Stack overflow when CA cert missing
 601a2e5  Fix #2516 - Fix format detection when content-type contains charset
 d86bc88  Fix #2507 - Add missing integration tests
 aad3b76  Fix #2507 - Exported resources were not correctly collected.
 63cb1ad  Fixes #2503
 c129f2a  Fixes #2360 - Removed annoying log message
 b1ffffa  Fixed #2525 - Wrong method being overridden in Red Hat services
 a88fc4d  Fixing more tests broken from missing libraries
 9a356ab  Fixing ActiveRecord Indirector tests to skip w/out Rails
 acc5a96  Fixing #2489 - queue integration tests are skipped w/out json
 1a5c5b3  Fixing #2508 - removing mention of ActiveRecord 2.3
 0cb9072  Fixing #2541 - file cache is more resilient to failure
 23948d0  vim: Mark puppetFunction values as contained
 79a4339  Add shellquote() function.
 79d705f  Fixes #2499. Allows execs to specify an array for the returns parameter
 b611c34  Updated fix for #2481
 f385072  Revert "Fxied #2481 - Added status and restart overrides for Red Hat service provider."
 cc379b6  Fixed #2498 - logcheck update
 85a3633  Removed extraneous debugging
 
 0.25.0rc1
 =========
 bf94de9  Updated two more tests
 5b87dba  Logs now assume resource params have metadata
 1410bed  Adding metadata delegation from param to resource
 3ab3a5c  Removing unnecessary debug output
 488e368  Adding integration tests for #2371 (backup refactor)
 f1406bf  Adding many tests for #2371, and slightly refactoring
 8f60f0c  Fixes for Redmine 2371.
 cd224c6  Fixes #2464, #2457. Deprecate reportserver for report_server. Add report_port setting. Add tests.
 401a9ec  Fixing #2484 - "format missing" messages are better
 f6cc598  Fixes #2483 - Log only copies metadata from RAL objects
 7c4c00f  Fixed #2486 - Missing require 'monitor' in parser_support.rb
 ea34ee6  Added R.I.Pienaar's extlookup.rb to the ext directory
 36d3f58  Added example conf/puppet-queue.conf
 967eb9f  Fxied #2481 - Added status and restart overrides for Red Hat service provider.
 c702f76  rack: SSL Env vars can be in Request.env or ENV
 ca17b3c  rack: don't directly use the forbidden HTTP_CONTENT_TYPE env var (fixes rack specification conformance)
 a002e58  Removing old filebucket test
 d8de446  Cleaning up tests for #2469
 266aafa  default server in remote filebuckets
 1f8ef60  Fixes #2444 - Various JSON test failures
 11c0fb7  Fixed #2294 - Classes sometimes cannot be found
 7e5b562  Adding #2477 - puppet can apply provided catalogs
 97274ad  Fixing problems my Feature refactor caused
 6fb8bf6  Fixing ruby warning in definition test
 b3545fc  Fixed global deprecation error in useradd Unit tests
 dc24472  Adding a test for the Exec type
 58d9587  Speeding a test up through stubbing
 d4d8372  Fixing a small test by stubbing instead of mocking
 f7e1c36  Fixing a test broken by the regex features
 54a225d  Fixing tests broken by caching autoload results
 1ce31b4  Migrating Handler base tests from test/ to spec/
 cc3f56a  Migrating Feature tests to spec
 21d1d25  Fixing cron test to match new behaviour
 849fa67  Migrating tests to spec and removing an obsolete test
 6f458cc  Logging the configuration version we're applying
 ac58e27  Configuration version information is now in logs
 6ed0103  Adding support for an external catalog version
 39320b8  Cleaning up duplication in another test file
 25fae5f  Removing duplication in the test structure
 36c0662  Simplified Rakefile and moved tasks to tasks/rake directorya
 b45ccf8  Implement node matching with regexes
 58a73b5  Make sure node are referenced by their names
 3ebf148  Enhance selector and case statements to match with regexp
 ef68967  Fix #2033 - Allow regexp in if expression
 17e62b1  Add AST::Regex, an AST leaf node representing a regex
 4f9545f  Add regexes and regex match operators to the parser
 0ccd259  Add regex, match and not match token to the lexer
 201ae59  Allow variable $0 to $9 to be interpolated, if ephemeral
 f357a91  Implement ephemeral scope variables
 d40ef29  Signed-off-by: Eric Sorenson <ahpook@gmail.com>
 6d22afb  Modifying the REST client error to make server errors more clear
 21f477a  Fixes #2472. Load Facter facts when ralsh is invoked, plus test.
 2e41edb  Update CHANGELOG.git
 ebb5a1f  Fixed ci_spec task for RubyGems 1.3.5
 b6b903e  Fixes #2461. Provide new and old code paths for macosx_productversion_major with deprecation warning
 26b0c70  Fixing typo in two tests which caused them to always pass
 76fc2b1  Fixing #2440 - catalogs can now be compiled on demand
 832b6ff  Exiting from app failures instead of raising
 4ea3f17  Minimal patch to fix #2290 (/tmp permissions)
 08ff9e8  Fix #2467 - rack: suggest putting puppet/lib at beginning of RUBYLIB search path
 fb60f90  Fix #2465 - Default auth information is confusing with no auth.conf
 0ca9b53  Fix #2459 - puppetdoc added namespace classes as RDoc modules instead of classes
 18b5d61  Fix #2429 - vim: class/define/node should only be followed by whitespace
 da828a4  Fix #2448 - fix the broken runit provider and tests
 3898436  Fixed #2405 - Mount parameter "dump" doesn't accept all valid values on FreeBSD
 9825bec  Fixes #2362. Do not validate users/groups when supplied with numeric uid/gids
 450a19c  Fix #2454 - Definition named after a module don't show in puppetdoc
 8551ece  Fix #2453 - puppetdoc mixes long class names that look alike
 e3ee594  Fix #2422 & #2433 - make sure puppetdoc transform AST::Leaf boolean correctly
 b3b76df  Fixing #2296 - overlapping recursions work again
 9120712  Fixing mocks to remove warnings
 eeec8e9  Fixing #2423 - no more strange dependency cycles
 7d40f9e  Fixing #2443: Adding debugging guidance to dep cycle errors
 b4facb0  Fixing a test broken by changing the default os x package type
 b418921  Fixing selinux tests broken in the fix for #1963
 719e76b  Fixing #2445 - fixing the mount test mock
 f13f08d  Minor fix to URL for LDAP nodes documentation
 7c859a7  Fixing #2399 - removing client-side rrd graphs
 f6d6145  Fixing #2421 - file renaming errors now propagate
 db82523  Fixes #2438, get major OS X version from Facter and replace Puppet::Error invocations with fail builtin
 22145e7  Update install.rb to cope with all OS X versions, not just 10.5
 935c463  Fixing #2403 - provider specificity is richer and better
 d95b687  Fix #2439 - let puppetdoc use loaded_code
 ef5c4ae  Fixed #2436 - Changed ralsh to use Puppet::Type.new and avoid deprecation notice
 0c18013  Fixes #2430 - Stock apache2.conf for passenger incorrect
 c383ceb  Make pkgdmg default Darwin provider, make confines consistent on Darwin package providers.
 98599c4  Convert to using sbindir for OS X packages, clean out previous executables in bindir
 c659743  Fix #2425 - make sure client can contact CA server with REST
 17205bb  Fix #2424 - take 2, make sure default mounts allow every clients
 f2c55cc  Fix #2378 and #2391 tests
 8bbd8b4  Fix #2424 - File server can't find module in environment
 effaf80  Fix small typo in the fix for #2394
 a06094e  Feature #2378 - Implement "thin_storeconfigs"
 b2a008e  Fix #2391 - Exported resources never make to the storeconfigs db
 8f82407  Fix #2261 - Make sure query string parameters are properly escaped
 c86d44e  Fixed #579 - puppet should try to clear solaris 10 services in maintenance state
 910a5e2  Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads
 ba824e9  Fixing #2245 - provider lists are not lost on type reload
 eb40966  Ruby no longer clobbers puppet autoloading
 a42e878  deprecate NetInfo providers and examples, remove all NetInfo references and tests.
 22f5632  Fixed #2410 - default acl logs as info instead of warn.
 65b0137  Adding test for current auth config warning.
 74f5ad4  Fixed #2394 - warn once on module mount deprecation.
 f46a52a  Add test for current module mount deprec warning.
 858d333  Fixes #2258,#2257,#2256. Maintain correct type for integers/booleans, allow correct values, and fix rule array handling
 44f127f  Added Markdown mode to puppetdoc to output Markdown.
 8a8ce9d  Excluded directories from rcov coverage report
 d152c5e  Allow boolean value for boolean cli parameter
 911b490  Fix #2364 - Associates the correct comment to the right statement
 faefd92  Make sure the parser sees the correct line number
 869ec27  Fix #2366 - puppetdoc was parsing classes in the wrong order
 4c659b7  Added rcov coverage to Spec tests
 1fd98b1  Fixes #2367 - Mongrel::HTTPRequest returns a StringIO object
 8b09b83  Fix #2082 - puppetca shouldn't list revoked certificates
 ea66cf6  Fix #2348 - Allow authstore (and REST auth) to match allow/deny against opaque strings
 1e83aad  Fix #2392 - use Content-Type for REST communication
 aaca17a  Fixed #2293 - Added cron syntax X-Y/Z and '7' for sunday
 cddc365  Switching to LoadedCode from ASTSet
 fc1f8cd  Adding a special class to handle loaded classes/defines/nodes
 325b8e4  Fix #2383, an incompatibility with early ruby 1.8 versions
 46112da  Fixing #2238 In some cases blank? is not available on String.
 cdd1662  Fixing #2238 - Deal with nil hash keys from mongrel params
 769c8aa  Final fix to CI test rakes
 a6816ff  Set ENV['PATH'] to an empty string if non-existent
 64a4720  Fix to CI rake tasks
 5680cd5  Fixing #2197 - daemontools tests now pass
 603b9cf  Change the diff default output to "unified"
 9bc9b5c  Added missing colon to suntab
 0f2d70d  Fixed #2087 and refactored the code that gets the smf service state
 
 0.25.0beta2
 ===========
 3f070c1  Using the logging utilities to clean up module warnings
 feb7f89  Fixing #1064 - Deprecating module 'plugins' directories
 ccf4e69  Removing deprecated :pluginpath setting
 4036de9  Fixing #2094 - filebucket failures are clearer now
 ed876e0  Refactoring part of the file/filebucket integration
 bd81c25  Adding tests for file/backup behaviour
 c45ebfa  Fixed pi binary so --meta option works and updated documentation
 d2080a5  Fixing #2323 - Modules use environments correctly
 b9e632f  Fixed #2102 - Rails feature update fixed for Debian and Ubuntu
 1c4ef61  Fixed #2052 - Added -e option to puppet --help output
 d332333  Fix #2333 - Make sure lexer skip whitespace on non-token
 5fbf63c  Updated split function and add split function unit tests (courtesy of Thomas Bellman)
 a585bdd  * provider/augeas: strip whitespace and ignore blank lines
 a94d2de  Fixed pi tests
 5f7455e  Fixed #2222 - Cleanup pi binary options and --help output
 134ae3e  Fixing #2329 - puppetqd tests now pass
 de55e19  Cleaning up scope tests a bit
 e4ae870  Fixing #2336 - qualified variables only throw warnings
 607b01e  Fix #2246 - take2: make sure we run the rails tag query only when needed
 06b919d  Fix collector specs which were not working
 2945f8d  Make sure overriding a tag also produces a tag
 e142ca6  Removed a unit test which tested munging which is no longer done in the type
 d8ee6cf  Clearn up a parsing error reported by the tests
 446557f  vim: several improvements + cleanup
 9152678  Fixed #2229 - Red Hat init script error
 b5a8c4d  Fix #1907 (or sort) - 'require' puppet function
 74730df  #2332: Remove trailing slashes from path commands in the plugin
 1a89455  Changing the preferred serialization format to json
 0de70b7  Switching Queueing to using JSON instead of YAML
 7b33b6d  Adding JSON support to Catalogs
 c0bd0aa  Providing JSON support to the Resource class
 c16fd1b  Adding a JSON utility module for providing Ruby compat
 f059c51  Adding JSON support to Puppet::Relationship
 7f322b3  Adding a JSON format
 7666597  Allowing formats to specify the individual method names to use
 d40068f  Allowing formats to specify the methods they require
 024ccf5  Adding a "json" feature
 c8b382d  Fix some tests who were missing some actions
 f9516d4  Make sure virtual and rails query use tags when tag are searched
 b5855ec  Make sure resources are tagged with the user tag on the server
 d69fffb  Fix #2246 - Array tagged resources can't be collected or exported
 6ce0d1e  Partial fix for #2329
 4f2c066  Removed extra whitespace from end of lines
 97e6975  Changed indentation to be more consistent with style guide (4 spaces per level)
 41ce18c  Changed tabs to spaces without interfering with indentation or alignment
 f3b4092  Fix #2308 - Mongrel should use X-Forwarded-For
 7b0413e  Fixes Bug #2324 - Puppetd fails to start without rails
 48d5e8c  Enhance versioncmp documentation
 ef56ba5  * provider/augeas: minor spec test cleanup
 d322329  * provider/augeas: allow escaped whitespace and brackets in paths
 9735c50  * provider/augeas: match comparison uses '==' and '!=' again
 dbfa61b  * provider/augeas (process_match): no match results in empty array
 386923e  * provider/augeas: remove useless checks for nil
 171669a  * provider/augeas: simplify evaluation in process_get/match
 51cc752  * provider/augeas (open_augeas): use Augeas flag names, not ints
 4951cdf  * provider/augeas: ensure Augeas connection is always closed
 0d5a24d  * provider/augeas: minor code cleanup
 cea7bb5  * provider/augeas (parse_commands): use split to split string into lines
 95bd826  * provider/augeas: remove trailing whitespace (no functional change)
 7c5125b  Brought in lutters parse_commands patch and integrated it into the type. This includes reworking the get and match commands as well. This change introduces a few small changes. These are:
 6ce8154  Removed --no-chain-reply-to in rake mail_patches task
 4ef7bba  Removing --no-thread from the mail_patches rake target
 508934b  Fixing a bunch of warnings
 fb0ed7a  Fixing tests broken by a recent fix to Cacher
 650029e  Always providing a value for 'exported' on Rails resources
 f1dba91  Fixing #2230 - exported resources work again
 5522eb8  Disabling the catalog cache, so puppetqd is compatible with storeconfigs
 abbb282  Fixing the rails feature to be compatible with 2.1+
 907b39b  Using Message acknowledgement in queueing
 42247f0  Fixing #2315 - ca --generate works again
 d7be033  Fix #2220 - Make sure stat is refreshed while managing Files
 e4d5966  Added puppet branding to format patch command
 00d5139  vim: Remove another mention of 'site' from syntax
 9067abd  vim: Highlight parameters with 'plusignment' operator
 736b0e4  vim: Highlight strings in single quotes
 ce01c95  vim: Clean up syntax spacing
 3af2dbf  JRuby OpenSSL implementation is more strict than real ruby one and requires certificate serial number to be strictly positive.
 62534a1  Logging when a cached catalog is used.
 ff5c44f  Changing Puppet::Cacher::Expirer#expired? method name
 e3d4c8e  Fixing #2240 - external node failures now log output
 bc1445b  Fixing #2237 - client_yaml dir is always created by puppetd
 e0c19f9  Fixing #2228 - --logdest works again in puppetd and puppetmasterd
 ab34cf6  Fixing puppetmasterd tests when missing rack
 9d5d0a0  Fixing the Agent so puppetrun actually works server-side
 b0ef08b  Fixing #2248 - --no-client correctly leaves off client
 b83b159  Fixing #2243 - puppetrun works again
 3d2189f  Fixed #2304 - Added naggen script to directly generate nagios configuration files from a StoreConfigs Rails database
 700ad5b  Sync conf/redhat/puppet.spec with Fedora/EPEL
 3ec3f91  Fixed #2280 - Detailed exit codes fix
 f98d49f  Fixing #2253 - pluginsync failures propagate correctly
 d860a2f  Fixing a transaction test that had some broken plumbing
 a728757  Refactoring resource generation slightly
 6e824d8  Adding a Spec lib directory and moving tmpfile to it
 1d69dbf  Extracting a method from eval_resource in Transaction
 7650fb2  Not trying to load files that get removed in pluginsyncing
 3995e70  Fix #2300 - Update ssh_authorized_key documentation
 cb4a4d3  Changed version to allow Rake to work.  Minor edit to Rakefile
 99f666f  enable maillist on centos, redhat, fedora
 e13befa  Fixing #2288 - fixing the tests broken by my attr_ttl code
 a406d58  Fix for #2234: test fails with old Rack version
 c189b46  Fixing #2273 - file purging works more intuitively
 138f19f  Caching whether named autoloaded files are missing
 415553e  Adding caching of file metadata to the autoloader
 d489a2b  Adding modulepath caching to the Autoloader
 5f1c228  Adding caching to the Environment class
 047ab78  Adding TTL support to attribute caching
 6a413d2  Fixed #2666 - Broken docstring formatting
 469604f  Deprecating factsync - pluginsync should be used instead
 d39c485  Added spec and unit tests to the Rakefile files list and fixed CI rake tasks
 e1a7f84  Added install.rb to Rakefile package task
 e180a91  Fixed #2271 - Fix to puppetd documentation
 4bf2980  Protecting Stomp client against internal failures
 f4cb8f3  Adding some usability bits to puppetqd
 a18298a  Refactoring the stomp client and tests a bit
 2771918  Relying on threads rather than sleeping for puppetqd
 07ff4be  Fixing #2250 - Missing templates throw a helpful error
 7ce42da  Fixing #2273 - CA location is set correctly in puppetca
 e1779c7  RackXMLRPC: buffer request contents in memory, as a real string.
 fb957cc  Modules now can find their own paths
 c608409  Moving file-searching code out of Puppet::Module
 83ba0e5  Fixing #2234 - fixing all of the tests broken by my bindaddress fix
 4f3a67f  Fixing #2221 - pluginsignore should work again
 2d580c2  Fix snippets tests failing because of activated storeconfigs
 8c718c9  Fix failing test: file.close! and file.path ordering fix
 17f2c7d  Confine stomp tests to Stomp enabled systems
 6a80b76  Fix some master failing tests
 172422f  Fix bug #2124 - ssh_authorized_key always changes target if target is not defined
 f945b66  Fixing #2265 - rack is loaded with features rather than manually
 5aef915  Added .git to pluginsignore default list of ignores
 6db5e8d  Cleanup of the Puppet Rakefile and removal of the requirement for the Reductive Build Library
 5cc4910  Fix #1409 once again, including test
 a6af5bf  Added split function
 
 0.25.0beta1
 ===========
 2dd55fc  Fixing #2200 - puppetqd expects Daemon to be a class
 c016062  Removing unneeded test stubs
 1a2e1bc  Fixing #2195 - the Server class handles bindaddress
 df3a8f6  Minor fixes to function RST documentation
 305fa80  Remove the old 0.24.x rack support, which is now useless cruft
 d85d73c  puppetmasterd can now run as a standard Rack application (config.ru-style)
 d6be4e1  Add XMLRPC compatibility for Rack
 6e01e7a  Puppet as a Rack application
 cc09c1a  Use FileCollection to store the pathname part of files
 d51d87e  Add an unmunge capability to type parameters and properties
 a1c0ae0  Fix #2218 - Ruby YAML bug prevents reloading catalog in puppetd
 bf054e1  Fixes #2209 - Spec is failing due to a missing require
 1c46205  Fix #2207 - type was doing its own tag management leading to subtile bugs
 929130b  Moved puppetqd binary
 36d0418  Fixed #2188 - Added set require to simple_graph.rb
 51af239  Fixed puppetqd require and tweaked stomp library error message
 dc0a997  Fixes #2196 - Add sharedscripts directive to logrotate
 4d3b54e  Added puppetqd binary to Rakefile
 1fee506  Updated version to 0.25.0beta1
 0fbff61  Updates to CI tasks
 aa6dcef  Fixing #2183 - checksum buffer size is now 4096b
 c0b119a  Fixing #2187 - Puppet::Resource is expected by Rails support
 5ec4f66  Adding an 'Exported' attribute to Puppet::Resource
 adff2c5  Removing a non-functional and horrible test
 606a689  Making sure the cert name is searched first
 f489c30  Removing an "inspect" method that often failed in testing
 93c3892  Removing deprecated concurrency setting usage in rails
 6f8900d  Always making sure graph edges appear first
 3f7cd18  Reverting part of the switch to sets in SimpleGraph
 bf46db7  Fixing rails feature test
 5f6b5c0  Failing to enable storeconfigs if ActiveRecord isn't available
 8ed7ae3  Fixing the Rails feature test to require 2.3.x
 a0c1ede  Modifying the Settings#handlearg prototype
 284cbeb  Fixes #2172 - service provider for gentoo fails with ambiguous suffixes
 68ba1f1  SMF import support working and documentation update
 f1f0a57  Fixes #2145 and #2146
 ec478da  Fix configurer to retrieve catalog with client certname
 e623f8a  Unify auth/unauthenticated request authorization system
 037a4ac  Allow REST auth system to restrict an ACL to authenticated or unauthenticated request
 3ad7960  Fill REST request node with reverse lookup of IP address
 c0c8245  Refactor rest authorization to raise exceptions deeper
 aac996e  Add environment support in the REST authorization layer
 72e28ae  Fix some indirector failing tests
 dc1cd6f  Fix #1875 - Add a REST authorization system
 8523376  Enhance authconfig format to support uri paths and regex
 22b82ab  Add dynamic authorization to authstore
 15abe17  Add RSpec unit tests for network rights
 86c7977  Add RSpec unit tests for authconfig
 f04a938  Adding support for specifying a preferred serialization format
 6a51f6f  Fixing the FormatHandler test to use symbols for format names
 b249f87  Fixing #2149 - Facts are passed as part of the catalog request
 1cde0ae  Adding better logging when cached indirection resources are used
 828b1ea  Fixing #2182 - SimpleGraph#walk is now iterative
 9f32172  Fixing #2181 - Using Sets instead of Arrays in SimpleGraph
 7a98459  Removing code that was backported and is now not needed
 d06bd3e  Finishing class renames
 b694b3c  Fixing tests that apparently only worked sometimes
 93246c0  Removing the old rails tests.
 5cb0f76  Fixing some rails tests that sometimes failed
 bdbf9db  Added class_name tags to has_many relationships
 2e62507  Adding time debugging for catalog storage to active_record
 a705809  Adding defaults necessary for queueing
 8a67a5c  Adding daemonization to puppetqd
 fcd1390  Adding Queueing README
 9b90f34  Using a setting for configuring queueing
 444ae9f  Adding puppetqd executable.
 22ae661  Adding "rubygems" and "stomp" features
 efe6816  Removing unnecessary parser variables when yaml-dumping
 a3b1e8c  Add queue indirection as an option for catalog storage.
 bccfcc9  Introduce abstract queue terminus within the indirection system.
 7947f10  Introduce queue client "plugin" namespace and interface, with a Stomp client implementation.
 80dc837  renaming a method
 f7ccaaa  Adjusted parameter name and puppet tag classes to use new cache accumulator behavior for storeconfigs.
 75f1923  Initial implementation of a "cache accumulator" behavior.
 bab45c4  Saving rails resources as I create them, which saves about 10%
 7a91e1f  Changing rails value serialization to deal with booleans
 c30ede5  Adding equality to ResourceReference
 589f40f  Adding some more fine-grained benchmarks to Rails support
 042689e  Adding a Rails-specific benchmarking module
 89d9139  Adding simplistic param_name/puppet_tag caching
 ea4e3b2  Adding more time debugging to Rails code, and refactoring a bit
 6314745  Refactoring the Rails integration
 be30a61  Adding a common Settings method for setting values
 863c50b  Switching to Indirected ActiveRecord
 a137146  Adding ActiveRecord terminus classes for Catalog
 b9c95eb  Adding ActiveRecord terminus classes for Node and Facts.
 8d0e997  Fixing #2180 - Catalogs yaml dump the resource table first
 4e0de38  Partially fixing #1765 - node searching supports strict hostname checking
 c1f562d  Removing unused Node code
 e6b4200  Fixing #1885 - Relationships metaparams do not cascade
 50e0f3d  Fix #2142 - Convert pkgdmg provider to use plists instead of string scanning for future proofing
 c1be887  Fixing #2171 - All certificate files are written with default perms
 e2201d6  Fix #2173 - fix running RSpec test by hand
 424c87b  Fix #2174 - Fix RSpec rake targets
 7ab7d9f  Fixing #2112 - Transactions handle conflicting generated resources
 84e6c1b  Adding another stacktrace for debugging
 4793334  Fixing puppet -e; it got broken in the move to Application
 7398fa1  Partially fixing #2029 - failed caches doesn't throw an exception
 88ff9c6  Fixing #2111 - SimpleGraph only creates valid adjacencies
 36594fe  Switching to new() in the Puppet::Type.instances() class method
 edcbab5  Removing duplicate method definition from SimpleGraph
 d8eaca8  mini daemon to trigger puppetrun on clients without puppet listen mode
 d2c417e  Fix #2113 - Make temp directory
 173b5f0  Adding #2122 - you can specify the node to test with puppet-test
 a677e26  Fixing all tests that were apparently broken in the 0.24.x merge.
 e016307  Fixing Rakefile; apparently there was a rake or gem incompatibility
 62dad7a  Fix #2107 - flatten resource references arrays properly
 cbee426  Fix #2101 - Return to recurse=0 == no recursion behavior
 3b4816b  Fix #2101 - fix failing test
 f089e11  Fix #2101 - fix recurselimit == 0 bad behaviour
 1b4eae7  Added rake ci:all task
 3f61df8  Fixed #2110 - versioncmp broken
 830e1b1  CHANGELOG updates
 3e0a9cd  Moved of puppetd, puppetca, puppetmasterd, puppetrun binary from bin to sbin
 6ddebf4  Fixed #2086 - Fixes to make building tarballs easier
 33d3624  Fix #1469 - Add an option to recurse only on remote side
 77ade43  Forbidding REST clients to set the node or IP
 0179e94  Fixing #1557 - Environments are now in REST URIs
 a497263  Adding explicit optional attribute to indirection requests
 3e95499  Removing an unused source file
 97975e1  Adding a model accessor to the Request class
 b6116fe  Requests now use default environment when none is specified
 15740fe  Moving the REST API functions into a module
 ef4fa68  Using the Handler for the REST api on both sides of the connection
 8b13390  Adding REST::Handler methods for converting between indirection and uris
 edf00db  Adding environment support to the REST URI
 a064ed1  Moving the query_string method to Request
 ff9c3ca  Adding tests for the REST query string usage
 87ec08e  Fixing #2108 - pi should work again
 af4455e  Fix #1088 - part2 - Add rspec tests
 b15028f  Fix #1088 - Collections overrides
 b24b9f5  Fixed #2071 - Updated LDAP schema
 88aa1bc  Fixing tests broken in previous commits
 f8dea98  Fixing #1949 - relationships now use attributes instead of a label
 d0fc2f5  Correctly handling numerical REST arguments
 90afd48  Not passing file sources on to child files
 858480b  Correctly handling non-string checksums
 27aa210  Removing unnecessary calls to expire()
 5329b8a  Passing checksums around instead of file contents
 71e4919  Moving default fileserving mount creation to the Configuration class
 09bee91  Fixing #2028 - Better failures when a cert is found with no key
 cf1cb14  Moving the clientyamldir setting into the puppetd section
 5f73eb5  Fixed #1849 - Ruby 1.9 portability: `when' doesn't like colons, replace with semicolons
 e40aea3  Fixed metaparameter reference to return str
 5df9bad  Fixed #2016 - Split metaparameters from types in reference documentation
 7e207a1  Fixed #2017 - incorrect require
 417b5a5  Fixing #1904 - aliases are no longer inherited by child files
 c0d5037  Removing or fixing old tests
 262937f  Correctly handling URI escaping throughout the REST process
 b800bde  Refactoring how the Settings file is parsed
 d7864be  Relying on 'should_parse_config' in the 'puppet' application
 bd8d097  Providing better indirection authorization errors
 d3bc1e8  Adding pluginsyncing support to the Indirector
 00726ba  Moving Request and Fileset integration into Fileset.
 058266f  Switching the ModuleFiles Indirection terminus to the new Module/Env api
 19b8534  Migrating the old FileServer to the new Module/Environment code
 1be7c76  Using the Environments to handle a lot of Module searching
 2b4469d  Environments now use their own modulepath method.
 94de526  The 'Environment' class can now calculate its modulepath.
 2573ef1  Added support for finding modules from an environment
 9c18d5a  Adding support for finding all modules in a given path.
 4b5ec82  reformatting the environment tests
 458642b  Supporting multiple paths for searching for files.
 eec1cad  Adding support for merging multiple filesets.
 bdf3a80  Adding new methods to Puppet::Module.
 a7be174  Refactoring Puppet::Module a bit.
 7ceb437  Only using the checksum cache when we're using a host_config catalog
 5fd182d  Fixing fileserving to support strings or symbols
 7bc41ce  Adding clarity to query string handling in REST calls
 992231a  Some small fixes to provide better debugging and load a library
 0304a78  Providing better information when an exception is encountered during network communication
 4a7cba3  Stubbing tests that were affecting other tests
 3105b5b  Fixing a warning in a test
 c854c59  Fixing a syntactically invalid application test
 0f43fd6  Move --version handling to Puppet::Application
 156fb81  Move puppetd to the Application Controller paradigm
 0c71c5c  Move puppetdoc to the Application Controller paradigm
 e317fa9  Move ralsh to the Application Controller paradigm
 81f5438  Move puppetrun to Application Controller paradigm
 3390d8d  Move pi to the Application Controller paradigm
 8265d6e  Move puppetmasterd to Puppet::Application
 af219bf  Move puppet to the Application Controller paradigm
 d51398c  Move filebucket to the Application Controller paradigm
 9b9e5e8  Move puppetca to the Application Controller paradigm
 97e716a  Introducing the Application Controller
 495ad66  Fixing broken filetype tests resulting from the loss of Type[]
 21a714a  Fixing some tests that somehow broke in the merge to master
 327ee17  Removing a test that was too dependant on order.
 487b9b1  Failure to find node facts is now a failure.
 610c838  Fixing #1527 - Failing Facter does not hurt Puppet
 a2eca6c  Removing some unused code
 cb0a083  Using Puppet::Type.new instead of create
 84bd528  Actualling syncing facts and plugins
 d5abdfb  Fix #1933 - Inconsistent resource evaluation order in subsequent evaluation runs
 9bac833  Adding README.rst file
 916abc2  Changing how the Configurer interacts with the cache
 5335788  Fixing tests broken during the #1405 fix.
 08a5d49  Adding an Agent::Runner class.
 c7d178d  The Agent now uses its lockfile to determine running state
 c0fcb21  Creating and using a new Puppet::Daemon class
 700e823  Not using 'master' client for testing
 4b7023e  Fixing (and testing) the return of Indirection#save
 8dc0005  Adding a 'close_all' method to the Log class.
 37d1a7c  Removing restart-handling from Configurer
 bf3c72e  Adding temporary class EventManager
 fc14b81  Splitting the Agent class into Agent and Configurer
 e8be6dc  Removing the Hash default proc from SimpleGraph.
 6bb804f  Removing the Catalog's @aliases hash default value
 502e062  Removing an erroneous configuration call in puppetmasterd
 337057a  Removing obsolete code and tests for the agent.
 d53ad31  Converting the catalog as needed
 f38277f  Adding REST support for facts and catalogs.
 c48525b  Adding better error-handling to format rendering
 b93a642  Resetting SSL cache terminii to nil when only using the ca
 212b3e3  Allowing the Indirection cache to be reset to nil
 5a83531  Moving the Agent locking code to a module.
 b672790  Cleaning up SSL instances that can't be saved
 f78a565  Only caching saved resources when the main save works
 5434459  Moving classfile-writing to the Catalog
 e65d7f1  Refactoring how the Facter integration works
 6b4e5f4  Reformatting tests for facts
 54faf78  Moving fact and plugin handling into modules
 9d76b70  Removing the Agent code that added client-side facts
 a5c2d7a  Adding Puppet client facts to Facter facts.
 b99c6b5  Clarifying how node names are used during catalog compilation
 8b44d6f  Reformatting Indirector catalog compiler tests
 e770e7a  Removing ConfigStore code that was never actually used.
 37692e5  Renmaing Puppet::Network::Client::Master to Puppet::Agent
 15d8768  Revert "Adding the first bits of an Agent class."
 63fb514  Revert "This is work that I've decided not to keep"
 8f5cbc3  This is work that I've decided not to keep so I'm just applying it here so it continues to show up in the history in case I ever want to look at it again.
 25b28c5  Adding a new Agent::Downloader class for downloading files.
 1afb821  Adding the first bits of an Agent class.
 2afff60  Adding support for skipping cached indirection instances.
 361db45  Change the way the tags and params are handled in rails
 62cdeaa  Add methods to return hash instead of objects to params and tags
 3acea41  Rails serialization module to help serialize/unserialize some Puppet Objects
 10bf151  Fixing #1913 - 'undef' resource values do not get copied to the db
 500ea20  Fixing #1914 - 'undef' relationship metaparameters do not stack
 1407865  Revert "Fixed #1916 - Added environment option to puppetd"
 8d0086b  Fixed #1916 - Added environment option to puppetd
 a065aeb  Fixed #1910 - Updated logcheck regex
 fa9dc73  Typo fix
 7c8094c  Fixed #1879 - Added to tidy documentation
 f40a6b1  Fixed #1881 - Added md5lite explanation
 6af3179  Fixed #1877 - Tidy type reference update for use of 0
 a5b0a75   Fix autotest on win32
 234a035  Fix #1560
 fb8f8cd  In order for ReST formatting to work properly, newlines and indentation of doc strings must be retained.
 69432d6  Fix Bug #1629
 1f6dce5  Fix #1835 : Add whitespace/quote parsing to
 8142981  Fix #1847 - Force re-examination of all files to generate correct indices
 d2d3de5  Fix #1829 - Add puppet function versioncmp to compare versions
 bdee116  Fix #1828 - Scope.number? wasn't strict enough and could produce wrong results
 d69abfe  Fix #1807 - make Puppet::Util::Package.versioncmp a module function
 34335b7  Fixed #1840 - Bug fixes and improvements for Emacs puppet-mode.el
 3b8a77d  Fix #1834 part2 - Fix tests when no rails
 b6e34b7  Fix #1834 part1 - Fix tempfile failing tests
 566bf78  Fixing #1729 - puppetmasterd can now read certs at startup
 0cf9dec  Canonicalizing Setting section names to symbols.
 0fc0674  Fixing all of the test/ tests I broke in previous dev.
 e4ba3db  Deprecating the Puppet::Type.create.
 b6db545  Deprecating 'Puppet.type'; replacing all instances with Puppet::Type.type
 89c25ad  Finishing the work to use Puppet::Resource instead of TransObject
 1c7f8f6  Adding name/namevar abstraction to Puppet::Resource.
 e601bab  Supporting a nil expirer on cacher objects.
 f69ac9f  Setting resource defaults immediately.
 352d7be  Refactoring the Settings class to use Puppet::Resource
 91ff7c1  TransObject is nearly deprecated now.
 fae3075  Simplifying the initialization interface for References
 14c3c54  Replacing TransObject usage with Puppet::Resource
 60062e4  Renaming the "Catalog#to_type" method to "Catalog#to_ral"
 6b14000  Using Puppet::Resource to convert parser resources to RAL resources
 e3b1590  Adding resource convertion to the parser resources
 c306a17  Adding equality testing to Puppet::Resource::Reference
 48a9949  Correcting whitespace and nested describes in Puppet::Resource::Catalog
 d48fff6  Renaming Puppet::Node::Catalog to Puppet::Resource::Catalog
 c927ce0  Renaming Puppet::ResourceReference to Puppet::Resource::Reference
 e88746b  Adding Trans{Object,Bucket} backward compatibility to Puppet::Resource
 832198f  Starting on #1808 - Added a base resource class.
 820ff2e  Removing the "clear" from the macauthorization tests
 89e9ef7  Fix #1483 - protect report terminus_class when testing for REST
 435f1e9  Fix #1483 - use REST to transmit reports over the wire
 6b30171  Fixing all broken tests.  Most of them were broken by fileserving changes.
 f73e13e  Adding more file tests and fixing conflicting tests
 cc12970  Completely refactoring the tidy type.
 720dcbe  Cleaning up the tidy type a bit
 053d7bf  These changes are all about making sure file data is expired when appropriate.
 a8d9976  Catalogs always consider resource data to be expired if not mid-transaction.
 8b08439  Properly cleaning up ssl ca configuration during testing
 73fa397  Adding caching support to parameters, and using cached attributes for file source and metadata.
 0ecbf79  Adding cached attribute support to resources.
 29b9794  Allowing a nil expirer for caching classes.
 cd09d6b  Refactoring the Cacher interface to always require attribute declaration.
 14af971  Changing the Cacher.invalidate method to Cacher.expire.
 99a0770  Fixing a critical bug in the Cacher module.
 fe0b818  Fixing tests broken by fileserving and other refactoring.
 eed37f7  Fixing a test broken by previous refactoring
 45c6382  Finishing the refactoring of the resource generation interface.
 0840719  Refactoring and clarifying the resource generation methods.
 cc04646  Refactoring Catalog#add_resource to correctly handle implicit resources.
 a73cad9  Adding SimpleGraph#leaves, which I apparently did not migrate from PGraph
 2a685f9  Removing mention of obsolete edgelist_class from GRATR.
 7e20f06  Changing the catalog's relationship graph into a normal graph.
 2ba0336  Removing the PGraph class and subsuming it into SimpleGraph.
 e92c1cc  Moving Catalog#write_graph to SimpleGraph, where it belongs.
 0149e2e  Converting the file 'source' property to a parameter.
 35c623e  Removing mid-transaction resources from the catalog.
 f4800e8  Adding a method to Checksums to extract the sum type
 44fadd1  Aliasing "must_not" just like we alias "must"
 a9dbb5d  Deduplicating slashes in the fileserving code
 bb6619a  Fixing the augeas type tests to work when augeas is missing
 e728873  Reducing the number of calls to terminus() to reduce interference with caching
 aa8d091  Switched all value management in props/params to internal classes.
 e5b5033  Fixing #1677 - fixing the selinux tests in master.
 77d73e0  Changing the meaning of the unused Puppet::Type#parameter method to return an instance rather than a value.
 05e1325  Moving a file purging test to rspec
 6f7ccff  Fixing #1641 - file recursion now only passes original parameters to child resources.
 a4d4444  Removing obsolete methods and tests:     Removing obsolete handleignore method     Removing obsolete FileSource class     Removing a now-obsolete test/unit test     Removing a now-obsolete recursive filebucket test
 b4f4866  Making it so (once again) files with sources set can still be deleted (which I think is kinda stupid, but apparently people want it).
 caf15c2  Fixing and migrating more file tests.
 cccd838  Adding a starting point for spec tests for tidy.
 255c9fb  Setting puppetmasterd up to serve all indirected classes.
 7fdf2bb  Retrieving the CA certificate before the client certificate.
 a00c1f2  Handling the case where a symbol (e.g., :ca) is used for a certificate name.
 cf3a11c  Fixing :bindaddress setting to work with the new server subsystem.
 a78c971  Fixing CertificateRequest#save to accept arguments.
 e70c1a0  Fixing forward-compatibility issues resulting from no global resources
 4596d2d  Fixing a test I broke when fixing a reporting bug
 9742c26  Fixing resource aliasing to not use global resource aliasing. I'm not really sure why the 0.24.x-style code got merged in, since master's changes should be more recent.
 1b517d2  Adding comments to Puppet::Util::Cacher
 7a6d9b1  Removing obselete code from the file type.
 1b512a9  Merged fsweetser's selinux patch against HEAD
 e31df2f  Removing files that git wasn't smart enough to remote during a merge.
 ac5db5e  Removing the old, obsolete recursion methods.
 a9b7f08  As far as I can tell, recursion is working entirely.
 b69c50c  Removing insanely stupid default property behaviour.
 45f465b  Source recursion is nearly working.
 93fc113  Files now use the Indirector to recurse locally.
 bd1163a  Fixing filesets to allow nil ignore values.
 5da2606  Recursion using REST seems to almost work.
 ee1a85d  Mostly finishing refactoring file recursion to use REST.
 7c68fdb  Fixing FileServing::Base so that it can recurse on a single file.
 ac41987  Fixing the terminus helper so it correctly catches options passed from clients via REST.
 be4c0e7  The file source is now refactored and uses REST.
 44c6a52  Removing mention of an obselete class.
 8271424  One third done refactoring file[:source] -- retrieve() is done.
 98ac24a  Adding a "source" attribute to fileserving instances.
 6e43c2d  Aliasing RSpec's :should method to :must.
 8b45d13  Adding automatic attribute collection to the new fileserving code.
 6ed8dfa  Adding the content writer to the content class.
 92e144b  Fixing a test in the module_files terminus
 151a54f  Causing format selection to fail intelligently if no suitable format can be picked.
 deda646  Removing the last vestiges of the 'puppetmounts' protocol marker.
 30dea68  Adding a 'plural?' method to the Indirection::Request class.
 40e76fb  Fixing the rest backends for webrick and mongrel so the get the whole request key.
 8ea25ef  Refactoring how files in FileServing are named.
 550e3d6  Finishing the rename of FileBase => Base.
 90e7022  Adding weights to network formats, and sorting them based on the weight.
 5a195e0  Renaming FileServing::FileBase to FileServing::Base.
 3101ea2  Adding a hackish raw format.
 89a3738  Adding suitability as a requirement for a format being supported.
 a0bda85  Removing the yaml conversion code from FileContent.
 6335b14  Causing the Indirection to fail if a terminus selection hook does not return a value.
 1104edb  Correcting whitespace in a test
 2f224c9  Spell-correcting a comment
 bcd40fb  Cleaning up an exception.
 0a05720  FileServing Configurations now expect unqualified files.
 237b7b2  Fixing whitespace in docs of some tests.
 91b8252  Fixing the fileserving terminus selection hook.
 f5ba99f  Special-casing 'file' URIs in the indirection requests.
 a215aba  Dividing server/port configuration responsibility between the REST terminus and the indirection request.
 d174605  Fixing a test that relied on hash ordering.
 7034882  Adding parameter and URL support to the REST terminus.
 c819042  Fixing the String format (fixes #1522).
 78bc32d  Removing dead-end file work as promised.
 a5ab52c  Adding files temporarily, since I've decided this work is a dead-end.
 4f275b6  Fixing #1514 - format tests now work again.
 025edc5  puppetd now uses the Indirected SSL.
 62202bf  Adding 'require' statements as necessary for Puppet::SSL to work.
 86a7188  Fixing the SSL::Host#waitforcert method.
 a31c578  Adding logging when files are removed.
 09ee814  Removing now-obsolete the wait-for-cert module.
 cd314fa  Documenting a bit of a test
 113d74a  Certificates now work over REST.
 2cad30a  Caching the SSL store for the SSL Host.
 93fd55f  Enhancing formatting errors with class and format.
 6c80e0f  Making all certificates only support the plaintext format.
 c464bf2  Adding wait_for_cert functionality to the ssl host class.
 c854dbe  Adding a plaintext network format.
 818599d  lazy load latest package definitions with yumhelper 2.2
 8457856  Fixing a group test that failed after merging 0.24.x
 c2c8941  Correctly handling when REST searches return nothing.
 186f3cd  Removing an obsolete method from the rest indirector
 29d704c  The REST formats are now fully functional, with yaml and marshal support.
 c55acee  Adding some support for case insensivity in format names.
 8033bd4  Moving validation from FormatHandler to Format.
 3405841  Moving functionality out of the FormatHandler into the Format class.
 43a6911  Searching again works over REST, including full content-type translation.
 1064b5b  Fixing the format_handler tests so that they clean up after themselves.
 167831e  Fixing a test I broke while rebasing
 e78b1a6  Fixing a test to be order-independent.
 352e2d0  Adding rudimentary support for directly managing formats.
 55e2944  Adding support for rendering and converting multiple instances.
 4632cfd  All error and format handling works over REST except searching.
 e3350ca  Drastically simplifying the REST implementation tests.
 b3914c3  Removing an apparently-obsolete hook from the handler
 739a871  Adding explicit tests for the HTTP::Handler module.
 0ce92f1  The REST terminus now uses the content-type and http result codes.
 a4170ba  Removing a now-obsolete pending test.
 bf5b086  The REST terminus now provides an Accept header with supported formats.
 1f15725  Using the FormatHandler in indirected classes automatically.
 0e7e16d  Adding a FormatHandler module for managing format conversions.
 93eeff5  Fixing the user ldap provider tests
 00b7da3  Fixing the new-form version of #1382.
 c542dc0  Fixing #1168 for REST -- all ssl classes downcase their names. This is a much cleaner fix than the xmlrpc version, thankfully. :)
 eaa6eab  Fixing #1258 -- Removing a Rails idiom.
 eb5e422  Fixing #1256 -- CA tests now work with no ~/.puppet.
 66c36f0  Fixing another failing test -- the new CA tests correctly clear the cache.
 447507c  Fixing #1245 -- ssh_authorized_keys tests work in master.
 6f533d1  Fixing #1247 -- no more clear_cache failures.
 3cb0d60  Fixing how the mongrel server sets up xmlrpc handlers.
 6efe400  Using the new Cacher class for handling cached data.
 68d8d0a  Adding a module for handling caching information.
 e936ef2  Fixing some broken tests.
 1cfb021  The CRL is now automatically used or ignored.
 0365184  Removing obsolete tests
 3303590  The master and client now successfully speak xmlrpc using the new system.
 8fd68e3  Adding pidfile management and daemonization to the Server class.
 dd4d868  Fixing the HttpPool module to get rid of an infinite loop.
 57c7534  Adding REST terminuses for the SSL-related indirections.
 d78b4ba  Adding autosigning to the new CA.
 a822ef9  Moving the CA Interface class to a separate file.
 38e2dcf  The master is now functionally serving REST and xmlrpc.
 6e0d6dd  The REST infrastructure now correctly the SSL certificates.
 51ce674  Fixing the webrick integration tests to use the newly-functional SSL code.
 62f1f5e  The Certificate Authority now automatically creates a CRL when appropriate.
 e57436f  The Settings class now clears the 'used' sections when a value is changed.
 137e29f  Moving some http configuration values to the main defaults section, rather than the puppetd section.
 a3b8804  The http pool manager now uses new-style certificate management.
 e596bc5  Fixing some tests that were insufficiently mocking their configurations.
 160f9d9  Fixing a critical problem in how CRLs were saved and moving SSL Store responsibilities to the SSL::Host class.
 ce6d578  The SSL::Host class now uses the CA to generate its certificate when appropriate.
 67dc268  The CA now initializes itself.
 6356c04  Switched puppetmasterd to use the new-style server plumbing.
 4c590df  Adding xmlrpc backward compatibility to the new Mongrel code.
 31b79fa  Adding xmlrpc support to webrick.
 7a876ed  Fixing some whitespace
 7267341  Adding configuration support for XMLRPC handlers.
 8c9b04d  I think I've now got the Webrick SSL support working. Now I just need to get xmlrpc working alongside REST in both mongrel and webrick.
 83519f4  Interim commit, since I want to work but have no network available.
 58fb416  Changing the File certificate terminus so that it saves to the :localcacert instead of :cacert.
 79ca444  Renaming the 'ca_file' ssl terminus type to 'ca'.
 a116d10  Temporarily disabling the revoke/verify test in the CA.
 d87e018  Fixing how the CRL is used for certificate verification.
 6c539c0  Fixing puppetca so it uses the :local ca setting.
 ebdbe48  Added an Interface class to the CA to model puppetca's usage.
 934fbba  Making the SSL::Host's destroy method a class method, rather than an instance method.
 d4813f1  Adding the last functionality needed for puppetca to use the Indirector.
 809fc77  Finishing the interface between the CA and the CRL.
 16056a2  Adding inventory support to the new certificate authority.
 d498c4a  Adding support within the inventory for real certs or Puppet cert wrappers.
 67f9d69  Changing the Inventory class to rebuild when the first cert is added, so it's easier to test.
 7cca669  Adding a comment to the inventory class.
 98db985  Adding an SSl::Inventory class for managing the ssl inventory.
 92a7d76  All SSL terminus classes now force the CA information into the right place.
 fb56dea  Switching the SSL::Host class to return Puppet instances.
 f7e0990  Setting the expiration date of certificate objects to the expiry of the actual cert.
 71db9b5  Adding integration tests for a lot of the SSL code.
 e5c4687  Moving the password file handling into the SSL::Key class.
 d8bb81e  Moving all of the ca-specific settings to the ca_file terminus classes, rather than the normal :file classes.
 cbe5221  Adding SSL::Host-level support for managing the terminus and cache classes.  Also, defaulting to the :file terminus for all of the SSL classes.
 c5f0eff  Fixing the CA so it actually automatically generates its certificate.
 3d24b12  The certificate authority now uses a Host instance named 'ca'.
 daa8cd5  Changing all of the SSL terminus classes to treat CA files specially.
 7d2c05e  The 'destroy' method for the ssl_file terminus base class now returns false on missing files, rather than failing.
 7555af6  Marking a test as pending, because it's not ready yet.
 c19c9d4  Removing all the cases where the ssl host specifies a terminus.  Also, getting rid of some metaprogramming that wasn't really helping.
 054e4e4  Making the first pass at using requests instead of specifying the terminus class.  The individual ssl classes now work, but the ssl host class doesn't yet.
 6900f97  Adding a :to_text method that will convert the contained thing to readable human text.
 174b9c9  Actually signing the certificates in the CA.
 546ac97  Adding the first attempt at managing the certificate revocation list.
 c98ad25  Adding a :search method to the ssl_file terminus type and the SSL::Host class.
 d184b35  Fixing a failing test that had not been updated from previous coding
 b9d6479  We have a basically functional CA -- it can sign requests and return certificates.  There's still plenty more work to do, but I'm probably not much more than a day away from redoing puppetca to use this code.
 1efed03  Adding tests for the easy bits of the CertificateFactory. I probably am going to skip the tests for the rest, since the code is unlikely to ever change, and it's going to be a royal pain to test.
 ee07d0b  Adding tests for the certificate serial numbers
 dc5c73b  The certificate authority is now functional and tested.
 a776a12  refactoring the cert request test a bit
 7641bd4  This is a first pass at the certificate authority. The tests are basically entirely absent still, but the structure is all there.
 0f46815  It looks like all of the new ssl classes for managing keys, certificates, and requests now work, including talking to the certificate authority.  Now we just need the authority itself, along with the necessary REST terminii.
 00e35bc  Adding he last of the indirection classes for the ssl classes, finally including the certificate requests.
 8347b06  The certificate and key are now correctly interacting with the existing cert/key store.  Certificate requests are not yet handled, nor are the ca-specific collections.
 50f3c18  Removing obsolete indirection classes
 ec5bdf3  The basics for the certificate and certificate request indirection terminii are done.  I need to move most of the test code to a shared behaviour now.
 bb87464  Fixing a couple of broken tests.
 b0811ad  The new SSL classes basically work, but they're not functionally connected to any kind of indirection.
 3970818  Finished the certificate request wrapper class.
 4ca6fd3  First stage of cert refactoring:  Private keys kind of work.
 ef7d914  Oops; final fix on the integration test failures resulting from my partial support for ssl in webrick.
 0ca0ef6  Fixing whitespace problems.
 4640a3d  Fixing an integration test of the rest terminus; it was broken by my incomplete cert support in webrick.  I just stubbed out the cert usage for now; once all the cert stuff is done we'll need to go back and unstub it.
 d738f31  Adding the necessary tests for webrick to have logging and ssl.  The tests can't be completed until the certificate work is all done.
 b49fb68  Fixing the tests in test/ that were broken as a result of the move to no global resources.
 5e78151  Fixing tests that were failing as a result of the merge, including removing some now-obsolete code and tests from the Settings class.
 bee9aba  Environments are now available as variables in manifests, and specs can be directly executed again.
 b225e86  Fixing #1017 -- environment-specific modulepath is no longer ignored.
 4ede432  Tidied the man page creation function and created "master" branch man pages
 f335dc3  Updated defaults.rb to fix foru error stopping man page creation - links are not as neat as before but puppet.conf.man file will create neatly now.
 c751058  Removed remaining elements of old_parse - closing Ticket #990
 31e0850  Removed old configuration file behaviour and deprecation warning - closes ticket #990
 4165eda  More fixes to the testing.
 cfda651  Another round of test-fixes toward eliminating global resource references.  This should have gotten rid of all of them, and now it's just a question of fixing a few hopefully unrelated failing tests.
 488c437  Fixing automatic relationships.  I was previously looking them up in the relationship graph, which only stores the vertices, not the resource table.
 d8991ab  Updated install.rb to product puppet.conf.man page - updating ticket #198
 5a0388f  Disabled new man page creation support
 e5888af  Added support for man page creation - requires rst2man.py and writer - closed ticket #198
 5bef4a5  Another round of fixes toward making global resources work.
 3cc3e0f  Lots o' bug-fixes toward getting rid of global resources. We still have about 60 failing tests, but some of them are the failing directory service tests (probably 20 or so), and most are simple fixes to the tests themselves.
 b7b11bd  Fixing a couple of failing tests
 aed51b4  Fixed puppet logcheck issues
 7aa79e2  Revert "Fixed documentation for code option in defaults.rb"
 f2991a2  Revert "Fixed indentation error in pkgdmg.rb documentation"
 754129e  Revert "Fixed issue where permissions are incorrectly set on Debian for /var/puppet/run directory"
 20628ea  Added patch to ext/logcheck/puppet to fix ticket #978
 badf977  Fixed indentation error in pkgdmg.rb documentation
 e6547f0  Fixed documentation for code option in defaults.rb
 594a5a3  Fixed issue where permissions are incorrectly set on Debian for /var/puppet/run directory
 9736b3c  Updated for 0.24.0
 99f9047  tweaking spec language; require Puppet::Network::HTTP class since it is referenced by Puppet::Network::Server
 b38f538  Moving $PUPPET/spec/lib/autotest up to $PUPPET/autotest as something has changed and it can't be found otherwise.
 e1abfac  moving autotest directory to make it possible to run autotest again
 
 0.24.9
 ======
 0dee418  Fixed typo in util.rb
 df33cb0  Updated CHANGELOG
 a22a088  Updated version to 0.24.9
 0aae57f  Backport of tmpfile patch from 0.25.2
 9a26421  Brought in lutters parse_commands patch and integrated it into the type. This includes reworking the get and match commands as well. This change introduces a few small changes. These are:
 916dd60  Fixed rspec gem at version 1.2.2
 57b37e5  Add @options to test run call, for compatibility with more recent rspec versions.
 0863a79  Adding #2122 - you can specify the node to test with puppet-test
 a43137c  More RST fixes
 843cc6e  Fixed RST for functions
 6160aaf  In order for ReST formatting to work properly, newlines and indentation of doc strings must be retained.
 d125937  Added rake ci:all task
 c62c193  Updated to version 0.24.8
 aa00bde  Fixing #1631 - adding /sbin and /usr/sbin to PATH
 39deaf3  Fixed #2004 - ssh_authorized_key fails if no target is defined
 dcf2bf2  Changelog entries for #1629 and #2004
 bbcda1d  Fix Bug #1629
 69a0f7d  Fix #1807 - make Puppet::Util::Package.versioncmp a module function
 081021a  Fix #1829 - Add puppet function versioncmp to compare versions
 2b33f80  Fixed install.rb typo
 5ab63cd  Updated lib install permissions to 0644
 
 0.24.8
 ======
 02a503f  Updated to version 0.24.8
 cbc46de  Fixing #1631 - adding /sbin and /usr/sbin to PATH
 9eb377a  Fixed #2004 - ssh_authorized_key fails if no target is defined
 1b3fe82  Changelog entries for #1629 and #2004
 8a671e5  Fix Bug #1629
 ff5b13a  Fix #1807 - make Puppet::Util::Package.versioncmp a module function
 991f82c  Fix #1829 - Add puppet function versioncmp to compare versions
 d0bf26e  Fixed install.rb typo
 4cf7a89  Updated lib install permissions to 0644
 2c7e189  Fixes incorrect detail variable in OS X version check, re-patches ralsh to work with Facter values and adds error check for missing password hash files.
 73a0757  Fix #1828 - Scope.number? wasn't strict enough and could produce wrong results
 
 0.24.8rc1
 =========
 84d6637  Fixed #2000 - No default specified for checksum
 a3bb201  Fixing change printing when list properties are absent
 67fc394  Fixed #2026 - Red Hat ignoring stop method
 cf64827  Bring in the documentation changes from the master branch
 01bc88c  Added a force option to ensure the change is always applied, and call augeas twice to reduce the chance that data is lost
 cedeb79  Backport the fix for #1835
 cf48ec0  First cut at the not running if augeas does not change any of the underlieing files
 9d36b58  Bug 1948: Added patch by jab to support the correct ins syntax. Updated the test cases as well
 61661b1  Fixing #1991 - ldap booleans get converted to booleans
 d5850dc  Refactored a method: extracted about five other methods
 1c7c8fe  dbfix - fix typo and close another possible inconsistency
 c55ac3f  Fix #2010 - add protection code for some storeconfig corruption
 a790ee3  Further fix to #1910
 9577d3a  Fixing #2013 - prefetching had a mismatch between type and title
 719a8df  Fixed to rake tests for reductivelabs build
 ac87600  Fixed report reference page
 0c16426  Fixing broken 0.24.x tests in test/.
 23066c1  Fixing every failing test I can find on the build server.
 ec56ddf  This script fixes the most common issues with inconsistent storeconfigs database (including duplicate resources record, duplicate param_values records, dangling records...).
 c052ff8  Make puppetd --waitforcert option behave as documented:
 e2b4062  Adding a performance optimization to the FileCollection.
 fa6494b  Using the FileCollection where appropriate.
 373d505  Adding a FileCollection and a lookup module for it.
 0e46786   Fixed #1963 - Failing to read /proc/mounts for selinux kills file downloads
 4170238  Fixed #2025 - gentoo service provider handle only default init level
 8c010e0  Fixed #1910 - updated logcheck
 7504b04  Updated useradd.rb managehome confine to include other RH-like distributions
 f07d928  Use Puppet.debug instead of own debug flag
 25a3f59  Fixing #558 - File checksums no longer refer to 'nosum'
 d758f45  Fixing #1871 once and for all - contents are never printed
 c0f4943  Minor fix to launchd tests
 24d48e6  Fix #1972 - ActiveRecord fixes resulted in broken tests
 446989b  Fix spec test for launchd service provider to work with new service status method and add two new status tests.
 3ef5849  Fixing a test I broke in commit:"897539e857b0da9145f15648b6aa2ef124ec1a19".
 72bd378  Removing a no-longer-valid test.
 682dd8b  Fixing password validation to support symbols.
 44f97aa  Only backing up within parsedfile when managing files
 04af7b4  Fixing a syntax error in the up2date provider
 1070b3c  Fixing a test broken by a log demotion
 ab84756  Cleaned up variable names to be more sane, clarified error messages and fixed incorrect use of 'value' variable rather than 'member'.
 7f41857  Provide dscl -url output support for OS X 10.4 clients using the directoryservice provider.
 0bc3c07  Fix launchd service provider so it is backwards compatible with OS X 10.4 as well
 2561c8e  Updated Augeas type code
 7d72186  Removed site from Puppet VIM syntax
 1bc7404  Fixed #1831 - Added sprintf function
 336b645  Fixed #1830 - Added regsubst function
 2a85551  Bug 1948: Add logic and testing for the command parsing logic
 2218611  Updated up2date and service confines to add support for Oracle EL and VM
 39a8b28  Fixing #1964 - Facts get loaded from plugins
 7cf085c  Adding tests for Puppet::Indirector::Facts::Facter.loadfacts
 70ea39a  Adding a post-processor for Nagios names.
 4dfa034  Revert "Refixing #1420 - _naginator_name is only used for services"
 d5a193a  Fixing #1541 - ParsedFile only backs up files once per transaction
 53f15b9  Removing the apparently obsolete netinfo filetype.
 4e89156  Migrated FileType tests to spec, and fleshed them out a bit.
 cc4d658  Bug #1948: Added patch by jab to support the correct ins syntax. Updated the test cases as well
 5e35166  Fixing #961 - closing the http connection after every xmlrpc call
 af3f3ae  Refactoring the XMLRPC::Client error-handling
 f0ac3ae  Fixed #1959 - Added column protection for environment schema migration
 319822a  Fixing #1869 - autoloaded files should never leak exceptions
 6b0c1b9  Fixing #1543 - Nagios parse errors no longer kill Puppet
 7fd5c7e  Moving the transaction specs to the right path
 efb5cc5  Refixing #1420 - _naginator_name is only used for services
 32c2be9  Fixed #1884 - exported defines are collected by the exporting host
 0e49159  Cleaning up the AST::Resource code a bit
 b22d148  Fix #1691 - Realize fails with array of Resource References
 6331bfc  Fix #1682 - Resource titles are not flattened as they should
 7e036eb  Fix #1922 - Functions squash all arguments into a single hash
 535fa89  Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d
 f7b04df  Fixed #1936 - Added /* */ support to the vim file
 671d73c  Prefetching, and thus purging, Nagios resources now works *only* if you use the default configuration file locations.
 063871f  Adding some basic tests for the Naginator provider base class
 897539e  Removing a redundant instance prefect call.
 012efe3  Fixing #1912 - gid still works with no 'should' value.
 a9f34af  Fixing the Rakefile to use 'git format-patch'.
 db05c00  Fixing #1920 - user passwords no longer allow ':'
 aa219e7  Adding README.rst file
 1d3f117  Added Reductive Labs build library
 f01882d  Change the way the tags and params are handled in rails
 b7ab54c  Add methods to return hash instead of objects to params and tags
 5c64435  Rails serialization module to help serialize/unserialize some Puppet Objects
 b27fccd  Fixed #1852 - Correct behaviour when no SELinux bindings
 7403330  Updated Red Hat spec file 0.24.7
 
 0.24.7rc1
 =========
 84d6637  Fixed #2000 - No default specified for checksum
 a3bb201  Fixing change printing when list properties are absent
 67fc394  Fixed #2026 - Red Hat ignoring stop method
 cf64827  Bring in the documentation changes from the master branch
 01bc88c  Added a force option to ensure the change is always applied, and call augeas twice to reduce the chance that data is lost
 cedeb79  Backport the fix for #1835
 cf48ec0  First cut at the not running if augeas does not change any of the underlieing files
 9d36b58  Bug 1948: Added patch by jab to support the correct ins syntax. Updated the test cases as well
 61661b1  Fixing #1991 - ldap booleans get converted to booleans
 d5850dc  Refactored a method: extracted about five other methods
 1c7c8fe  dbfix - fix typo and close another possible inconsistency
 c55ac3f  Fix #2010 - add protection code for some storeconfig corruption
 a790ee3  Further fix to #1910
 9577d3a  Fixing #2013 - prefetching had a mismatch between type and title
 719a8df  Fixed to rake tests for reductivelabs build
 ac87600  Fixed report reference page
 0c16426  Fixing broken 0.24.x tests in test/.
 23066c1  Fixing every failing test I can find on the build server.
 ec56ddf  This script fixes the most common issues with inconsistent storeconfigs database (including duplicate resources record, duplicate param_values records, dangling records...).
 c052ff8  Make puppetd --waitforcert option behave as documented:
 e2b4062  Adding a performance optimization to the FileCollection.
 fa6494b  Using the FileCollection where appropriate.
 373d505  Adding a FileCollection and a lookup module for it.
 0e46786   Fixed #1963 - Failing to read /proc/mounts for selinux kills file downloads
 4170238  Fixed #2025 - gentoo service provider handle only default init level
 8c010e0  Fixed #1910 - updated logcheck
 7504b04  Updated useradd.rb managehome confine to include other RH-like distributions
 f07d928  Use Puppet.debug instead of own debug flag
 25a3f59  Fixing #558 - File checksums no longer refer to 'nosum'
 d758f45  Fixing #1871 once and for all - contents are never printed
 c0f4943  Minor fix to launchd tests
 24d48e6  Fix #1972 - ActiveRecord fixes resulted in broken tests
 446989b  Fix spec test for launchd service provider to work with new service status method and add two new status tests.
 3ef5849  Fixing a test I broke in commit:"897539e857b0da9145f15648b6aa2ef124ec1a19".
 72bd378  Removing a no-longer-valid test.
 682dd8b  Fixing password validation to support symbols.
 44f97aa  Only backing up within parsedfile when managing files
 04af7b4  Fixing a syntax error in the up2date provider
 1070b3c  Fixing a test broken by a log demotion
 ab84756  Cleaned up variable names to be more sane, clarified error messages and fixed incorrect use of 'value' variable rather than 'member'.
 7f41857  Provide dscl -url output support for OS X 10.4 clients using the directoryservice provider.
 0bc3c07  Fix launchd service provider so it is backwards compatible with OS X 10.4 as well
 2561c8e  Updated Augeas type code
 7d72186  Removed site from Puppet VIM syntax
 1bc7404  Fixed #1831 - Added sprintf function
 336b645  Fixed #1830 - Added regsubst function
 2a85551  Bug 1948: Add logic and testing for the command parsing logic
 2218611  Updated up2date and service confines to add support for Oracle EL and VM
 39a8b28  Fixing #1964 - Facts get loaded from plugins
 7cf085c  Adding tests for Puppet::Indirector::Facts::Facter.loadfacts
 70ea39a  Adding a post-processor for Nagios names.
 4dfa034  Revert "Refixing #1420 - _naginator_name is only used for services"
 d5a193a  Fixing #1541 - ParsedFile only backs up files once per transaction
 53f15b9  Removing the apparently obsolete netinfo filetype.
 4e89156  Migrated FileType tests to spec, and fleshed them out a bit.
 cc4d658  Bug #1948: Added patch by jab to support the correct ins syntax. Updated the test cases as well
 5e35166  Fixing #961 - closing the http connection after every xmlrpc call
 af3f3ae  Refactoring the XMLRPC::Client error-handling
 f0ac3ae  Fixed #1959 - Added column protection for environment schema migration
 319822a  Fixing #1869 - autoloaded files should never leak exceptions
 6b0c1b9  Fixing #1543 - Nagios parse errors no longer kill Puppet
 7fd5c7e  Moving the transaction specs to the right path
 efb5cc5  Refixing #1420 - _naginator_name is only used for services
 32c2be9  Fixed #1884 - exported defines are collected by the exporting host
 0e49159  Cleaning up the AST::Resource code a bit
 b22d148  Fix #1691 - Realize fails with array of Resource References
 6331bfc  Fix #1682 - Resource titles are not flattened as they should
 7e036eb  Fix #1922 - Functions squash all arguments into a single hash
 535fa89  Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d
 f7b04df  Fixed #1936 - Added /* */ support to the vim file
 671d73c  Prefetching, and thus purging, Nagios resources now works *only* if you use the default configuration file locations.
 063871f  Adding some basic tests for the Naginator provider base class
 897539e  Removing a redundant instance prefect call.
 012efe3  Fixing #1912 - gid still works with no 'should' value.
 a9f34af  Fixing the Rakefile to use 'git format-patch'.
 db05c00  Fixing #1920 - user passwords no longer allow ':'
 aa219e7  Adding README.rst file
 1d3f117  Added Reductive Labs build library
 f01882d  Change the way the tags and params are handled in rails
 b7ab54c  Add methods to return hash instead of objects to params and tags
 5c64435  Rails serialization module to help serialize/unserialize some Puppet Objects
 b27fccd  Fixed #1852 - Correct behaviour when no SELinux bindings
 7403330  Updated Red Hat spec file 0.24.7
 8befc18  Updated to version 0.24.7
 cf19bd8  Not using a temporary file when locking files for writing.
 b966ea0  Modifying the corruption-checking test.
 1f34bca  Issue 1804 VDev with the same devices should be in sync
 6d5a129  Documentation fixes
 45144a1  Fixing #1812 (hopefully) - adding read and write locks to yaml.
 2385a78  Preparing to fix #1812 - Moving locking code to a module
 2961b83  Fix #1815 - puppetdoc --all crash on resource override
 e5c36fd  Fix ZFS autorequire test
 da71ad5  Add a unique name to objects so we can determine uniqueness when read back in
 4418b34  Fix launchd service test on non-OSX platforms
 4b2bdf9  Fix the spec tests to work on other platforms, do the confine around OS X versions more sanely
 544a3e1  remove unnecessary mk_resource_methods call
 50ac03a  CHANGELOG updates
 a0a6d2c  Add a unique name to objects so we can determine uniqueness when read back in
 68ffd46  Bug #1803 Zfs should auto require the ancestor file systems
 7e2da7e  Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value
 8616d74  Fixing #1800 - tidy now correctly ignores missing files and directories
 6075d10  Fixing #1794 - returning sync when it is already initialized
 18fe5c3  Fixing #1750 again - All of the properties and now :ensure check replace?
 b22303e  Fix rake abort when there is a matching confine
 0caa9c5  spec tests for type and provider and some code cleanup to adhere to DRY
 0f2fc88  Finished work on rules creation and deletion
 ed49153  new better way of doing stdin
 05e05bb  finished rights flush, working on rules
 1e37230  macauthorization type
 4ed73ef  reset macauthorization tree. Initial checkin of new type/provider
 5d32cd9  add NetInfo deprecation notice to user and group providers, make the directoryservice user provider the default, remove default for darwin from NetInfo providers
 99ab940  Warn that the NetInfo nameservice provider is deprecated. Use directoryservice instead
 c4412ec  add some more sanity checks around stdin
 7de82c3  add support for stdin to Puppet::Util.execute
 edef064  Make ralsh behave more sanely for non-existent objects and property values
 9384a4a  Added git changelog task
 c398db1  Bug #1780 Fixing meaningless test
 278bfe8  Fixing mcx test failures (only happened sometimes).
 c4812b8  Need to stub out the defaultprovider call for non Mac platforms
 b444e43  remove extraneous comments
 49d4d01  Trim down the after block clears to try to make the tests work for the build servers
 65d6b49  Updated mcx type and provider with comprehensive spec tests.
 fd128d6  Fixing a package test to be *much* faster
 cdcbc5b  Fixing splaytime tests
 6a4c0d5  Removing debugging from the "resources" type
 0c6a151  Fixing a test that fails depending on test execution order
 968f5cc  Relicense under GPLv2+
 9ab3afb  Hopefully fixing #1703 - using a mutex around the sending of the tagmails
 3fe9cc7  Fix #1741 - fix some failing tests on some ruby versions.
 3570c71  Fix #1788 - allow rspec rake to run only some tests
 1b3a7d8  Fixing the AST constant warnings, using a variable instead of a constant
 091b8bf  Fixing #1785 - selinux tests no longer break other tests
 c005dcf  Ticket 1780 - Solaris RBAC roles should be autorequired
 3eff225  Feature 1696 Add support for branded zones
 fa9820b  Bug #1778 - Solaris RBAC profiles should maintain order
 f6fa4f7  Bug # 1680 Now you can set the hashed passwords on solaris
 0a40668  Feature #1783 - Add ZFS support
 047e5d0  Handle password when user is created
 88edf66  == is not =
 a219c88  Solaris doesn't have a native tool to set hashed passwords
 9329c95  type/mcx.rb Feature #1026 - MCX Type
 83b3a1e  Simplify launchd service provider and add tests
 65a6074   Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases
 0171e25  Fixing #1749 - Splay now hopefully behaves "better" for small values.
 607958c  Fix #1741 - Add inline_template function
 cc45c43  Fix #1741 - refactor TemplateWrapper, test for template function
 d8c741f  Fix #1741 - Puppet::Parser::Functions rmfunctions and unit test
 3c4efa7  Fixes #1773 - no longer check for absolute paths
 3a39509  make sure only types that have passwords search for the password
 a45c6b1  fix bug with numeric uid/gid in directoryservice provider. doc string cleanups
 1f52795  Documentation fix for runit provider
 81a91a7  Documentation fix for daemontools provider
 4f67a7c  Fixed #1776 - Trivial fix for gentoo service provider
 2764ab4  Rename migration so it's still applied
 965c08d  Slight denormalisation to store a host's environment as a first class object in the database Fixes: #1392
 5742966  Fixing #1743 - defined types get catalogs too.
 31ec3e6  Adjusted CI tasks exit codes
 3421954  Fixing #1755 - handling fully qualified classes correctly.
 a1ac9a5  Added Rake :ci namespace and CI tasks
 d978668  Lots of DirectoryService work. New Computer Type. Users now use password hashes. Groups now support setting members as attributes of the group for OS X.
 86ce934  launchd service provider
 97a8177  Refactoring the thread-safety in Puppet::Util a bit.
 78bced1  Fixing #1683 - accessing and changing settings is now thread-safe.
 83cebb5  Partially fixing #1772 - fixing selinux tests broken by removal of extraneous 'stat' in :file.
 a839fe2  Partially fixing #1772 - fixing tidy code I broke.
 5bd27c8  Partially fixing #1772 - broken 'resources' tests.
 a3140b2  Manually setting an env var to mark autotest enabled so we see color
 bbad983  Removing the included testing gems; you must now install them yourself.
 b415848  Fixing #1708 - user groups specified as names are now detected correctly.
 9ed382d  Fixed #1767 - Minor fix to emacs mode
 27a750d  Revert "Fixing #1755 - File modes (and other strange properties) will now display correctly"
 eb0d32a  Fixing #1764 - a property's 'sync' method is never considered a no-op.
 e9f858a  Refactoring the file/owner property to be simpler and cleaner.
 ed4c405  Fixing #1755 - File modes (and other strange properties) will now display correctly in ralsh and generated manifests.
 c65f2b5  Fixed #1668 - puppetca can't clean unsigned certs
 1ad33cc  Fix #1759 - Comparison operator was using string comparison for numbers
 c96d250  Fixed #1711 - fileserver test fails due to incorrect mocking
 8523a48  Fixed #1751 - Mac OS X DirectoryService nameservice provider support for plist output and password hash fil
 d32d7f3  Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine     whether stderr and stdout are combined in the output
 4396740  Fix the init service type to cope with an array for defpath and if defpath does not exist
 3c870d8  Added versionable feature to the RPM provider
 f62d04d  Fixing broken tests resulting from the fix to #1747
 030c791  Moved RRD feature from util/metric.rb to feature/base.rb
 dc192b0  Manifest documentation generation
 2c05a0a  Move function existance test to parser evaluation
 064fb00  Add a doc attribute to AST nodes and fill it with the last seen comments
 724a6f6  RSpec tests for the doc system (covers AST.doc, lexer and parser)
 b8ed667  Fixed #1735 and #1747 - Fixes to confine system
 6be5ac8  CHANGELOG updates
 0ca5025  Fixed #1718 - Added preseed to apt uninstall and purge
 01976ca  Include spec directory in packages
 c98f7a5  Fixing the provider's confine subsystem so the logs are more useful.
 6426a29  Removed extra 'end' from yum.rb
 1e81739  Fix bug #1746: Sync SELinux file attributes after file contents created/modified
 cebadd9  Fix bug #1681: Add filesystem type check to test for per-file SELinux context support
 60455e7  Quiet debug when no default SELinux context found for one of the components
 71a9e60  Fixes relating to transition to native SELinux bindings
 3a5dcab  Refactoring of SELinux functions to use native Ruby SELinux interface
 d5e19f1  Fixed #1739 - Added uninstall functionality to yum provider
 bf5be00  Fix #1737 - part2 - Fix display of "options"
 e032034  Fix #1737 - ssh_authorized_keys should be able to parse options containing commas
 e33d087  Fix #1740 - Daemontools and Runit is not ReST compliant
 dfc0554  Fixed #1730 - Edited file/ensure.rb docs for clarity
 6d7b5ef  Fixes #1672 - unsafe crontab handling in Solaris Signed-off-by: Martin Englund <martin@englund.nu>
 083077d  Fixing the augeas type tests to work when augeas is missing
 0a3d34d  Fixes #1714 - yumhelper handling with yum 2.2.x is broken
 7b70e85  Fixed #1721 - puppet.conf documentation incorrectly lists signals that affect the daemons
 781a685  Fixing a test I broke when fixing a reporting bug
 f063517  Added unit tests for the augeas type and provider
 2d37f09  Fix #1402 - Allow multiline comments
 9f30306  Fix #857 - Multiple class of the same name don't append code
 649a9e0  Fixed augeas examples in type
 56f3be6  Fixed #1710 - Spurious output in test run
 4806c51  Fixing #1669 - The dump parameter can now be changed on mounts.
 c7ccc4b  Fix #1682 - ASTArray should flatten product of evaluation of its children
 c906afd  Fixing #1667 - regex automatic value documentation is now readable.
 9fd1756  Split Augeas up into a provider and a type.
 e542f8c  Fixed #1692 - k5login fails to set mode when file is created
 57e791b  Fixing #1660 - Adding specifically supported values for tidy recursion.
 42cac73  Fixing #1698 - all logs again show up in the report.
 6ab4f1b  Fixed #1661 - Type reference: tidy should specify manditory parameters
 2459106  Removing all mention of EPM, RPM, or Sun packages.
 9ecbd63  Fixed #1104 - Classes and nodes should set $name variables
 bc8cdb1  Beginning provider split, need help on the voodoo
 6539f55  Updated Red Hat spec file for 0.24.6 and removed conf/debian directory.
 cacafeb  Added augeas type and feature
 
 0.24.6
 ======
 b2c1149  Updated to version 0.24.6
 5ba54d2  Updated to version 0.24.6
 22024bc  Improve the inline documentation for SELinux types and parameters
 f216237  Fixes #1663 - added Symbol check and additional test
 81c3b72  Fix SELinux test to succeed when Puppet debug mode is enabled
 f7516a7  Fix regression caused by switch to Puppet's execute() functions
 c09d0cc  Solaris RBAC Attributes
 6d05cbc  Fix #936 - Allow trailing comma in array definition
 ec2b461  Fix #1115 - part2 - fix tests and add all_tags
 356d8ca  Fixed #1662 - Configuration Reference still references 'section'
 b53509b  Fixed #1460 - enhance redhat puppetmaster init.d script to easy start puppetmaster as a mongrel cluster
 8a4e2e9  Fixed #1663 - Regression relating to facter fact naming from 0.24.5
 e6f99f9  Fix #636 - Allow extraneous comma in function argument list
 a74ec60  Fixing tests I broke when trying to fix the Providers reference.
 d4df361  Use fully qualified paths when calling binaries, adjust chcon call to use Puppet's execute() function.
 dedf0cd  Setting SELinux contexts with chcon should not dereference symbolic links
 7f5ded1  Fixed #1646 - service puppet status does not work as non-root on redhat system
 00d5fe4  Fix #1115 - Allow checking tags/classes from ERb templates
 f5fb2d3  Fixed #1649 - OS X package creation script should be more selective about cleaning out prior versions
 b0fd2e0  Fixing #1647 - puppetdoc's 'providers' report works again.
 157c0dd  Fix 1642 (always warning) and improve unit tests to cover when to warn and not
 65eafb7  lazy load latest package definitions with yumhelper 2.2
 eff6ce0  Revert "Added last part of #1633 patch - update to util/metrics.rb"
 c5d1a4f  Added last part of #1633 patch - update to util/metrics.rb
 0fff7d7  Fixing some tests that were broken in 2fba85af
 2afbd0d  Fixing a test that was failing as a result of the fix to #1491
 b0c01da  Adding an additional option for the fix in ff36832e, skipping missing cert dirs
 aea5582  Removing a gid test for users, since it is a bad test and has mostly been replaced in rspec
 65d3040  Fixing a test that was broken in ee579641
 b08002e  Fixing some tests that were broken in the fix for #1633
 2bf0ba5  Fixing a test that was failing because i-have-no-idea
 952ebb8  Fixing a test that was failing because of the change to retrieve() in ee579641
 a5fe87f  Fixing a file source test that was failing because missing sources is now a failure
 53b7d42  Fixing the broken tests resulting from the fix for #1551.
 5ec6b07  Adding warnings when example groups are skipped.
 54abe70  Moving some test/ package tests to rspec integration tests and disabling a gem test that hangs forever for me.
 85d3ae0  Cleanup selboolean and selmodule unit tests to pass on non-SELinux systems
 a562ce5  Add unit test coverage for Puppet::Util::SELinux and fix problems found by tests
 2b4aa0c  Fixed #1639 - uninitialized constant Puppet::Type::User::ProviderUseradd
 4265825  Fix #1636 - part2 - correct some client errors.
 9c31db9  Add failing test for plugin with file and recurse
 2853447  Fix several small regressions in plugins mount
 2153bae  Fixing #1640 - file groups now no longer get set on every run (this was a regression caused by other work I did).
 80e5c11  Incremented CHANGELOG to 0.24.6
 996ac46  Fix scenario when SELinux support tools exist, but SELinux is disabled
 d803096  Add new set of unit tests for selmodule type
 a3f34f9  Removal of redundant lines from unit test
 307260f  Remove old selboolean unit tests and fix permissions on new tests
 2ebd34e  Rewrote seboolean unit tests to provide better coverage
 4df51ea  New and improved tests for file type SELinux contexts
 253d4df  Fix regression when templatedir doesn't exist.
 c7a6ef2  Fix #1202 - Collection attribute matching doesn't parse arrays
 3281f2b  Fixed #1633 - Added support for --detailed-exits to bin/puppet which causes puppet to produce different exit codes depending on whether there were changes or failures in the transaction.
 0b1e60f  Adding an array indexer method to Puppet::Util::Metric as requested in #1633.
 765db30  Adding partial spec tests for Puppet::Util::Metric.
 fb14e91  Fixed #1473 - Rescue Timeout::Error in xmlrpc clients
 7275d7c  Fxied #1354 - yum provider problems with RHEL 3
 0c297be  Fix #1109 - allow empty if or else branches
 5268487  Fixed documentation, typo and added CHANGELOG entry
 990e8e3  Fix #1530: Correctly parse ssh type 1 keys
 06edac4  Fixed additional environments tests
 79bb1f2  Rspec Tests for #381. Moved part of the old resource reference tests to rspec.
 750e9ab  Fix #381 - Allow multiple resource overrides or references
 782181e  Minor test fix for #1614
 614326a  Fixing #1098 - Multiline strings now correctly increment the line count
 1c6d57e  Doing some simple refactorings on Puppet::Log
 a774443  Fixing #1089 - Log messages are now tagged with the log level, making it easier to match messages in the 'tagmail' report.
 db7f108  Adding rspec tests for the Puppet::Util::Log class.
 d2c8998  Fixed #981 - Removed 'Adding aliases' info message
 d098a90  Fix failing tests dependent on /etc/user_attr file existing
 6bcfd9f  Fixing #947 - pluginsync no longer fails poorly when no plugins exist
 67136f1  Fixing the Node class to no longer validate environments since #1614 removed that validation.
 a4110a3  Add SELinux context reset after file writes in Puppet::Util::FileType
 250239e  Add new support for :selrange SELinux file property
 c831482  Add detected defaults for existing SELinux file properties
 772e9b2  Refactor SELinux commands to utility module
 8153181  Clean up of SELinux rspec tests so all pass
 e77ddc1  Merged fsweetser's selinux patch against HEAD
 7272d49  Fixed #1613 - The client environment will be substituted when looking up settings.
 1a9b567  Fixing #1614 - Environments no longer have to be listed out.
 397c841  Fixed #1628 - Changed node search to use certname rather than Facter hostname
 9d174c4  Updated puppet binary documentation
 6a0b334  Fixed error message typo
 655f378  Adding a rake task for sending emails to the dev list
 d39bab9  Fixing package provider tests to use the new Transaction::Change interface
 e32256a  Migrating the apt and dpkg tests to rspec.
 ddda80a  Update change log with RBAC roles
 d1abb86  Add role support to user type and an implemention
 2fba85a  Some small clarifying refactors and change to objectadd to allow subclasses of with a uid not need to be a single class us use modify
 4a863c3  Adding user_attr util to parse attributes on solaris
 93f952a  Fixed #1586 - Specifying "fully qualified" package names in Gentoo
 8620775  Fixed #791 - You should now be able to create and find a user/group in one transaction.
 63ad845  Refactoring and adding tests to the file group property.
 7da4152  Modified the group and zone resource types to no longer call 'currentpropvalues' as a means of setting all values to absent. There should be no behaviour change from this change.
 ee57964  Modified the behaviour of resource-level 'retrieve' -- it only calls 'retrieve' on each property if the resource exists.
 0fb4693  Updating changelog for #1622
 2afc4f5  Adding tests for the user retrieve method
 679fede  Removing commented code from the user type from about 2005
 2480654  The Netinfo and DirectoryService providers can now create user and group simultaneously.
 4c998fe  Fixing #1622 - The user type only looks up groups when necessary.
 6bc56ae  Aliasing the rspec 'should' method to 'must' so it does not conflict with the RAL 'should' method.
 b9c75cd  Rewriting the user tests, in preparation for enhancing them
 99de920  Fixed #1620 - Add 'sles' to Puppet confines when 'suse' is used
 4cf9710  Add parser for arbitrary expressions
 cfa230a  Add arithmetic operators to AST
 850e0ba  Add not operator to AST
 9cdecfe  Add comparison operators (< > == != <= >=) to AST
 8372dc4  Add boolean operators to AST
 e6698c2  Add warning and forcibly set to :md5 fixing #1564
 af8c706  Fix metadata class for cases when checksum_type set
 860bdb1  Fixed #1603 - Added support for running Puppet inside a Rack application
 b2f0d87  Fix ticket 1596 in new fileset code, use tmpdir in fileserver tests.
 a30ecf2  Make fileserver use fileset for recursion and handle dangling links by ignoring them fixing #1544
 3b80763  Add tests for FileServer::Mount list for #1544
 3749267  Fixed #1610 - Raise "Filebucketed" messages to Notice priority
 f792b64  Added a number of confines to package providers
 074abd4  Fixed #1609 - Added confines for the Gentoo, FreeBSD and SMF (Solaris) service providers
 2da6d19  Fixed #1608 - Added ubuntu to defaultfor for apt provider
 aa629ec  Fixed #1607 - Added ubuntu to defaultfor for Debian service provider
 774c0f9  Fixed #1588 - Fixed puppetca --clean --all
 98e79f8  Fixed #1472 -- defined, exported resources in the current compile now get expanded correctly.
 0040bc8  Fixed #1045 - Multiple metaparams all get added to resources.
 8d5ded0  Removing some code in Parameter that is unnecessary.
 5fbdc49  Fixed #1595 - Internally, Property#retrieve is no longer called when no 'should' value is available for a resource.
 c16a5ae  Only apply splay the first run
 27f0c7d  fix failing hpux user specs
 7a3a38f  Add rspec unit test for the append operator
 16793d2  Add an append (+=) variable operator:
 7f8abbd  Bug #1550 - Rework to avoid regressing rspec tests, add new rspec tests for templatedir as a path
 0905734  Allow a templatedir to be colon separated.
 11b0848  Fixed #1500 - puppetrun host regression
 3b1d6e2  Fixed #1579 and #1580 - errors in the Puppet RPM spec file
 77f4fb6  Fixed #1521 -- ldap user and group are now used with the default connection when available.
 a1a670b  Fixed #1572 -- file purging now fails if remote sources do not exist.
 dd4f654  Fixing #1576 - moving all of the Puppet::Type code back into type.rb.
 923fd89  Fixed issues with file descriptors leaking into subprocesses
 cab5d85  Fixed #1571 - Puppet::Util::binary returns incorrect results
 a7306e1  Fixed #1553 - Puppet and Facter cannot both install the plist module into two different locations
 758505b  Fixed #1568 - createpackage.sh
 7ce902d  Adjusted hpuxuseradd user provider to confine to HP-UX and fixed HP-UX user provider path regression
 8f1336f  Fixed #1566 - changed password property of the user type
 d4d3213  Fixed debug messages in package type - thanks to Todd Zullinger for this fix
 b88df5a  Sync with latest Fedora/EPEL specfile
 0705dfb  Fixes #1455 - Adds HP-UX support for user type
 e15d316  Fixes #1551 puppetmaster.freshness xmlrpc call returns incorrect type
 8fe0338  Fixes #1554 - Fix exception for undefined hostname
 81cc9bf  Fixed #1533 - changed permissions for man directory
 41dc1fa  Runit service provider
 aae0793  Daemontools service provider
 29ae879  Fixes tests broken by 95aa085
 b50e718  Fixed #1488 - Moved individual functions out of functions.rb into the lib/puppet/parser/functions directory. New functions should be created in this directory.
 5fb5091  Fixed #1457 - case insensitive match for error
 ded94f7  Removed spec color option for buildbot
 415663b  Added simple rake task for running unit tests
 557be9d  Added spec Rake task
 0d118a5  Fix leaking LoadedFile when adding templates to be watched
 67387e2  Fixed #1506 - Removed storeconfig duplicate indexes
 7accb89  id column is autogenerated by rails as a primary key, there is no need to create an additional index on this column. This changeset contains the new schema and a migration.
 c5fb092  Removed reference to namespaces from --genconfig documentation
 1729de1  Updates to ext/puppetlast to support multiple hosts
 b6609ee  Fixed #1508 - Add HP-UX package provider.
 3e482a2  Updating the authors list for the gem spec
 2ec4e29  Fix #1502 - abysmal storeconfig performance - part2
 9272df4  Fix #1052 - abysmal storeconfig performance - part1
 f48a0ae  Fix #1510 - storeconfig fails with rails 2.1
 b1ad596  Add the -P/--ping option to puppetrun, fixes #1501
 6676b6b  Fixes #1274 - allow class names to start with numbers
 d02f95c  Fixed #1394 - Added stored configuration clearing script to /ext
 fb8cc53  Fixed #1442 - replaced use of Facter for report titling with certname
 18dda20  Fixed $1456 - add proxy configuration to yum repo
 ab4cb6a  Fixing #1447 -- Replacing Puppet::PackageError with Puppet::Error.
 8a0cb16  Added tests for TemplateWrapper's use of Scope#to_hash.
 3ae7eca  Fixing an ldap connectivity test
 d3393b4  Added CHANEGLOG entry for removal of interface type
 bfcdfe8  fix terrible error with overwriting permissions
 0147570  Fixed #1457 - removed confine warning
 fecdfbc  A working script to create an OS X pkg out of the Puppet repository
 6a2e71d  Fixed #1441 - Updated console colours
 404450a  Add testing for the changes to resolve redmine #1427, where Kernel methods shadow variables that the puppet template should otherwise see.  Specific changes:
 03c76de  Expose all puppet variables as instance member variables of the template wrapper. This helps resolve redmine #1427, by providing a safe mechanism to access variables.
 13069ec  Ensure that we consistently use either string #{} interpolation or String.% interpolation, not both, to avoid issues where a #{} interpolated value contains a % character.
 469c5fe  Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir in install.rb
 2a3d195  Specs for yaml indirector .search - I'm still learning!
 c97389d  Made puppetlast work on 0.24.5 by using the YAML indirector
 5c53617  Added a search method to the YAML indirector.
 482489a  Revert "Fixing puppetlast to make it work with 0.24.5 / 0.25."
 0bbac8d  Fixes #1417 - whitespace in ssh_auth_key provider
 a772110  Sync with latest Fedora/EPEL specfile
 97987a7  Feature #1241 : Improve performance of group lookups
 fe99828  Bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each certificate signing
 971af69  Fixing puppetlast to make it work with 0.24.5 / 0.25.
 d91d806  Updating the authors list for the gem spec
 
 0.24.5
 ======
 ce964ec  Updated to version 0.24.5
 a7df4eb  Updated to version 0.24.5
 4dffaf3  Reverting the version so my release process works
 aac7dd1  Incremented versions
 bfcd626  Fixes #1445 and #1426
 8f5800f  Fixes #1445 and #1426
 ff36832  Fixing the renaming code to skip missing directories.
 8c2478b  Fixing puppet_module -- it needed the same node interface change.
 d9aa5ab  Fixing a cert test to pass on Darwin.
 686ba4d  Revert "Merging fsweetser's selinux patch against 0.24.4"
 f16da42  Merging fsweetser's selinux patch against 0.24.4
 a47fed4  'Fix' broken tests related to missing source raising Issue 1437 In two cases, I removed the assertion that caused the failure. In one case, I changed the assertion to expect an exception.
 238b8d7  Fixing #1438 -- mongrel and module tests now pass.
 ebb219e  Fixed all of the fileserving termini so they use indirection requests.
 d8937ac  You can now select the encoding format when transferring the catalog, with 'yaml' still being the default but 'marshal' being an option. This is because testing has shown drastic performance differences between the two, with up to 70% of compile time being spent in YAML code.  Use the 'catalog_format' setting to choose your format, and the setting must be set on the client.
 a0fa09f  Revert "Fixed #1201 - all external node attributes are converted to strings."
 8f8ce60  Fixed #1431 - Provider confines must now specify similar tests in one call.
 7fa7251  The mongrel-related tests now run without mongrel.
 bdbd992  Updated /spec/unit/rails.rb test
 de6aec6  Fix Ticket 1426 - services on redhat are restarted again
 0a0fcaf  Fixed #1414 - Return code from waitpid now right shifted 8 bits
 61b9bcd  Added Changelog entry for new auth_key type
 65b9869  Further moves from the examples directory and ext directory
 4ce7159  Fail instead of log when rescuing remote file connections
 4c5293b  Fix #1409, Move path expansion from the type into the provider
 8043655  Fixing #1408 - --loadclasses works again.
 605d760  Moved debian to conf and updated examples directory
 d25c2b2  Fixed #1407 - allowdupe is now a boolean group parameter.
 9eb9aff  Fixed #1368 - updated Red Hat init scripts
 c7dc73f  Fixing the user ldap provider tests
 edf99c5  Added message referencing ReductveLabs build library
 6ff9246  Fixed #1396 - Added sha1 function from DavidS to core
 19b76c7  Fixing #1401 - integration tests now work regardless of the yamldir.
 667fac1  Fixed #1226 - Gems can now specify source repositories.
 21d4957  Correct whitespace
 4762b52  Moving the gem test to the non-ral directory
 71f4b02  Importing Sam Quigley's work to enhance gem support for sources.
 c751e4e  Fixed #1272 - ldap group names will be converted to GIDs.
 0922c3b  Fixed #1399 - the ldap user provider knows it can manage passwords.
 196494a  Fixed #1231 - Exceptions during startup should now be clear.
 9d69b3f  Testing and simplifying the Transaction::Change#backward method.
 61ec332  Removing the Transaction::Change#transaction accessor.
 2863df2  Refactoring the Transaction::Event class.
 a37a784  Adding tests for the Transaction::Event class
 31ffeab  Adding tests to the Transaction::Change class.
 8865bdf  file object creation should fail if source is not present
 73c06c0  Renaming Puppet::Event to Puppet::Transaction::Event
 84b5665  Updated test/ral/type/sshkey.rb test
 5ef8979  Removed debugging from lib/puppet/util/ldap/connection.rb
 6124c69  Renaming the Puppet::PropertyChange class to Puppet::Transaction::Change.
 ba12d30  Fixed #1232 - the rundir no longer specifies a user/group, and there are now client- and server-specific yaml directories.
 be169da  Removing all of the code related to the interface type.
 04ecb74  Doing what I can to fix #1128, but just in preparation for removing 'interface'.
 2279acd  Adding changes to config print that were missed in fix for 1183
 a87885a  Fixing the "describe" in the redhat interface specs
 bd3f8e3  Fixed 1240 - puppet will function more like puppetd if graphing or reporting are enabled.
 7a6ae29  Add a missing test for exercising the last untested line of lib/puppet/type/ssh_authorized_key.rb
 731d0f2  Minor documentation updates for ssh_authorized_key type
 c825c99  Fixing the ldap node terminus to merge facts with the right name.
 4b6b22e  Adding logging when a node's facts can't be found
 daf0d9d  Backporting a test that was failing in master, and fixing it
 38540d5  Fixing the ldap node integration test so it cleans up
 e03c1be  Fixing #1382 - existing uppercase certs, keys, et al will be renamed.
 5156230  Use generate instead of autorequire in the ssh_authorized_key type based on Luke's comments
 d3a8125  Fixed #1006 - puppetrun --class works again.  I added the class membership testing to the Ldap node terminus, and added tests,
 c1e010f  Fixing the Node::Ldap.search method to use an indirection request.
 4d22a95  Switching the ldap terminus to use Util::Ldap::Connection.
 b47d4e1  Added a 'search' method to the ldap node terminus.
 a1d1abd  Adding an 'instance' class method to ldap connections.
 ee9d002  Fixed #1114 - Facts in plugin directories should now be autoloaded, as long as you're using Facter 1.5.
 f1d5903  Fixing #1388 - the package test no longer uses 'require'.
 8c5c949  ssh_authorized_key: autorequire, default permissions and cleanup
 5a283d6  Fixing #1374  - Using Puppet::Type.type() in tests
 17afb8a  Fixes #1195 - Updated Gentoo init scripts
 00182ff  Fixed #707 - special '@reboot'-style cron jobs work again.
 c83b23d  Updated CHANGELOG for two missed commits
 2380fcd  Fixed #1012 - templates in the templatedir are preferred to module templates.
 4d95364  Fixed #1221 - aliases to titles now work for resources.
 24ca81f  Fixed #1360 -- allowdupe works with groups again.
 955a8ff  Removed test/util/loadedfile.rb tests which fixes #1370
 9c1ab14  Fixed #1371 - Updated bin/puppet to use Node.find
 aedfa2b  Fixed #1369 - the init service provider now supports HP-UX.
 422dea0  issue 1183
 d3a4d9a  Updated Rakefile fixes #1367
 5f600dd  Fixing #1168 (for 0.24.x) -- automatically downcasing the fqdn. Also requiring that passed in certnames be downcased; the setting system isn't currently flexible enough to automatically downcase it for the user.
 ac7f596  Fixed #1201 - all external node attributes are converted to strings.
 6658463  Updating the changelog for the changes to node lookups.
 1f19453  Removing the Node.find_by_name method.
 51e1ba8  The LDAP Node terminus now searches for the fqdn, short name, and default.
 fb4e843  Refactoring the 'find' method a bit in the LDAP Node terminus.
 317af36  Removing the now-obsolete Node.node_facts method.
 b7bd427  Converting the Node.node_names class method into an instance method.
 75c94e3  Removing an obsolete, unimplemented test
 98e38a6  Adds support for keepconfig for the dpkg provider fixes #234
 4d70449  Fix bug in test, add more specs and small refactor
 86f8ff4  Removed the unless condition in query, because the issue is a stale cached value and added comments that query will now always do so.
 4539b1c  Issue 1215
 7b2c310  Adding another note about the save_object stub.
 d816614  Fixing #1362 -- I had previously removed a stub point needed for testing.
 9b1301c  Removing a duplicate call left over from debugging
 087480b  Replacing all two-space indents with four-space
 3980323  Adding ruby interpreter lines to the tests missing them.
 9fe2b03  Adding execute bits to every test currently missing them.
 fb5f09b  Fixing how the Indirector::Request sets its options.
 4b29a5e  Fixing how the indirection tests for whether the request has node info.
 6764af3  Change description of spec to make baby jesus happy
 946081b  Try again
 bdc578a  Applying the fixes recommended by David Schmitt to the inline documentation of the ResourceTemplate class.
 886c984  Updating the docs for ResourceTemplate.
 29c840a  Adding a class for using templates directly within resources (i.e., client-side templates).  This would really only be used for composite resources that pass the results of the template on to generated resources.
 1205881  The mongrel and webrick REST handlers now extract certificate information.
 e8044f9  Adding to the indirection request support for authentication information.
 dbd9b40  Updated fix for ticket #1271
 cf3b98e  Applied patch for ticket #1271
 9943da6  Further Emacs puppet-mode fixes
 3c2e69f  Fixed Rakefile to install non-.rb files to fix #1266
 ad3803f  Fixes for install.rb running of tests that fixes #1267
 65c1889  Fixing #1242 -- lack of storeconfigs only produces warning, not exception.
 8a22b59  Fixing #1265 -- the ca/client tests now all pass again.
 02411f5  Always using the cert name to store yaml files, which fixes #1178.
 89100c4  Moving the majority of the pkgdmg docs to the wiki, fixing #1264.
 9decf35  Put function in ticket #311 in correct location
 6c3e7e1  Reverted function - "Added cron random function fixing ticket #311"
 c173264  Refactoring warnings.rb for tests.
 e6837a4  Fixing an inaccurate test so the tests will run correctly in all branches.
 054a811  Removing extra debugging
 bdcf5db  Fixing tests that are broken when running as root under OSX 10.5
 d55a755  Added warnings test and cleaning up trailing whitespace.
 c0f78b4  Fixed a bug in my tests which caused them to fail when run against the master branch.
 d54338f  Added cron random function fixing ticket #311
 6ea494f  Pushed patch fixing #1235
 c370104  Fixing the node/catalog so that it can convert from parser catalogs to RAL catalogs.
 bd51a53  Fixing transaction support for prefetching generated resources.
 4434072  The ldap user/group providers now work when no users/groups are in ldap yet.
 419f244  Adding support for settings within the existing Facter provider confines.
 3e13bd5  Intermediate commit so I can move on to other things.
 ee4be4f  Removing an unused file.  Closes #1229.
 b8ce6a1  Mocking Facter in an integration test, so it works with no networking
 77ee4ec  Refactoring how the provider confine tests work, again.
 0820819  Minor cosmetic changes to cleanup some style elements and get rid of some cruft.
 6a6a1d9  Another refactor based on feedback from Luke. This includes adding an accessor for @@state to make testing a bit cleaner.
 ee04129  Refactored tests based on feedback from Luke.
 d7f25ff  Rewritten tests for Puppet::Util::Storage.
 c5da401  Add unit tests for Puppet::Util::Storage
 8008bbc  Modified the 'factpath' setting to automatically configure Facter to load facts there if a new enough version of Facter is used.
 a02c6bb  Fixing a mock in the redhat interface test.
 390db80  Updated puppetd documentation which fixes ticket #1227
 2d6a914  Fix for latest method in rpm provider (fixes #1224)
 38545d9  Crontab provider: fix a parse error when a line begins with a space character
 a1409d7  Moving all confine code out of the Provider class, and fixing #1197.
 995991d  Switching the Provider class to use the new Confiner class.
 c9757a6  Moving the 'confine' handling to separate classes.
 ac79a79  Duh, fixing all of the paths being loaded for spec in the moved tests.
 d02334f  Moving all tests that are in 'ral' up a level.
 e7bef08  Fixing the user test.
 158d3df  Added the ability to add arbitrary attributes to ldap.
 83ef1b0  Fix for #1219
 b500689  adding more autotest docs
 c61fc02  Adding autotest info to the ext/ directory.
 59b9958  Correcting whitespace in the templatewrapper code.
 49dde11  Adding has_variable? support, fixing ticket #1177
 d8cc1c5  adding execute bits to tests
 5e2a4b5  updating the changelog for the ldap providers
 17e8158  Adding ldap providers for the user and group type.
 c56e9a6  Fixing another test that wrote to ~
 954aad4  Fix Emacs mode indentation of multiple nested blocks
 f52e343  Enhancements to syntax highlighting and indentation for Emacs
 9bf21a6  Use our own count-matches for Emacs 21 compatibility
 20e60b1  Applying patch by martin to fix #1207.
 270c007  Clarifying the exception when there's a syntax error but a valid parser.
 f3fa589  Fixing a test that wrote to ~.
 ae842ea  Fix for urpmi provider that fixes #1217
 da4cdd2  Fix for ticket #1218 - changed to appropriate variable name
 88ec3d8  Cosmetic fix
 67dc261  Removed "none" as a valid type attribute value, it was useless anyway
 db8a46c  New native ssh_authorized_key type
 2b185af  Add values for dump parameter for the mount type closing #1212
 69fc802  Update to man pages, fix to ralsh help text and fix for #1211
 c57e194  Fixing an error message to be more clear
 5a2bbad  fix bindir/sbindir defaults on OS X 10.5
 fff6ad9  Fix for ticket #1209
 b2a3db9  Fixed #1196 - added /sbin/service support for the redhat service provider + some doco fixes
 62ca726  Fixed some tests broken by #1176
 82b9f61  Added puppetlast script to ext directory
 a35450b  Pushed patch for #1176 - configtimeout fix
 57fd88b  Pushed patch for ticket #1191 - adding globbing support to ports provider
 b5640a1  Pushed patch for ticket #1187 - freebsd pkg_add support
 0a5d8a6  Fixed #1195 - support for gentoo openrc
 4599791  Pushed schema patch for #1193
 eac14f6  Fixed #1189 and added support for --all to puppetca --clean
 d9846fc  Fixishing some pending tests, including filling in the connection information.
 cb617f2  Making the changes necessary to get the REST support to work with the current state of the indirection work, including using a request object and an expiration date.
 a6a397b  The 'destroy' method in the indirection now returns the results of destroying, so they can return true or false.
 04aba52  fill out specs for network_* methods; refactor lowest-level network hooks
 a0804ae  adding rest_connection_details helper to Indirector::REST -- will need to be overridden to lookup the real connection details
 aed1375  make sure unit indirector specs are working with #save; fill out network_put pending specs
 75bf05d  removed a debugging helper from the Indirector::Rest#save method
 9187a34  updating mongrel/webrick unit tests to match integration-tested version of REST save functionality
 93bc1a9  adding REST save support, with integration tests.  A handful of unit tests in that area now need to be updated.
 99b295b  disabling caching for Puppet::Indirector::Indirection as it was causing hella problems with testing save without caching; judging my luke's blog this is going to be rewritten somehow anyway
 1befd1d  work-in-progress; playing with refactoring network_* methods inside Indirector::REST
 f28f20b  Added support for destroy/DELETE over REST (including units & integrations on both webrick & mongrel).
 0797440  updating search integration specs to include webrick
 e8caf13  making search work over REST, w/ unit & integration specs
 b750482  unit specs and implementation for Indirector::REST#search method
 a7f2dd4  placeholders for integration specs on final REST methods
 cebb677  ensure that we only run the mongrel specs when mongrel is available as a feature
 dab9deb  bringing Indirector::REST specs to mongrel-land as well.
 1e0f19b  Make mongrel happy like WEBrick.
 d24c03c  exceptions on remote end now properly passed to local end via REST and re-raised (integration-tested)
 7a73434  Much larger commit than I would like to land at once.  This is all REST-related code.  Two specs are failing related to how Mongrel is initialized for REST; will fix those shortly.
 a1c4579  a trivial integration test to test whether the RESTful indirection terminus has a remote shot at working; will need to be upgraded to actually be useful
 7d51146  fixing Puppet::Node::REST class name to work with autoloader inflection (Puppet::Node::Rest), so we can do Puppet::Node.terminus_class = :rest
 e86fde2  This is the first version where mongrel and webrick are reliably startable and stoppable via Puppet::Network::Server.
 c2f8c69  the indirector will not serve xmlrpc (this is the responsibility of the legacy networking code; it was a mistake to include stubbed support for it in the new code); removing
 13c40e9  removing obsolete TODO comment
 2cdd0f8  puppet-compliant indentation
 b49fd49  Resources now return the 'should' value for properties from the [] accessor method (they previously threw an exception when this method was used with properties).  This shouldn't have any affect functionally; it just makes the method equivalent to 'should' for properties, but it works for all attribute types now.
 4aaad26  Modified the 'master' handler to use the Catalog class to compile node configurations, rather than using the Configuration handler, which was never used directly.  I removed the Configuration handler as a result.
 2925ad1  Fixed #1184 -- definitions now autoload correctly all of the time.
 376628d  Removed the code from the client that tries to avoid recompiling the catalog. The client will now always recompile, assuming it can reach the server.  It will still use the cached config if there's a failure.
 3718b64  Fixing #1173 -- classes and definitions can now have the same name as a directory with no failures.
 d91b6d8  Fixing #1173 -- classes and definitions can now have the same name as a directory with no failures.
 738889b  Fixing the expire method (it wasn't using a request internally), and fixing the Facts class so it auto-expires any associated cached nodes when facts are saved.
 f285f1a  Moved the request creation into the Indirection class instead of the Indirector module.  Also, added an 'expire' method to the indirector, so there's an easy way to expire cached instances.
 d420701  Making the log messages around caching better.
 d82ac98  Fixing the executables to use the new indirection api.
 7774d9c  Ported the rest of the indirection terminuses over to expecting requests instead of having a random interface.
 bf728d2  Intermediate commit.
 644d6ba  Fixing some tests that were failing because new base types were added to Naginator, but no new related resource types were added.
 768315b  Adding the ability for indirection requests to be created with instances instead of just keys.
 38f0f48  Fixing an errant comment
 69a321f  Fixing the tests that were failing because of the use of the indirection request object.
 f9881ed  Adding a Request class to the Indirection layer.  This class is currently only used internally by the Indirection instances, but I expect that I will soon be pushing it to all of the terminus types.
 4032a27  Fixing the integration tests related to the destroy fix.  Yay.
 0bd5799  Fixing one other test that was failing because of the change to Indirection#destroy.
 941177a  Changing how destroy works, just a bit -- it now accepts the name of the instance to be destroyed, rather than the instance itself.
 c6729d1  Reworking the caching layer to use TTLs instead of versions based on timestamps.  This just modifies the indirection class itself, there is still some work to do to remove version code from other classes.
 8e1e06f  Removing unused code from the file_serving/metadata class.
 1458123  Adding an envelope module to handle indirected instance expiration.
 bd858df  Changing the default environment to production.
 80f8b80  Adding validation to the user type to confirm that the group list does not contain any commas. This seems to be a common problem.
 92765ea  Making a test executable
 7295626  Used stubs to decouple our code behavior from the behavior of the underlying filesystem, as well as removing the need to sleep (which caused the tests to take a long time).
 911c7fb  Additional fix for emacs syntax for ticket #1160
 c13486e  Revert "Additional fix to emacs for ticket #1160"
 bb65226  Additional fix to emacs for ticket #1160
 6f1c469  Extend workaround from 56aad69f8cdf8b0b08fdb7985014986223fa4455 to not only fix UIDs but also GIDs
 e621985  Changed some non-standard Ruby locations to env ruby shebangs
 2036d22  Fixes debian service enabled/disable issue as detailed in #1161.
 1c02749  Committed patch from #1160
 335972e  Pushed patch to fix #1174
 6f32e95  Adding the report reference back; I don't really know why I removed it, since the information in it isn't anywhere else.
 f927b97  Updates to rrdgraph documentation
 e51d05c  Better fix for #1020
 4a39d64  Revert "Added updated fix for #1020"
 2cac600  Fixed duplicate oid for parentnode and environment in schema - addresses #1170
 eae5cee  Fixing a duplicate word in the mount docs
 4f8df98  Added updated fix for #1020
 aa830b9  Adding 0.24.4 header to the changelog
 4c63b69  Add a bunch of directives, allows a full parse of stanford's huge nagios config Also reformatted a bit
 9d30b26  Fixes #1148 - replaces #!/usr/bin/ruby with #!/usr/bin/env ruby.
 874a02f  Added check_puppet.rb Nagios check plugin (See #1162)
 491a696  I think this will include the man pages in the build but overall the Rakefile needs a rewrite
 9cf7150  Added some more tests for loadedfile, based off the old unit tests.
 077312a  Added rspec tests for loadedfile
 
 0.24.4
 ======
 3a8053a  Updated to version 0.24.4
 d3e4ed7  Updated to version 0.24.4
 55a9009  Pass source to pkg_add via the PKG_PATH environment variable if
 6a53519  Fixing #571 -- provider suitability is now checked at resource evaluation time, rather than resource instantiation time.  This means that you don't catch your "errors" as early, but it also means you should be able to realistically configure a whole host in one run.
 528bbf1  Fixing a couple of tests.
 017f673  Moved the configuration of the Node cache to the puppetmasterd executable, since it otherwise causes caches to be used in all cases, which we don't want (e.g., bin/puppet was using them).
 bd3f6ec  Disabled man page creation by default and updated CHANGELOG
 4bfc4ef  Modifying the way ensure is handled so that it supports having it be a parameter.  This is only useful if you want a composite resource that just generates other resources and passes the value on.
 d93e1b4  Fixing #1138 -- the yamldir is automatically created by the server now that it's in the :puppetmasterd section rather than a separate :yaml section.
 273c7ec  Disabling http keep-alive as a means of preventing #1010. There is now a constant in Puppet::Network::HttpPool that will disable or enable this feature, but note that we determined that it can cause corruption, especially in file serving (but it's client-side corruption).
 6aa6fdb  Applying patch by Ryan McBride to fix OpenBSD package matching.  The actual problem was caused by the fix to #1001.
 5a31959  Added man pages and man page creation logic to install.rb
 e5b16b2  Ported #198 man page creation functionality to 0.24.x branch
 18320b8  Found all instances of methods where split() is used without any local variables and added a local variable -- see http://snurl.com/21zf8.  My own testing showed that this caused memory growth to level off at a reasonable level. Note that the link above says the problem is only with class methods, but my own testing showed that it's any method that meets these criteria.  This is not a functional change, but should hopefully be the last nail in the coffin of #1131.
 f6325dc  Found an array that leaked pretty quickly between reparsing files, thanks to work by Adam Jacob and Arjuna Christenson (the finding, not the leak).  I'm going to act like this fixes #1131, at least for now, but I doubt it does, since that shows general memory growth over time, whereas the leak here should go away as soon as files are reparsed (because the parser is holding the reference to the leaking array).
 25b81b3  Fixing a test I broke with my fix to #1147
 4f400d4  Fixed #1147: Cached nodes are correctly considered out of date if the node facts have been updated (thus causing node facts to again be available in manifests, for those cases where they were not).
 54bedb2  tweak the (already applied) patch in 388cf7c3df7ce26e953949ed6fe63d76cbbb3691 to resolve #1137; also, add tests which detect the problem.
 a240969  Applying patch by wyvern to fix #1142.
 e00065a  * puppet/ext/emacs/puppet-mode.el (puppet-indent-line): Clean up the code somewhat after commit 738d275f41f3eaf015800021dd2dfe6c42a1ae79, as promised.
 5f3ed8d  * puppet/ext/emacs/puppet-mode.el (puppet-indent-line): Be more sophisticated about what we do at the beginning of the buffer, so that the first expression after an block-opening statement that happens to begin at the beginning of the buffer gets indented correctly. This may need some cleanup, but I wanted to get the correct behavior committed first.
 d1d408c  Fix bug mentioned in commit f814e23eab140ad01df4a4a3b187fcbf20da02be:
 7514057  * ext/emacs/puppet-mode.el (puppet-comment-line-p, puppet-in-array): New helper functions. (puppet-indent-line): Rewrite to handle three more situations: indent elements in an array, indent single-line blocks, and ignore previous comment content when indenting non-comment lines.
 40a389a  * ext/emacs/puppet-mode.el: Untabify, in preparation for substantive changes.
 0c45a5a  Adding another commit for #1136 -- Consolidated the setting of the loglevel and destination to just one call, rather than the multiple calls that remained.
 4ce1d37  Fixed ports documentation error
 c75cc42  Added more detail about the requirement for ruby-libshadow for useradd password management
 1dc6dc2  Final fix to #1136 - further changes to --test setting
 e714156  Second fix to #1136 - fixed --test problem
 2155fe1  Fix for ticket #1136 --verbose cancels out --debug
 4cc18ed  Applied patch in #1134
 2795ba4  fixing another failing test
 a40e9b7  Fixing some tests that only failed under certain circumstances (mostly, when loaded with other files, or when loaded from rake or autotest rather than separately).
 7d35ae8  Refactoring how the catalog creation handles errors. Previously, if there were an error creating a resource, the error would propagate leaving any previously created resources still in memory.
 1b3c85b  Removing extra debugging
 2d90468  Fixing a unit test for node integration
 e81fc58  Settings now (again?) do not use a section more than once, which should make the system a bit more efficient.
 fca467d  Removing explicit requires of types and providers, because they were conflicting with Puppet's autoloading. This is clearly a sign that our autoloading is silly, if Ruby's own loading easily makes it unhappy.
 34129d9  Removing obsolete code from the fileserving handler. This was obsoleted in 0.24.2.
 f62eec8  updating resource references in the docs
 d0554db  Hopefully *finally* fixed the "already being managed" problem (#1036).  The problem only cropped up if there was a failure when trying to manage the system -- this would cause the setting-based resources not to get cleaned up.
 13c6de3  Adding a rake taks for updating the trac docs
 
 0.24.3
 ======
 0e26a07  Updated to version 0.24.3
 990638c  Updated to version 0.24.3
 18ed28b  Updating changelog for 0.24.3
 ab72048  Removing a Settings.use that is unnecessary
 bba0b43  Downgrading the "Using cache" message from the indirection to debug
 1dc0e24  Modified the ldap node terminus to also use the facts version as the version for a node, which should similarly encourage the use of the yaml cache.  (Related to #1130)
 4a45a1d  Caching node information in yaml (I figured caching in memory will cause ever-larger memory growth), and changing the external node terminus to use the version of the facts as their version.  This will usually result in the cached node information being used, instead of always hitting the external node app during file serving. Note that if the facts aren't changed by the client, then this will result in the cached node being used, but at this point, the client always updates its facts.  (#1130)
 f3a304c  Modifying the yaml terminus base class to use the timestamp of the yaml file as the version of the object.
 8b29368  Adding a filebucket test to puppet-test
 da77cb6  Adding a test for local compiling
 405802e  Using the indirected facts rather than master.getfacts, so no factsync is used
 388cf7c  Regression in :node_name functionality
 872ced7  Flat file now does writing to a tempfile.
 4956323  Fixing #1132 -- host names can now have dashes anywhere. (Patch by freiheit.)
 ecb873d  Fixing #1118 -- downloading plugins and facts now ignores noop. Note that this changes the behaviour a bit -- the resource's noop setting always beats the global setting (previously, whichever was true would win).
 e2370b3  Fixing the service-stop on debian, using the patch provided by DavidS
 e8029cc  Fixing the "tidy" type to use an option hash for specifying its parent class
 c955f61  updating changelog for already-closed tickets
 eecc22c  Cache the same type we check for, hopefully fixes #1116
 f1216f8  Revert "Cache the same type we check for, hopefully fixes #1116"
 ca0b62a  Cache the same type we check for, hopefully fixes #1116
 35214eb  Fixing the rest of #1113: External node commands can specify an environment and Puppet will now use it.
 2261032  Partially fixing #1113: LDAP nodes now support environments, and the schema has been updated accordingly.
 4c0f6c8  Fix for 1094
 647f5b4  Always duplicating resource defaults in the parser, so that stacked metaparameter values do not result in all resources that receive a given default also getting those stacked values.
 ee8fac6  Changed name of method for clarity per code review
 8192475  Ticket #1041 The CA serial file was getting owned by root because it was using a different method to write to file
 4c47656  Applies patches from #1111 and #1112
 443db20  Fix tests depending on the Puppet[:localcert] file existing using stubs
 8627139  Updating version number
 3b5daf7  Revert "Fixes #1099 - use of -m option with -d option for home directories"
 0ae58a9  Fixes #1099 - use of -m option with -d option for home directories
 
 0.24.2
 ======
 f019cac  Updated to version 0.24.2
 bfdac69  Updated to version 0.24.2
 6faed12  updating changelog for 0.24.2
 ee88c58  Applying patch by DavidS to fix #1083.
 a7339ec  Fixing a few tests
 e008b02  Fixing #1110 -- transactions now always make sure their tags are arrays.
 65b7267  Fixing the fact that resources that model defined resources were getting finished multiple times, which meant they got multiple copies of metaparams.
 4c3fa78  Fixing a few more loading order issues.
 857814a  Fixing tests that did not work with Rails 2.
 7ca0ad6  Fixing a test that changed the environment for all later tests, thus breaking some of them.
 9b07758  * Tweaks for puppetshow UI cleanup
 0139889  * Add migration for "created_at" (hobo expects it) * Tweaks for puppetshow interface cleanup * Delete unused tagging lib and puppet_class model
 43aea83  renaming ral/types to ral/type in the tests
 879ee22  Fixing #1062 by moving the yamldir setting to its own yaml section.  This should keep the yamldir from being created on clients.
 fd1573f  Fixed #1047 -- Puppet's parser no longer changes the order in which statements are evaluated, which means that case statements can now set variables that are used by other variables.
 9d6e926  Fixed #1063 -- the master correctly logs syntax errors when reparsing during a single run.
 abd688e  Fixing #1092 by no longer using the resource reference to look resources up, which means there's no concern about not finding the resource, which is where the nil was coming from.  We now just iterate over the vertices.
 29aafb4  Fixing an integration test so it cleans up after itself
 82b02b9  Fixing #1101 -- puppetrun works again.
 dd17d4c  Fixing #1093 -- 0.23.2 clients are again compatible with 0.24.x servers.  :ignore links is now equivalent to :manage links.
 c0b5352  testing automatic commit emails
 614ab9f  Adding a 'control' parameter to services, for those service types that need a control variable to enable/disable.
 bb8051b  Removed the loglevels from the valid values for 'logoutput' in the Exec resource type -- the log levels are specified using the 'loglevel' parameter, not 'logoutput'.  This never worked, or at least hasn't for ages, and now the docs are just correct.
 ff4f65a  replacing tabs with spaces in the redhat interface provider
 f3db79e  Fixing a typo in the mailalias resource type
 4e55999  Removing the validation on package sources, since some platforms (e.g., hpux) do not have a well-formed requirement for the source.
 42bfdf2  Fixing #1085, I think -- I was not returning a resource if the class had already been evaluated, but this was only being run into in corner cases -- mostly where one class included another class, I assume.
 1258512  Fixing #1084 -- the node catalog asks the individual resources whether they're isomorphic, and they in turn ask the resource types (or default to true for defined resource types).
 9a33487  adding a comment to the namespaceauth.conf file
 04892ee  Adding an example namespaceauth.conf
 f0975df  Trac #1038: not a fix, just an attempt at improving the situation.
 c8b320e  Corrected #1040 fix - this should now be right - trace was after raise
 07cd482  Making a couple of other small fixes, requiring classes that were not being required in the right order.
 ff97059  Somewhat refactored fileserving so that it no longer caches any objects, nor does it use Puppet's RAL resources.  In the process, I fixed #894 (you can now copy links) and refactored other classes as necessary.  Mostly it was fixing tests.
 939c952  Fixes ticket #1080
 f184228  Fixes ticket #1079 - added . support for tags
 9b6e501  Fixing a test that was failing when a user-specific fileserver.conf actually exists.
 5d35bc5  Fixes #1078 and includes new test
 7976015  Removing a test I never migrated from test/unit.
 279a0c5  Fixing a test that was actually reading in keys from the filesystem and failed when those keys were unreadable.
 098a69c  updating checksum for #1010 fix
 b06767e  Quashed commit of my fixes for #1010.
 5e18b8d  Hasstatus in the init service provider; it was just doing a boolean check, rather than comparing to :true.
 60f18c2  Fixed minor documentation error
 39a6756  Fixed #1073 - moved show_diff and other logic post config parse
 f006e17  Fixed test for #1040
 1f0ea5a  Second attempt fix address ticket #1040
 39f9818  Removing some extraneous debugging from a test.
 d82bfd8  Attempt to fix #1040 - catching errors in compilation
 e830f28  Fixed #1018 -- resources now have their namevars added as aliases in the resource catalog, just like they were added in the resource classes.
 60dd569  Fixed #1037 -- remote unreadable files no longer have the permission denied exceptions caught, thus forbidding them from being replaced with 'nil'.
 2de4654  converting parser ast node specs from setup/teardown to before/after
 9927efb  converting parser ast host class specs from setup/teardown to before/after
 c86c1da  converting node catalog specs from setup/teardown to before/after
 61cdc2b  converting indirector yaml specs from setup/teardown to before/after
 f702096  converting facter indirector specs from setup/teardown to before/after
 516e5b6  converting indirector checksum file specs from setup/teardown to before/after
 d260b7e  converting parser compilerspecs from setup/teardown to before/after
 1913134  converting mount provider specs from setup/teardown to before/after
 6781e10  converting indirector terminus specs from setup/teardown to before/after
 dba64dd  converting file serving configuration specs from setup/teardown to before/after
 b4c8f99  converting indirector ldap node specs from setup/teardown to before/after
 3cb1118  converting indirector direct file server specs from setup/teardown to before/after
 9e632bc  converting parsed mount provider specs from setup/teardown to before/after
 becafab  converting mount type specs from setup/teardown to before/after
 034336b  converting indirector file specs from setup/teardown to before/after
 12f139c  converting package type specs from setup/teardown to before/after
 b8d5ce0  converting fileserving/configuration/parser specs from setup/teardown to before/after
 eb0bdcb  converting indirector/module_files specs from setup/teardown to before/after
 22d6f9f  converting ral/types/schedule specs away from setup/teardown
 d04567a  converting indirection specs away from setup/teardown to rspec compatible before/after usage
 aa14ce7  moving setup() methods to before :each, so that the tests will run with rspec, as opposed to just rake (which calls them directly with ruby, as opposed to any spec binary)
 f9f32c4  reordering spec binaries to prefer the local vendor/gems/rspec/bin/spec option
 d11cd39  Fixing a failing test that resulted from a change in how checksums are created.
 62d7616  Fixing the directory service provider's behaviour when there's no value for a given attribute.
 f087df0  Fixed ticket #1072 - Debian directory updates
 0eede76  Fixed Ticket 1009 - problem with plist xml parser.  We do not need the plist parser for pkgdmg.
 458cb23  Fixed ticket #1070 - puppetrun configuration parse problem
 2e41803  Fixed ticket #1069 - removed remaining references to multiple configuration files
 10d4d0e  Fixed ticket #1065 - Solaris SMF manifests
 8fa4120  Fixed ticket #1068 - Minor documentation fix
 30128bd  Really minor change to user creation in Leopard.
 6013b25  Refactoring the incremental checksum generation slightly based on the code in type/file/checksum.rb.
 aebd303  Enhancing the stand-alone checksums utility module with the rest of the checksums we're likely to use, and adding tests, which I somehow missed when I wrote this file.
 df3fbc7  Fixed #1060 - Debian service removal and addition
 5ef8a3e  Changing portage to use Puppet::Error instead of Puppet::PackageError, fixing #1059.
 c4f7c51  Fixing comment -- ticket #1027 instead of #1064
 8920557  Fixing #1064 -- providers et al are now autoloaded from modules even when Autoload#loadall is used.
 4829711  removing "lib" deprecation notice from autoloader
 f8afe13  Fixed #1043 -- autoloading now searches the plugins directory in each module, in addition to the lib directory.  The 'lib' directory is also deprecated, but supported for now to give people a chance to convert.
 fe02591  Fixed #1003 -- Applying DavidS's patch to fix searching for tags in sql.
 9b1bfc1  Fixed #992 -- Puppet is now compatible with gems 1.0.1.
 0cfa1d2  Fixed #968 again, this time with tests -- parseonly works, including not compiling the configurations, and also storeconfigs is no longer required during parse-testing.
 8367fdf  Renaming the 'pfile' and 'pfilebucket' files to plain 'file' and 'filebucket'.  This should have been done years ago.
 a42c3ae  Fixed #1021 -- the problem was that my method of determining the in-degree sometimes resulted in a lower number than the number of in-edges.
 d406353  Removing the last vestiges of GRATR from the PGraph class
 068b61e  Removing obsolete references (they're in the indirection reference), and adding error handling to puppetdoc.
 98dbfa2  Loading the mocha gem from the puppettest.rb file.
 12fa0fa  Fixing the Rakefile so all tests run in one task instead of multiple.
 cb5def4  'rake' within the spec dir works now, anyway, which is a good start.  Autotest still doesn't work, though.
 eb74033  Fixing the puppet_rspec autotest plugin to use the modern interface
 1b90f7f  Trying to upgrade rspec, but not having much luck.
 bcb9b56  Copying over Rick's work from the master branch supporting autotest and cleaning up the rspec support.
 3af6827  Adding an inflection util class.
 7e45553  Fixed #997 -- virtual defined types are no longer evaluated. NOTE: This introduces a behaviour change, in that you previously could realize a resource within a virtual defined resource, and now you must realize the entire defined resource, rather than just the contained resource.
 c8da318  Moving the ast node tests to rspec (which I could have *sworn* I did this weekend).  In the process, I fixed a couple of bugs related to differentiating between nodes and classes, and then cleaned up quite a few error messages.
 8b2fae0  Removing the last remaining vestiges of GRATR -- removing the bangs from 'add_vertex!' and 'add_edge!'.
 cf21ade  Switching the Node catalog to use the Tagging module instead of its own tag methods.
 744cd45  Added a 'tagged?' method to the Tagging module.
 d21416b  Switching the Node Catalog to using a separate method for validating that a given resource is unique within the catalog.  This no longer allows any duplication, even with Execs.
 fd0c5cb  Changing the name of the Compile class to Compiler, since it's stupid to have a class named after a verb.
 5ebaa89  Refactoring the interface between the Compile class and the AST::Node class to match that to the definitions and AST classes.
 e247b56  Changing some methods in the Compile class to be more internally consistent (switched store_resource to add_resource, and store_override to add_override).
 6a4cf6c  Fixed #1030 - class and definition evaluation has been significantly refactored, fixing this problem and making the whole interplay between the classes, definitions, and nodes, and the Compile class much cleaner.
 3b740ff  Converting the Compile class to use a Node::Catalog instance as its resource container, instead of having its own behaviour around resource uniqueness.
 194e730  Moving all of the tests for Puppet::Parser::Compile to rspec, so I can refactor the class to more heavily rely on a Node::Catalog instead of doing its own resource container management.
 fb4bdc0  More AST refactoring -- each of the code wrapping classes just returns a resource from its evaluate() method, and all of the work is done in the evaluate_code method.  This makes the code cleaner, because it means 1) evaluate() has the same prototype as all of the other AST classes, 2) evaluate() is no longer called indirectly through the Parser Resource class, and 3) the classes themselves are responsible for creating the resources, rather than it being done in the Compile class.
 5a0e34b  Refactoring the AST classes just a bit.  I realized that all of the evaluate() methods only ever accepted a scope, and sometimes one other option, so I switched them all to use named arguments instead of a hash.
 82720d5  Removing some obsolete code from the AST base class
 dbaffae  Ceasing autoloading ast files; loading them manually instead
 7c500da  Stubbing Facter during the snippet tests, so they are faster and work with no network
 084d0fb  Adding more information to dependencies that do not resolve
 b293763  Applying patch by Jay to fix #989 -- missing crl files are correctly ignored, and you now use 'false' instead of 'none' to explicitly ignore them.
 2931723  Fixing the Settings class so that it correctly handles file values that are false.
 f7b0ca9  Fixed #1052 - fixed gentoo service management
 b3f67ec  Fix ticket 974. My original "fix" wasn't. This actually fixes the problem by using a regular expression that matches only up to the first square bracket.
 8f0d87d  Added :env parameter for backwards-compatibility, with warning about deprecation. :env parameter sets new :environment parameter. Changed instances of :env to :environment for consistency with other types. Added tests for new parameters. This cimmit fixes ticket 1007.
 139ff33  Fujin's patch for ticket #1007 - consistent use of 'environment' instead of 'env'
 aedd59c  fix bug 974 - filenames with opening bracket characters generate exceptions
 b8036a9  Updating the docs for the cron type
 28a8577  Added hostname test for hosts type
 16df87c  Updated fix for ticket #151 and added a test
 ed0c745  Fixing #1017 -- environment-specific modulepath is no longer ignored.  (Cherry-picked from master.)
 ade9f3c  Store a resource before adding relations to it otherwise activerecord will complain. This fixes #933
 047ec54  Fixed tickt #1034 - doco typo
 6ff9423  Significantly refactoring the lexer, including adding Token and TokenList classes for managing how the tokens work.
 11799b3  Fixed #1001
 348aa3e  Fixed #1028 - examples incorrect for 0.24.x
 974fcdb  Removed womble-specific Debian build section
 321b8fd  Fixed #1006 - changed ldapnodes to node_terminus
 ee6ddc9  Removing tons of unnecessary calls to "nil?" from the lexer.
 7a4935f  Fixing a couple of tests, one related to recent tagging changes and one that somehow slipped through when I removed the GRATR code.
 9a290bb  Second attempt to fix ticket #151 - host type now validates IP addresses and hostnames/FQDNs
 4a7fcfc  Revert "Fixes ticket #151 - host type now validates IP addresses and hostnames/FQDNs - the regex for the latter is quite complex but I have found it bullet-proof in the past"
 b561ae6  Fix bug #997, only evaluate non-virtual definitions
 1ccc9c3  Fixes ticket #151 - host type now validates IP addresses and hostnames/FQDNs - the regex for the latter is quite complex but I have found it bullet-proof in the past
 d7a89b4  Fixed #1019 - made libshadow available for non-Linux users
 8a649ff  I think I've finally fixed #959, by having the Settings class skip any resources that are already in memory.
 52eba77  Fixing #794 -- consolidating the gentoo configuration files.
 f43be56  Removing the line that marked fink as the default package manager on darwin.
 f98be4a  Fixing #976 -- both the full name of qualified classes and the class parts are now added as tags.  I've also created a Tagging module that we should push throughout the rest of the system that uses tags.
 2cbab2c  Fixing #1008 -- Puppet no longer throws an exception when you've pointed a file at a source that doesn't exist and you specify 'ensure'.
 f5674cd  Fixing #995 -- puppetd no longer dies at startup if the server is not running.
 7a9aae8  Wrapping the Resolv call in the mongrel server so if it fails it doesn't kill the server.
 9161ae8  Applying a fix for #998 -- I used a patch equivalent to bartv's, although I could not use his commit because it was against the 'master' branch instead of 0.24.x.
 046a326  Fixing #977 -- rundir is again set to 1777.
 4618140  Updating docs for ssh.
 7ee4746  Adding a parse test to puppet-test.
 35145f3  Fixed ticket #1005 - added additional logcheck lines
 b24ac77  Fixes ticket #1004 - documentation fixes for ralsh and puppetrun
 1ff9d65  Updated documentation for builtin cron type; added information about range and step syntaxes.
 f15696c  Updated tagmail documentation fixing ticket #996
 e3d4ea8  Fixes ticket #993 - tagmail with smtpserver specified does not add To/From/Subject header
 40addcd  Fixing #982 -- I have completely removed the GRATR graph library from the system, and implemented my own topsort method.
 927dff4  Fixing #971 -- classes can once again be included multiple times.
 117926c  Fixing the unit tests for nagios_maker; I could swear I'd already done this but I must not have committed it.
 a7bca7e  Removing the requirement in the parsed mount provider that the fstab file exist.
 1bdf3f8  Fixed #984 - Added Debian to reponsefile doco
 b1f13af  Fixed #980 - minor wiki formatting error in nagios_maker.rb
 2f9c13b  Fixed ticket #979 - code configuration option doco
 039dc8d  Fixed ticket #979 - pkgdmg.rb documentation
 1154c42  Fixed ticket #978 - logcheck/puppet
 33e319a  Added builtin support for all Nagios resource types. I use Naginator to parse and generate the files, with ParsedFile to handle record management and the like.
 68cde4f  Removing the one-off naginator provider for nagios_command.
 348f257  Adding the metaprogramming to create the Nagios types and Naginator providers.  This is basically all of the code that's necessary to create all of the needed Nagios types.
 4e8bc40  Fixing the inability to manage '/' directly.  It was a result of stripping extra and trailing slashes.
 9b1d036  Adding the first round of Nagios code.  There are no tests here, but at least a single Nagios type is functional.  Now I need to do some metaprogramming so this works for all nagios types, and add tests for the whole thing.
 20367c6  Updated for 0.24.1
 20d430d  Adding 0.24.1 tag to the changelog.
 
 0.24.1
 ======
 4fa6546  Updated to version 0.24.1
 d17fb7a  Updated to version 0.24.1
 40439da  Updating an exception message a bit.
 e2fc425  Attempting to fix #952 -- catching any exceptions thrown during a run.
 c59ff62  Further fixes toward #965.  Turned out that the previous fix caused other problems.
 4d28b10  Updating the failure when the CRL is missing, so it's clear how to solve the problem.
 e4446b6  Fixing parseonly with a modified version of jay's patch from #968.
 bc0616e  Updating filetype detection for vim, and changing the filestructure for vim files. (#900 and #963)
 927cb24  Fixing #967 -- default resources no longer conflict with managed resources.
 c998a25  Adding a --print option to puppetca that just prints the full-text version of a certificate, and --verify, which uses the external openssl command to verify the cert against the CA cert (I could not find an option to the builtin Ruby libraries to do this).
 9c32c9c  Removing the ability to disable http-keep alive, since it didn't work and is now unnecessary.
 553b2ad  Entirely refactoring http keep-alive.  There's now a central module responsible for managing the http pool (Puppet::Network::HttpPool), and it also handles setting certificate information.  This gets rid of what were otherwise long chains of method calls, and it makes the code paths much clearer.
 92b0ebc  Fixing #967 -- relationships now work when running 0.23.x clients against 0.24.0 servers.
 1ada24d  Fixing some tests that were failing with the recent ruby that has ssl issues.
 c22a584  Uninstalling packages through 'ensure => absent' works again for the rpm and yum providers.
 8f5989a  Updated for 0.24.0-2
 cc2d532  Updated for 0.24.0
 933b1df  Fixing #961 -- closing existing, open connections when a new connection is requested, and closing all connections at the end of each run.
 e0dab9a  Updating changelog to reflect the fact that we no longer warn about explicit plugin mounts.
 4d3a368  Remove the warning about an explicit plugins mount.
 178093f  Fixing the Rakefile to include the yumhelper.py file in the file list.
 
 0.24.0
 ======
 6b02bd5  Updated to version 0.24.0
 e92f1cc  Updated to version 0.24.0
 22daebe  Adding changelog update for misspiggy/0.24.0
 e0f5444  Fixing the webrick test to provide a correct host name so the stupid ssl checks pass during the test.
 106f319  Changing the statefile to only being managed by clients, not by puppetmasterd.
 4ebb8d0  Hopefully finally fixing #959.  Loading the stored cache resulted in the resource duplication, based on how the settings are used, so I added a test to only use those settings if the directories do not exist.
 690e287  This should be the last fix for exported resources. Hosts were keeping the export bit on all resources, even when they'd collected another host's resources, which caused a duplicate copy that was still exported.
 f1169ee  Not using the main section when running the store report, since it is unneeded and can cause conflicts within puppetmasterd
 ce5cab1  Removing extraneous debugging from the schedule resource type.
 cb0c4ee  Renaming 'configuration' to 'catalog', fixing #954.
 7ac3bd7  Renaming the 'null' terminus type to 'plain', as requested in #960.
 a21ee00  Copying the fact-loading code from the network client to the Facter terminus until I have a better solution. This problem was discovered becomes of #958.
 1bbaf18  Applying patch by whaymond to fix #955.
 d9200a0  Adding what is hopefully the last commit for #896.  Here's the changelog:
 74db777  Removing the 'addpath' commands from the freebsd service provider, since it's no longer needed or even valid.
 b19a0c9  Removing the recently-commited paludis provider, because it breaks autoloading as indicated in #956.
 02b64ab  Applying patch by josb in #884 to provide pattern matching in the tidy type.
 584127c  Applying patch by raj in #881.
 4ee5ab8  Applying patch for portage package support from thansen in #895.
 ed642ac  Replacing freebsd service provider with the one provided by raj in #880.
 117f005  Adding paludis package support as provided by KillerFox in #741.
 3248c93  Fixing #937 -- I had not ported the dot methods at all, and I had to make a few small changes to make them work.
 a8bf74b  Fixing #946.
 b70f00a  Fixing some further failing tests resulting from the fix for
 862d1f7  Adding an Indirection reference, along with the work necessary to support it.
 da77e4a  Updating the changelog with external node info.
 f127d04  Fixing #951 -- external nodes work again, but you have to set the 'node_terminus' setting to 'exec'.
 7a4ae08  Fixing the rest of #948.  My previous work was sufficient, except that I was not passing the interpolated value in to the hook, which meant the libdir was set to something like $vardir/lib.
 3790ce1  Fixing part of #948 -- per-setting hooks are now called when the configuration file is parsed.  The bug is still there, but I'm getting closer.
 b852c2f  Fixing #941 -- calling pkg_info instead of info in the openbsd package provider.
 ae33e57  Fixing #923 (again).  The host storage method was not correctly searching for the host, so it was creating a new host on each run, which is what was causing the conflict.
 9ad7d1a  Adding basic unit tests for type/user by DavidS from #948.
 038b9c8  Fixing #923.  Resources that are collected on the local host are no longer marked as not exported.
 5886d37  Applying patch by whaymond_home to further fix part of #896.
 072b03e  simplify PluginsMount
 a012849  Updated tests for http_enable_post_connection_check configuration setting.
 4d4abd3  Better test to match the behavior of the code.
 24cacdb  Fixed test case for http_enable_post_connection_check
 f94d6d3  As per lutter; augmented fix for #896 to be configurable and defaulting to validate the server certificate, honoring CVE-2007-5162.
 8eecbe5  Fixing another failing test I somehow missed in my last big commit
 88304cc  Renaming @model to @resource in a provider
 75647ee  Fixing a couple of tests that were failing on a different platform or with a different version of ruby
 811fefa  Fixing #892 -- filesystem mounts are no longer remounted.
 dedc56a  Fixing #527 (rewrote service tests), #766 (services only restart when they are running), and #918 (service tests fail when hddtemp is not installed).
 421b3fc  Another backward compatibility patch, this time helping with a new server and old client
 bbf8a8b  Making a few changes to the transportable class to enhance backward compatibility
 11ae473  Theoretically, this patch is to fix #917 (which it does), but there were enough problems fixing it that I decided something more drastic needed to be done.
 8127397  Fixing puppetca so it passes its tests, duh.  Apparently wyvern's patch broke things a bit and I was stupid enough not to run the tess right before accepting.
 2282046  Adding a top-level ResourceReference class that everything else can use to canonize how we refer to resources.  Finally.
 c6d1746  Fixing the first half of #917 -- the ResourcReference AST code now correctly finds the resource.  It's getting lost in the configuration translation, though, so I need to fix that, too.
 6c1d8d3  Applying fix to xmlrpc client tests by Matt Palmer
 6b2c0d8  Fixing the error message as requested in #893.
 1b2142b  Applying patches from #823 by wyvern
 c7cd7ec  Fixing the markup on the pkgdmg provider so it is a bit better
 1e6ba6f  Fixing #781, from what I can tell.  I'm leaving it with no tests for now, since it's a very small chunk of code and it's *insanely* difficult to test this kind problem.
 5d30ea9  Fixing #810 -- I catch the error and prefix it with something a bit more useful.
 4e52ffc  Fixing #796 -- the fileserver can now start with no configuration file (it creates both default mount points if it does) and puppetmasterd no longer requires the configuration file to exist.
 168fa5f  Fixing the asuser method in Puppet::Util::SUIDManager so that it correctly just yields if you're not root.  It also no longer tries to set :uid or :gid; just :euid and :egid, and it once again sets :egid before it sets :euid, which is important because you usually can't change your group after you've changed your user id.
 0ef6b95  Fixing #931 by keeping track in configurations of what transportable resources get converted to, so different names don't throw it off.
 a38b415  Fixing #927 -- rewriting the test to actually test what it's supposed to be doing and to skip the whole network connect thing.
 7ff8ea5  Fixing the persistent and periodic schedule test failures by rewriting the schedule tests entirely.
 18b4c3a  Fixing #924 -- clearing the configuration cache before and after the test.
 2cb1199  Fixing the breakage that I caused when I added the 'declared_feature?' method to provider features.
 2d19ee2  Fixing #920 -- I have replaced the existing mount test with an rspec version.  It's not perfect, in that it only tests the :ensure state, but that's where 90% of the behaviour is.
 c3dde68  Fixing #919 -- installed packages used for testing are just ignored, rather than throwing a failure.
 47890f9  Fixing a test that was erroneously testing for the wrong feature
 12ebbe2  Rewriting the tests for the package resource type, fixing #930.
 fc7f1b4  Fixing #921, mostly by just deleting the existing test.  I had already migrated all of the tests into rspec but forgot about these tests -- they were only in the rails/ subdir because people kept not running the parser/ tests after modifying the Rails code.
 9311bdd  Applying patch by trombik from #756.
 b575d15  Integrating Matt Palmer's patch to provide a 'plugins' mount, fixing #891.  The patch was ported to the current code by David Schmitt, I applied the rest of Matt's patches, and I then fixed all of the code so that the tests passed.
 36c947e  Fix #896 - Always disable DNS checking of certificate when making https connections.
 3fb8e2e  Applying the rest of Matt Palmer's patches related to providing a plugin mount.
 7eb09ab  Implementing the test for setting the Rails log level.
 676efa7  Incorporating patch 20071030034736-6856b-6004090b3968cdbf7d366a03ee1c44e2160a3fe0.patch from womble, and rewriting and significantly enhancing the unit tests for the Puppet::Parser::Collector class; it should have full coverage now.  There are no integration tests for it, so there's still no guarantee that it works at all, but hey, we're a lot better off than we were.
 7f1b2d6  change up rails specs again with Luke's help
 8de1412  Integrating most of Matt Palmer's from http://theshed.hezmatt.org/mattshacks/puppet/_patches/puppet-0.23.2/.
 a88891a  Fixed #906 - Augmented Cert DN regexp check to work with Pound and Apache.
 c19d08a  mock all use of Puppet[] in Puppet::Rails.database_arguments
 e69e0c3  fix spacing
 b435f04  fix socket argument to AR and add rails spec
 e53693e  Hopefully fixing #698 -- fixing the markup for the pkgdmg package provider
 7c36ae9  Adding patch 20071030035457-6856b-bd1c45ed5ecd753b2cb4f05347061f7245cc175a.patch from womble -- Force removal of directories during pluginsync
 880a8e2  Adding patch 20071020020745-6856b-dbc63ff3f137a4039fb997b9978202d52f621e8c.patch from womble -- Fix some residual instances of /var/run fever
 696f1fb  Adding patch 20071020015958-6856b-69efa7868cf3df3f2a2da6fcfc3b794bbb532c7f.patch from womble -- Remove rundir from puppet.conf, and add a NEWS entry to document these changes
 7a95017  Adding part of patch 20071020011907-6856b-05b59120fdb90ab4a5842f91613247b07206a4ba.patch from womble -- Fix for Debian#447314, by fiddling with /var/run/puppet.  This does not accept the whole patch, because the change needs to be tested around other platforms.
 38b970a  Adding patch 20070927050018-6856b-7fa134180aceb9cee2e667630345f5f8467a9d0c.patch from womble -- Catch more retryable errors in the XMLRPC call wrapper
 276034f  Adding patch 20070927042000-6856b-38a0c82fd0a0d950937e7fe5a38b9901743402b3.patch from womble -- Recycle the connection more aggressively, to stop problems with clients that are newly requesting certificates
 3bf7031  Adding patch 20070926235454-6856b-079fc12a9b63d59afd59aa205bc8bfeb350b097a.patch from womble -- Recycle the connection if we're presented with an EPIPE
 0ebd99e  Adding patch 20070926214630-6856b-edd313b08555033710c90a94d9d8beaf889d6cf4.patch from womble -- Fix spelling mistake in debian control files
 7ed1c17  Adding patch 20070913032650-6856b-b1cca1c249415c6076ffcecb9df1525a728457c7.patch from womble -- Fix annoying database deletion error for ParamValue objects.
 28430c4  Adding patch 20070913032546-6856b-0de200e8450920e7f712c54bf287ae43c7fda8af.patch from womble -- Only set dbuser if explicitly asked for
 d7b381b  Adding patch 20070913011122-6856b-98bf03f09c8e19679390d73fdddc2e4d1273f698.patch from womble -- Add changelog entries for the pulled pgsql patches
 a7d75d3  Adding patch 20070913010926-6856b-eb64be3b5169b7af674388124b406a1db7470880.patch from womble -- More restrictive permissions on some puppet-related directories
 407734f  Adding patch 20070913005414-6856b-db5ea77e10ec6869ad01a4bd6483912c337f3a70.patch from womble -- NEWS for the ssldir transition
 1486d39  Applying patch 20070913004017-6856b-cdbbba99de0b33b64874205a27833b5114fcc6b9.patch by womble -- Allow empty config settings
 03c8ffd  Adding patch 20070913003810-6856b-cdc8b2e8c6c46eb8d6d073f86291a0fc5a59f429.patch from womble -- Only set the hostname and password if we want them; this allows pgsql ident auth to work it's magic
 035fa38  Adding patch 20070905004837-6856b-2e7b8d8595ee0883537620c46424a4bf6174dc6a.patch from womble -- Add an attr_accessor for @http#ca_file, since older versions of libopenssl-ruby only provides ca_file=, not ca_file
 63b205a  Adding patch 20070831053637-6856b-dd0fddab681485ce7cea0b57336d0c48fa33f7f8.patch from womble; updates changelog
 72c0e7b  Adding the debian directory via patch 20070831052721-6856b-b90bb56a4ed37ea420f10352a0a366068cddc7e4.patch from womble
 7efe24f  Fixing #882 -- I just added a quick hook to the Master handler again; we need a better long-term solution, though.
 56aad69  Patching a bit for #804 by making the maximum much higher UID and making it tunable, but it has not gone away yet.
 a525ab5  Fixing a couple of tests that were failing because of the environment changes.
 6d74ddd  Accepting a modified form of the patch from #885 by immerda.
 b745f04  Fixing #886 -- the problem was the I had changed the base class for Parameter, which apparently lost the 'nodoc' method for that class.
 dbe70a1  Added calls to endgrent/endpwent in util/posix.rb to fix #791.
 7f504b0  Applying patch from #896 by whaymond_home, adding more certname aliases.
 1cb40ec  Obviating targets in interfaces; they now just generate a warning.
 eee9f5e  Adding more tests to the redhat interface provider.  It no longer uses the :target parameter (which I'll be removing in the next commit).
 1a4e4fb  Rewriting the sunos interface provider to manually parse and generate, rather than using ParsedFile.  This should fix #777, and has from what I can tell.
 8cbe8bd  Adding unit tests for the sunos interface provider.
 3d2e1a5  Adding some unit tests for the interface type before i go messing around with it
 cca613d  Fixing the first part of #787.  Not all collections were being evaluated on the first pass because they were being deleted from the collections list during evaluation, which caused some to get skipped.  This commit fixes that problem, which helps in the trivial cases where the collections are in the same scope. I expect it's still broken for more complicated usages.
 96b3cde  Applying patch from #834, apparently fixing a problem with bringing up alias interfaces.
 9472eef  Removing the bootproto and broadcast attributes from the redhat interface provider, since they are not needed
 a7a46af  fixing the path to the spec helper in the exec test
 3d31dc8  Fixing #762.  The main problem was that I accepted the patch in #744 which broke the templates. In the process, I also added test code for the redhat interface provider and rewrote how parsing worked to make it more testable.
 8ecdfc2  Moving the exec test into the types/ directory
 94e63ad  Fixing the last failing test relating to the environment changes
 7fe5bfc  Fixing the exec spec so it works when non-root and is a bit cleaner
 8cc07ad  Using the Environment class to determine the default environment, rather than plenty of different places having the logic of how to determine the default environment.
 53008e5  The Puppet settings instance now validates environments when you set an environment.
 9e5fc76  Fixing #911 and #912 -- there's a default environment (development) and you have to specify the valid environments for your site.
 cc88441  Removing the manual ssldir setting by David in 59626cb3907d36e4fd762277daa76f523faf0908
 1bf3999  Fixing a failing test from my fix for #446 -- I had changed the behaviour of Resource#override_parameter unintentionally. I've corrected the comments so it's clear why the original behaviour was there.
 3f0b250  Fixing a few test suites that passed when run as part of the suite, but failed when run individually.  The problem was that I changed lib/puppettest/support/utils to have a separate module and I didn't test the individual files.
 4bd7b6f  Fixing #896 by applying DerekW's patches, with slight modifications to fit coding style.
 8ad2732  Fixing #446.  I ended up largely not using porridge's patch, but only because the code (and my coding style, to some extent) has changed so much in the last few months. Also, added specs.
 1b78f57  Add Exec{ logoutput=> on_failure }
 2b14f62  Reverting the changes I'd made toward removing the global resources.  These are commits:
 9cf477b  Applying fix by Jeff McCune from #905
 edc4b1d  Fixing a SimpleGraph unit test so it doesn't depend on hashing.
 c19835c  Fixed most failing tests, but there are still over thirty failing.
 4afbaa6  fix #903: add patch from hrvojehr
 32d9afc  tests for #903: fail when no logoutput is generated on failure
 9290cc8  Modifying how default resources are created; they are now added to the configuration by the master client, rather than by the creating types.
 ffb4c2d  This commit is the first run at removing all global references to resources.  It deprecates the class-level [] and []= methods, used for so long to provide closure behaviour but now unnecessary with the node configuration's ability to function as a resource container.
 b65fb83  Fixing a parser test -- really, just removing tests that belong with the AST classes rather than in the parser.
 72510bf  Fixing #800 by refactoring how configurations are retrieved from the server.  The real problem was getting all of the validation done before any caching, which required a good bit more refactoring than I expected.
 dd7caa7  Moving some compile tests to the spec/ directory, and switching the node scope to no longer be lazy evaluation, just like I switched 'main'.  When I made all of these classes and nodes lazy evaluated, I should have decoupled my real goal (using resources to evaluate them) from the idea of lazy-evaluating them, and this basically does that.
 47a2605  Changing the 'main' class to no longer be lazy-evaluated. It was getting evaluated after node classes, which caused even stranger ordering issues.
 a4e8f1c  Adding a memory terminus for facts, which is really only used for testing
 3851415  fix dependency on $HOME, which causes massive failures when running without environment
 59626cb  fix failing CA test, when testing with incomplete setup (no ssldir, no DNS)
 a6ad326  fix the underlying dependency on the environment in the cron type
 d48ee3e  fix crontests depending on ENV[USER] by using Etc.getpwuid(Process.uid) instead
 8fe892d  fix a testfailure when running spec tests as root
 445c29c  fix #872: improve property(:content).insync?
 5726412  tests for #872: check interaction between "replace" and "content"
 61ef289  fix #815: add :main to all use() for :reporting and :metrics
 418bc21  remove obsolete runners variable
 a535cbb  Commenting out the time debugging I was using
 3f583dc  Adding unit tests for the module that handles the logic around mounting and unmounting.  This includes a fix for bug #761, which required a different regex for Solaris.
 8f04446  Fixing the 'mount' tests so that they no longer modify the local system and they run fine as non-root users.
 ba19989  Switching the class resource evaluation to only happen when using :include, not (for example) when evaluating node classes.
 cf75168  Classes once again get evaluated immediately when the 'include' function is used, instead of being lazy-evaluated.
 4441052  fix #891: create a plugins mount which collects all modules' plugins/ subdirs
 dfe774f  Switching the base class for the Relationship class. It was previously using the GRATR::Edge class, which had wonky overrides that dramatically slowed down sorting (its hash mechanism hashed the source and target so that edges with the same source/target got the same hash, which we actually don't want any more).
 4194526  fix #760: property_fix has to be called after creating a symlink
 b250416  fix #731: add exported=true to collect_exported
 1ffcce0  Splitting the puppetd tests into two tests.  It is still not a very good test, but I do not know of a good way to test this, really.
 065a1d0  Switching the graph base class from GRATR::Digraph to Puppet::SimpleGraph, which should dramatically enhance performance.  It should be largely functionally equivalent, with the only difference being that edges are no longer deduplicated.
 3f21e93  Adding a new graphing base class, because the GRATR stuff is just too slow.  This class has just about no iteration, and vertex deletation is dramatically (as in, 1000x) faster). Here are the results of some very simplistic graph operations:
 ef99495  Caching the 'parent' value, which resulted in a drastic performance increase.
 826efe8  The configurations should now be functional again -- file recursion was previously not working, because the relationship graph was setting itself as a resource's primary configuration, which caused it to try creating its own relationship graph.
 db293cf  Fixing a bit of indentation and commenting in the xmlrpc/client file
 956daa5  This won't be perfect by any stretch, but put in a moderately reasonable autotest config file.
 c7b36b7  One significant step closer to getting autotest running properly on the Puppet specs. Created a spec/lib/monkey_patches/ directory for holding patches to RSpec functionality. Extraced 'confine' and 'runnable?' support from the local copy of RSpec (spec/lib/spec/) and now load them from the monkey_patches/ directory. Fixed a bad include in one of the specs. Made it possible for the gem-installed spec binary (which autotest calls) to be used with Puppet. Imported the Autotest::Rspec class, created a PuppetRspec autotest class, added a discovery.rb file for autotest to pick these up.
 6585835  Adding patch from #879 by tim
 d03f68e  Changing the test/ classes so that they work from the main test/ dir or from their own working dir, like the specs do. This was just a question of changing how their libraries are loaded.
 c0a07ac  File serving should work now, both recursive and single files, across modules, local file system, and the traditional file server.
 54fc80d  Exceptions on requests are now captured, exceptions are serialized, and exception text is passed back via REST.
 e7bfe0b  Finish serializing successful results (via calls to to_yaml, etc.) for REST handlers.  Refactor request building in REST handler specs.
 d28a904  REST handlers now properly returning 200 status on success.
 1746751  Adding post- hooks for :find and :search in the indirection class.
 09f9c3c  Adding the calls to the authorization hooks in the Indirection.
 b874751  Renaming the FileServing TerminusSelector module to IndirectionHooks, because I'm going to add some hooks for transforming returned objects.
 de5d91e  Renaming the :local termini for metadata and content to :file.
 7fa99b0  Link handling is now in the file serving classes. This was done by putting all of the functionality in the Content and Metadata class (actually, in a new base class for them).
 688fcdf  Adding searchability to the fileserving termini, using the new Fileset class.
 393a3e8  Adding a Fileset class for managing sets of files.  This is the new server-side for file recursion, and I'll next be hooking it to the fileserving 'search' methods.  This is basically a mechanism for abstracting that search functionality into a single class.
 b2b8f75  Adding authorization hooks to the file_server and module_files indirection terminus types.  Both hooks use the fileserver configuration, but the module_files hook only uses the 'modules' mount.
 8f827ff  Renaming the 'mounts' terminus to 'file_server', and renaming tests accordingly.
 08099b7  File serving now works.  I've tested a couple of ways to use it, and added integration tests at the most important hook points.
 264331b  Partial work done for ssl certificates.
 ec39672  Adding this test stub that's been sitting around in my repository for a while.
 fc60751  I've now split the file-serving termini into two separate types (in addition to Rest):  A local terminus that just uses direct file paths, and a mounts terminus that uses the file server to figure out what the path should be.
 64c6700  Fixing all of the classes that I just renamed, and adding the TerminusSelector module to the File Metadata indirection.
 56b83fe  Renaming the file serving indirection termini to match the standards I set in the TerminusSelector.
 33d7dc0  I'm working on making file serving work in the indirector now, so I added two abilities to the indirections:  Models can specify a module to extend the indirection instance with, and indirections will use a :select_terminus method, if it's available, to select the terminus to use for finding.  (It's currently only used for finding, not destroying or saving.)
 8156185  Renaming the file_serving/{content,metadata} indirections so that they make more sense in the REST API, and creating stub tests for the indirection termini.  Now it's on to create the rest of the tests for them.
 2718b63  This is the first mostly functional commit of the new file serving structure.  The next step is to hook it up to the indirection so we can start writing integration tests to see if we can actually serve up files.
 e1dd5dd  Adding spec stubs for authorization in the indirection
 e69a50a  Fix test which is conditional on mongrel installation.
 8bf5196  Oops, forgot this file in my last commit.
 d0bd48c  Adding the first pass at modifying file serving to work with indirection.  I've split the fileserver handler into four pieces:  Mount (which so far I've just copied wholesale), Configuration (responsible for reading the configuration file and determining what's allowed), Metadata (retrieves information about the files), and Content (retrieves the actual file content).
 d2b891f  More specs, fleshing out the returns from REST
 e5921c5  getting more fine-grained with the response specs -- the target is always moving.
 705f76f  Argument passing now supported on {webrick,mongrel}+REST.
 ce34968  Make the actual runtime be more robust when mongrel is not installed.
 6cd0f37  Make it possible to run all tests even if mongrel isn't installed.  Shouldn't "confine" produce some output when running spec?  Who knows.
 216dd8c  Refactoring, argument processing for model methods.
 abbc824  Tweak to move model lookup functionality into the Handler base class where it belongs.  Robustifying the request sanitization a bit more.
 2a497ff  Refactored to use a Handler base class for server+protocol handlers.  Finally eliminated dependency on Puppet.start, etc., from WEBrick HTTP server class.  {webrick,mongrel}+REST now support request handling uniformly; need encode/decode next.
 6ab78f6  Inlined the controller, eliminating a class.  Mongrel+REST has the right bits for request handling prior to the encode/decode/exception-handling bits.  Refactored to make the common logic extractable to a base class.
 b8c877c  Registration now built for {webrick,mongrel} REST handlers.
 3c370b3  Going back to each server+protocol object being responsible for only one indirection, as the REST vs. XMLRPC models are different enough that the object must register itself on initialization and handle the request when it comes in.
 c06edda  First pass through initializers of {mongrel, webrick} REST handlers; hooks into Indirection to look up models from indirected names.
 ab4c7fa  Minor tweaks to make the ::Server initialization a bit more robust.  Fail on unknown HTTP Server types; fail fast.
 099c546  Finish front end of delegation to server+protocol helper classes ("handlers").
 b1d6223  Bringing in initial handlers for server+protocol pairs.
 a815f78  Reorganizing the file structure for indirection terminus types.
 ba95202  Partial support for building Handlers for all handler-protocol pairs.
 ef8ebe0  Implementing address & port support for new webrick server.
 c34efbc  Hooking up address/port support for the various servers w/ specs.  Still need to start up a webrick server w/ address + port (this is far too incestuous with Puppet lib & Puppet.start at the moment).
 9a179ec  trivial: WEBRick -> WEBrick, to be more consistent with how the WEBrick ruby classes are named.
 e56406f  Implementing listening state tracking for webrick and mongrel.
 ec71e05  More unit specs for mongrel and webrick; more code to make them work, yo.
 31384fe  Pushing functionality down to webrick/mongrel classes now; cleanup in the base server / http server classes + specs.
 694f98b  Fixing failing tests, including making the debian service provider test work on non-Debian platforms.
 29feac0  Translating the report handler to an indirected model. I've provided backward compatibility with the old handler.
 74d77f7  Adding version handling through most of the indirection work. This counts as the first commit where configuration compiling actually uses the caching correctly according to the application model.
 e90191a  more stuff for the interim commit
 10039b9  interim checkin of network stuffs
 512096a  Fixing some small spec failures resulting from test fixes. The problem was in how TransObjects were converted to RAL resources.  (Committed while flying over Arkansas.)
 d24c1cc  All tests should now pass again.
 ec58355  Fixed #819.  Applied patch provided by matsuu.
 7ac7872  Fixed #822.  Applied patch provided by DavidS.
 fc9c850  Adding support for versions and freshness-checking to the indirection layers.  This should hopefully enable the different application models we need in our different executables.
 1befcc4  Homing in on a clean separation of concerns for a low-coupling, high-cohesion "server" model that will handle REST and/or XMLRPC on webrick and/or mongrel.
 5c32c8e  Somewhat better documentation of the :absent field feature in fileparsing.
 d055cbc  Make it apparent that absent fields in a record have a value of :absent, which is different from what appears in a line.
 b6dc1ae  Trivial tweak on HTTPServer module file
 a7d220b  Moving the webrick/mongrel "servers" over to HTTPServer module instead of Server.  Using Server as the master class for client connections.  Server (former RESTServer) will instantiate the appropriate subclass based upon Puppet configurator setting.  There are now tests broken in the network section which I can't seem to figure out yet.  Not a happy place to be.
 cdaad28  Fixing error thrown when the end of the file is encountered unexpectedly
 7d7e428  Removing obsolete comment
 f084d83  Another round of test-fixing around the changes I made to the configuration system.  'puppet' itself still works, even with -e, but I expect that puppetd and puppetmasterd are broken, and there are still quite a few broken tests because the default fact store can't write but that's the default behaviour for a networked configuration master.
 9c58c47  Adding a :code setting for specifying code to run instead of a manifest, and removing all of the ambiguity around whether an interpreter gets its own file specified or uses the central setting.
 d35cd94  Making "null" the default node source, so nodes are at least created easily
 0e336bf  This commit is focused on getting the 'puppet' executable to work.  As a result, it involves a lot of integration-level testing, and a lot of small design changes to make the code actually work.
 1fa5912  Adding the integration tests to the Rakefile for spec, fixing the integration tests, and extending the Classmethods for the indirector so that indirected classes can set the terminus class and cache class.
 a93db87  Adding another test to the ldap node source -- we make sure we throw an appropriate exception if a parent is specified but we cannot find it.
 9984a35  Fixing some terminology so some ldap tests are easier to read.
 6acde71  Switching the indirection from using settings for configuration to requiring explicit configuration.  This means that if you as an application developer want to use a different indirection terminus then you have to specify it; something like:
 8ba3a70  Fixed #838.  Applied patch provided by DavidS to add more robust update functionality to the dpkg provider.
 f41c843  Fixed #837.  Added freebsd service provider by trombik.
 533ce4b  Fixed #855, but I didn't add any tests.
 19ad238  Fixed #827.  Applied a form of the patch provided by porridge and wrote a test.
 29accba  Minor tweaks.
 2412199  Allow for multiple REST servers to be active; some terminology changes in spec; fleshing out more behavior, implementing.
 102ad23  Added .listening to REST server, handle listen states and transitions.
 187d910  Spec'd a reset() method for clearing out known routes.  Uses the unregister method so that any hooks there will be run.  Probably a violation of YAGNI, but I'm willing to suffer it :-)
 fd841b3  Updating first portion of the Network RESTServer spec with example code, getting the added examples to pass.
 9236179  Attempting to reproduce and fix #829 by applying patch by Paul.  I could not get a test to show the exception, nor could I figure out how the coding bug could have actually had an impact, but it's an innocent-enough fix, so I'm fine applying it.
 e5c623e  Fixing tests for the Configuration object, since I added the any_failed? test to Transactions.
 938f051  Fixing #817, mostly using the patch by DavidS.  I could not directly use the patch because I have refactored too much.
 fd11603  Removing the Id tags from all of the files
 bb3b3ce  I finally tracked down the problem that was causing providers to sometimes suddenly disappear and thus tests to fail -- Kernel.require was not loading the normal ruby path (e.g., 'puppet/type/cron'), so if someone else loaded that then it would replace the in-memory type with a new one, but that new one couldn't load its own providers, because the Kernel would ignore the providers, thinking they were already loaded.
 782bc4d  Fixing the yaml path so that it is correctly created for puppetmasterd.
 7c8fc8b  Fixed #854.
 d4afe39  Fixing #813 -- empty configurations again work.
 5d50ca7  Fixing #814 -- when files are missing, the exceptions should now be more reasonable.
 1be1db9  Updated CHANGELOG.
 0b8893b  Fixed #832.  Added the '--no-daemonize' option to puppetd and puppetmasterd. The default behavior of 'verbose' and 'debug' no longer cause puppetd and puppetmasterd to not daemonize.
 b45a7ca  Adding more behaviours to the Puppet::Module spec, and fixing some bugs in the process.
 3f90ddb  Interpreting "hidden" class from spec drafts as a REST Controller.  This name, functionality, and/or location in the tree is subject to change, but it's down now somewhere so we can move forward on it.
 861c21d  Added partial spec for the serving of REST information, as well as some client-side REST terminus behavior.
 8722e43  Use external helper script to talk to yum; should avoid any more trouble with "yum list". Fixes trac #836
 1174d99  Fixed a failing test where we presumed that non-string Fact values would have type preserved across a P::N::Client.master.facts call, which is not true.
 7fe18e3  Fixed a test which was secretly sneaking off and pulling certs from ~ if they were there: Added set_mygroup method, removed duplicate setme method.  Included PuppetTest in the  XMLRPC servlect test.
 fa643e6  Adding more indirection termini, mostly focused on caching information in yaml.
 938b918  Adding cache support to indirection.  If you have a '<indirection>_cache' setting, then the indirection will use the value there as the name of the cache.
 06ad6a3  Updated the configuration doc to more clearly explain where puppet.conf is expected to be by default.
 c8d02bd  Fixing ralsh to use a configuration instead of a component
 ffaa8ce  Demoting the "file does not exist" log to debug from notice
 c3c3e51  Fixing a small problem with the mailman type
 f8ab62b  Renamed princs to principals in the k5login type.
 6079348  Added k5login type written by Digant Kasundra.  This is for ticket #759.
 2e33061  I changed the Terminus class to switch camelcase to underscore-separated words, e.g., FactStore becomes fact_store.
 d6fd60c  Removing obsolete fact stores and node sources.  The functionality has been moved into the indirector.
 cdc8ea6  Taking a first stab at moving configuration compiling into the indirection system.  There are still quite a few unanswered questions, the two most notable being embodied in unimplemented tests in the Configuration Code terminus.
 c40da33  Adding a "memory" node terminus, which will be used by 'puppet' and the Cfengine 'module_puppet', since they need to set up the node specially with classes and other weird things.
 1e7c648  Fixing the spec for the checksum terminus to match the changed design in the previous commit.
 048464f  Adding my first integration test, verifying that checksum interaction behaves as I expect when interacting with the file terminus.
 84146d0  Adding the first version of checksum support, which will acquire the behaviour of FileBuckets.
 3a18348  Renaming the 'Puppet::Util::Config' class to 'Puppet::Util::Settings'.  This is to clear up confusion caused by the fact that we now have a 'Configuration' class to model host configurations, or any set of resources as a "configuration".
 e552c83  Adding the base file terminus.  This will, at the least, be used as the back end for filebuckets and the certificate authority.
 86dde63  All tests now pass in this configuration branch, which means it's time to merge it back into the indirection branch.
 60cd6a7  The structure for handling resource generation is now in place, which means I'm over the hump in developing this branch.
 a666995  Adding the last tests for the ldap node terminus.  I managed to forget the tests around the main find() method.
 ebe7290  All indirections are working, and they have all been migrated over to the new organization.  Where we would have previously had an 'ldap' node terminus at puppet/indirector/node/ldap.rb, we would not have it at puppet/indirector/ldap/node.rb, and it would be a subclass of puppet/indirector/ldap.rb.
 b9dc6cb  It looks like the new indirection setup is complete.
 02275f0  Adding automatic association between terminus subclasses and the indirection they're working with.  It looks like I'll be moving terminus registration to the indirection rather than the top-level Indirector.
 da0555d  Adding the first top-level terminus (yaml).  It works and is tested, so now it is time to migrate the Facts YAML Terminus to use the <terminus>/<indirection> file structure instead of <indirection>/<terminus>.
 0a48e5f  Moving the Puppet::Indirector::Terminus class into its own file and adding a spec for it.
 7e2ff4b  Adding a couple more tests to the indirector, talking about terminus registration.  I am about to change how loading is handled, so that individual termini are declared as normal Ruby classes.
 7740cd4  The indirector specs now all pass.  I think I need to add a few more specs, though.
 4e8b671  The unit tests for the newly-resurrected indirection class now work; all we need do is fix the indirector module tests.
 8212f88  Fixing all existing spec tests so that they now pass given the redesign that Rick implemented. This was mostly a question of fixing the method names and the mocks.
 944cd0e  Whitespace and comment commit.
 46d6906  An intermediate commit so I can start working on a different branch.  The file recursion code actually works for the first time in a painful while, but there are still some quirks and design issues to resolve, particularly around creating implicit resources that then fail (i.e., the behaviour of the create_implicit_resource method in Configuration).
 e90a51f  More spec and indirector updates.
 129cce8  Finally, some progress.  Closing the loops and delegating registered class calls out to the actual Terminus.
 a6c4041  Reworking the Indirector code.  Continuing to fight the classgen and instance_loader "utilities".
 9fa2628  This is basically another intermediate commit.  I feel like I've gone too far down the rabbit hole to turn back now, but the code is clearly getting more centralized around the Configuration class, which is the goal.
 19e0493  Updates to indirection stuffs.  Making a better spec and migrating to it.
 b3c8cdb  Configurations now set a "configuration" instance variable in resources that are inside a configuration, so the resources can interact with the configuration to get things like relationships.
 f17f19d  The whole system now uses Configuration objects instead of ever converting the Transportable objects into a tree of components and then converting that into a graph.  This is a significant step, and drastically simplifies the model of how to use a configuration. The old code might have looked something like this:
 f014d73  Partial fix for #772.  The SIGHUP now produces a EOPNOTSUPP instead of NameError.
 3ccf483  Removing the completely obsolete passwd2puppet and the obsolete component.rb
 3632926  Moving the resource container behaviour to the Configuration object, rather than the base PGraph class.  I expect I will just do away with PGraph, but for now, I am at least going to keep configuration-related code in that class.
 43f22a2  Adding a to_graph method to TransBuckets, so that the buckets can directly generate a graph, rather than having to first convert to RAL types and then have them convert to a graph.  This allows us to make it so components do not need a @children array at all.  This was all done because I am having the "already a parent of" problem again, and I have gotten far enough that it is relatively easy to just make this problem go away once and for all.
 a6fe700  Another intermediate commit.  The node and fact classes are now functional and are used instead of the network handlers, which have been removed.  There are some failing tests as a result, but I want to get this code committed before I massage the rest of the system to make it work again.
 1459c50  Adding setup/teardown hooks to rspec, so we can use test/unit methods
 3b3065b  Refactoring the feature support so it loads libraries when a feature is asked about, rather than when it is defined.
 65c1501  The Node handler is now obsolete.  Node searching is handled through the indirector.  I have not yet added the tests for the node handlers themselves, which is next.
 1638089  Fixed #797.  Removed the warning message about specifying 'enable' or 'ensure' when initializing a service.
 6f9a444  Fixed #784 by applying patch by vvidic.
 5aa4440  Doing an intermediate commit so rick can look at the work I have done so far.
 bb69a1f  Renaming the instance loader method to "instance_load".  It was previously autoload, which could class with Kernel.autoload.
 6a105c4  Fixed hdiutil syntax for ticket 812
 19a748b  Removed TYPE token, replacing it with CLASSREF token, in the grammar and lexer.  Updated CLASSREF token regex in the lexer.
 ca9c48d  Removing extraneous logging from the node handler
 041393d  Fixed #774, which fixed fully qualified collection statements
 6700adc  *Finally* fixing the tests that were failing around users and groups.  The problem was that the autoload tests were somehow clearing all loaded classes, including the providers.  This is fixed now.
 9af79f1  Fixing some failed tests.  Mostly cleanup.  Next is to make all of the user tests pass again, dammit.
 50874b2  Fixing a path test.  I have now made the path stuff a lot cleaner, but it apparently broke this test.
 ca57c79  Fixing #801 -- resources that have changes when running in noop mode do not record that they were checked, so that they will be scheduled on the next run.  This is a somewhat murky solution, but considering that no one had submitted this bug before, I expect it will not hit many people.
 caad11a  Fixing some broken tests in the master client, and adding a test for #800 but it is unfortunately disabled because we cannot realistically fix it using the current design.  It will be easy after the REST refactor, though.
 7abc78a  Fixing #795 -- configuration elements now make sure all file paths are fully qualified by prepending the wd to unqualified path names.
 4212f9c  Fixing #802 -- tags are now applied before parent classes are evaluated, so parent classes can use tagged() to test if a node is a member of a subclass.
 4104bd3  Fixing #807.  The exception handling should more closely resemble how it used to be done.
 b7f4244  Renaming some ast resource classes and files so they make a lot more sense.
 653c151  Fixing #806.  Resources correctly look up their fully qualified definition type, just like resource references do, which causes the resource and reference to again agree on the full name of a given defined type.
 40e3b37  A small change to the indirector, moving it to a module instead of a class.  I still do not really know how i will use it, though.
 a5539cd  Adding my indirector class before i rewrite it.  I am probably not going to keep any of this, but i wanted to store a copy before i got much further.
 b0a9475  Flipped the switch so that compiles now return a Configuration instance instead of pre-extracting the configuration.
 11b127b  Successfully modified all tests and code so that all language tests pass again.  This is the majority of the work necessary to make the separate "configuration" object work.
 3b2efd2  We now have a real configuration object, as a subclass of GRATR::Digraph, that has a resource graph including resources for the container objects like classes and nodes.  It is apparently functional, but I have not gone through all of the other tests to fix them yet.  That is next.
 0faf76e  More refactoring.  I have removed a few more extraneous methods from Scope, mostly just pointing directly to the compile, and I have begun (but commented out) the move to having resources to model each of the classes and nodes, in addition to the definitions.  This will, again, enable a real Configuration object, and it will enable class versioning and similar features.
 9d70b97  Removing the Scope#setresource method, since it was essentially redundant.  The work is done in either AST::ResourceDef#evaluate or Compile#store_resource.
 b021587  Doing a small amount of refactoring, toward being able to use Parser resources to evaluate classes and nodes, not just definitions.  This will hopefully simplify some of the parsing work, and it will enable the use of a Configuration object that more completely models a configuration.
 25f6d7c  Deleting old documentation that somehow made it back into the tree in the switch to git, and refactoring the evaluate_classes method on the compile object so I can use resources as intermediaries, thus making classes do late-binding evaluation.
 62806bb  Renaming the file containing all of the configuration defaults to "defaults.rb", since I am going to create a separate "configuration" top-level directory to contain all of the classes related to managing the configuration for a given node.
 6832a4b  Fixing some failing unit tests.
 2625eb1  Making a couple of small bugfixes in the configuration subsystem
 1de5ae0  Adding support for providing a diff when files are being changed.  Currently uses a local diff binary, but could easily be changed to use the ruby diff/lcs library.  Modified puppet and puppetd to automatically show file diffs when in noop mode, but can otherwise be enabled using --show_diff.  This only works when running interactively, because the diffs are printed on stdout.
 11081ce  Multiple environment support now works, and I have even tested it in real life.  This commit is mostly a bug-fix commit, resulting from the difference between real-life testing and unit testing.
 9ea8e6c  The fileserver now uses an environment-specific module path.  I also made various bug fixes around the network tree.
 51ff72c  Adding a bit of testing for node names.
 4e9c631  Moving the node tests to rspec, and cleaning up the spec of the node, especially WRT the environment.
 a8f2a33  Moving the node tests to rspec, and cleaning up the spec of the node, especially WRT the environment.
 9df4fd1  And we have multiple environment support in the parser.  The only remaining piece to make this complete is to add multiple environment support to the fileserver.  I also renamed Configuration.rb to Compile.rb (that is, I fixed all the classes that used to know it as a configuration).
 ba3a861  Removing this test for now; I do not have time to port it from test/unit to rspec
 37f0eed  Renaming the "configuration" object to "compile", because it is only a transitional object and I want the real "configuration" object to be the thing that I pass from the server to the client; it will be a subclass of GRATR::Digraph.
 deb0107  Oops, created a test directory in the main spec dir, rather than in the unit/ subdir
 3030d3e  Modules are now tested with spec, and they now can handle environment-specific module paths.
 ab54183  The config class now has support for add an environment to its search path.  Now I just need to go through the whole system and use the search path in addition to the parameter name itself.
 c6e201c  I have added basic support for a search path, altho not yet with any ability to manipulate it.  All config tests pass in both the old tests and the new ones, so it is time to add the hooks for manipulating the search path.
 520aaaf  Adding some rspec tests for Config.rb, because I am planning on significantly changing its internals and the current tests, I think, will be harder to migrate than just writing rspec tests from scratch.
 724fef1  Everything up to the parser (and the Modules) is ready to support multiple environments, including the parser having an environment setting.  I have also created my first spec-based tests, for the interpreter (and deleted the old test/unit tests).
 3d68ed6  Oops, left out the spec rake file from the main spec commit
 58494cc  Building a stand-alone spec directory for creating the new spec-based tests.
 d59315a  Adding the second half of the rspec upgrade -- apparently the "git add" thing I used did not remove the old files, only add the new ones.
 5601ecf  Upgrading rspec to version 1.0.8.  This only includes the contents of the lib directory, and even then only the spec-related stuff, not the autotest stuff.
 7c4d39e  Adding environment information to the client fact list.  The environment is retrieved from the normal Puppet configuration, so it is set via puppet.conf or the cli, rather than being a normal fact.
 b599862  Fixing the integration test between interpreter and configuration -- the interpreter was not passing on that the config should use ast nodes
 a54fa7e  Sync to latest specfile in Fedora
 8b3361a  The last commits before I actually start on the multi-environment support.  There are still failing tests, but apparently only those that are also failing in trunk.
 f1727f1  Adding the topscope metadata to the configuration being returned to the client, just like it expects, and fixing how the resource handler calls the master type.
 efcd1e8  Fixed CA race condition (#693)
 4eb87ed  A round of bugfixing.  Many more tests now pass -- I think we are largely down to tests that (yay!) fail in trunk.
 2a4e101  All language tests now pass.  I expect there are other failures elsewhere, but I want to commit this before delving into them.  My method for fixing the tests was to do as little as possible, keeping the tests as bad or as good as they were before I started.  Mostly this was about changing references to the interpreter into references to the parser (since that is where the new* methods are now for ast containers) and then dealing with the new config object and its relationship to scopes.
 6467c21  The first pass where at least all of the snippet tests pass.  I have unfortunately had to stop being so assiduous in my rewriting of tests, but I am in too much of a time crunch to do this "right".  The basic structure is definitely in place, though, and from here it is a question of making the rest of the tests work and hopefully writing some sufficient new tests, rather than making the code itself work.
 a846ea9  The new parser configuration object works now, but the rest of the compiling process is hosed (although the parser itself should still be fine).
 282ec89  Fixing the spec library so it correctly can see its version
 1527f4a  Adding node caching, so that node sources are not spammed during file serving and such
 a953954  Keeping the node names in the node object, so that they are available to the interpreter
 297dabb  Refactoring a small part of the interface between the configuration handler and the interpreter.
 901ae68  Requiring mocha in all cases in the test tree
 70dffdd  The new configuration handler looks to be ready for usage.  Now I just need to convert the interpreter to use SimpleNode objects, then continue with the Configuration object.
 aabad8e  Adding the necessary name/ip fields to the node methods
 65559af  Adding a "none" node source, which will be the default node source and will just return an empty node.
 2ff15c0  Added shortname support to config.rb and refactored addargs
 90a9d09  Finalizing the node handler.  It now correctly uses the different node sources and knows how to retrieve data from those sources.  Now I just need to fix the language stuff to use this handler instead of the existing node stuff.
 ec50484  Fixing documentation string on the file "ensure" property to remove the confusing mention of "exists"
 58e3855  Added optional per-module lib directory.
 aab419b  An intermediate commit in the work towards adding multi-environment support.
 40491eb  Merge /opt/rl/git/puppet
 b59d396  Revert "Updating more milestone names"
 3e9ac59  Updating more milestone names
 ab42534  Applying patch by Adam Jacob to make external node tools able to handle command-line arguments
 24e7b4d  Revert "Updating more milestone names"
 61a747f  Updating more milestone names
 b5aefd4  Adding milestone names to changelog
 7e4f270  Actually honour :namevar => true on newparam calls
 01b21ae  Removing extraneous debugging from crontab
 6ab30eb  Fix for setting global exit code ($?) in SUIDManager tests
 0195893  Broaden assert_absent so that it thinks that :purged is equivalent to :absent
 6a78648  Change the service name so that it is less likely to trip on a common word and spuriously fail
 e143cae  trac #763: Make redhat provider default for CentOS (patch by jtimberman)
 d2f2bc0  Trivial mock cleanups
 ada960b  Constants in provider/interface/redhat.rb are getting redifined as they are dynamically assigned, changing them to instance variables
 8f05951  Changes to lib/ corresponding to test refactoring from r2759, was unaware that subversion only commited in the CWD
 13f358d  Highlight what I think is a problem in the test suite that I just can't solve
 3de4829  Refactor SUIDManager tests to run without root, change SUIDManager's behavior to not silently fail when it's not root and fix all other tests that broke as a result.
 5a25701  Upgrade mocha to 0.5.1, which gives much better error messages
 5e8d71d  Fix the ral:providers:host:parsed tests so they run successfully
 9530df1  Updated to version 0.23.2
 0d312a1  Updated to version 0.23.2
 
 0.23.2
 ======
 49c9a62  Adding release tag REL_0_23_2
 b84015a  The last set of bug-fixes before the next release.  This commit just fixes a couple of problems that resulted when I changed the Provider#initialize method to not duplicate its argument, which was necessary for ParsedFile.
 aaf5959  Adding test support for the other mongrel configuration header
 db0ffc7  Copying the "commands" and "confine" statements to the actual dscl providers, since they need to be there to determine where the providers are suitable.  Otherwise base classes could unnecessarily affect how subclasses work.
 5e419cf  Fixing #749 -- environment settings no longer accumulate.  Significantly adding to the cron tests at the same time, such that hopefully we will no longer have these recurring bugs.  I now do every combinatorial of multi-line cron jobs, including doing them all in one file.  There are, unfortunately, still edge cases, but maybe we will have some peace in cron space for a while, anyway.
 d121b1f  Removing the code from #745 until it can pass some basic tests
 1e6c2ba  Adding syslog support by devdas (#745).
 22e7b39  Fixing #751 -- the interface providers now have basic tests, at least to verify that prefetching and listing works.  I think these resource types need to be largely rewritten, though, and they currently have no relationship to ifconfig, which seems strange.
 7bda32e  Fixing #731 - we are now correctly only collecting exported resources
 3d629bb  Fixing #730 -- mounts now call flush() before trying to mount
 a8bf96a  Adding a file that should have been in a commit from yesterda
 40e4d6f  Fixing #735 -- gen_config now uses a single heading, matching the name of the process
 97cd057  Fixing #314 and #729; here's the changelog:
 72f2ac3  Apply fix for typo provided by Toshio Kuratomi (bz250870)
 2a37c73  Removed stray debugger method.
 5a5d241  DirectoryService provider for users and groups.  Alternative to netinfo, as apple has indicated NetInfo may go away at some point in the future.  It might happen in October.
 08d8945  Fixing #734.  The problem was that when I switched how the configs were parsed, I managed to lose the ability to keep values set on the cli from being overridden by values set in config files.
 5eacd19  Renaming the linux interface provider to redhat
 6841397  Applying patch by stick to the linux interface provider
 877282e  Undo previous commit, which was an error
 81d690a  Do not set any options if they aren't set in /etc/sysconfig/puppetmaster - otherwise we clobber settings from puppet.conf
 36a3e4a  Changes for 0.23.1
 52e9fa0  Adding interface implementations, as written by Paul Rose
 7547baf  Adding a test for rails
 1e11a1a  Removing test that ended up being redundant
 4b25750  Applying patch my emerose to fix #652.
 87da172  Adding the requirement that the cert dn have /CN= in it, thus hopefully catching clients without certs
 530d290  Applying a modification of the patch from Marcin Owsiany, allowing Mongrel to be a CA
 64fba48  Updated to version 0.23.1
 d3988cc  Updated to version 0.23.1
 
 0.23.1
 ======
 0f7f752  Adding release tag REL_0_23_1
 2229dc1  Fixing #726 -- mounts can now correctly handle mounted but absent filesystems.
 47b7058  Adding some code in an attempt to fix #728, but it is all commented out since I could not get it fixed in time for beaker
 2e14ea4  Attempting to clean up the mount documentation as in #727.
 7401ada  Caching whether a given file or module has been loaded, because the loading was greedy and was causing files to get loaded every time a class or module was asked for
 3f1b957  Fixing the mail aliases generated by the mailman list provider; it was generating capitalized list names
 3f1c865  Fixing #725.  I was apparently not deleting the alias I was creating to the components.
 55014a2  Hopefully fixing #720 -- I added tests and a lame back-off system to give the child process time to write
 eacb06c  Converting mount test to use mount everywhere instead of df
 501e8c8  Adding the ability to specify relationships to classes, using Class[name] resource references.
 b9dd7ee  The first round of bug-fixes in preparation for beaker
 5d7c5c9  Adding documentation to the "test" script
 4f34fb0  Removing the chdir from util.rb, I forgot that the directory often matters
 f2a1a10  Hopefully fixing #640, and maybe some warnings at the same time.  I added a call to Process.setsid after the fork, and I chdir'd to /.
 fdd2d49  Fix #696. (patch by Jason Kohles)
 90c8b8c  Fixing #716 -- the package type was considering anything that was not "absent" to be installed, but that included "purged", thus the problem
 0316bed  Applying patch by DavidS to fix #711.
 48755b1  Fixing #702, hopefully.  As suggested, I switched to "mount" instead of "df" to determine whether an fs is mounted.
 f59ce4e  Fixing #695 -- resource references will correctly serialize and unserialize in the db
 53a469c  Fixing #703, mostly.  You still cannot do multi-condition queries, but you can at least query against any parameter, and matching any value is sufficient for a match, so the tags work fine.
 d5569bc  Fixing #719 -- the filebucket docs now only mention filebucket, not pbucket
 d9a30a6  Trying to get rid of the warning from #724
 e618065  Applying a slightly modified patch by Dean Wilson -- puppetca now exits with a non-zero code when it cannot find certs to clean.
 49d8ef2  Guard the rpm command suitability confine better so we hopefully stop seeing all of the 'Command not available' errors
 f104dc5  Updating the docs to mention that you can use the file server with no server name
 cf25b25  Fixing some logging in cron
 60ef578  Fixing the rest of #705, except for the env stuff, which I was not able to reproduce.
 53c2f0a  Fixing #691 -- I added "refreshable" features to the types that can restart, although exec does not have providers (yet), so I just made the docs a bit clearer
 4c1a70c  Reordering some of the type docs
 e0237d1  Removing notice about "import loop", which was happening constantly when autoloading module files
 1d261bf  Fixing error message when a parameter is getting redefined
 554c23c  Adding rpm as a specific command to :rug
 54a5f77  Fixing #589
 2c13d53  Fixing #468 -- fully qualified resources can now be specified as dependencies
 e88d694  Applying patch from #714 -- aptrpm now loads on RHEL
 c3290a0  Fixing the mailman provider so it correctly matches case.  Apparently mailman helpfully autocapitalizes list names.
 2086e07  Removing extraneous debugging
 6ddbec3  Fixing the interpreter autoloading so that it correctly loads classes even when being loaded from a namespace
 f217fbf  Fixing the instances method.  It now works when there are already managed resources.
 edb1be2  Fixing the :check metaparam so it does not try to check unsupported parameters
 f1462cb  removing the test for a method I removed yesterday
 e98edac  Applying docs patch by David Schmitt from #713
 7580657  Applying a version of the diff to the defined() docs from David Schmitt
 a4b94cf  Fixing the first half of #705 -- matching no longer fails.  I think this also fixes #648.
 d104d4b  Having FileType instances automatically back their contents up to a filebucket, so it is much harder to lose content.  This does not yet back up crontab contents, though.
 17a830d  Fixing transactions so that they do not flush resources that are in noop
 f570a5f  Adding a maillist type, with support for mailman.  It is not as flexible as I would like, partially because of how mailman is implemented (the "mailman" command is never in the search path), but at least it is working for mailman on debian.
 2d3c920  Adding support for a "mailalias" type, with /etc/aliases support initially.  I have not yet figured out how to best rebuild the aliases file when necessary.
 fdfe0a3  Adding line/file info to parsing errors in ParsedFile
 9f685e6  Adding support in Property for declarating whether a given property type will match all @should values or just the first.
 c8801b7  Always setting a to_s value in authstore, so we do not get dumped objects
 e79828f  Cleaning up a log message in the transaction
 20b9060  Adding benchmark info to fact retrieval in the config client
 7a71db8  Adding patch by Valentin Vidic to add the "+>" syntax for adding values to parameters
 e662c86  Fixing #621 -- plugins are now downloaded directly into the $libdir, and autoload looks for them there.  You can now easily download any reloadable file to your clients.
 7befe1b  Changing some of the internals of autoloading so that there is a class-level method to query whether a given file has been loaded.
 eabe0d1  Fixing #710 -- you can now specify the rails_loglevel
 d36d0cf  Fixing a typo in a log message
 8807ac2  Changing "element" to "resource" in the documentation, which just aligns with a terminology change we made almost a year ago.
 f5f8949  Changing the log message when a resource type cannot be found
 773f187  Ignore the pkg directory if it exists, and fix up a couple of tests that were erroring out, which also will help the confinement of package types a bit more.
 1bcca31  Fixing #687.
 8a7fe9f  Applying patch by David Schmitt from #701.
 4080077  The parser now throws an error when a resource reference is created for an unknown type.  Also, resource references look up defined types and translate their type accordingly.
 07f0519  Making sure that #686 is fixed -- I specifically included the Daemon module in the Puppet mongrel server, and I call daemonize on the Puppet class, rather than the Mongrel http server
 e8217ab  Hopefully fixing #685 -- I added a wrapper around the call to getconfig(), so any timeouts will just throw an error and skip the run, rather than failing and killing the daemon.  This is not the best approach, since really, each method should be wrapped, but it is sufficient.
 60e5e10  Applying further tests to double-quoted hostnames by Valentin Vidic
 266d37d  Applying patch by DavidS from #697 to allow host names to be double quoted
 aa74135  Fixing #596 -- classes in modules now autoload
 d0680c8  Fixing the dpkg querying so that it works for packages that are in "config-files" state rather than just missing entirely.  Also fixing logging so that the package version is visible, instead of a dumped object
 8b14ef8  Fixing logging of module mounts; it was using the module as the name, rather than the module name
 32e5bff  Removing extraneous debugging
 3ae3a4e  Fixing #689, although I have not added unit tests.  The problem was that a tag name was being removed, rather than the tag object itself.
 19e180f  Fixed #680 puppet should handle internet enabled image files correctly.
 c22e667  Applying patch by daikinee from #690.  I was not able to reproduce the problems, but it did not seem to hurt anything, either.
 50b8f96  Fixing #704 -- Puppet was not failing correctly when schedules were missing, I think
 c762c19  Removing the long-obsolete Element base class.  The Parameter and Type classes no longer have the same base class.
 0ff7827  Fixing #620 - class names and node names now throw an error when they conflict
 a627f46  Adding a reference to the LDAPNodes wiki page in the ldapnodes config item
 0f4de4f  Fix trac #684 - set exit code for status properly (patch by abnormaliti)
 6b7d3aa  Create the right puppet.conf; make sure old config files get preserved and stay functional
 ac36ddd  Fix name of main section
 ec2d469  Rename puppet.conf to puppetd.conf
 8013e96  Get rid of using silly macros in %install
 dc2a0bf  Use single config file
 3aafa84  Updating reference docs
 55a512c  Updating trac location for laeg
 044968f  Updating build files to support laeg
 ada4355  Updated to version 0.23.0
 d8f4c53  Updated to version 0.23.0
 049faf8  Updated to version 0.23.0
 
 0.23.0
 ======
 f588d47  Adding release tag REL_0_23_0
 8844fca  Changing the paths to match laeg, instead of culain.
 d79a788  Modified the fileserver to cache file information, so that each file isn't being read on every connection.  Also, added londo's patch from #678 to avoid reading entire files into memory.
 944e1f4  More updates to puppet-test
 4bb0228  Updating puppet-test with clearer options around describe and retrieve
 fd15de7  Removing extra debugging from the interpreter
 5043ade  Updating error message during test failure.
 e5a9e24  More test fixes.  I seem to be getting very close.
 bd444d8  Refactoring puppet-test -- it now supports specifying a fork level (so you can get multiple tests running in parallel from one host), and tests are modeled explicitly, so it will be easier to add new tests.
 a57e39d  Added documentation for pkgdmg provider in the provider desc accessor as per request in #641  It stil might not be crystal clear, but should be better than the one liner it replaces.
 01420ac  Adding tracing to prefetch failures, and Fixing the environment support in the cron type (#669).
 fa39488  The other half of fixing the versionable stuff -- removing "latest" as a requirement.
 0b1dbbb  Applying patch in #572 by trombik
 611e783  Fixing my stupid fix of Matt's work.  I conflated :versionable and :upgradeable.  I have now added back all of the "has_feature :versionable" lines.
 4cb30eb  Adding fink package provider.
 099bf6c  Fixing some failing tests.
 f96ec6d  Updating the has_version work that Matt did -- the only thing he missed was that the :versionable feature depends on the :latest method, and when that is present we can safely assume that a package is versionable.  Also, created the :latest method on the dpkg provider, as requested in #647.
 3f6c413  Applying patch by trombik to fix #628.
 eb2326d  Applying patch by trombik from #624.
 2d07334  Modifying the CA server so that it will not send back a cert whose public key does not match the csr.  We have been getting a lot of instances of this, so this should cut down that problem.
 6e16d9f  Fixing #578 -- Invalid certs are no longer written to disk.
 bf5d5d5  Fix #657: allow puppet URL's with no server; 'puppet' looks those up on hte local modulepath, whereas 'puppetd' goes to the default server
 52f3f83  fixing the appdmg provider to load the package provider base class, and trying to clean up the log-file opening in rails
 12adea8  Adding puppetrun as an executable in the gem, along with ralsh (#313).
 2ed10d8  updating changelog for #641
 bfb3852  Adding appdmg package provider from #641.
 f05464e  Adding the output_file.close, as wyvern recommended
 30ebbc9  Applying the patch by wyvern from #662.  This should hopefully kill the client hanging problems.
 ac05442  Updating rrdgraph documentation with a pointer to the new rrd package.
 029a191  Reverting the change I just made to the config handler; it was only there for testing.
 2b1d478  Adding puppet-test, which is useful for performance testing
 afc3563  Adding patch by Ghislain from #670, with slight modifications.
 f6838f5  Fixing #548, and making functions support other rvalues, too, including other functions.
 f842cef  Fixing #643 -- replacing the get_posix_field method with a more degenerate version that works even on broken systems
 46252b5  All rails and language tests now pass again.  All of the rails tests should now be in the rails/ directory, and I have modified resource translation so that it always converts single-member arrays to singe values, which means the rails collection does not need to worry about it.
 6084e1a  Fixing #673, but I have not written a test case for it.  I moved all rails-related unit tests into the rails/ dir, because they keep getting missed.
 e8c6cd9  Fixing the yum provider, and fixing the unit tests so the failures people were experiencing will result in failed tests.  This fixes #672.
 4f7c650  Moving puppetd and puppetmasterd back to bin.  Damn. Reverting the fix to #323.
 23f986c  Move ralsh and filebucket into /usr/bin
 659792f  Adding ralsh and filebucket to the rpm and the rakefile, and changing the url in the rpm
 6be8b21  Modifying the check metaparam so that it just silently ignores metaparams and parameters, since they're uncheckable, and only tries to check properties
 e039f7b  Fixing the type/title index for mysql
 9ba878a  Removing erroneous debug message
 b5523ff  Trying to load ruby gems, in case needed libraries are installed that way, and fixing a warning in the provider
 f84ac7d  Significantly reworking both external_nodes and ldapnodes support (see changelog).
 fc9a798  Fixing error about non-puppet protos
 45f76c5  Significantly optimizing the database queries -- I am getting about 40% better times now.  See http://www.madstop.com/optimizing_the_activerecord_integration.html.
 e32a1bd  adjusting the rrd color stack as requested by thijs
 469d999  Updated the CHANGELOG.
 51b9fc1  Fixing (hopefully) the last two providers that had "resource.is" calls
 77934f4  Fixing sun package provider
 270cea8  Fixing #644 -- the install.rb file works again
 8003320  Applying metrics patch from #659 by thijs
 4910301  Fixing a typo in the docs
 c67e016  A few small fixes here and there, and the rest of the zones commit
 399c37b  Fixing #655 -- Solaris zones are again fully functional, from what I can tell
 9bc236b  Adding indexes for the rails tables
 7c53aab  Removing the indexes migration, since the indexes are now in the main db schema
 ef2698c  Updating ralsh with more functionality:  You can now perform work on the command line, with commands like "sudo ralsh file /etc/passwd ensure=absent".  This makes ralsh a bit more interactive.
 cb5bccc  Added to_s to the values to ensure the check versus the database will be consistent and booleans and references will check correctly.
 d78a7a5  documentation fix
 3a2f3d5  Fixing mongrel test so it does not try to load the mongrel server class on machines without mongrel
 6aa5d76  Applying patch from #666 by Rainhead and monachus
 ea190c1  Changed the host to "eager fetch" all the resources and their associated tables.  Also removed some unecessary lines from resource.rb that were causng it to re-read information it already loaded from the db.
 3003aad  Added the teardown of the database back to the tests.
 4442a31  Revert unintentional change.
 68e37a9  Major rework of the rails feature.  Changed the relationship between host and facts (now many-to-many with fact_name through fact_values). Also changed the relationship between resource and params (similarly many-to-many with param_names through param_values).
 c26f678  Fixing #550 -- I had to list pass and dump as optional fields.
 f0b5090  Fixing #112 - mounts now default to 0 for dump and pass
 d396fd5  Fixing #637 -- defined resources can now correctly be virtual or exported
 ad9c9ce  Removing old line from the fix for #660 -- I had strangely just commented it out, rather than removing it
 ffb7ae0  Fixing #660 by applying patch by freiheit.  Looks like this is another problem with yaml on 1.8.1.
 79b604d  Oops; I forgot to add the base class for package providers.  Also, cleaning up the package provider code a touch
 c826be9  Adding a simple unit test for mongrel, and adding the ability to select the header used to store the client SSL dn.
 b50c85d  Fixing error when commands fail -- the error code is now printed, instead of the inspection of it
 3479387  Adding (slightly modified) urpmi support from #592 by Devin
 73502a7  Finishing off the type/provider interface work, including adding package prefetch for all packages.  The only not-done one is yum -- prefetch is set up for rpm, but not yum.  We need to modify prefetching so that it also prefetches latest information, to avoid having to run yum so many times.
 bf82d51  Fixing the "Server is not a class" problem with mongrel
 992636a  Applying patches from Valentin Vidic to fix open file discriptor and open port problems
 1867d0e  Fixing the few test failures that resulted from the changes to provider listing
 c35d07b      Significantly reworked the type => provider interface with respect to     listing existing provider instances.  The class method on both     class heirarchies has been renamed to 'instances', to start.  Providers     are now expected to return provider instances, instead of creating     resources, and the resource's 'instances' method is expected to     find the matching resource, if any, and set the resource's     provider appropriately.  This *significantly* reduces the reliance on     effectively global state (resource references in the resource classes).     This global state will go away soon.
 a7b057d  Adding a "source" attribute to providers, so eventually types will be able to avoid duplication during listing by only listing one provider for each source (e.g., dpkg and aptitude should not both be listed).
 0cfd28e  this is a spurious commit to test the trac site
 e8aef1e  Change pi to list properties instead of states
 f2c524d  Add protect and priority properties; patch provided by Matt Hyclak
 0a2b438  Fix trac #601: wrong location for client pidfile
 d467e18  Fixing #532 -- reparsing config files no longer throws an exception.  The problem only occurred when reparsing a configuration file that was also being managed (which was common) and only whent the manifest was up to date (the combination was uncommon).  Reparsing would find the existing file object and use it to check permissions and such, then it would remove all of the internal data in the object, for cleanup; the problem is, the client still had a reference to the object, so when it went to run its configuration, this broken reference was used.
 e8097a2  Changing --show-available to --showall, as requisted by Jeremy Dreese on the list
 e0fbd41  Switch the package type to use a :versionable feature, and convert all providers to use the feature.  Hope it doesn't break anything.
 37a221c  Add a grammatically correct 'has_feature' alias, and switch to using it where appropriate in existing code
 0a605e8  Clean up a really hairy code construct in the useradd provider
 58be1fd  Fixing up2date name matching, as mentioned by Jeremy Dreese on the list
 464e688  Changing the resource title to be text instead of a string, because some title are > 255 chars
 48ec137  Mark all package providers that don't currently report themselves as being versionable as not supporting versioning; this way we get a more sensible error message when people try to specify a package version.  See #647 for some discussion.
 a9ea3c8  Correct a problem with the dpkg provider's handling of the :purged state, and expand the package type's understanding of what purged actually means.  Fixes #644
 d1458bd  Adding a warning for when no properties are specified on services
 1883b8f  Adding a debug statement describing why restarts are skipped on services
 ca255b9  fixing the method to check for hostdir writability in the rrdgraph report
 ac686e8  Changing the location of the classes.txt to the state dir
 25d5ebd  Adding more detail to the per-host reports dirs, since it was not setting mode or ownership.
 62a4d4c  Adding better error reporting on unmatched brackets -- you will now get notification of what was expected in most cases
 2b372df  Updating the exec docs to specify that the timeout is in seconds
 4aef0ba  Fixing #323 -- puppetd and puppetmasterd are now in sbin; packages still need to be fixed
 6f83d4d  Fixing #501 -- there is now a splay option, disabled by default and when running under --test
 7d1f760  Adding the execute bit to install.rb and fixing #473 -- there was a /win/ regex that matched darwin but was just supposed to match windows
 611f88a  fixing a documentation bug
 df6f41a  Changing the notify type so that it always uses the loglevel for logging
 ef1a4af  Fixing #568
 e8d560e  Fixing #566 -- definitions, tags, and classes can now be single characters
 eed85f4  Adding #629 -- an undef keyword now exists
 8410c4d  Fixing #507 (behaviour in cycles) by changing the topsort algorithm.
 67ee251  Using the method for retrieving the dipper class, in case it has not been loaded
 e3b7a54  Making sure there is an editor set for ralsh
 e95734b  Redoing autoload a bit in preparation for adding a plugindir
 dbedcd7  A round of fixes so unit tests pass; most of the failures were from the merging of the transaction-refactor branch
 28f7d6c  Fixing #569 - I have added a dynamic facts option to choose which facts will be ignored.
 d9f6f41  Fixing the "is" related problems in yum and rpm support, but there are still some package providers that use the "is" method (grep for "\.is[^_a-zA-Z]" in the package providers), and the util/posix.rb module has a call to obj.is.  I will fix those soon.
 1934f2b  Removing obsolete parsedtype
 61784ed  Attempting to fix the fact that the yum package provider calls [] on the ensure property, and making the resulting error more readable
 85fef63  fixing some problems with the config timeout -- I am not sure it ever actually worked
 27cabf2  Fixing a weird bug that occurred because I was changing @parentclass in the AST stuff the first time it was called, from a string to a the actual instance of the parent.  This worked fine as long as the parentclass was only called when parsing was complete, such as during evaluation, but if anything resulted in it being called earlier (e.g., attempting to add to the class during parsing), then things behaved, um, badly.   This commit fixes the method so that the variable is not modified; there is now @parentclass and @parentobj.
 613c413  Fixing a path problem that resulted from the changes I made to internal variable names -- the pathbuilder method in file referred to @resource instead of @parent
 aed12c3  Use @http in store, add filterhost
 19af1cb  First try at the REST config_store
 12e5656  Initial configuration storage abstraction layer stuff.
 426330c  Updated the CHANGELOG with changes for retrieve and acts_as_taggable.
 24b11b5  Removed acts_as_taggable from the rails stuff.  I haven't removed the tables from the schema nor the indexes yet.
 ca2b9e6  Not parsing old versions of puppet.conf -- otherwise, puppet parses the whole configuration.
 eca5510  Fixing the to_trans method and ralsh a bit so ralsh now works with the new lack of "is" method
 55666a5  correcting some of the function reference docs
 1d23013  Fixing #605 -- providers now refer to @resource or @resource_type.
 de21226  Fixing #607 -- parameters and properties now refer to a @resource rather than a @parent.  The @parent parameter is still set for now, for backward compatibility.
 3e7d44e  Fixing #606 -- now only components mention @children.
 13c7f2f  Allow Darwin to remount rather than unmount / mount, as per puppet-users discussion "mount type and ensure => present on OS X" (Message-Id: <C44C8E86-DF31-4344-9B74-937325A03F5F@madstop.com>)
 7f8a903  Getting rid of the last vestiges of the logger tests
 bfc0c35  The TODO file has never really meant anything, and it hasn't been modified in 2.5 years
 cdd0dd3  Adding default provider info to the providers report
 2fa529e  Fixing the ability to fail correctly in the fileserver -- a constant was not defined correctly for it
 fbfaa0f  Removed FIXARB's from the pfile stuff.  These have been resolved.
 93cbe77  Removed FIXARB's from a file that will be going away.
 a966606  Removed override of change_to_s since it is the same as the overridden method in EnsureProperty.
 8bad074  Removed override of change_to_s since it is the same as the overridden method in EnsureProperty.
 b0374d8  Removed calls to is.
 5b44159  Removed the testing method: checknewinsync.
 c164360  Merging of refactor-transacton to the trunk.  This work removes the :is attribute from properties and relies on the provider to cache or return the current value of the property.
 8f18746  Hopefully final version of the providers reference
 c99e99d  Intermediate commit of more reference work, including making provider suitable more introspectable.  I am about to significantly change the output format of the providers reference, so i want to get this committed before that change.
 73df973  The result of .compact.join("\n") isn't assigned to anything. Fix.
 568db0b  Fixing configprint so it fails correctly when an invalid parameter is provided, rather than throwing a stack trace
 40b3834  Sorting the network handlers in the network reference
 7835d29  Adding a dynamic? option for references, so those are not stored in trac
 1decfa3  Lots of work related to generating more reference.  Moving all of the individual references out of puppetdoc and into an external "reference" class, which itself can autoload, so it is now easy to add new types of references.  Also adding a network reference, along with an unfinished provider reference.
 69cb721  Removing the obsolete logger network interface
 a040bd4  First run at moving references to lib/puppet instead of puppetdoc
 f42a755  Adding a module to abstract using Autoload to load and manage instances
 53f1612  Fixing the time-cleaning in the rrdgraph report
 494675b  Fixing #206 and #422.  Executables will still look for the deprecated config files and load them using the old parse method, but they now prefer a single configuration file, and files can set parameters (owner, mode, group) in brackets on the same line.
 1f8de9d  Consolidating all of the configuration parameter declarations into configuration, at least partially just because then the docs for each parameter have to be a bit better.  Also, I have gotten rid of the "puppet" section, replacing it with "main", and changed, added, or removed a couple of other sections.  In general, we should now prefer more sections, rather than fewer.
 f783859  Correcting function reference markup
 e864eab  Applying patch to puppetrun docs from JosB
 e1438a5  adding --summarize option to the changelog
 28254b5  Adding a --summarize option, to get a transaction summary
 0c07125  Fixing #615 (subclasses with similar names) by getting rid of the class "type" and "fqname", and instead using "classname" everywhere.  You should no longer see unqualified class/definition names anywhere.  Also, rewriting how snippet tests work, to avoid creating all of the files, since the point was the parsing tests, not functional tests.
 8d7ec14  Adding a fact handler, along with an abstract interface for fact stores and a simple yaml fact store, towards the Node Classification work.
 79dcd33  Set LANG/LC_ALL/LC_MESSAGES/LANGUAGE to 'C' whenever we execute things, so that the output that comes back is more easily parsed, without needing to understand all sorts of foreign languages
 a1d4f35  Update to latest shipped for Fedora/RHEL
 4022968  Committing all the work that josb did, plus a couple of small changes
 bf37676  Applying patch to puppetd from Jos Backus
 8d11bb8  Fixing class name for Handler in puppetd
 1ccdff5  Adding --serve back in as an option to puppetd, and failing when a handler is specified but missing
 fb4f04d  updating changelog with version number
 0f02a54  Updated to version 0.22.4
 e049999  Updated to version 0.22.4
 4f2b903  Updated to version 0.22.4
 
 0.22.4
 ======
 22ce899  Adding release tag REL_0_22_4
 3e895b5  Changing the remount stuff back to not repeating the mount options.
 6438270  Adding a "supports_parameter?" method to test whether a given provider supports the features required by a given parameter.  This is used during attribute instance creation, but its creation was necessicated by test code.
 c9de332  Fixing the fileserver naming tests after the change to allow "-" in fileserver module names.
 80ec494  Fixing #430 (I hope) -- execs now autorequire the specified user
 483c25e  Switching the simpler features to a single file, so it is easier to add new features
 c369c6a  Fixing cron to correctly match blank lines, fixing #602
 f69dcda  Working a little bit on rails failures, with no real progress
 e05392e  Fixing a bug in the tests introduced a while back when I switched to using "generate_report"
 7fb7146  Updating the changelog for #594
 3aafd81  Fixing #594 -- Files on the local machine but not remote machine now purge.  Note that this introduces a difference in behaviour between recursing locally and recursing remotely.
 c2bc848  Adding purge => true to downloading of facts and plugins, and removing some extraneous logging from the provider base class
 7e97143  Allowing "-" in fileserver module names, #617
 4dbcc5d  Changing the resource handler to return the whole object, rather than just type and title
 8b60d20  Not stripping domain info from the ldap node, as requested
 63e907c  Switching the mount command to always add the mount options, so that the parsed provider can be used even in cases where /etc/fstab is ignored, like it is on OS X.
 dad9373  Fixing the tests for the aptrpm provider.
 89ac6d7  Adding "rug" package provider from #609
 4296e4e  I managed to put those provider tests in the wrong file -- the file meant to test the resource type interactions with providers, rather than the provider file.  Fixing that, and the failed test resulting from that silly mistake.
 21eab22  Okay, one last try -- the Util#binary command was not returning a path in all true cases, and the provider tests were poorly written and missed it.
 94bd3b2  Apparently I messed up providers a bit; binaries were not having their full paths returned, which made most providers suddenly unsuitable.  This fixes that, and adds tests to verify behaviour.
 96eed99  Closing #585 -- providers can now have optional commands, which only differ from normal commands in that they do not affect a provider's suitability
 0a46bb2  Fixing #603 -- I had to add a special case for escaped carriage returns.  I am not entirely sure this is the right solution, but so be it.
 9a1a88c  Fixing #574; puppetmasterd now exits with non-zero error code when there is a failure
 3169bfa  Adding extra info to the "Parameter already set" error, as requested in #573
 86c206b  Possibly adding the ability to manage passwords on os x.  I expect it does not work, since there is probably no way to set up an encrypted password, but at least it now creates a user that can not log in by default.
 0aeda97  Adding the ability to manage passwords with the useradd provider
 7fbd3ff  Adding the ability for parameters to declare that they require a given feature, and resources will not instantiate that parameter if required features are missing.  This is mostly useful for properties.
 4aaae62  Adding a note to the references indicating that they are autogenerated.
 0681cfa  Refactoring puppetdoc so it is a bit cleaner and is actually object-oriented.  PDF output still fails miserably (there has to be some kind of markup problem, but I have no idea what), but other output now successfully varies on the pages.
 0ff3772  Last modifications to rst conversion before bedtime
 1d036bb  All conversions to RST are done, but I did not quite succeed at making puppetdoc able to generate a single PDF with all of the references in them.
 9526e53  Mostly done with the conversion to restructured text, but there are still some tweaks to perform on the typedocs output.
 8d3673d  Adding a :block_eval option to FileRecords in FileParsing, so ParsedFile providers can have records just define a bunch of methods at once, rather than using lots of hooks.  This is cleaner when custom parse and generate methods are used.
 a478ed2  Translating all of the docs except the type docs to RST
 70ec0cc  Removing the naming restrictions on cron names
 5afa587  Fixing #588 - the parser correctly ignores directories in globbing now
 3c5ba06  Fixing #587 -- just defaulting to root when there is no USER set in the environment.
 e1b0444  Fixing #591 -- puppetd now correctly restarts itself when it receives a HUP
 37ffb63  Removing the stubs for nodevar; I did not mean to commit them
 7cc3a2f  adding note about the class variables in the change log
 5436f96  Enhancing the docs a bit for the apple package provider.
 775c72b  Adding support for aptrpm from #227 as added by Ian Burrell, the rest of the commit
 be68411  Adding support for aptrpm from #227 as added by Ian Burrell
 f1f4c42  Adding patch by apowers from #545.
 df0cd95  Adding init script by apowerrs from #546.
 9828b25  Fixing fileserver doc links
 f8a0e99  Adding the functionality requested in http://mail.madstop.com/pipermail/puppet-users/2007-April/002398.html . You can now retrieve qualified variables by specifying the full class path.
 9946249  Only caching the configuration when it has been successfully turned into Puppet objects
 b6d0d27  Adding a --version argument to puppetca
 da4d252  Changing the test package for debian
 b8b14d3  Forgot to change Puppet::Util::SUIDManager#run_and_capture arguments to execute
 efe9a83  Fix for #565: Final merge of changes from source:branches/execute-refactor into source:trunk Generated with svn merge -r 2378:HEAD https://reductivelabs.com/svn/puppet/branches/execute-refactor trunk
 8ab2722  Hah!  Finally fixing the problem where mount tests would fail when run as part of the whole suite.  The real problem was that I was changing the filetype of the provider without setting it to change back after the test, but the key change that made it straightforward to fix this problem was that my test loader was not exiting with a non-zero code when there was a failure, which mean that the ./test script never thought anything failed.  I fixed the former, then fixed the test script to work fine with -n method_name stuff, and quickly found the problem.  *whew*
 f9d89b5  Changing the date that certs are valid to start one day before the cert is created, so clocks that are off by a little bit can still be used.
 4615e3a  Fixing Client.read_cert so that it automatically adds the certificate information to the driver when the certificate is correctly read.  This makes sure the Net::Http instance has the cert all set up.
 ca5d068  Updating the docs for the sourceselect parameter
 295b357  Renaming some methods so that we can generate a report on a transaction and then retrieve it later
 1e8e7ee  Fixing #567.  I overrode the propertychanges method to only return changes if the file exists or if the file has a property that could create the file.
 4863012  Enhancing the report docs a bit
 0ecb775  Adding last bits to the change log for 0.22.3
 a999752  Updated to version 0.22.3
 24ad5ab  Updated to version 0.22.3
 9ce7c79  Updated to version 0.22.3
 
 0.22.3
 ======
 a3a7ea7  Adding release tag REL_0_22_3
 e154589  Fixing puppetdoc with the recent changes to the networking code
 801d0f7  Fixing a bug I apparently introduced in the testing that would have made user management not work with netinfo.  In the process, I am enabling validation on the nameservice subclasses.
 2544f75  Fixing the documentation to match reality, as reported in #548.
 4358e85  Trying to fix the problem that occurs when noop somehow manages to be nil when downloading files
 2ad9469  Changing gems to automatically include dependencies
 858cb81  Updating changelog and adding filebucket to the exluded file list in the Rakefile
 d54b645  Updating changelog and adding filebucket to the exluded file list in the Rakefile
 fa26552  Fixing #562; I had to fix how the client class was loaded
 142d0fa  Applying patch by Ian Burrell from #559
 2c3abbe  Refactoring some of the rails code.  The speed is now pretty good, but the tagging stuff does not seem to be working and is certainly working very ineffficiently.  Blake says he is going to take a look at that.
 33f4a66  Renaming pbucket to filebucket
 52df47e  Finalizing the filebucket client, with test code.
 def15e3  Adding filebucket client app
 c5e1a44  Fixing the "readcert" method after getting the signed cert; the method got refactored, and essentially renamed in the process
 60d36e2  Moving the authconfig setting to configuration.rb instead of network/authconfig.rb, as mentioned by Koen Vereeken
 5bd0e8c  Rails is now significantly faster.  I refactored all of the queries; they are mostly reduced to three queries, each of which is relatively fast, although there are still a ton of file- and tag-related queries that I cannot find the source of.  Note that this speedup requires indexes, which will only get added if you start puppetmasterd with --dbmigrate (although you cannot always start with that, as there is an error in the init code).  I expect that the indexes will not help unless you forcibly reindex your database, but after that you should see significant speed improvements.
 4c357d8  Adding a migration to create indexes
 5ad9bf4  Fixing #553; -M is no longer added when home directories are managed
 804c0f4  Fixing the same bug as the Metric stuff, but for logs this time.
 46152c1  Fixing the Metric class old clients can still refer to the Puppet::Metric class.
 36feb29  Fixing a small bug in testing whether instance methods are already defined.
 45904ca  Updated to version 0.22.2
 0452878  Updated to version 0.22.2
 
 0.22.2
 ======
 a917a3e  Adding release tag REL_0_22_2
 474b86c  Hopefully the last batch of commits before I release 0.22.2.  Mostly just get tests to pass.
 90d8b2d  Remove no-lockdir patch. Clean changelog
 a68a7c2  Change puppet's homedir to /var/lib/puppet
 145c39c  Don't clobber an explicitly given waitforcert
 41e1285  Reverting changeset [2243]; this apparently causes chkconfig not to work
 bcc937a  Absolutely guaranteeing that the provider is always created before anything else.  Previously, it could get created later if it were using a default.
 60ea7d2  Fixing #432 - you can now manage home dirs with users.  You cannot yet purge home directories, because there is still controversy over how that should be done.  Also, allowdupe is now handled like a feature, which is, um, better.
 3d17685  Adding a "has_feature" method, so a provider can just declare that it has a given feature
 290ad14  Finally fixing #504, I think; I even have tests to prove it.  It was a little thing, in the end.
 32662cb  cleaning up an error message a bit
 9b5833a  Clarifying the errors a bit when nodes come from external sources.
 1f8b768  Apply patch from Ian Burrel (trac #479)
 3e2510f  Adding the "ralsh" executable (formerly known as x2puppet).
 531136e  Updating the config generation stuff a bit, mostly just cleanup, but also changing the servername fact to be the fqdn of the server.
 0153a06  Changing the config cache location to the state dir
 f046067  Adding context to the warning message about unknown escapes
 0040edf  Changing execution to reopen stdin to /dev/null
 b804573  Changing notify to default to its message being its name
 e2c5dbb  Another round of bug-fixes, prompted by test logs from David Schmitt
 92bad78  Fixing the spelling of David Schmitt's name and giving credit to Chris McEniry in the changelog.
 547fb64  Adding a provider feature table to the provider feature docs
 5b2ffbc  Adding provider features. Woot!
 80dac92  Following Russ Allbery's advice and using the Candidate field in the apt-cache output.  Apparently I'm blind.
 3606482  Updating changelog for #487
 4dc7233  Fixing #487.  I know use "apt-cache policy", instead of apt-cache showpkg, because it clearly shows which version will be installed.  This is basically impossible to test well, so I just added a test that verifies we always get a value back, although I cannot really test that it is the "right" value.  Also, I modified the logging of packages so if there is a latest version, you will get the new version number, along with the old, in the log.
 973f9d0  Taking another crack at #504 -- I was using Pidlock incorrectly.  I should have been using "locked?" but was using "lock".
 cef41c2  A slight fix for #507.  This should at least provide better information if this problem crops up, although I cannot reproduce it.
 1778883  Changing the "found a bug" message to something a bit more informative.
 184266d  Fixing #447 - filebuckets now use deeply nested paths
 b436002  Oops.  Fixing the other tests to now past the facts to "fresh?", as required by the fact checking.
 61b3490  Fixing the fact caching so that facts are only downloaded and retrieved once, rather than once during fresh checking and once during config compile.
 5f7ae35  Fixing #519.  The facts are now cached in the state file and changes to them force a recompile.
 a2a9d93  Fixing #544 -- there is now an --ignoreimport option for commit hooks.
 a212ea7  Adding #539.  Definitions can now have titles, and both $title and $name are guaranteed to be set within any definition.
 90bdc33  Adding test to make sure ensure does not conflict with any of the creating types.
 e952029  Adding #541.  There is now a "generate" function.
 6654661  Fixing #538.  There is now a simple file() function to read in file contents.
 5ecfd39  Looks like I already accidentally committed the switch from using system() to exec().  I am hoping this will fix the many problems people are having with processes hanging around (e.g., #509).  This change just removes the attempts at closing TCPServer instances, which should now be fixed from using exec instead of system.
 6b85962  The first round of fixes for failing tests.
 8eddd4b  More work on #542 -- services in noop now produce noop events so that they can themselves trigger further changes
 2fe9998  Removing bogus log message in file parsing
 3b8dc6a  Removing the cycle checks from the splice! method in pgraph, which *considerably* speeds up splicing of very large graphs.
 adedab1  Getting rid of a warning in the rpm provider
 40eeadb  Adding example cron tab from #492 and making the read/write tests ignore whitespace.  This cron now parses successfully, as I thought it would with the move to providers.
 2a3f56c  Fixing #529 -- specified targets keep their values.  The problem was that I was using model[:target] instead of model.should(:target) and model.is(:target).  The real problem was that my tests were using a parameter for tests but all of the real code uses properties.
 fe2f0d9  Fixing #533 -- puppetd now exits in onetime mode.
 5257837  Fixing #491 -- the client correctly realizes when the cache file is missing and only considers the config to be in sync if that is not the case.
 a76afb7  Trying to clean up the error message from #490.  It looks like the problem is just a failure in one of the types, and it has nothing to do with the state file.
 4a6d705  Fixing #542.  Transactions now cause services to warn when they would have gotten restarted by a noop resource.  Also fixing #549 -- transactions now only refuse to delete required resources if they are being purged.  All other resources can be deleted just fine.
 8387d48  Fixing #540.  I modified Puppet::Network::Client::Master so that it disables noop during its run, so that facts and plugins will always be downloaded.
 86c63ce  Fixing cron support (I hope).  It now uses providers, and seems to work, at least on my os x box.
 ba23a5a  Adding spec libs, so we can use them some day
 8ea6ada  Clarifying that the ruby RRD support is provided by a binary library
 df4595e  Significantly reworking the internals of the fileparsing code.  It now passes around an instance of a FileRecord, rather than just a hash, which I think makes it much easier to understand.
 b05ae2a  Don't blow up when PUPPETLIB isn't set
 0fa3c43  Search manifests first within modules, and if no module is found, search in the directory the current manifest is in.
 38975de  Introduces a new implicit 'modules' fileserver module, whose allow/deny can be set from the fileserver.conf, but whose path is ignored and can therefore not be used directly in puppet:// URL's.
 ebcb6b6  The template function now tries to first find a template within a module (if the template path looks like it belongs to a module) and only when that fails looks for it in templatedir
 ba6257c  The basic plumbing for modules: a modulepath config parameter, and a new class Puppet::Module that will contain the module-related functionality. The modulepath can be extended by setting the environment variable PUPPETLIB
 10d6891  Adding support for a prefetch hook on individual providers, rather than only supporting it for the whole class.
 4fa8008  Fixing a few of the log messages so file content changes always include the md5 sum
 6ad8998  Adding a bit more testing to the config stuff
 3489bd8  One last try at getting the config and mode stuff working.  The tests were passing because "mode" is a valid config option in the tests, but not in the real configuration.  So, now the Config class correctly only tries to set the meta params if they are valid options, otherwise they get skipped.
 b36f9c9  Fixing the config path to use Puppet[:name] rather than Puppet.name
 6b92c04  Oops, forgot a file in the commit
 f59cade  Fixing a bug related to link recursion that caused link directories to always be considered out of sync.
 b6df336  Looks like [2265] was not a complete solution -- it resulted in failures when the config set modes via integers.  Everything is working now, and tested more completely.
 0925fb0  Adding some more testing on the @should values for :groups on users, and fixing a bug that often made :groups think it was out of sync.
 333842b  Putting the final touches on #144, most of which I had provided in the mongrel work.
 fa253b5  Fixing #489.  I was unnecessarily converting to octal in config.rb
 69338da  Adding some changelog info for the next release, which is still a ways away, probably.
 205bbb9  Flushing out the ability to have a stand-alone CA server, specified using ca_server and ca_port.  This is just a final unit test, since the code was done and lutter fixed the rest in [2261].
 185a003  Fixing #531 and #414.  This includes pretty much a complete redesign of the AuthStore class, with (hopefully) all of the edge cases removed, the code is now much cleaner, the tests are (I think) complete, and everything is just generally better.
 fde8b28  Fix typo in default config and add simple test to check default config sanity
 7e41d43  Turning a failure into an error when, for some reason, pfiles do not have paths set.
 46d344b  Merging the webserver_portability branch from version 2182 to version 2258.
 6823370  Sync with latest Fedora specfile
 4a73da3  Don't include bin/pi in distributed tarball (and hence fix trac #471)
 1808c50  Apparently the include function was not failing when it could not find asked-for classes.  Now it does.
 521606b  Allowing trailing commas in selectors
 9080686  Committing patch by Dennis Jacobfeuerborn to only use the domain name if it is set.
 17c59f8  Adding "ignorecache" option to always force a recompile of the configuration
 ebc4dd2  Fixing #464 and #515.
 ff9ec47  Applying patch in #528 by ask.
 cc26026  Fixing #467.  It is a hackish solution, because I just reordered the definition of the params, but it works for now, anyway.
 d229d49  Fixing at least part of #514.  This does not get rid of all errors, but at least it fixes the spurious warning
 be8dfd9  Fixing a problem with the splice! method on the graphing.  The problem was another issue with hash ordering, where it would usually work but sometimes start failing.  The solution was to splice the containers in topological-sort order.
 4df0738  Applying a modified form of the patch by cstorey from #523.  The modifications were mostly around the fact that Strscan does not set $1 and its ilk.
 0f16bf3  Fixing #526.  Implemented as a period of "never", rather than adding a new parameter.
 07fce23  Fixing #477.  setvar() can now accept the file and line info from callers.
 d5444e0  Fixing #199 and moving service tests (which are completely atrocious) around.
 7d965ae  Applying patch by cstorey from #521
 36ae6a2  Making the package provider tests able to be executed separately, and using "clear" instead of resetting @objects in the types.
 b7a0fb4  Make up2date the default for RHEL <= 4, and confine it to RHEL; make yum the default for RHEL >= 5. Fixes trac #478
 672e281  Fixing #142.  As expected, trivial.
 87f100a  Applying patch by DavidS from #522, along with test code and a small bit of code cleanup.
 a3f3674  Redoing some aspects of the graphing in hopes of helping hte performance a bit.
 1a7d8b6  Fixing file backup defaults to correctly use the puppet filebucket by default.
 d833c3e  Changing the log messages for source and content properties to mention the md5 sum of the new content
 789b786  More code related to #517.  Oops.
 4c885b7  Fixing #517 and more.  Classes now support more than one namespace in their search path, parent classes automatically have their namespaces added to subclass namespaces, and (huzzah) there is a "search" function that can be used to add new namespaces into their search path.
 aad5123  Fixing #524.  Functions, both statements and rvalues, now support no arguments as long as you use parens.
 3e13e36  Actually commit the changes to lib/puppet that were supposed to be part of [2223] (Fuck svn and it's partial-repository-by-default behaviour)
 1d711dc  Partially complete #241.  Add a 'purged' value for Package.ensure, and add a handler for all of the Debian providers.  Also wrote sensible test cases, and so we've now got Mocha running around in our source tree.
 a752eb2  Fix #516, 'Cached manifests get unescaped twice'
 db8a23e  Print stacktrace in debug mode when catchign a signal - useful for understanding client hangs
 fa02d67  Fixing #472.  Apparently this has been broken since I did the parser redesign.  I had to fix the scope trees so that subclass scopes are subscopes of the parent scopes, which used to be the case but was far more complicated.
 d145aae  Fixing #505, #508, and #513.
 774415b  Allow 'key=' to be the only thing on a line (livna uses this)
 4d02823  I believe this fixes the issues in ticket #469 My testing on mysql shows connections being reaped.
 7a9e28a  Applying patch from #495.
 6fbd5fd  Removing extraneous debugging
 90b1058  Fixing a problem in collecting exported resources.  Virtual resources worked fine, but exported resources resulted in an essentially infinite loop.
 deab3a0  Fixing the default dbadapter back to sqlite3
 3d093ae  Applying patch from #510 by curzonj.  Note that the right solution to this problem is to use the ruby API, but it does not appear to be stable yet.
 65599af  Re-add the files
 beb7873  Undo the param_name param_value merge
 f4f555d  Renamed Puppet.name to Puppet.execname so rails 1.2 doesn't freak out
 9a672ec  Undo the param_names param_values changes
 8b18fdf  Undo the params & facts stuff
 9fe8905  Changing date to datetime in the database
 964c805  Trying to fix problem of locks lying around
 2418e4a  Adding hook to update timestamp when a report is run
 0aa3b66  Change Puppet.name to Puppet.execname so rails 1.2 won't freak out.
 6555dad  Update relationships Remove dynamic class generation for now. Include the fact class
 328e576  Revamping collections to get what is hopefully more reasonable behaviour when they are used in combination with defined resource types.  You should now be able to combine them in just about any way and get "correct" behaviour, which in this case means that you can have virtual definitions or definitions wrapping virtual resources and the resources will still all get realized.
 69d4bfe  This works for me.  Probably not the most universal fix.
 9de665c  Apparently using "gem" requires an environment we don't have.
 91991f1  Merge fact_names & fact_values, and param_names & param_values.
 0b5600a  Fixing features to use the new feature location
 17a5f4c  Applying patch from #502 by Jose
 6216ae5  Applying patch from #497 by Jose Gonzalez
 258651c  Applying patch by Jeff McCune from #496
 9cd2636  Applying patch from #474 by David Schmitt.
 4effff4  Fixing #482.
 c3b6232  Fixing #493.
 81ae397  Applying doc patch from #494.
 1756bec  Fixing #484.  Moving unit tests at the same time.
 a216df2  Okay, last file moves for the night.  The test code has been moved to match the lib directory, and I have moved a couple of things into network/ instead of network/server, since they did not belong as much.
 7e07e3d  Moving all of the client and server code into a single network/ directory.  In other words, more code structure cleanup.
 6d8068e  Moving some of the stand-alone classes into the util/ subdirectory, to clean up the top-level namespace a bit.  This is a lot of file modifications, but most of them just change class names and file paths.
 1626023  Adding a libdir setting for puppet, so you can store your modifications to puppet in a separate directory.  This probably will still be somewhat limited because it will always depend somewhat on load order.  For instance, if you add a new provider, it might not be available when you expect, since providers are all loaded as soon as a type is loaded, which might happen before the libdir is set.  It should always work fine if you do not override it, but if you do override it, things might behave a bit strange.
 99c8a54  Adding a parameter to allow you to override how an exec refreshes itself.
 dd71a51  Changing exec so that the checks apply to whether an exec is refreshed.
 31c9a6f  Disabling the netinfo mount provider
 ad359f3  Reorganizing some of the tests.
 d403131  Merging the state-rename branch.  This includes the diff from version 2156 to 2168.  All states should now be properties, with backward compatibility for the types that restricted themselves to the methods.
 f6f72f2  fixing the cookbook link fix
 3a024d7  Removing the default value for :ensure on mounts.
 71346e9  changing the cookbook link
 f80bd5e  Fixing exec so it actually works when path is specified as an array
 d117aa8  Updated to version 0.22.1
 1e90209  Updated to version 0.22.1
 463d3a8  Updated to version 0.22.1
 
 0.22.1
 ======
 530c255  Adding release tag REL_0_22_1
 1d059b0  Fixing #470, I think.  I basically just threw away the validation and let suidmanager do it all when running commands.
 69a07b1  The resolve functionality in "test" is almost working...
 42d15fe  Adding note about removing mounts netinfo provider
 2c79bbf  Oops, that last commit seems to have broken the rakefile.  Works again.
 3836201  Trying to get the functionality I had in previous tests.  Mostly I want to be able to load many files but run just a couple of methods, which test/unit supports via -n, selectively enabling -d.  I now can do this with the Rakefile, using 'TESTOPTS="-n <method> -d" rake <blah>, although I find that a bit kludgy (certainly more so than 'rake -n <blah> -d <blah>').
 fd2982f  Fixing executable tests to take new rundir into account
 a62fd3e  Filenames for test must _end_ with '.rb'
 12bf816  Fix to make running tests work in ruby 1.8.5
 18eebaf  Fixing selector tests to get rid of a lame hash ordering bug in the tests.
 a3a85d8  fixing rails test to take into account the fact that resources now do not always return arrays
 f1deaa8  Fixing autogen so it passes on non-Darwin systems.
 173f5cc  Fixing a purging bug introduced by [2138].  I had to move the purge check to the recurse method, rather than the localrecurse method, because the purge check needs to happen after sourcerecurse.
 62ab873  Deleting the file even if a source is specified, as mentioned by Robert Nickel.
 c8f38b7  Renaming "pelement" to "resource".  The old name is a holdover from before we had settled on "resource" as a term.
 ea73cdb  Fixing Files to work with the Resource server.  Basically I just remove the "target" value if it is a nullop, so that it does not cause a conflict with "contents" on the far side.
 d7fde42  Adding explicit umasks to these tests.
 a4de59c  Fixing rundir so that it is only set to be in /var if the process is named puppetd or puppetmasterd.  Otherwise the unit tests set it to /var/run/puppet, which has the chance to cause hangs.
 9dc6cf6  Removing all remnants of the old symlink type
 7889b0b  Revert 2125, and instead change the way the 'latest' version is selected from the sorted list of versions
 97583b4  Updating changelog for 0.22.1, although I am not quite ready to commit yet.
 8d90e56  Puppet can now read files on stdin.  This means you can put "#!/usr/bin/env puppet" in the first line of a puppet manifest and then execute the manifest normally.  Yay!
 8821300  Providing a partial fix for #428.  Resources can now be deleted as long as all of their dependencies are also being deleted.  This, combined with the fix to #433, means that you can now explicitly specify the order of deletion, and everything will work as long as all required objects are being removed, too.
 0a62369  Partially fixing #460, take 3 -- fully-qualified classes can now be included.
 788a74e  Partially fixing #460, take 2 -- fully-qualified definitions can now be used.
 a7bd786  Partially fixing #460 -- fully-qualified class names can be used as parent classes.
 c9e7699  Fixing #462.  The package sort order was always resulting in the lowest-version package being first, rather than highest, so I inverted the sort order.
 add6e5d  Applying patch in #465.
 1f9ede2  fixing #427. Facts now timeout, both in loading and downloading
 049d79c  splitting the tagmail report into multiple methods and adding test code
 727672f  Not creating the listening server at all if --onetime is enabled.
 af3863e  Fixing #440, albeit with a slightly hackish fix.
 01ec5ba  Moving code from external sources into an external/ directory
 1374e4e  Moving the switch that disables the certificate authority into the main library, so they can be disabled in the configuration file.
 dc580cf  Fixing #433.  I basically just added checks to all the places where I add edges, to make sure automatic relationships lose out to explicit ones.
 e418691  Fixing the warning message related to namespaceauth.conf
 d3fc49d  Fixing a problem that occurs when puppetd starts with an up-to-date configuration -- the default schedules and filebucket were not being created.
 6c61f0c  Fixing #463.  I redid all the autogen stuff so it can handle autogenerating string values for stupid os x.
 8198e7e  pointing documentation to the wiki now
 54c458c  Fixing #438.
 04017b3  Fixing #444.  I was losing the list of sources when creating new children.
 b7560d5  A couple small bug-fixes
 3aff4a0  Doing more work on #113.  Mostly, just making sure remounts do not happen spuriously very often.  They will still have extra remounts when changing the value of "ensure", but that is not currently avoidable (similar to #199).
 1cc8ecb  Fixing info around newtype options
 dd502db  Fixing #113.  I added support in the transaction for self-refreshing, which just creates a special trigger for resources that have self-refreshing enabled.  Logging is a bit different for them, so it is clear why they are refreshing.  I still need to verify the remount methods work in the providers.
 bf46e7d  Adding a "self_refresh" option, so resources can refresh themselves if they have changed in the current transaction.
 1f41c35  Fixing #454.
 c07494f  Fixing #441.
 9924244  Fixing #431.  Collection was always returning an array, even when only a single value was passed.
 0a9c8da  Changing how transactions check whether a resource is being deleted.  This is a small step towards fixing #428.
 f6a3d94  Fixing #455.  A simple fix, fortunately.
 81025d1  hoo
 e29ef5c  Updating reference docs
 af4f7d7  Fixing documentation references to refer to the wiki
 37acfb9  Fixing #442.  You can now do: defined(File[...]) to see if a resource is defined.
 2db6878  Fixing #434.
 6475487  Fixing #423.  Configurations now default to timing out after 30 seconds (tunable with configtimeout).  This only happens for remote configurations, not local configs compiled using puppet.
 a081d41  Fixing #418.  The problem was that multiple objects might include Daemon, which means that Daemon#shutdown can be called multiple times.
 c33d5e4  Using Time instead of Time.to_i for compile time, because some versions of ruby have trouble converting Bignum to yaml
 6d791f5  adding client name to processing line
 7670df2  Fixing #445.  Nodes can now inherit from default.
 afe77b6  changing selector error message
 aab3214  reworking the selector case-insensitivity test
 9f8a3b1  Removing an extraneous debug message, and fixing the case where the server compile fails in --test mode -- it resulted in an extra warning message.
 ca1e36b  Applying patch from #457, as submitted by Jeff McCune.
 81ae09e  making yum the default packager for centos
 5735d48  Wrapping the resource generation methods in begin/rescue blocks so that failures cannot kill the transaction.
 e8f3806  Fixing error-catching in resources.rb
 a3041cd  Updating changelog for 0.22, which fixes #429.
 bda74bc  Fixing #415.  Configuration parsing now removes trailing whitespace.
 f8115a7  Fixing #424.  The configuration compile time is now cached in the yaml cache file.
 53f3b8c  Fixing rundir so that it does not throw an error when not running as root
 c285d7a  Fixing #437.  Transactions now check whether graphs are cyclic, with a somewhat-useful error message if they are.
 9720a97  Fixing #436.  Also finally renamed pfile/uid.rb to match the state name.
 db5494f  Fixing #421 by changing the rundir to /var/puppet/run.
 bfb5506  Fixing #416.  There is now an option (downcasefacts) that determines whether facts are downcased by the client.
 53c3f5a  Make rpm operations much faster by suppressing unneeded verification
 bcd81bc  updating docs with new location for reference info
 f069418  Moving the reference docs to the top level
 c03a8c9  updates
 42b78a0  Use a specific ActiveRecord subclass to check for the proper existence of AR in the Rails feature test, so that we don't kill everything if the machine has Rails installed, but it's an old version that doesn't support polymorphic associations
 e64e64d  Make the version string optional in the dpkg-query output parsing regex (Fixes: #425)
 32bbb3a  Clear existing yumrepo instances befoer listing - assumes list should only return "is" instances
 3dea961  Enclose values in single, not double quotes; otherwise if values have $ in them, the manifest will be incorrect
 5836c23  Allow listing of yumrepos
 a676e08  Sync with latest in Fedora repo
 965a82d  Minor cleanup, leave cursor at beginning of indented line, not its end
 c35b441  Add indentation written by Mario Martelli
 f7d8350  Updating docs for 0.22.0
 4ee6c97  Updated to version 0.22.0
 98ed0ae  Updated to version 0.22.0
 38cfa67  Updated to version 0.22.0
 
 0.22.0
 ======
 728d745  Adding release tag REL_0_22_0
 3446dd6  Last round of fixes before the next release
 954a285  Fixing puppet test task for older ruby versions
 7afa69c  Fixing rake test so it works with the new puppet loader
 54c387f  Adding #408.
 d0ecc0e  Messing around a bit with how tests work
 2728f50  Adding a bit more comments to the :template function
 704bd76  Fixing a few testing bugs that have crept in, and fixing a self-reference problem when configuring, graphing, and setting graphdir manually.
 e756711  Fixing #411.
 48bbd0b  Further work on #407.  I forgot to actually connect it to the interpreter internals.
 f6beef5  Fixing #407.  You can use external_node to specify a command to retrieve your node information.
 f8f7c57  Don't rely on the type to store the actual NVR of the package; breaks in the provider tests since they call the provider slightly differntly
 42c13e2  Adding a timeout to execs.  This is not really a sufficient solution, since it needs to be added throughout the system, but this is a good start.  The default timeout is 5 minutes.
 6e10004  Using Puppet.settraps in puppet executable, instead of old ad-hoc code.
 903b40b  Applying patch by mccune from #409.
 5e470b3  Regressing to always creating files/directories as root, rather than trying to do it as the right user.
 bb72a08  Throwing warnings instead of exceptions when dpkg-query produces info we cannot understand
 08a56cb  Fixing module_puppet to use the usage? feature.
 239727c  Re-enabling the dirchmod test and fixing its syntax
 2195b76  Trying to fix #364.  Somewhat used the patch provided by nslm.
 8fd9765  fixing filebuckets so that only the client bucket is created on clients
 d5651f8  Fixing tests so they now include descriptions with all config options, which is now required.
 a454dfb  Creating two filebuckets by default, one for the client and one for the server
 9c1a446  Fixing #403.
 2b271f8  #398 is already fixed, but this will fix things so it cannot happen again
 f4b2e13  Fixing #391.  Keeping track of times of compile and freshness checks.
 098081d  Setting up specific allowed types for sshkey
 5292e4e  Handle continuation lines in inifiles properly; stick a little closer to how python's ConfigParser parses
 2366c95  Explicitly require puppet/filetype; otherwise, tests for this module fail
 cbd20f0  Simple script to produce type info
 3b6bf05  Fix yum update breakage - query should not change the name the user gave us; instead, the fully versioned pacakge name is now stored in the instance parameter
 587deea  Tone down the debug spewage from yum
 9115fef  Adding extra connection statements and enabling concurrency support in rails, hopefully fixing #399.
 0ef8971  Fixing #394.  LoadedFile was not checking to see if files went missing.
 f58bda2  The package name must match at the beginning of a line; otherwise we might get fooled by other yum spewage
 caabe9b  Not saving tags right away.  This seems to cause postgres to explode.
 9271142  Adding a check to the rakefile to throw a warning if the test task is missing
 651640c  Fixing #401.  Transactions were trying to trigger every resource, even those that did not respond to the specified callback.
 c140037  Not setting the graphdir to the puppet user, since it is only used by puppetd
 127f0df  Using text for parameter values, instead of string, so the fields support larger amounts of text
 86e434e  Adding postgres as a dbadapter option
 2d25816  Fix trac #354, and some other oddities around installing multiple versions of the same package.
 50965c7  Changing "sourcematch" to "sourceselect"
 373f177  Adding sourcematch parameter to file.
 cc05e8d  Fixing the error thrown when a dependency cannot be retrieved, WRT to #395.
 57d0933  Fixing #396.  Using the provider command instead of a direct exec, which automatically captures stderr.
 0887fcd  Modifying the "Resource#set" method to simplifying adding new parameters
 56619d5  A couple of small fixes to pass existing tests.
 4482691  Fixing some failing tests on fedora.
 3e933cc  Enabling debugging except when running under rake.
 3b2521b  Fixing graphing tests, and correctly only using storeconfigs in tests where rails is available
 54a838e  Fixing #369.  I was not flushing changes to disk when ensure was out of sync.  This is going to become a common problem, and should probably be addressed by the framework rather than by individual types, but for now, it works.
 b8f798f  Fixing #390.  You can now add --graph to produce dot files, and you can then produce pngs or whatever from those.
 0a1dd1a  Use Puppet::Util.sync instead of MonitorMixin to ensure that only one thread runs the executor at once
 23b75e2  Fix a syntax error in lib/puppet/daemon.rb (That'll teach me to not run the test suite before committing)
 38244fb  Create rundir in a test that needs it
 27c1b49  Switch puppet/daemon.rb to use Pidlock
 16f7980  Switch the run-lock to use Pidlock instead of the ad-hoc code
 e4843f1  Make Pidlock#lock return true if we currently hold the lock
 e252505  Add a Puppet::Util::Pidlock class, for use by locks and PID files
 c1035cc  Add system library directories directly in puppettest.rb, so you don't have to do it by hand in every single underlying directory; also change the debug check slightly so that we actually put debug stuff only when we really want it
 a333539  Applying patch by rainhead from #392.
 7e62bb0  Add updated_at for all tables make sure it's removed from the resource hash that gets returned
 6d8b3f3  Removing debugging
 da3e9d4  Hopefully fixing tagging problem
 280f0b4  Still trying to track down the tagging problem
 79e9b46  adding a bit better error reporting when tags are bad
 419cdf0  exiting sleeper after no more than two minutes
 fa538bc  Moving the tagging stuff to an "external" directory, instead of "lib".
 0166004  Adding carriage returns to output of puppetrun
 f52e2d0  Trying to clean up how rails is loaded
 3a313ad  Supporting arrays for the backup parameter
 17306c0  Features now load dynamically using method_missing, so that undefined features never throw errors.
 96f91f6  Adding a bit more testing to mounts, and pulling a bit of the transaction into a separate method to shorten the apply() method.
 a2b0ee6  Finally writing unit tests for Transaction#trigger, and drastically simplifying the method in the process.
 9ff80c0  *whew* Okay, simplified the splice method a bit, and I am actually somewhat confident that the stronger testing is correct.  I have had a lot of problems with tests usually passing but sometimes failing, mostly because of ordering problems related to multiple edges.
 bb9c813  Did a short-cut on the graphing, since we currently only support one type of subscription.  This solution still will not scale to all that many edges, but it works, although it will fail if we need to support different types of subcriptions.
 7ae62a5  A couple of small bug fixes
 c4c3d77  Some tweaks to graph splicing, although I do not think it will be enough to handle some of the edge cases.
 d07570b  Looks like providers work again on Solaris.
 6529822  I have not yet finished testing, but most of the providers now successfully pass arrays to execute() instead of strings, which means that the vast majority of execution problems are now gone.  I will finish testing tomorrow, hopefully, and will also hopefully be able to verify that the execution-related bugs are fixed.
 038d6a6  Fixing #387, hopefully.
 a5cf056  Fixing #388.  Paths now look a lot cleaner.
 883c64a  A couple of small bug-fixes
 65e76e8  Fixing #353.  It was as simple as exiting with a different error code depending on the results of the call.
 d3a7c28  Fixing #386.
 1d05739  Switching files to use a filebucket named "puppet" by default.  Also, set up MasterClient to create that default filebucket.
 92ff712  Fixing #365.  I am not sure what the problem was in previous versions, because the new graphing stuff changed the solution to this problem, but it all works now.
 8ff7e0c  Closing #362.  Case-insensitivity is handled by downcasing all host names.
 f1dc103  Hopefully fixing #355.  I could not actually reproduce the specific problem, but I found a couple of issues around the problem and they are all gone now.
 a3ce917  Fixing #348.  Overrides now support an extra end-comma.
 5e58273  Loading the rails lib early on, so that the rails configuration parameters are accepted on the CLI, as noted in #357.
 2742995  Fixing #343.  Collections and definition evaluation both now happen on every iterative evaluation, with collections being evaluated first.  This way collections can find resources that either are inside defined types or are the types themselves.
 85b19c4  Fixing #349.  Doing some hackery so defined types can now (again) be used as dependencies.
 311aba9  Fixing #66.  The "defined" function previously checked for definitions and types, but since types and classes can't have the same name anyway, the function now works for classes.
 9bb5c50  Not downcasing facts any longer, closing #210 (although not using the patch from mpalmer, since I had not noticed the patch was there).  Also, making all nodes, classes, and definitions case insensitive, closing #344.  Finally, I added case insensitivity to the language in general, which should preserve backwards compatibility and probably makes the most sense in the long run anyway.
 be711d3  Allow execution of bare strings as long as there's no attempt to change uid/gid
 c616572  Fixing test to work with new style of graphing.
 2c2177c  *whew* Fixing the vast majority of the graph-related performance problems.  I found a simple solution to handling events produced by generated resources, and that basically fixed all of the performance problems.  Transaction tests still fail, but I wanted to get the fix in now so I do not forget it.
 299bdc1  Fixing #380.  The problem was that a method was sometimes returning :absent when I expected it to return nil when the group was not found.  All fixed, yay.
 e605c4a  Adding some defaults to users, mostly for darwin because it is kinda stupid when it comes to this info
 41562cc  Adding test for the fix to #361
 a9dd641  Fixing #361, I think.  It appears to be a problem with missing a setting for realname.
 1bdf379  Applying patch from #384, by jgonzalez
 253376a  Fixing #385.  Puppetca correctly exits with non-zero exit code if there are no certs to sign.
 36e8d65  Fixing #372 and #374.  All is not perfect, since OS X still cannot set UID, but it is much better.  There is still plenty of bug-fixing to do on other platforms, I expect.
 115ec09  Re-add support for tags and file/lines
 f851ca6  Adding :replace aliases, as requested in #366.
 9f48706  All rails *and* language tests now pass, with the exception of a language/resource test that passes by itself but fails when run as part of the whole suite.  Also, I added deletion where appropriate, so that unspecified resources, parameters, and facts are now deleted, as one would expect.
 dc5f4dc  Fixing most of the rails stuff.  I think everything basically works now, and now I am just going through and making sure things get deleted when they are supposed (i.e., you remove a resource and it gets deleted from the host's config).
 5a52855  Fix up a problem with initialising an sqlite3 data store, presumably only with older versions of Rails
 3c93400  Adding daily snapshot tasks, altho they only work at my site
 10dbb17  Some more graph optimizations; I think I am now close enough that I am basically just going to spend a bit more time making sure the modeling is right in the transactions, and then walk away for now.
 b01ffe6  Adding a simpler and *much* faster tree_from_vertex method, and using it instead of the default one
 a481f9b  Requiring puppet/rails in the interpreter before Rails.init
 9df9e4b  Getting rid of the db init stdout and reindenting
 02cfc44  Simplifying the splitpath method a bit, altho it is still strangely slow
 9fa7794  Simplifying the the Puppet::Type[] method
 0dbe96d  Redoing the benchmarking a little bit
 f622e18  Go back to restype and remove STI classes, they were more trouble than they were worth.
 9ad62d2  Modifying rails test
 0dac4ec  Changing some of the error output.  This gets rid of the duplicated information that occurred when definitions or nodes were duplicately defined, and it tightens the error output a bit.
 0f78282  Adding unit test for #364.  It passes on OS X.
 dc96f98  Adding some selectability to host creation for testing.  Using find_or_create_by results in lots of saves instead of one big one at the end, which causes initial saving to be much slower.  To switch between them, just modify the value of "create" at the top of Host.store.
 6b5d001  I like to checkin one-liners a lot.  I'm cool. set the type when we create the object, might be a bit faster
 7173c1f  Don't use find_or_create_by_title since titles aren't unique.
 e28c604  Remove old files, don't require pp anymore
 3d070f7  These are the same versions from changeset 1837
 0cd5799  Some rails modifications
 6d9ae0c  Don't dump out debugging stuff.
 342a4a6  Don't symbolize the param names
 56098ca  Rename some stuff I missed when it was reverted
 b5fd822  acts_as_taggable plugin
 98ebb87  Moving the mount provider tests into a subdir, and fixing the basedir calculation in tests so it does not matter where the test is called from
 8714e14  New rails stuff redux.
 026ec4f  Small changes to the test rakefile.  This rakefile still is not completely satisfactory, as I cannot use it to load all libs but only run on test method, which is often important when trying to track down a bug that only occurs when multiple files are loaded.
 8be0d33  Fix service.list, in particular for the redhat provider
 29ded01  Fixing painfully difficult to find bug in defining exported resources
 72f8b32  Reworking the package tests.  Now providers are tested individually
 f5e7915  Rewriting the test rakefile so test directories can be more than one directory deep.  This will be particularly useful for providers.
 40c0905  Fix up the filelist for gems, so that all of lib/puppet gets put into the gem, not just the top-level .rb files
 c35988a  Another round of bug fixing.  Now everything passes except mounts, at least on OS X.
 ab60452  Fixing the next round of bugs, mostly little things but I had to modify transactions so they are willing to delete implicit resources even if they have dependencies, else we would often not be able to purge files at all.
 3937aa3  Never default to rpm provider; use up2date on RedHat. This also works on RHEL5, which does not have up2date, the provider properly fails over to using yum
 c763346  You can now use the "resources" type to purge resources.  I still need to modify transactions so they do not purge resources that have relationships.  Also, apparently the noop metaparam was never actually working; now it is, and there is a test for it.
 64d96e9  adding a note about facter to the faq
 e96049f  Change the filelist slightly so that the externally-included lib/rake doesn't end up in the gem
 8829aa7  Adding a metatype to manage resources of a specified type.  For now, this metatype just supports purging unmanaged resources.  Also, fixed a few tests here and there
 4abbdc1  Working some on the export/collect problem.  It actually works now, but there are not yet sufficient tests for it, so I will leave the bug open until we have got the new work in place.  I also added a "rails" feature, so I do not have to keep testing whether ActiveRecord is defined.
 8fee538  Adding a short note on variable interpolation
 8accd80  Adding a bit of clarity about file locations
 dd1c4b9  Add a task to build Debian packages more-or-less 'directly' out of SVN.
 01fecb1  Add external Rake task file as an svn:external, and modify the Rakefile to add lib to the load path
 b3eb9f1  All tests should now pass, with the possible exception of some tests that might fail when all tests are run in one process.
 e287d1e  Almost all tests now pass.  I have basically reached the point where I was before I integrated graphing, except that all of the relationship handling is now inside the transaction, and any kind of recursion (including file) is *tons* easier to model and manage.
 37a059b  Most tests now pass in the whole system, but there are still about 8 cases that do not work.  I am working on those now.
 374c830  Removing the explicit load for most types in type.rb
 8aebdfc  Removing the reference to the symlink type
 2d43580  Most of the graph handling is now done, and all of the recursive types (basically just file, tidy, and component) now correctly use the generation mechanisms in the transactions, instead of sticking them in their @children array.  Now I just need to go through the rest of the tests and make sure everything passes.
 d3b76d6  Removing the symlink type finally.
 cdd1e6e  Another intermediate commit.  Most of the graphing work itself is now done, but I am in the middle of converting files to use the graphs and at the same time am writing some actually decent tests for the file recursion stuff.
 01e5b69  adding note about --no-client
 8ff90ef  Fix bug in example code: all resources now must have names
 f3a0c48  Most of the graphing work is now done.  I have also added the generator work in transactions, but I need to migrate files to using it.  Until that migration is done, files will not work correctly for many cases.
 a7354d0  Fixing link to fsconfig reference
 ccd7b58  Intermediate commit -- I am ready to start pushing the graph stuff into the types and transactions, which will break everything for a little while.
 c301b1b  Make spec file work for Fedora < 5 and RHEL < 5
 3e3f70e  Adding GRATR and the beginnings of graph integration.
 34c89b0  fixing typo
 b3c3de2  Fixing #342.  Classes needed to have their namespaces set to their fully qualified names, so that contained code and definitions looked for definitions starting with that fq name.
 4076101  Fixing mount tests after fixing the backward compatibility
 185ba8c  Fixing backwards compatibility in mounts -- they were not correctly copying the path over to the name
 5f5417a  Fixing #347 (I hope).  Doing a provisional require of rubygems.
 c369e40  Fixing #346 -- on some scripts I accidentally used "feature" instead of "features"
 c3c5851  Fixing configuration storage -- there was a check being done that caused false values to get converted to nil values, which failed in the database
 25d563b  updating syntax matcher to highlight dollar signs in prototypes
 60af8e2  Updated to version 0.20.1
 e313a26  Updated to version 0.20.1
 68d9e78  Updated to version 0.20.1
 
 0.20.1
 ======
 2feb9e8  Adding release tag REL_0_20_1
 7d46167  Updating changelog for 0.20.1
 7fa96cb  Another small fix, just for solaris
 db5d9d4  Another testing fix
 0efa969  Fixing more tests
 5d2f954  Fixes to the test system, and a couple of small fixes to the main code.  Also, disabled the "port" type, because I cannot seem to model it correctly.
 f8b9e86  Fixing a small syntax error in the port provider
 35de0e3  Temporarily reverting all of the recent rails work so that I can release 0.20.1
 26b32b9  adding svn keyword to notify type and reindenting
 e936fcc  Removing the caveat so that the log message is always provided during a run.
 b2e98b1  Fixing #339 for real this time -- fixing the log message
 1bf97cd  Fixing #339, and the bigger problem it concealed.  Metaparams are now only added to resources that do not explicitly set them.
 50d28ef  Applying patch from #335
 0a35c34  Removing some debugging, and trying to track down a bug where symlinks get recreated for now reason
 ff06a8d  Ported sshkey over, yay.
 4e96031  Adding a NetInfo provider for hosts.  Yay!
 064ddbc  Hosts now work again, and it should be straightforward to create a netinfo provider, too.
 bb80c1b  Ports are still broken, but I need to work on something else while I am thinking about how to fix them.  Stupid /etc/services.
 25b575f  adding a comment to namespaceauth.conf
 b2a49c9  adding up-to-date example configs
 4d5f70f  Trying to get a netinfo provider for mounts working, but i give up.  I am leaving it in place but marked as highly experimental.
 bd169b4  Mounts work again, at least with the parsedfile provider.  I still need to create a netinfo provider, but it should be short and easy.  And, painfully, I still need to port the other six or so subclasses to this new provider.
 138150d  Doing some refactoring in how state values are set.  The primary motivation was to provide the ability for the "newvalue" method to specify whether the provider should still be called, and if so, in what order (e.g., before or after).
 5685013  Fixing the state class so that blocks are optional for values.  This is useful for cases where you want to specify values for validation but you want a method called on the provider instead.
 0643113  An intermediate commit.  All of the classes that use parsedfile are assuredly broken, since I have basically completely rewritten it.  These classes have been a thorn in my side almost since I created them, yet they have been significantly less functional that I wanted.  So, I decided to do the rewrite I have been putting off, just to spend all of the maintenance time now so I do not spend 3 days on them every release.
 7c8614b  Adding module for parsing files.  This module is only included into the parsedfile provider base class, but it is cleaner to have it broken out like this.
 f9d6213  Fix silly regexp mistake where lines with values containing '=' were parsed improperly.
 b44ebe2  Fixing some warnings
 9f8849e  Mostly small changes toward 0.20.1
 10634d6  Fixing #324.  Mkusers was not specifically ignoring the root user, and it is now.
 349e2aa  Updating docs with correct links for the doc restructuring, as mentioned in #322.
 5a4f807  Fixing #326 -- parseonly now just creates a simple Master without opening a port
 cbb4578  fixing #327; debian packages now correctly register their "latest" status
 87fd075  Adding a simple report that just duplicates client logs onto the server
 10c860f  Slightly more doc updates
 114cd8a  More doc updates -- I moved the doc headers into separate files, rather than having them in the code
 b14982a  Small fixes here and there.  The rails changes needs to be pushed through the collection code, so I am committing so Blake can take a look at that.
 aa2da58  Updating docs
 f438bab  Refactoring the doc generator a big
 1f548f9  Updating documentation
 87aea8b  Fixing rrdgraph report (as marked in #334); also, expanding the docs on all of the existing reports.
 51882d9  The new rails files.
 cf166c2  Rails stuff part 1
 28c283c  Fixing some sticky problems with checksums when just using the "check" metaparam.
 744ded3  Merging the code over from the oscar branch.  I will now be doing all development in the trunk again, except for larger changes, which will still get their own branch.  This is a merge of the changes from revision 1826 to revision 1834.
 dc4d980  Syncing up with FE repo specfile (only mandatory changelog entries)
 033de88  Making some documentation changes
 e741b7b  Fixing some Class.to_s handling
 0930b5e  Mostly rewrote intro doc
 71924ad  Updated to version 0.20.0
 a488dd9  Updated to version 0.20.0
 4688d93  Updated to version 0.20.0
 
 0.20.0
 ======
 7694bd9  Adding release tag
 f9f939e  Updating changelog for 0.20
 e3b4f23  Another round of bugfixing, including finding out that the tagmail report was leaving zombie processes lying around
 07f616b  A round of bug-fixing on OS X
 ed38ba4  Doing some work on the DSL.  It behaves a little more like the real language now, although overrides use the same syntax as normal resources, and there is no facility for specifying defaults
 7b34e25  Another round of bug-fixes in preparation for 0.20.0
 ead49c6  Applying patch from #318.
 7261cbb  Applying patch from #319.
 3a6683e  Changing the realize() function to be just syntactic sugar for a collection -- it literally creates a collector object now.  The benefit of this is that it is late-binding, so file order does not affect whether a resource is available.
 05080ff  adding docs for virtual resources
 a05b8f5  Adding a "realize" function that can be used to make one or more resource non-virtual.  It is just syntactic sugar for a collection by title.
 8a4bf1b  Hacking cron so that it works even though I have changed ParsedType.  The whole stupid thing needs to be rewritten from scratch, but this is the best i can do for 0.20.
 d77d6d4  Adding prefetch of providers to transactions.  Nothing is using it yet.  I wrote it for cron jobs, but it is too much work to fix this for cron jobs right now.
 f1ebef0  Fixing virtual object collection.  I apparently broke it when I added rails collection back, and I never created any end-to-end tests.
 52105c6  Fixing doc generation for objects w/out their own docs
 1d35f28  Fixing a bug that only occurred if a defined resource was already defined in memory.
 ada7777  sshkey now uses a provider
 95f2fe7  Ported mount over to using providers
 86dae84  Fixing ports to now use a provider
 7e488b2  Working on migrating the parsedtypes to using providers for the parsing aspects.  This just converts the hosts; I will convert the others next.  This is all work from the sync-retrieve-refactor branch, modified to work with trunk.
 ce4c494  Fixing puppetmodule to use env to find ruby
 0472b24  First batch of fixes from running tests.
 5ddbc36  Fixing sbindir path, thus fixing #302.
 29ff4f3  Switching from calling "up" on the migration directly to using the "migrate" method.  It is still not checking versions or allowing external forcing of migration, but it is a start.
 b4ebe76  Rewriting nearly all of the tests for the tidy type, and redoing the internals of the testing.
 9e5ea8c  Fixing the test scripts so that the library path is modified in ruby instead of in the env line
 72688e3  Fixing gennode; it was not actually adding the class code to the generated node.
 816c5ce  Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts.  Using multiple commits because I am having some svn problems.
 1d56ca6  Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts.  Using multiple commits because I am having some svn problems.
 624eddf  Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts.  Using multiple commits because I am having some svn problems.
 67704e7  Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts.  Using multiple commits because I am having some svn problems.
 0859da9  Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts.
 1020c04  Making all test suites executable, adding some tests for handling changing files from one type to another, and fixing #304.  The problem with #304 was only occurring when backing up to a filebucket (I can only think the example code was wrong)
 dad596e  Fixing #291 -- the problem was that instead of throwing an error on a missing server, puppet was just exiting.
 9a8636c  Moving all of the configuration parameters out of puppet.rb into puppet/configuration.rb, and adding a PATH setting as requested in #307, although it does not include a default.
 86b3386  Adding the ability to have hooks for configuration parameters.  This will simplify things like setting the shell path.
 32deb3f  correcting warning about spaces before parens
 c48f68c  Adding patch from Jeff McCune, #317
 9bd5593  adding explicit load of ast/branch to its subclasses
 b9ed053  Format tweak for fact tutorial.
 5403a91  Adding a summary of using facter and using imported facter facts with puppet.
 90e4c7b  Adding some documentation to the programmer's documentation introducing the concept of providers.
 f545350  Adding some documentation to the programmer's documentation introducing the concept of providers.
 7b75590  New documentation hierarchy: fixing indexes.
 db24e17  New documentation hierarchy: fixing indexes.
 628f6c9  New documentation hierarchy: fixing indexes.
 9c01560  New documentation hierarchy: adding indexes.
 ba33249  New documentation hierarchy.
 da7cb9f  New documentation hierarchy.
 7b0e528  I was stupidly creating an error but not raising it.
 29cce30  Moving methods around so they are alphabetical
 ed89572  Committing the metatype branch -- this is just splitting the type.rb code into multiple files for readability
 b4fd8d1  Catching missing ldap correctly in puppetrun
 b5344f2  Fixing the problem reported by Adnet Ghislain where facts do not load on later runs.
 8f9264b  Fixing code from [1754] -- I stupidly did not even do a parse check, and I had to refactor the patch because parameters do not have code associated with their values.
 94484df  Applying patch from #234 from David Schmitt.  This is also untested, and the patch is slightly modified.
 4a8c5dc  Adding modified patch from #256 -- apt now uses "responsefile" for the preseed file.  This is untested, though, since I do not know how to test it.
 a7c88e8  Adding patch from #308.
 08900a4  Fixing #298 - refreshonly now correctly deals with specified false values
 133c17f  Fixing #305 -- logs now reopen when Puppet restarts, and there is also now an autoflush mechanism available so logs will flush to disk immediately.  I also now trap USR2 and reopen logs when it is sent, so if you just want to reopen logs you do not have to restart the whole process.
 c3cc162  Fixing #309 -- files now correctly replace any number of slashes with a single slash.  Also, trailing slashes are removed, since that is how Puppet expects to find files internally.
 c8ea361  Fixing #301 -- s/logfile/logdest/g
 1c6cb60  Fixing #310 -- users no longer autorequire their homedirs, and files now autorequire their owner and group.
 34f8337  Refactoring reporting.  Reports are now modules instead of simple methods.
 5b6ee8c  Adding a "genmodule" equivalent to classgen, which we will use for reporting
 1cdbe52  Added a section about testing.
 96aabac  adding id tag to tags.page
 d532ea8  Documentation edit
 addfe16  Adding a document to outline the use of tags
 0716c83  Expanded documentation for rrdgraph report.
 675495c  Many, many, many performance improvements in the compiler (I hope).  I did not change functionality anywhere, but I did some profiling and significantly reduced the runtime of many methods, and especially focused on some key methods that run many times.
 ab0141a  More specific configuration and argument documentation.
 c7a7381  Documented signals the puppet daemons accept Documented host type to make it clear ipv6 is supported
 aea6eaf  adding id tag to reports
 8f058a0  Fixing the rrdgraph report so that it creates a separate rrd directory for each host
 b892093  Fixing weird case where the default node is in one node source and the real node is in a different one
 06a7d34  Fixing ldap nodes -- they were always returning true because i was returning an empty array for missing nodes.
 2489764  Changed document priority.
 c1afdec  Another minor formatting fix.
 c9f6113  Missing tick.
 d72c970  Adding some documentation on reports.
 8a8191f  updating install docs with new suse pkgs
 1213d60  Removing some left-over debugging
 28cee40  Merging the changes from the override-refactor branch.  This is a significant rewrite of the parser, but it has little affect on the rest of the code tree.
 e0e2913  Renaming logfacility to syslogfacility as recommended by lutter.
 30fa686  Adding configurability to the syslog facility, using the "logfacility" parameter.
 da0c862  Do restart as stop + start, since sending HUP to puppetmaster doesn't work (see trac #289)
 ee76231  adding links to the real deb pkgs
 dc6d426  Comment out the setting of PUPPET_LOG, so that puppetd uses its default
 6e6cb8f  Messages will now be at current loglevel, regardless of whether the object path is displayed.
 30f9fa3  Added parameter 'withpath' to toggle printing of the object path.
 8cc3c8a  adding a note about single-quoting node names
 5da80db  - New type Notify for sending client-side log messages
 f53b9b0  - New type Notify for sending client-side log messages
 04c0c14  Changing warnonce to Puppet::Util::Warnings.warnonce.
 8214c48  Fixing suidmanager so it uses warnonce instead of using a variable that only existed in Util
 de304e5  Rephrased a short section about finalizing the object dependence hierarchy.
 fee5116  Fixing reported problem of crons rewriting every time when the environment is set
 244a11d  Fixing what I hope are the last batch of problems caused by the addition of the suidmanager module.  Also fixing a couple of other small issues that somehow cropped up.  All tests should now pass again.
 674841c  Just fixed some RCS/CVS id tags.
 98028ce  Adding flush functionality as requested by Scott Seago
 fd9b2f6  File types were dying silently on OS X when the group specified in the manifest was not a valid group.
 db7d784  Fixing SUIDManager#asuser so that it only resets egid and euid if they were changed
 dfef7e1  Adding a note about another error
 d888d9e  Added some documentation to the security page to offer some example invocations useful for generating/signing certificates for clients and servers.
 ab225aa  regenning configref with the fixed spacing
 b4970a9  Expanded documentation of command-line arguments for the puppet executables. (Tweak)
 cc08e2f  Expanded documentation of command-line arguments for the puppet executables.
 008a138  Expanded documentation of command-line arguments for the puppet executables.
 f2ac4dc  Updating changelog for 0.19.3, and merging the version changes over.
 68016a9  ! rename file because rake_test_loader is dumb.
 287b18c  + New assertion: assert_uid_gid will check that the UID and GID have been changed to the proper values. This uses a fork and a FIFO to achieve it's checking. ! nonrootuser and nonrootgroup now only return users/groups that are less than 255, due to the "Darwin debacle" ! many, many, many fixes for suidmanager. This is rather embarassing.
 55f2873  Merging the fix to server/master.rb
 3aac2e1  Some small housekeeping things that I saw while doing other bug hunting
 48082a1  adding note about the irc channel
 515f3cc  Harded-coded pathname to OSX's ssh_known_hosts as a work-around until the ssh pathnames are user-configurable.
 7b5604b  Adding some test reports
 6f11dee  + Puppet::SUIDManager - This replaces all calls to the built-in ruby 'Process' library for uid/gid/euid/egid operations, including (not surprisingly) Puppet::Util#asuser and a method to run commands and capture output. This is due to many inconsistencies (through bugfixes) between ruby versions in the 1.8.x branch. This is included in the core puppet library and can be used by all puppet types and providers. ! Modified Puppet::Util#uid to check (and warn) if passed a nil value. ! Changes to use Puppet::SUIDManager instead of Process and relevant Puppet::Util calls. ! Removed Puppet::Util#asuser.
 320ac38  Updating CHANGELOG for 0.19.2
 8f9dcb5  Updated to version 0.19.2
 595d5ba  Updated to version 0.19.2
 6902f2d  Updated to version 0.19.2
 
 0.19.3
 ======
 bec795d  Adding release tag REL_0_19_3
 0513ffa  Fixing problem with the hostname being removed when running locally.  The node_name setting was not checking that the client was set, and it is never set when running locally.
 7726afc  Adding branch to fix the problem with hostnames getting nilled
 
 0.19.2
 ======
 ddb4c47  Adding release tag REL_0_19_2
 164c18f  As requested by Christian Warden, triggering an object now results in an event, which can result in further triggers.
 98004b2  Adding some error handling for when a non-existent report is asked for, and adding a bit more testing.
 a1e27bc  Adding trace information to autoload.rb
 0bd3055  Switching Autoload#loadall from using "load" to using "require", so it will not reload already-loaded files.  Also updating the checksum docs a bit.
 eecc7cc  Fixing error in tagmail when there are no messages to report
 a468c15  Disabling a test on solaris, since apparently sh on solaris is different than everywhere else
 64a3392  Small test fixes in preparation for 0.19.2
 d35d04e  Adding class list method to group.  Also added a test to verify every type responds to "list", but it does not pass right now so it is disabled.
 9afdf1f  Adding an Autoload instance to Type.rb so that I can load all known types for documentation purposes.  And, of course, loading all types in puppetdoc.  Also updating zone.rb to fix markdown's stupidity in trying to interpret the ERB template, and adding some timeouts to puppettest.rb
 1ae4344  more fixes to the zone examples
 c8c3ee9  doc updates
 2e17e4a  Doc updates
 9bd69c4  Typo: As stood had "remove" for "remote"
 fcf16f7  Fixing #245, opened by marthag.
 1ad76d1  Fixing #278, opened by Digant, with patch.
 5faa45d  Fixing #274.  I just set :ensure to be :link when :target is set.
 62abbd5  Fixing #283, opened by luke.
 ea4b9c8  Fixing #285, opened by ericb.
 c99843a  Fixing #288.
 2b27289  Fixing #293, I think.  The problem was that the groups state was not correctly passing strings in all cases, which caused some very strange problems internally.
 0870c5c  Fixed a minor typo
 dc8fb0a  Fixing #292 (A bug in tagmail that causes any tag other than 'all' to fail) and #277 (tagmail report missing To: header).
 afed9a1  adding an extra make target for debugging, rather than defaulting to always creating the debug file
 e88bf77  Rake::TestTasks were running the test suite inadvertantly against the installed tree instead of the development tree due to a botched "libs" setting.
 bc15e04  Fixing provider commands and Util#execute so they always include the command output when possible, as mentioned on the list
 f0a9345  Regenerating docs, and correcting some markup mistakes
 62917fc  Small update to the fileserver tests; it was apparently not making some test dirs correctly
 3891f48  Converting to using the Rakefile for testing.  The old 'test' script is now deprecated, and I'll send an email to the dev list and update the docs to reflect that.
 dcab464  Reworking test/lib structure a bit, and renaming all of the files so that their file names match their module names
 abe1d3c  Fix trac #282 (Change URL to configref, mention --genconfig)
 7030aca  Small modification so i can make more changes
 6a1b43a  updating changes from the trunk
 6747b6a  going through all of the other providers and making sure any reference to a state uses the :should value, not the :is value.
 69d4083  Fixing case of silly states on os x, where files are owned by "nobody" and File.stat returns a huge number.  I thought i had already fixed this, but apparently not.  I added a test, and it is definitely fixed now.
 8cbe19f  Fixing the same bug in the netinfo provider -- it was retrieving the "is" value instead of the "should" value
 6137812  Fixing #280; added a warning and exiting if no hosts are specified to clean
 533a022  applying patch from #275.  aptitude -q works fine on my testing release, but apparently stable does not support it
 94f5865  Removing the no-longer-necessary type/nameservice info -- it is all in the provider tree now
 94762e1  Trying to fix a bug where files other than site.pp do not get noticed for reparsing
 176d483  Add config option 'node_name' to control what puppetmaster considers the proper name of a client (name in the SSL cert or name uploaded with facter) Default to name from the cert
 fd4ef3c  Better documentation around certificate revocation and mgmt
 c8a6df0  Updated to version 0.19.1
 ee8b8c7  Updated to version 0.19.1
 6f85511  Updated to version 0.19.1
 
 0.19.1
 ======
 7e229a8  Adding release tag REL_0_19_2
 0e58f65  Updating changelog for 0.19.1
 4a3c8d1  Adding testing for the default? method, and fixing it to support arrays and returning false when no defaults are specified
 48992d7  Using the "trace" configuration parameter to determine whether a stack trace should be printed, rather than just using "debug".  I added the param a little while ago and was using it internally in Puppet::DevError, but I just now went through the whole configuration and switched to using it.
 cda7253  Adding patch from #235
 5219205  Fixing docs, as mentioned in #271.
 c04cb13  Reverting the work done in [1605] and [1606].  I have added it as a patch in #271.
 08499b1  Adding the feature from #259.  I had to rework the Scope#lookupvar a bit, but everything now works as expected when variables are either undefined or set to empty strings.
 26bf373  Applying patch in #160.
 e46d007  Fixing #262.  I somehow lost the line that only added a given user's jobs to each tab.
 0af8ad7  Removing a test in the parser that is no longer necessary because of how imports work now, and fixing a snippet not to interfere with a local fact
 5669d1b  This commit adds two important features (but which probably were not worth the priority I suddenly placed on them).
 fbdd6c4  Specifically rescuing Exception, since apparently the default does not rescue LoadErrors and everything else
 349bddd  collecting output from blastlist, for later use
 4cd37ad  Merged test framework into trunk - still not ready until tests are converted to use it.
 4897995  Fixing the "Adding aliases" message, so it is clear when an alias with spaces in it is used
 6bb4814  Fixing #267.  The problem was that the user provider was retrieving the @is value instead of the @should value, because it was using [] instead of the should method.  I fixed the FakeModel to behave a bit more like real types, so that it keeps track of the is/should values, and also to keep track of which attributes are valid, since I immediately ran into another problem stemming from the use of the fakemodel.
 e5aa761  Updating changelog for 0.19.0
 2c57173  Raising element creation errors up outside the "create" method, so that tests can more easily tell when an object is invalid.
 16d9d6f  Fixing spelling of retrieve, to fix ##268
 3b8c9ff  Fixing #269.  I was aliasing every case where the title and name were different, where I should only have been aliasing isomorphic types, which does not include exec
 bf5d0bc  Catching all errors encountered during loading, not just LoadError, to fix ongoing problems with rdoc/usage.
 64eb1e8  Let puppetd listen (when given --listen) without a CRL
 5e2091b  Brute force fix for trac #266
 37c9633  Fix test_host_specific to not depend on the path of the test directory and reenable it
 aa56185  Expanding the Fedora/RHEL instructions some
 47dc290  adding note about david's yum repo
 8ff418c  Fixing the problem with fileserver expansions, and doing a bit of refactoring to make things clearer
 cf5291a  Fixing the interpreter to nodesearch across all listed names, just like is done in the manifests.  Also fixing a comment in type.rb
 ca6ac62  fixing typo
 0527426  adding gentoo notes
 3e1b6bc  Adding a :trace config option that prints stack traces of DevErrors, and using that in DevError instead of :debug
 95269bf  Adding test code for providers that makes sure the default and confine mechanisms work internally.
 09f264a  Add config parameter ca_ttl and deprecate ca_days; ca_ttl makes it possible to generate certs that are valid for < 1 day
 130b245  Use Pupet.warning instead of nonexistant 'warning'
 a5f4f53  Fixing #261.  Applied patch, with small modifications.
 0c0936b  Adding a module for helping with warnings, starting only with the "warnonce" method
 af1de89  Sync with FE repo
 c651b19  Disable the sample fileserver module by default, otherwise users get spurious warnings about nonexisting directories
 65bb635  Updated to version 0.19.0
 61e42e7  Updated to version 0.19.0
 12b219e  Updated to version 0.19.0
 
 0.19.0
 ======
 fbebcc5  Adding release tag REL_0_19_0
 e309b76  Modifying the provider base class so that it defines a method for every used command (e.g., you call "commands :rpm => 'rpm'", and it defines an "rpm" method.  I then pushed this throughout the package providers, which are the heaviest users of commands.
 c5ce953  Adding aptitude support, including a new util::package module that provides a method for package version sorting, and a couple of smaller bug fixes.  This fixes #237.
 2113eed  Adding hasrestart parameter to services
 fcc5bae  Adding an "env" parameter to exec, for providing extra environment settings, as requested in #236.
 8310c9d  Adding a "withenv" execution util method, and using it in :exec for path handling.  Next will be other env handling.
 f8254c6  Fixing #230.  If the first line in the cron tab, before the header, starts with TZ= then the header will be inserted after the TZ line.
 fa16a92  Fixing small bug in cron where removed fields are not deleted from the file
 e28250d  Adding further gentoo support -- finalized portage support, plus conf and init info for puppetd
 41c9081  Adding the Daemon module back into the Client class, which fixes #247.
 46fbf95  Adding an "ignoretags" attribute to transaction, and setting it for downloading plugins or facts, and for creating config directories
 b303e8d  Adding the ability to download facts from the central server.  This allows facts to be available before the configuration is compiled.
 b36df18  A small fix to the install/update aspects of packaging.
 47c86e5  Fixing the package type so that :ensure is always used for version specification, rather than :version, which is now deprecated.  This provides much more consistency.  I have not tested on all platforms yet, but I want to enable testing on Gentoo, also.
 19992f7  updating documentation for how to specify versions
 7eed92e  Applying a patch from Jose Gonzalez Gomez; apparently this makes package updating work
 40b2ed6  Adding portage support again, since it was added in the branch i reverted
 617fe58  Removing all of the changes I made towards refactoring in the last couple of days.  They have all been moved into the sync-retrieve-refactor branch.  This branch will soon become 0.19.0, and will not include that refactoring.
 8f39318  Committing a small amount of work in cron.  I have decided that this is too last-minute, and not important enough to hold up the release.  I want to get this refactoring done, but it is clearly not the 4 hour job I hoped it was.  It will have to be in another release, I think.
 b43b489  Committing functional mount support.  All that's left in this chunk of work is cron.
 639ed3d  Adding first version of the portage provider, as contributed by Jose Gonzalez Gomez
 655881c  Ports now work with a provider
 daa79e2  Intermediate commit; ports are not working yet
 b657850  Fixing SSHKey support.
 270f444  Beginning the process of moving parsedtypes to a provider.  Each parsed type will have a parsedfile provider, which will be responsible for all of the file parsing and generation.  This should allow us to create a useful DSL for file handling, but it also *drastically* simplifies these types.
 b9b3384  This is the initial commit of the changes to sync and retrieve.  The structure itself is now in place, and a few of the types (the most complicated ones -- file, user, group, plus exec since it was my easy first test) have been converted.
 3733034  Renaming parsedfile to loadedfile, which makes much more sense and reduces some naming conflicts
 a887993  Adding Gentoo support from #224.
 c626796  Adding eat-last-line support in ERB
 a115050  Adding pre- and post-hooks, as requested in #233.
 f797487  Fixing #239 -- missing checks now throw an ArgumentError.  This will break if any command purposefully returns 127, but that would be a bug anyway, I suppose.
 ff18e55  Adding support for file purging, as requested in #250.  Any unmanaged files in a purge-enabled directory will be removed.
 18320ee  Adding a "force" parameter in files to fix #242.  Currently only used when replacing directories with links, but should probably be used in other places.
 7fd5b6f  Specifying true/false allowed values for file[:replace].
 8cbe1d3  Adding logcheck script from #244.
 2cb2e03  Applying patch from #251, and switching "confine" to "commands", so we can document the command requirements.
 712e157  Adding SuSE files from #252.
 42812f8  Applying the patch from #253 plus tests.
 fd86428  Updating templating docs with more about usage, and adding installation notes about ruby segfaults on Debian
 f587d88  Adding note about configprint, indicating what versions include it
 989716e  Adding zone patches
 96350b2  Fixing #257, where host aliases were not being retained.  The problem was that the "should" method was returning an empty array if it was not set, and it should instead return nil.
 114debd  batch of small bug fixes
 2802b70  Making sure that the svn bin directory is at the beginning of PATH, rather that at the end, so the svn-versions of the exes are being tested.
 b086280  Removing type/provider references on type removal
 053f37c  adding notes about the libruby deb package
 77783e5  disabling reporting until i can find a way to make reporting only work with puppetd, not puppet -- clearly puppet should not try to report
 199f5b0  Fixing the state so it tries to call provider methods and only checks for errors, rather than checking with respond_to?
 b6b9d0b  Setting both "report" to true by default; I am going to enable pluginsync by default once I have plugins well-documented
 02b8b13  Fixing array printing in to_manifest
 29edb14  Fixing service refreshing -- there was a problem persisting from the provider work
 14d64dd  downgrading the template interpolation message
 fa0446b  Adding back in the code to change the euid.  I removed this yesterday because I thought it was redundant.  It is absolutely clear that I need to add tests for running as separate users.
 6f175ce  Adding automatic stacktrace printing to deverror.  I need to go through and remove the redundant puts in the rest of the code, but I need this now for some client debugging
 a46a620  disabling chuser on os x, since it is broken with < ruby 1.8.5
 a53d840  fixing provider commands; I broke them when making them easier to document
 0f231b8  Skipping blank lines and comments in autosign.conf
 9381d5f  Fixing report lookup so it looks up by name, not method
 948c96a  Changing autosign mode to 644
 762599b  Fixing tagmail config processing so it fails when appropriate
 0674c9a  Fixing reports error reporting
 a6c38b5  Fixing location of ca cert
 04b2557  Fixing report autoloading; I was calling the wrong method, and they were never getting loaded
 47dbf82  Upgrading Triggering line from info to notice
 d45d22b  Adding a module specifically for making doc generation easier, and adding defaults info to provider docs.
 e1aff4c  Last commit of puppet docs for the night
 b9ad604  Modifying providers so that docs generate better
 9b526ba  Adding provider docs for required binaries
 6aaeb05  Updating generated docs
 5395e23  Adding pointer to templating docs into the file[content] documentation
 8dbca3d  adding notice that "$" is now required in definition prototypes
 333c229  adding first draft of templating doc
 628896b  Adding a "configprint" option for printing out the local config state
 9f7621b  Adding a little more validation to the schedule, and documenting the source search-path stuff in files
 ad32b71  Tracking down some weird bugs that managed to creep into the parser.  I expect that the main ones were a result of the If support.
 db0be8e  Committing some changes to the %h expansion in fileserving.  This change makes the expansion entirely isolated in the Mount class, which makes it much easier to test.  Also, switched the fileserver config to use ParsedFile, which makes it a bit easier to understand and handle reparsing.
 a44b1dd  Committing the other half of the fix for #231; oops
 ed15471  Fixing #231.
 55d3fb8  Support for %h and %H replacement in the path of fileserver modules.
 2540cdf  Demoting the xmlrpc access logs to debug from info
 38a184e  Changing permissions on the cert file and the ca cert file, since it is no problem for them to be readable and sometimes it is required
 b612a15  Try this; seems to work for machines with both ActiveSupport installed and not. MissingSourceFile is an AS thing, though it subclasses LoadError.
 8fcec23  Adding up2date support, as submitted by Kostas Georgiou (with some modifications to support providers).
 9576d1d  Certificate revocation through puppetca. Keep a simple text inventory of all certificates ever issued.
 4151fd5  Committing definition inheritance.  I have not yet written tests yet, but my last commit pretty seriously broke some things without me realizing it, so I wanted to get this in.
 1b2ee4b  Adding "if/else" constructs.  No operators, no elsif, but it is a good start, anyway.
 ea32a38  Function autoloading now works as requested in #214.
 bba972f  Adding warnings and error throwing for #218 -- metaparams in prototypes are treated specially.
 a1d71d9  adding faq item about ipv6 support
 6e4d4c9  Accepting patch from #220, thus fixing the bug.
 e322161  Fixing #225.  Normal file copying worked with spaces, but recursive file copying did not.  I modified one of the support methods so it works now.
 bf43c76  Fixing #228.  The real problem was that "present" should match any type of file existence, whereas it was just matching files.  If the file was a directory, as in this case, Puppet considered it to be out of sync.  Now, "present" matches files, links, or directories, but still creates an empty file if the path is missing.
 aee1c6a  adding cookbook into to the docs index page
 7ade561  Support for certificate revocation and checking connections on the server against the CRL
 c6fc6c5  Adding a link to the cookbook
 b2031aa  Making some of the metaprogramming a bit more explicit and a bit easier to manage.  In the process, I have created multiple Util modules, only one of which is used for this current commit.
 beba3e4  Finishing changes to support titles instead of two types of names.  This is basically a bug-fix commit.
 607d7c6  A first pass of changing one of the types of names to titles.  I still have to fix a lot of tests, but the core itself is now working.
 12452ee  Merging r1468 from the implementations branch with r1438 from when the branch was first created.
 4d6120a  Committing changes that require dollar signs in prototypes
 abaeb86  removing classing example, since it involves parameterized classes
 e684cd3  Adding some documentation for the cfengine module
 1eaf1bc  Fix problem when --fqdn is used
 e6aa4ab  documentation updates, pointing to the suse yum repository and specifically mentioning package locations
 0e862a3  Fix shebang lines in executables
 450b495  Added comments to stay in sync with the spec file checked into Fedora Extras CVS
 d6fc1b7  more ordering info
 89b4dfd  adding ordering information
 7957ce0  fixing puppetdoc to add ordering info
 f974ffc  Fixing the master server so that it always uses the Facter hostname, not the cert or IP hostname.
 eb8c687  updating links after a link validator
 257fb78  fixing faq links
 3ef4663  adding DSL class.  Sorry, not much in the way of docs.
 31b1d0b  fixing more doc links
 b2f1aa0  doc updates
 b8bf113  Updated to version 0.18.4
 94cc68b  Updated to version 0.18.4
 ce95ee3  Updated to version 0.18.4
 
 0.18.4
 ======
 74a3b4d  Adding release tag REL_0_18_4
 f13c451  updating changelog for 0.18.4
 cdeccab  Another batch of bug fixes, this time focused on OS X patches.  Looks like I did not test on os x last time.
 b42eaee  First round of bugfixes in preparation for 0.18.4
 9e61510  Fixing #77.  As I feared, this was a pretty complicated fix; I had to add a lot of infrastructure to both ParsedFile and Config.  All config files now have a timer created for them, and by default they check for file changes every 15 seconds.  If there is a change, they get rid of values set by the file (but not set on the cli) and set the new values, then the re-use all of the sections, so that any changed directories or whatever get recreated.
 310b3a1  Adding timeout functionality to the ParsedFile class, in preparation to adding config reloading to the Config class.
 c8537a5  Apparently objects were legal rvalues, which does not make any sense.  Fixed this, and added a test verify.
 21ae8fb  Fixing #185.  Added a check for cdrom sources, and added an override parameter.
 039abd6  Fixing #176.  You can now do duplicate UIDs (or GIDs on most platforms) with :allowdupe.
 2091edd  Fixing #200.  I basically just moved the daemonize statement before most other code.  This makes things a little less nice when starting puppetd manually, since it might still fail and the user would not know without checking logs, but it is the only real option at this point.
 76aec7c  Fixing #202.  Just bumped the log level to notice and changed the wording slightly
 3cc3f66  Applied patch in #203
 7228413  Fixing #201; users now autorequire extra groups
 ebd28e8  moving plugin evaluation into a begin/rescue block
 8e25115  Fixing puppetdoc's output
 041c07b  adding all mailing lists to index
 19e411b  removing message about the statefile not existing
 09e0792  more doc modifications
 c9640a7  Updating some docs, and renaming configuration reference page
 40e2db3  All docs moved over now, and the real index page exists again
 813d1c9  committing docs before i move all of them into a separate subdirectory
 f02f6f7  Adding Solaris SMF manifests and methods
 0b90333  Fixing #191.  I was only testing for parsed cron instances, not for created ones.
 aba3d65  Fixing bug in scope/interpreter where nodes found in ldap must have parent nodes.  The problem was that the the scope was using the presence of a parent node to determine whether a node was found.  Instead I added a flag in the arguments to "Scope#evaluate" to mark nodes as found.
 01c8808  Adding a unit test for plain "nodesearch"
 08650c1  fixing html markup
 e74b8af  fixing html markup
 8273f21  fixing index page in the docs
 b23b797  Updated to version 0.18.3
 fe8ce26  Updated to version 0.18.3
 a984a90  Updated to version 0.18.3
 
 0.18.3
 ======
 04a99e7  Adding release tag REL_0_18_3
 8063ab1  Fixing filebucket server so that paths are not added multiple times
 1ab4594  Adding tests for previous config bugfixes, and updating changelog
 a6cc3e4  Fixing reports so that multiple host report directories can be created.  There was a config conflict before.
 73556a8  Fixing templating so it immediately fails when a variable is not found, as opposed to passing up the method_missing heirarchy, which was causing a nasty memory leak and some kind of weird, long-running search
 1ec1b99  Fixing weird case involving interpolating config params in a URL
 8f28c6f  Fixing weird cases where configs might think non-files could be files
 b116ac7  adding sysidcfg param to zones
 a3849d7  Fixing templating bug that can result in what looks like an infinite loop, and changing default timeout to 2 minutes instead of 30 seconds
 86a92de  Reducing log level of missing file
 7139901  Fixing error when template does not exist
 3fbd06a  Fixing misstated error name ExecutionError in blastwave packaging support
 829c754  Fixing reports server so it refers to the main server
 0acebb1  Default the passno to 2, defaulting to 0 is a bad idea since it disables fsck
 44c54fc  changing plugin owner to root
 9be1e0b  changing default plugin host to be $server
 a4a04fe  adding rake targets
 0c96fc6  Doc change: explain what the values for ensure do
 67dab0e  adding another state that is equivalent to "stopped" for smf services
 8a10b08  Adding the newly generated docs
 e57f6e7  More documentation updates.  I think this is sufficient for replacement of the plone site.
 9b7f428  Fixing rakefile so it generates docs from markdown, and adding big-picture.page to the menu
 70877fb  removing faq.rst file
 fefe1c5  Updates; remove mention of patches from specfile completely
 f42666c  updating changelog for 0.18.2
 eff8d6e  Accepting the patch from #190.
 6b281ed  removing cf2puppet from rpm
 bd9fd8d  Updated to version 0.18.2
 71036e7  Updated to version 0.18.2
 aa87963  Updated to version 0.18.2
 
 0.18.2
 ======
 3e5907d  Adding release tag REL_0_18_2
 afe84ec  small fixes towards 0.18.2
 e17f4ed  adding host information to reports and tagmail report
 1503b42  renaming tagmail config file
 c3a8d45  Redoing reporting a bit, so that reports are now defined as methods.  If they are not methods, then they cannot use return, which makes things a bit uglier.
 3c22bc9  fixing some smallish bugs in preparation for 0.18.2
 73569d0  fixing a small but important typo, and adding sunfreeware as a dupe of blastwave packages
 87ce8ed  Adding blastwave packaging, and doing some fixes on gem and sun packaging
 2e78526  Some updates resulting from trying to track down a segfault introduced when I upgraded to 1.8.4-5 in Debian.  I never found the segfault and had ot downgrade to 1.8.4-1.  I expect it will not be encountered in real life, only in testing.
 e57c513  Adding Ruby Gem support to packaging
 25cf31b  Adding minimal update checking for templates.  It will only check the templates that have been parsed in this process, but it is better than nothing.
 c899e23  documentation updates
 c1e0bc6  More report and metrics manipulations.  This should be the last of it.
 34e779f  Significantly redoing metrics.  There are now no class variables for metrics, nor no class methods for it.
 24f07e0  committing tests for previous changes
 dea7e24  oops; adding transaction report class
 70143d2  Trying to merge metrics and reports.  There is now a separate transaction report class, and it works throughout the previously existing system.  I will next go through trying to make a metric report that graphs the metrics in rrd.
 795ec70  adding a "thinmark" method, which does a simple benchmark with no logging
 19b5d30  Accepting patch #189, although I am just putting the environment statement in the main part of the class, since there are two apt commands
 ff6562f  Fixing #133.  Added a "notify" and a "before" metaparam; notify is the opposite of subscribe, and before is the opposite of require.
 9bb9e10  Fix a small bug in mount where parsing fails if dump and pass are missing (they are optional on Linux) Revamp the tests slightly so that they parse fstabs provided in svn rather than relying on the fstab on the system the test is running on.
 f792a02  Moving the template handling into a simple wrapper object so templates don't have full access to the scope object without some real hacking.
 8b60619  adding some tests for the template function
 a6dc7f2  Adding initial template support.  It is just a function, and a method_missing method on Scope.
 e47a987  First commit of complete reporting support.  The only existing report at this point is the tagmail report.  I expect reporting to get significantly modified from here, but it is a good start.
 ea91896  changing the #!ruby lines to #!env ruby
 1677594  Adding reporting client, server, and tests.  At this point, the server just stores the report in a file as YAML.
 56a2845  Adding report collection to both statechange and transaction.
 d275489  Updated to version 0.18.1
 35ef37b  Updated to version 0.18.1
 427831c  Updated to version 0.18.1
 
 0.18.1
 ======
 1cc2712  Adding release tag REL_0_18_1
 7adafc6  For each type, adding a "new<type>" method to Puppet::Type, so instead of typing Puppet::Type.type(:file).create(...) you can now type Puppet::Type.newfile(...).
 e8c57ae  Cleaning up plugin handling a bit -- they can now be colon-separated paths, and I added a separate "plugindest" setting for determining where plugins are synchronized to.  The major feature I added, though, is that Puppet::Type now knows how to load plugins, and treats :pluginpath as a search path for plugins.
 d98ab11  Fixing zone tests
 4985d8f  adding message about retrieving plugins
 dec4053  updating CHANGELOG for 0.18.1
 5471211  Moving the timer monitoring to after the services are created (because they actually create the timers), and adding a sleep statement to give the threads enough time to create the timers.
 ad1396d  Fixing backgrounding in puppetrun; I had the bit flipped between the client and the server, such that setting --foreground caused the clients to go into the background.
 5be3c10  Converting Parameter#proxymethods from using eval to using define_method
 b2304f1  Making sure fail function converts everything to strings
 c363af0  Adding "fail" function, which will raise a ParseError if it is encountered.
 57a5a71  Catching errors thrown during object evaluation and marking the objects as failed.
 506269f  adding hooks for ignoring files in the plugins directory, and defaulting to ignoring cvs and svn files
 7685957  removing that info message, duh; it produces a lot of spurious output during parsing
 c886194  Adding info messages about errors loading plugins
 772ea91  Adding support for special freebsd @schedule crap.  Also making sure that cron listing works as expected.
 08f113c  switching puts to print, so the carriage returns are always included in the messages
 bdd1761  Largely refactored how log destinations are handled, although it is not exposed externally.  Most of this work is related to handling a large number of small problems related to threading.
 73a4bcc  Changes to make puppet package more LSB compliant. Update specfile for very latest Fedora ruby packaging guidelines. lsb-config.patch only checked in for documentation purposes, since changes are part of this checkin.
 0411f74  Fixing some more small problems in puppetrun
 31c17e4  Adding more docs to puppetrun, and fixing bug that can cause hosts to get skipped
 faab17b  adding - to HUP in init scripts
 bb5366f  Updating init scripts to use HUP for restarting
 3c5b10d  Adding a "latest" test for rpms, since I have been told this is not working.  It seems to be working fine, but the test cannot hurt.
 5cf2a4d  Adding HUP and USR1 hooks
 4a71706  Fixing #178.  I just added URI escaping and unescaping to file names.
 f9a4d7a  Fixing #175.  The setpidfile setting was being ignored.
 d812840  Fixing #182.  Added a retry section to try reconnecting to ldap.  Only one reconnect is attempted in a given search, and LDAP produces bad enough error messages that we reconnect regardless of the error thrown.
 46824cd  Setting pluginsync default to false, and (hopefully) fixing autosign problem when the file exists and autosign is set to true (#180).  The problem was that the puppetmasterd script was redundantly setting autosign in the CA, when the CA already knows how to deal with autosigning, which meant that autosign was being set before the config was parsed.  Thus, there was no bug when autosign was set on the command line but there was when it was set in the config.
 15905bd  Fixing broken symlink behaviour mentioned on the list
 0a1e847  Adding plugins and plugin management.  The Master Client will now automatically download plugins if pluginsync is enabled, and they will be automatically sourced.
 edabf9e  documentation updates
 4df2583  More documentation changes.
 8ad2008  adding id tags to all of the docs
 58826ca  further work on converting from rst to markdown
 b6a52b7  further work on converting from rst to markdown
 3772aaf  further work on converting from rst to markdown
 e891ffb  updating some docs and puppetdoc in preparation for a move to webgen instead of plone
 90e8ad8  removing the old rst index file
 644fd4e  updating docs to work with webgen
 f090760  Fixing my autorequire fix; oops
 084a31d  fixing autorequire message to include the object type
 bdb9110b  Delete entries from the config file if their should is 'absent'
 883921c  Test that setting a state to 'absent' really deletes it from the config
 e841d8f  Adding test and fix for empty execs being ignored
 6ef3d88  fixing interpreter to initialize ldap in the nodesearch_ldap method, which really only matters for testing (since it is already being inited in the nodesearch method
 662fcaf  making links even if the target does not exist
 0ab461b  Updated to version 0.18.0
 daac8cf  Updated to version 0.18.0
 8779dbe  Updated to version 0.18.0
 
 0.18.0
 ======
 4a5df83  Adding release tag REL_0_18_0
 a6f9bf4  Adding release tag REL_0_18_0
 ae3dba9  updating changelog for 0.18.0
 ead6b17  updating documentation for sshkey
 20b0a6d  fixing transaction tests to just warn when the user is not in more than one group, rather than failing.
 be92c44  Setting options and the facility for syslog
 9a1b9ec  Fixing some logging issues with puppetmasterd when daemonized with verbose mode on, and fixing ldap support when daemonizing
 c1dd0a1  Changing statechange noop message so it's a bit clearer
 603a53c  Just logging host failures, not exiting
 c1f0fb7  Adding fqdn, an --all flag, and --test mode to puppetrun
 f86357d  adding namespaceauth and --listen docs to puppetrun
 97c7342  Adding fixes for solaris zones
 02d397c  abstracting out ldap connections so that there is a single method responsible for all of them and a single connection can be shared in all classes if necessary
 076e888  adding ssl usage to puppetrun
 15da00c  Fixing ldap usage when ldap libs are not available
 4a5b886  removing extraneous debugging
 7ed5560  Fixing installer; it somehow got broken with recent DESTDIR fixes
 fd8e080  Fixing #173.  At this point, I am just calling both "--add" and "on", or "--del" and "off".  This should probably be broken up into other states, but....
 ef163ba  fixing parallelization to match the docs
 1dfd554  Fixing packaging to deal with the fact that yum exits with 0 exit code even when it is told to install a non-existent package.
 df340d6  Correcting puppetrun docs and fixing a test so it works with older versions of facter
 b4b3c27  Adding support for default nodes as requested in #136.
 ba4071c  changing puppetclient schema to descend from top instead of iphost
 07e0d59  Fixing #169.  Tags are ignored during config.
 c380bfe  Fixing the main bug reported on the list today relating to file sourcing truncating linked-to files.
 90762c5  adding noop marker as requested
 ec0609d  A round of bug-fixing in preparation for the next release.
 9af5d69  adding nothing test to zone tests
 a6122e8  Fixing ldap node lookup.  The test was set up badly, in that it did not actually provide a way to enable ldap node support, even though there was a config option that should have worked.  All works now.
 360a405  turning on output flushing
 edfaf6e  Adding support for following referrals
 555e1b8  Fixing #135.  I was setting the object to the result of an include? test, instead of just "obj = ary[val]", so all but the first bucket-backed files were getting errors.
 8ceb1f3  Found a bug where single-value selectors can fail on a second compile.  Fixed it, and am now compiling all snippets twice.
 4ca7ece  modifying rakefile to specify the package hosts; they were previously hard-coded in the build library
 09d2cd0  Fixing #168.  Reworked the regex to allow matching TLDs.
 1fc4ec3  Fixing #167.  Started with the submitted patch and made a few more modifications, and added a regression test.
 c90d0b1  Fixing #157.  Objects are no longer allowed to be their own parents, and there are checks in both directions to stop this.
 7c358df  Fixing #166.  Function names are no longer reserved words.
 e73f2d4  Fixing #158.  I did not add a force option, since I always back files up before I replace them.
 4266f64  adding faq to docs
 d6d05d4  Fixing #154.  Basically just accepted the patch that fixes master.rb and added a test case for it.
 1cef8f5  Applied patch from #153.
 2257d6f  Fixing #155.  It is now valid to have arrays with no values, although you will still likely get erratic behaviour elsewhere in the system, depending on what you do with this.
 0e52409  Fixing #159 -- packages now have a default value for ensure (:installed).
 3758bdb  adding rakefile for the docs
 1a93e6d  copying all documentation from the plone site
 d84827e  Committing largely complete Solaris zone support.  I still need to add static filesystem support, but everything else should work.
 73c5c58  removing one of the stack traces from error output
 95f273e  Fixing #163.  Strings can now correctly escape dollar signs.
 a3ed629  Intermediate commit; most of the core zone functions now work, and some of the configuration functions work.
 81ce66a  Fixing node tests to handle comma separation
 011e811  temporary commit so i can transfer my testing to a faster, sparc box
 add6b80  Fixing #160.  Fixing the error in Puppet::Type#[]= and scope.newobject
 76ff83d  Fixing #161.  Basically, AST::ObjectDef now catches when users specify a name as a parameter instead of the name before the colon and modify the results accordingly.  This catches this kind of problem, and the normal name handling picks up everything else.
 b08816b  Fixing #162.  Node names must now be comma-separated.
 2fcbc7f  Adding an "execute" method to Puppet::Util, and including the module in element.rb
 354b945  adding zone management stub; switching to my home vm for testing
 98ad43a  fixing destdir in installer, and adding solaris conf stuff
 4cd3019  Did some work on making sure object removal actually works, thus stopping some potential memory leaks.  Also explicitly removed objects in more places, again hopefully forestalling memory leaks.
 45a9edb  Reworking cron; adding many unit tests, and making it much more like a ParsedType (although still not quite the same).  Too many of my tests were invalid; I think those are all fixed now, and it appears to work as desired.
 3ab4a89  Small fix to include puppetrun in /usr/bin
 62a0ff0  adding puppetrun to the red hat spec file
 fda013a  Updated to version 0.17.2
 
 0.17.2
 ======
 b742236  Adding release tag REL_0_17_2
 3c15a28  updating changelog for 0.17.2
 a08ca93  Fixing #138, all of it, I think.  Environment settings are now allowed, although all bets are off in terms of parsing existing environment settings in crontabs.
 69cf2fe  Adding a small fix to cron tabs; they will at least parse tabs that have env settings in them, although you still cannot, at this point, set them.
 0381cc1  slight ldap fixes in puppetrun
 d55adda  First version of puppetrun.  It seems to mostly work, but I need to test it with greater parallelization.
 5671ce8  Added the last of the tests for the runner, along with the necessary work in puppetd to be able to start it.
 b3ea53c  Adding a lot of structure to puppet.rb to make it easier to manage multiple objects in a single process, including making it easy to add threads.  Added some testing for all of that.
 93771b7  fixing user[:groups] management when the user is absent
 738698c  Updated to version 0.17.1
 
 0.17.1
 ======
 f028420  Adding release tag REL_0_17_1
 ed9adf5  updating changelog for 0.17.1 and 0.17.0
 9b5de11  Allowing empty files
 5382118  Fixing #146.  I think I mostly just fixed the error message; I do not think there was another bug there.
 89ce72f  fixing stupid debian rails mistake
 dc3a6d5  Making sure file recursion works for all valid inputs
 373afa3  updating version on spec file
 4296b02  Updated to version 0.17.0
 
 0.17.0
 ======
 559f4b0  Adding release tag REL_0_17_0
 3be0f95  Wrapping the host storage into a transaction.  It might have a slight performance improvement, but, ah, unlikely.
 9d6166e  adding a test to make sure that defaults get taken up by components
 a0bcf5a  Adding code to try for the rails gem if the library cannot be found normally, and adding some protections in case there are problems
 122e2bc  only performing collection tests if activerecord is available
 8f14c3f  failing more intelligently in init if ActiveRecord is missing
 def5175  Making sure yum fails on unknown packages
 2e9f1c4  removing extraneous logging
 d9fdd8e  I believe I have finalized export/collection support.  I still want to go through all of the code and s/collectable/exported/g (thanks to womble for that term).
 ba57dff  I had to redo how the scopes handled collectable objects (which I will soon change to being called "exported objects").  All seems to work now, though.
 22e70f0  Made a *huge* performance difference in storing hosts -- down from about 25 seconds per host to about 5 seconds on my machine.  I will almost definitely still use forking or something to make this not affect the clients
 637cc71  I appear to have object collection working, incredibly.  This commit does the collection from the database up to adding the objects to the current scope, which is what sends it to the client.
 9e9ef1a  The "collectable" syntax now works end-to-end -- the parser correctly recognizes it, the AST objects retain the settings, the scopes do the right conversion, the interpreter stores them all in the database, and then it strips the collectable objects out before sending the object list to the client
 8ed666a  adding a few more fields to the host table
 5863a03  Adding initial rails support.  One can now store host configurations using ActiveRecord into a database (I have only tested sqlite3).  Tomorrow will be the grammars used to retrieve those records for object collection.
 0819e35  Adding some small changes towards fixing #140 and #83, but this work needs to take a back seat to object collection, so i will come back to it later.
 678e142  Fixing #141.  It was a problem related to the recent parser changes I made.
 578cf7e  removing some extraneous logging
 a2a4dd5  Updating doc system to add the list of valid values to the doc string, and tweaking a few docs.
 710bf0d  Slight modifications to package parsing on *bsd.  It should be better about catching the version number, and unparseable lines are now just warnings, not errors.
 9e77e7a  It is just a snippet test, and thus a functional test but not a coverage test, but definition overrides officially work.  This was important because it enables definitions to be collectable, which was not possible without the mechanism that enables this.
 513b87a  Preliminary commit of the first phase of the parser redesign.  The biggest difference is that overrides should now work for definitions (although i do not yet have a test case -- i will add one on the next commit).  The way this is implemented is by having scopes translate themselves at eval time, but in two phases -- the first phase does the overrides, and the second phase does the evaluation of definitions and classes.
 fe16f83  making a test to verify that the functionality womble is looking for now works
 bb60cab  Making trigger logs much clearer -- you now get info logs indicating how many dependencies changed, and debug logs indicating what those dependencies are
 88c3f7c  Changing how events work.  Events are now responded to inline, while an object is being applied.
 7b7ac18  Changing default for pattern to include the binary if it is included
 f0aeaec  require the very latest facter to avoid problems because facter changed iphostnumber to ipaddress
 e06c661  Small bug fixes
 58cfd1e  Fixing the problem that lutter ran into; the issue seems to be that Facter could not find the ipaddress on the server.
 18de804  fixing log messages
 a7fadbe  fixing log messages
 43fdd89  Updated to version 0.16.5
 
 0.16.5
 ======
 054cc77  Adding release tag REL_0_16_5
 64a58e4  updating changelog for 0.16.5
 44f1579  Fixing a stupid bug i managed to introduce in 0.16.2 (probably) involving importing files with classes in them.  This is a better solution than what I had before the bug, anyway.  Also, some documentation fixes.
 a9df49d  Fixing some naming problems with crons, and adding appropriate tests
 e8c912d  Allowing dashes in class names, although grammar rules restrict it from working anywhere except node names or in tag().  They are valid in host names, and many companies have them in the host names; in fact, this fix is for a company with this exact problem -- they cannot use puppet with their nodes because all their hosts have dashes in the host names.
 37d2850  Switching to just using "preserve" for file copying in file#handlebackups
 8b0481c  Updated to version 0.16.4
 
 0.16.4
 ======
 66b8bfd  Adding release tag REL_0_16_4
 4b84ca9  updating changelog for 0.16.4
 b67a19b  Fixing #132, which involved creating a separate CA client and using it to retrieve the certificates.  There was more work to do because of the weird client/daemon/server heirarchy.
 a435d07  Updated to version 0.16.3
 
 0.16.3
 ======
 ab17248  Adding release tag REL_0_16_3
 3f08155  updating changelog
 2faa447  Bug fixes from OS X for 0.16.3
 5e246ab  Hopefully final bug fixes in preparation for 0.16.3
 cc5ce34  Fixing tests looking for pmap
 a1574a5  Fixing TransObject#to_type so that it does not modify the object being converted
 7825f49  Changing test for service paths; only testing if it is a directory if it is present.
 65f6656  Added some code that could be used later to make sure the user and mode are also copied on backups.
 0ad65e9  Adding a check to make sure the mode is copied over.
 84db91e  Fixing the docs a bit for the executables, adding a --daemonize option to puppetd and puppetmasterd so they can still be daemonized with debugging or verbosity enabled, and causing puppetd to fail to start if a PID file exists (and not setting a pid file if running with --onetime enabled).
 12c122c  Puppetd now has an option for listening -- just run the --listen option, and it will start up with a pelement server.  It will fail to start if the authconfig file (defaulting to /etc/puppet/namespaceauth.conf) is missing, since it defaults to access at this point.
 047e63f  Making file copying significantly faster -- i found an extra call to "describe" in file sources and an extra read/checksumming of the dest file
 94caa8a  Fixing #128.  md5lite was being used instead of full md5.  At this point, md5lite cannot be used for source copies.
 bcfc469  Adding in all of the patches necessary to make a prototype rails interface to puppet nodes work.  The biggest change is that there is now a separate NetworkClient class for every Client subclass, because otherwise you get namespace collisions.  Most everything other change is a relatively minor patch.
 9539dbb  Adding in all of the patches necessary to make a prototype rails interface to puppet nodes work.  The biggest change is that there is now a separate NetworkClient class for every Client subclass, because otherwise you get namespace collisions.  Most everything other change is a relatively minor patch.
 9b627cd  Trying to track down the bugs reported this morning, so I added some more test cases.  I did find a bug in the filebuckets, fixed it, and added a test case.
 
 0.16.2
 ======
 13c91ea  Adding release tag REL_0_16_2
 003e897  updating changelog for 0.16.1 and 0.16.2
 a78bf1e  adding "clean" mode to puppetca
 bda8e52  This should have been in 0.16.1.  Moving the "setclass" statements around so that classes are set before a given class's code is evaluated, so it can be tested within the code, within node defs, components, or classes.
 
 0.16.1
 ======
 77bf69c  Adding release tag REL_0_16_1
 bff9463  Adding sum type to the retrieved sum if it is not already there.  This provides backwards compatibility for existing cache files.
 feff317  removing unnecessary debugging
 baa412c  Adding "defined" functino to puppet, so you can now test whether a given class or definition is defined.
 46ce36b  Creating a simplistic, generic function framework in the parser, so it is now very easy to add new functions.  There is a pretty crappy, hardwired distinction between functions that return values and those that do not, but I do not see a good way around it right now.  Functions are also currently responsible for handling their own arity, although I have plans for fixing that.
 ccc4d95  Modifying non-existent-package test to make sure syncing fails, and modified ports package type to check the error output instead of the return code, because the portinstall command returns 0 even on failure.
 e64bd22  Fix ownership on server files (trac #122) Change ownership on /var/puppet
 9fe0b37  removing patch from red hat spec file
 
 0.16.0
 ======
 2492328  Adding release tag REL_0_16_0
 a0b4553  Final commit before 0.16.0
 63cdc6c  making corrections to pass tests on freebsd
 d9fd002  Go some work started on developing authorization, but I have made little progress.  I might wait on this for the next point release.
 4a029d9  pelement listing now works
 d91b7df  Added a list class method to just about all types, and it seems to actually work for everyone.  Now just to add a list method to the pelement server.
 a9b67cc  Adding a "list" class method to most types, and using it in the tests for the pelement server to verify that objects can be copied using it.  I expect that most package types other than apt/dpkg are not yet working with these tests.
 e24a299  A simple first version of an object (called "pelement") server is now in place.  There is not yet a client, and the tests are pretty simple so far -- only files have been tested yet.  I had to make a significant number of modifications to the file object in order to get this all to work, and one of the big changes I made is to the internals of the checksum state.
 ac04981  Actually adding the ports file that provides freebsd port support
 3f9e918  Adding freebsd ports support
 c83bc91  fixing test to know that i skipped alerts
 538bc0c  Fixing service stopping; I had the %x{} command quoted
 6f66011  Fixin #102.  The syslog name is now either the name if the process (if that name includes "puppet" in it) or "puppet-" and the name of the process.  Also removing the "alert" test messages, since they result in a wall.
 d2634ba  Fixing #118; the hash is now always 8 hex characters, 0-padded.  Also changed the CA cert name to the FQDN of the host serving the CA, rather than "CAcert".
 449f662  Fix handling of run files so services can't be started twice (reported with patch by soul916 at gmail.com)
 21584a9  Don't create empty log files in %post (based on report by soul916 at gmail.com)
 a564e49  Changing the log level of the "defaulting to base service type" message
 d56870c  Fixing a bunch of small bugs, mostly found by testing on solaris, and added a check to the test system that points out memory growth
 0478f78  changing set to tag in the tests
 26f18a2  Fixing puppetca so it does not call chuser; instead, it is configured to create all of the files with the correct permissions and ownership (using Config#write and Config#writesub).
 c3961ae  Adding doc generation for exe arguments
 133ad87  Oops, typo in client/master.rb
 689dbf4  Adding --test option to puppetd (it enables --onetime, --no-usecacheonfailure, and --verbose), and modifying the docs a bit.
 cd9ea80  Adding locking to the master client, so that only one copy of puppetd will be running.  This should make it safe to run puppetd manually while it is also running normally.
 71793fb  Changing "set" to "tag"
 f522a7e  Adding the host name as a tag (stripped of the domain name)
 373fb3b  Modifying "setclass" on scope to check the validity of class names, now that "set" can be used to set them manually, and added a test for it.
 8df349c  Fixing the language side of #109.  Added a "set" keyword.
 de0d1dd  Adding a few informative facts on the server side: serverversion, servername, serverip. And only printing the parse time in the interpreter if it is not a local connection.
 bca4f5e  Adding the puppet client version to the fact list as "clientversion"
 9f92a3d  Adding the puppet client version to the fact list as "clientversion"
 4d75041  Adding a "tag" metaparam
 201aa02  Adding simple benchmarking, and using it in a few of the more obvious places.  Also, fixed a bug in Scope#gennode.
 0507486  Fixing #117. If only one value was provided, then it was not placed in an array, yet AST::Selector expected an array.  The grammar needs to have some abstraction added or something, because I seem to have encountered this bug for every ast type that supports arrays internally.
 ae4b12e  Revamp the yumrepo type to deal with repositories defined anywhere in yum's config files. Adds a generic module Puppet::IniConfig for parsing ini-style files
 8df6e84  another small mount fix; this time, for stupid os x
 88dd992  committing version changes
 d10a638  Committing an important fix to mounts; since i am sure no one has downloaded 0.15.3, i am just going to rerelease 0.15.3 with this fix in it
 
 0.15.3
 ======
 abf09dc  Adding release tag REL_0_15_3
 83d5236  updating changelog for 0.15.3; I need these exec fixes for my client
 e5be7d3  Adding autoloading for types and service types, also.
 fcce820  Okay, last one, hopefully.  Modifying checks to support arrays.
 37a4a55  And, one more time.  My test for the last bug did not actually retrieve, so it did not enounter the problem, and i had also forgotten to add the "check" boolean to the checks.  Hopefully this will be the end of exec bugs for the day.
 4ab74ce  Fixing checks so that they can run even if the set cwd does not exist
 50ffa7f  adding a bit of debugging
 1e4abae  moving cwd existence check into "sync" instead of "validate"
 7dae24f  Fixing a small bug in type.rb that ignored false values (instead of nil values), another small bug in value setting that resulted in the file and line appearing twice in errors, and added validation to all of the checks in :exec (along with testing for all of it).
 b0edb35  removing patch from spec file
 
 0.15.2
 ======
 feab8d9  Adding release tag REL_0_15_2
 122cf58  updating changelog in preparation for 0.15.2
 013cfd2  Adding darwinport type.
 9697354  differentiating openbsd from freebsd, adding freebsd, and autoloading package types instead of manually loading them
 f540ec8  fixing a couple small bugs in doc generation
 668342e  fixing Config#mkdir test to not check gid on any BSD, since they appear to ignore egid when making directories or files
 572648e  adding deprecation notice
 84693d6  adding some docs
 2b27545  renaming; i hate bsd
 ee65279  Fixing #103.  There are now no such things as node scopes; the entire tree is evaluated on every node connection, and node facts are set at the top-level scope.  This includes,um, the code; the last commit was accidentally just test changes.
 c3c413e  Fixing #103.  There are now no such things as node scopes; the entire tree is evaluated on every node connection, and node facts are set at the top-level scope.
 a0728c0  removing the parser dir
 8db837a  getting rid of the parser tree, and moving everything into the language dir
 d4a5b48  loading yumrepo in the test, since it is not being loaded in the main code
 e8c0471  Fixing a couple of bugs in preparation for 0.15.2; mostly they were in the testing system and resulted from changing :File to :Manifest in server/master
 9230289  Disable yumrepo type since it won't work with the FC5 repo files
 b5c759b  Fixing #108
 d8b4b0d  adding -e ability to puppet executable
 c0a9e5f  Change how names for nodes are specified: the 'node' keyword can be followed by a NAME or by single quoted text, i.e. fully qualified names for nodes must be enclosed in single quotes
 5d42cd5  Fixing the class file to actually store class names, not object ids.  Also added tests to make sure it all stays that way.
 c8be52b  Finally!  We now have mount support in OS X.  Ouch.
 3327dc8  Adding netinfo type and some tests
 97d5ab6  eliminating some debugging, and removing a small redundancy bug in nameserver.rb
 35e65de  Fixing authstore to use an array for ordering, rather than a hash, duh.
 c3b7d62  Bugfixes for OS X.  I had to do some shenanigans on type/file/ensure.rb -- it was testing whether the parent dir was writeable on object creation, and if not it was not setting ownership and such, so i added some post-creation checks that will fix ownership if it was not set correctly at creation time.
 caaa331  changing ssldir perms to 771, so non-root users can write to subdirs if they have permissions
 a791d98  Fixing a logging bug that apparently resulted from logging changes a while ago.
 4daf2c1  Adding apple package support, but it is very limited -- packages can only be installed, not upgraded or removed.
 f37154e  making a small change to the test, so failures are more informative
 7c7c223  Added a test for Type#remove, and fixed the method so it actually works. I was missing every other object, because i was iterating over the array being modified.  This caused the Config stuff to often fail, because objects were not correctly being removed.  All fixed now, though.
 72774bb  adding mkdir equivalent of Config#write
 e6f9163  Adding a "write" method to config objects, so that files can be easily written with the correct owner, group, and modes
 0f15e8c  fixing a bug that appeared somehow in port.rb, and adding mount and sshkey to the types being autoloaded
 0eae739  renaming filesystem to mount
 48d7fd6  Adding filesystem support, and modifying parsedtypes a bit to fix a bug where non-instance lines were being duplicated
 c7ae839  Manifests can now specify node names with fully qualified domain names, too.
 9b1e8d5  Accept a single file as a test to run in addition to a directory
 bdc819b  Remove unused should method; add more yum parameters to the type
 a9fdf9d  Disbale running puppetmaster as puppet until we've sorted out which files need what ownership (there's trouble with /etc/puppet/ssl right now when puppetmaster runs as non-root)
 1365103  New yumrepo type for basic management of the yum configuration of one repo.
 6d4e46c  Adding os x group management support
 791e4da  Committing support for group membership management.  Currently only works on Linuxes and other OSes that use "useradd" that support -G.
 932fd03  commiting package test fix that i thought i committed ages ago
 28602a6  Simplified as yum install can be used for both install and update
 
 0.15.1
 ======
 437ee64  Adding release tag REL_0_15_1
 95b762b  updating changelog for 0.15.1
 fc98ab0  Fixing #100.  I just added a bit of a hack to configuration parsing -- if a group is specified in a section that matches the name of the process, then it is assumed to be the group that the process should run as.  The problem is that we are reusing the term "group" here for both the run-group and the file-group.  Oh well.
 5dcf303  Using differents commands with yum depending on whether the package is currently installed or not.
 7e908a5  Removing ruby as a dependency, since too many packaging systems will have installed it differently
 73d051f  Fixing service enable/disable on solaris 10, and fixing some problems with the tests
 5e86634  Converted everything over for Puppet.  The Rakefile is, um, a *lot* shorter. :)
 8416f21  This version appears to work well with epm stuff
 fc68910  removing dos EOL chars
 086050d  Minor changes from Fedora Extras review
 72f1e8a  Don't mark puppetmaster for start by default; makes rpmlint happier
 6006a5a  Add little snippet on passing an additional option during system boot, but leave it commented out
 6af21e5  adding sbin directory
 c74fd81  Committing the EPM support.  I am in the process of moving this to a common library that all of my projects can use.
 271a8d2  Adding EPM package building.
 805b32b  Updated to version 0.15.0
 
 0.15.0
 ======
 1409cd6  Adding release tag REL_0_15_0
 92e3c1e  Updating changelog for 0.15.0.
 ec7d46e  fixing small bug in the test code when there are no packages to test
 f851be7  Adding upgrade ability to sun packages.  Currently it removes the old package and installs the new one.
 4d1c221  Changing the way the hosttest output is handled
 29ec706  adding some extra info to the ldap test
 76474ed  Fixing fileserver tests; apparently they were still broken from when i changed the fileserving interface to handle links.
 d7a75c5  Fixing small bug in symlink recursion
 f2c8218  Fixing #94.  When "ensure" is synced, it syncs the "enable" state at the same time.
 aed1f11  Ooops, did not save the docs before committing.
 5a47afd  Fixing #98.  Filebuckets now work throughout the system, and the puppetmasterd creates one by default.  I have also updated the :backup docs, adding an example.
 1b11697  reducing the log level for checksum warning about symlinks, really this time
 454247f  reducing the log level for checksum warning about symlinks
 08b36cc  Adding enhancement #92.  Unfortunately, I was not able to write test code to consistently verify that this works, because there is too much caching internally.  I verified it personally using my own configurations, but that is as good as I could do.  This indicates that caching should probably be rethought, so that there is some kind of global "do not cache anything" mechanism.
 97913d4  Fixing bug related to recursion testing
 c6230dd  Fixing rpms so they will automatically upgrade when you point Puppet to a new package file
 caa3d43  fixing broken test from my previous change
 fa9aab6  Fixing #82.  You can now specify comma-separated tags to get run in puppet or puppetd: puppetd --onetime --tags "enhost, facter" -v.  You cannot specify classes explicitly, but tags map well to classes and have the benefit of being more generic.
 414d364  Supporting rpm installs when a package source is specified
 8728920  Using undefined variables is no longer an exception, it just returns an empty string.
 4ee395b  Fixing small bug when autorequire returns an object instead of a string
 2cd67ad  There was a critical design flaw in the link recursion work I did previously, and fixing it required a decently large reorganization.  Everything is much, much cleaner now.
 02f91fc  Merging symlinks back into files.  Symlinks still exist but with a warning about deprecation.  Fixes #93.  Also the first time I have run any tests on OS X, so there are some bug fixes related to that.
 b336e7e  Parameters and states can now register regexes as allowed values.  Also, there are (finally) tests associated with params and states, although they should be much more comprehensive.
 b6d829b  Fixing #95.  I had to redesign how events were triggered; the transaction now individually triggers each subscription, so that it has control in how to respond to failures.  Eventually, this will lead the way to error handling within puppet, but for now, it just allows us to trigger every appropriate subscription, whether some have failed or not.
 782f85a  Creating a single, constistent method for writing files, instead of having :ensure, :content, and :source each have a slightly different mechanism.  This method also makes sure that the owner, group, and mode are always set on file creation, so extra runs are not necessary to make it work.
 2dbd7e1  Fixing #96.  Defaults are now set when the object is passed out by the scope, rather than when the object is created.  This is nice because it also moves awareness of the scope internals out of the AST object and back into the scope.
 7756f9a  Fixing #97.  I was wrong about the object type I had, so I was calling "type" with no arguments, which was causing the bug.
 2faff5d  lowering the log output for nonexistent files
 eb68633  Updated to version 0.14.1
 
 0.14.1
 ======
 ad0fa4b  Adding release tag REL_0_14_1
 cee0882  updating changelog for 0.14.1
 2351cd7  making case statements not create a new scope
 54fcdbd  fixing some more logging issues
 0549d03  Making some logging changes, and fixing a small bug in group management on missing files
 72d747b  Updated to version 0.14.0
 
 0.14.0
 ======
 783735c  Adding release tag REL_0_14_0
 b76004a  Fixing yum listing bug, and caching the "latest" value so it is not asked for so many times; this fixes #90.
 3c07deb  Committing the last changes, for now, to handling links.  You still cannot copy remote links, but you can either ignore or follow them.  I do not think we will be able to copy remote links until I have merged symlinks and files to be the same object type again.
 e9e88b0  Adding "links" parameter to files, and adding support for following or ignoring links to all of the states it can matter to.  I still need to modify "source" so that it behaves correctly when managing links.
 1099c4a  removing group ownership of the state file; I realized that the server does not ever actually write to it.
 5cca870  Switching from using "evaluate" to using "retrieve" when getting checksum values, since retrieval is sufficient, and evaluate keeps printing messages about changes.
 17d4b23  Fixing logging in the fileserver so it is always obvious where the logs are originating, and fixing a bit of debugging elsewhere.
 df74b62  fixing deprecation notice about services using "ensure" instead of "running"
 8c0a07a  removing extraneous debugging
 be4d3fd  fixing the mode of the yaml file
 f2ea9b7  Supporting variables as the test value in both case statements and selectors.
 1a3de8a  renaming
 549bc5f  Only setting group or owner on config files when running as root
 7ea739d  logging config changes at debug, instead of the normal log level
 aae9b2a  Definitions now always create their own context, which means that they cannot override elements in the containing scopes.
 451ba6d  upgrading to warning the message about using a cached copy
 faffd69  Updated to version 0.13.6
 
 0.13.6
 ======
 25614df  Adding release tag REL_0_13_6
 caa7f48  updating changelog for 0.13.6
 343dd08  Fixing tests so they do not chmod /dev/null to 640 (stupid tests).
 1a93c82  Fixing #68.  After tons and tons and tons of work, everything successfully configures itself, and the --genmanifest argument should actually work.  User and group creation will not necessarily work everywhere (in particular, Puppet uses dependencies to create the group first, but Fedora complains on user creation if the group already exists), but file and directory creation should.  The only downside is that there is a decent amount of extra information printed on daemon startup, as the daemon checks its config; this could maybe be seen as a bonus, though, I guess.
 95856ea  Okay, Puppet is now almost entirely capable of configuring itself.  I have not yet added the extra tests to puppetmasterd to make sure it can start as a normal user, and the executables still fail some simple tests because they are producing output when they start (I will get rid of the output), but overall things look pretty good.
 ff1df8e  Remove hte fedora-usermgmt stuff. As it turns out, it's not a Fedora Extras requirement to use it; so we'll just have useradd/groupadd allocate id's dynamically
 2db2317  Adding metadata to defaults
 179779d  Changing the setdefaults input format somewhat.  It is always a hash of some kind now.
 4574928  Intermediate commit; setdefaults now accepts both hashes and arrays
 6d8a1dc  Fixing user and group management in the config handling.
 65ed766  adding a connect log to the master server
 32cbc59  Fixing #70.  We now have user and group management on FreeBSD.
 8b5f709  Fixing bug #60.  Converting nodes to use types everywhere instead of names, and adding a localobjectable to keep track of what parameters have been defined locally.
 eda9d95  Fixing #64; multiple class definitions in the same scope is now an error, although using the same class name in different scopes is not an error.
 56116c2  Fixing bug #73; node names now appear only once in the path
 c894eb2  Fixing bug #75, providing support for unnecessary end commas.
 020499c  Removing all of the autoname code
 8c821c0  Mostly, this is a refactoring commit.  There is one significant new feature, though: overrides now only work within a class heirarchy, which is to say that a subclass can override an element in a base class, but a child scope cannot otherwise override an element in a base scope.
 37c10d1  Switching setclass to use object_ids instead of class names, and adding some comments.
 c5d8680  Fixing scopes and AST so that definitions and classes are looked for in the scopes, instead of in a global list
 ee818a9  Adding some debugging to list the states being changed when in debug mode
 63afa37  Fixing nodes so that their paths are printed correctly
 5056054  Removing timestamp debugging
 b119a72  Fixing output when user/group are not found
 772c7c8  Adding TERM to the signals being trapped
 503ad38  Fixing bug #72, where trailing slashes break file sourcing
 043fc33  adding commas to each line
 d06cd3f  removing the initial syslog dest setting
 f6ca82b  Updated to version 0.13.5
 
 0.13.5
 ======
 7ec2f82  Adding release tag REL_0_13_5
 85e4d31  adding changelog for 0.13.5
 2dffbee  Adding redhat service type, to support enabling and disabling a service
 7e5cc76  Fixing package types so you can specify the package type manually in a manifest
 7806618  removing extra error statement
 6e26a73  adding passwd converter
 3aff15e  Updated to version 0.13.4
 
 0.13.4
 ======
 d0b3f6c  Adding release tag REL_0_13_4
 1f05ad0  updating changelog for 0.13.4
 cfb0e36  updates
 89856ec  Adding a bit more logging
 82e02eb  Fixing bug when creating containers with parents
 31df227  Generate an error if the pattern for an import statement matches no file.
 beef01c  Properly figure out when updates are available. Previously, packages would neverbe updated because 'yum list foo' first prints the currently installed package. Now we use 'yum list updates foo'
 3ac5cd9  Incorporate initial feedback from FE review
 68aa302  Fix failure of test_importglobbing in test/parser/parser.rb
 70d2379  Enable passing --parseonly from the command line
 1ebb416  Adding single-quote syntactical element
 1fdb962  Changing transactions to be one-stage instead of two, and changing most of the type classes to use "obj[:name]" instead of "obj.name" where appropriate, because "obj.name" might be a symbolic name (e.g., File.unlink(file.name) will not do what you want if file.name == "sshdconfig" but file[:path] == "/etc/ssh/sshd_config")
 5f8d615  Removed some of the autorequire stuff from :exec because it created untenable require loops, and created a test case for some complicated exec + file recursion.  The test case fails, and I want to have a clean committed repository before i mess much more in trying to fix it, which might actually not be possible.
 6cc8157  Duh, removing some debugging
 5f4335f  Adding logoutput parameter to :exec
 89702d8  Fixing symbolic naming bug where symbolic names were being ignored in some cases
 7d15fe1  Updated to version 0.13.2
 
 0.13.2
 ======
 d0bbab5  Adding release tag REL_0_13_2
 037b7ac  Changed the parsedtype definition of exists(), and fixed a few smaller bugs.  Last code commit before 0.13.2
 6fe01ce  Tracked down a few other bugs; everything now passes on debian in preparation for 0.13.2
 8602932  Changing "answerfile" to "adminfile", adding "responsefile", and autorequiring both.
 d1cd443  Fixing users so that they can use a group created by Puppet, and they also now autorequire that group.  To do so, I modified Puppet::Util.gid, which required that I fix Puppet::Type#merge to support merging managed and umanaged objects, which required fixing a bug in Puppet::Type#managed?, and I also changed the ensure state to only default to a value, when the object is managed, which required that I change the defaults system to support default procs that do not return a value.  In other words, lots of fixes for a smallish problem, but we are much better off now.
 4df3468  Fixing the order of arguments when using admin files with sun packages
 20b65e7  Some important bug fixes in the parsedtypes types; this all started from the submitted bug today, but I added :absent support to most params.
 6cfee76  Committing the initial ldap support -- puppet can now look up node configurations in ldap.  The test scripts currently only work on my home network.
 1994263  Adding --enable/--disable locking for puppetd.  You can now disable puppetd from running by creating a lock file, which is useful if you are testing a configuration and want puppetd not to run for a bit.
 798b3be  Adding a general "check" mechanism to :exec, so it is now terribly easy to define a new check to perform, converted :creates and :refreshonly to use that mechanism, and then added :onlyif and :unless as new checks.  Also added any files they mention as autorequire files.
 376725e  Adding --loadclasses option to puppet
 f098485  Correcting some path problems with symlink, and changing "target" state to "ensure"
 3f15cb8  Fixing :target reference in pfile.rb
 9508bd0  Correcting some path problems with symlink, and changing "target" state to "ensure"
 64eafa8  Updated to version 0.13.1
 
 0.13.1
 ======
 ac8f3ae  Adding release tag REL_0_13_1
 a456c4d  updating alias docs to pass ReST checks
 1a05ed2  updating changelog and docs for :alias
 89d37f6  Fixing some problems with cron tab management, and creating Puppet::Util.{u,g}id methods.
 96388cb  Fixing locking.  It apparently was not working on OS X, and I was not syncronizing access in threads -- i assumed locks themselves were a sufficient sync point.
 2be25d5  Making the language name a real alias.  Now all objects in Puppet support specifying both the name and the namevar, or just a name and having the namevar set.
 7f7b5c6  Change in how logging is defaulted: by default logs go to :syslog, unless the user explicitly gives at least one --logdest argument, in which case logs only go to the destinations the user gave.
 b13b5ed  Set the Release tag in the spec file to 1 when the version is changed
 8c02ffd  Adapt specfile to the fact that puppetmaster now automatically runs as user puppet. Add default config files that send logs to /var/log/puppet.
 d629a80  Fix version in last changelog entry (makes rpmlint happy)
 44071d0  Updated to version 0.13.0
 
 0.13.0
 ======
 4751fce  Adding release tag REL_0_13_0
 2cb5cb3  Updating changelog for 0.13.0
 387db24  Adding answerfile support to sun pkgs.
 2ce061a  adding some documentation
 cd7a637  removing errant warning
 ccd0121  Fixing small problem where checksum retrieving did not look in the cache; this was only ever a problem in cases where checksums have no "should" value set, which is generally only the case on the fileserver, but it caused the fileserver to replace checksum values on every retrieval.
 8eab733  Fixing the conflict between ensure and source.  Ironically I had already made sure there was no conflict with "content", but I had forgotten "source".
 adda8f0  Checksums now get correctly updated for both the ensure and content state when those states are used
 8e4cf22  first bug fixed, where sources were not updating the checksum
 58db0ef  adding keyword
 b03635b  adding keyword
 01072a8  replacing all occurences of "is_a?" in the parser with "instance_of?"
 7ca3d3d  Fixing bug that occurs with only one argument
 195f2e9  wrapping all work in a single rescue clause
 59992b5  adding initial ldap schema
 0ba9d16  adding vim syntax stuff
 a5d2404  Simple emacs mode for editing manifests; only does pretty colors right now
 b98e65f  There is now full support for configuration files, and the entire system has been modified to expect their new behaviour.  I have not yet run the test across all test hosts, though.
 f1ffc34  Configuration parameters now require (and have) descriptions, and a set of configuration parameters can be converted to a configuration file, a manifest, or a component.  All I have to do now is integrate them into the executables.
 6affe22  Committing both the finalization of the config code, plus all of the code necessary to get basic isomorphism from code to transportables and back.  Mostly keyword and autoname stuff.
 59c7b02  Fix snippet_componentmetaparams test
 39d33ca  Temporary commit; configs now can be converted to manifests
 4ecfa7b  Config files now seem to work, so I am ready to start incorporating them.
 9114cbe  committing test code for bug lutter found
 d0436f1  Changes in lie with Fedora Extras requirements
 56bf12b  Fix processname tag
 7d711c0  Allow passing of options with 'once'; fix processname tag, add config tag.
 5590e3e  a couple small changes; the most significant is the addition of a class-level "eachattr" method, to avoid all of the calls to attrclass and attrtype
 30bf65f  Fixing a significant performance bug in file recursion, and trying to help performance a bit in attribute handling on types
 d5af359  Rewrote client init script since puppetd is now a proper demon.
 6637bb6  Install bin/puppet into /usr/bin/puppet, not /usr/sbin/puppet, since normal users are supposed to be able to run it
 931c159  Fix rpm packaging; include conf/ in tar ball, use conf files from tarball in spec file
 4ada6af  Fixing class storage -- it was not working for nodescopes
 8db35ec  Caching Time objects instead of numbers, since Bignum does not seem to be YAMLable
 96b761b  Fixing waitforcert so that the client can actually add the certs once it receives them
 c7f9942  Adding release tag REL_0_12_0
 cf82cfa  Updated to version 0.12.0
 
 0.12.0
 ======
 2c35151  Adding 0.12.0 release tag
 282cfcf  Updated to version 0.12.0
 1186069  Small mods to the packaging stuff
 87904d3  RPM release is almost entirely there, it just needs to be integrated into release management
 9b2afcb  Fixing some logging issues
 ae2575b  Adding the event-loop stuff to the repository and switching to using it.  Also, breaking many classes out into their own class files.
 18e8e74  Committing most of the scheduling stuff.  There is still a bit of work to do in terms of how puppetd interacts with scheduling, but the bulk of the work is done.
 258114d  Modifying docs, and adding scheduling hooks
 0cb51f3  Fixing a small checksumming bug, reorganizing the client stuff a bit, and adding freshness checking for the configuration, so the config is recompiled every time nor is it downloaded unless it has been recompiled
 f49b103  Updated to version 0.11.2
 
 0.11.2
 ======
 36f6e05  Adding release tag REL_0_11_2
 c372a7d  modding changelog for 0.11.2
 6bab167  Made lots of small changes, mostly to help usability but also fixed a couple of key bugs
 ed39be9  Fixing most types to allow no statements
 3d458ef  Updated to version 0.11.1
 
 0.11.1
 ======
 4bbb952  Adding release tag REL_0_11_1
 c3df525  modifying changelog for 0.11.1
 060b8bd  Adding openbsd packaging support
 ada3aee  Fixing problems where objects were passing @parameters[:param] objects, instead of specifically retrieving the value
 f36c7d1  Updated to version 0.11.0
 
 0.11.0
 ======
 1d2095b  Adding release tag REL_0_11_0
 3700b37  Adding an "ensure" state where appropriate, and significantly reworking the builtin docs.
 92a780a  Added "ensure" state to some classes, and added infrastructure for it to work elsewhere.
 83906a2  Adding sshkey class plus tests, and adding "aggregatable" methods to type.rb
 c67fb7b  Adding another host to the test lists, adding some test data, and modifying how hosts parse
 ad9d365  Adding a bit better logging and checking to file access
 87b3bb1  Moving ast classes into separate files
 1d4638a  Added "finish" method, using it in Type.finalize, and moved autorequire and setdefaults to it.
 a6e367e  Changing host and port aliases to also create Puppet aliases.  This involved futzing around with the attr* methods in Type.rb, to make sure states are always checked first.
 c8b6401  Fixing up the parsedtypes, fixing Type.eachtype to ignore structure types
 bbf2c54  Adding /etc/services support
 0c17149  finalizing cron and host management, hopefully
 df6ff9e  Abstracting host support so it should easily support other types
 5309479  Abstracting host support so it should easily support other types
 3f15e38  Adding initial host support.  I can promise that this will soon (hopefully almost immediately) be abstracted to make it easy to add new file types.
 f420135  Converting transport format to YAML instead of Marshal, and caching the file in a YAML format, also.  This required a significant rework of both Transportable classes.  Lastly, I am also now caching the list of classes in a class file in /etc/puppet.
 8aa331d  Adding further notes about openssl
 4092a78  Fixed a couple of warnings, fixed a critical bug having to do with case statements (where there is only one listed option), and did a couple of other cleanups.
 c5782df  Adding "content" state to files, and string interpolation handles escaped whitespace characters.
 b0ea70d  Adding 0.10.2 stuff
 6b6c49b  Updated to version 0.10.2
 
 0.10.2
 ======
 f7211e3  Adding release tag REL_0_10_2
 1cf05ff  Services now work at least somewhat on solaris 10, and service testing is pretty different.
 4c4f530  Fixing dependencies to not depend on file order.  Added Puppet::Type.{finalize,mkdepends,builddepends}
 21410a2  Fixing documentation generation, and fixing aliasing so that objects can safely be aliased to themselves
 29b00fb  Adding "alias" metaparam; you can now create as many aliases as you want for any of your objects.
 411ab22  Adding autorequire to files, and added the cwd to the list of files to be required for exec. Also, exec catches inline files and autorequires them.
 97fb6c9  Adding generic autorequire mechanism, and thus removing it from exec
 11b5463  Adding a requires? method to types, fixed the bug where exec fail when Puppet is downloading the script to execute, and modified "exec" to autorequire any managed scripts
 932b783  Updated to version 0.10.1
 
 0.10.1
 ======
 dc012b1  adding 0.10.1 release tag
 854f16b  modifying changelog for 0.10.1
 89d0050  Adding Sun support and fixing the last remaining bugs related to the daemon changes i just made
 45ac512  Supporting puppetmasterd running as a non-root user, and doing some basic message cleanup
 45c91e3  Adding some extra feedback
 7616289  Fixing init path default
 e5ac196  Adding some consistencies to the executable tests.  All exe tests now pass on OpenBSD, although the only real problem was that ruby was in /usr/local/bin.
 dccafc7  Updating Puppet to work with the new Facter
 b7974b5  Updated to version 0.10.0
 
 0.10.0
 ======
 8458a0d  Adding 0.10.0 release tag
 48031dd  Describing 0.10.0 changes
 48ba030  Modifying hosttest
 f00a7db  All tests pass now, although the lack of service support on os x means that i have now disabled services on it
 4275227  updates
 cbf10c5  Merging changes from the head of the rework1 branch, r 784
 23f982e  Undoing the merge that happened in 785
 1d73973  Merging in refactoring from version 774 into version 784
 3ba696d  updates
 cb51688  converting waitforcert to an int
 cedefab  adding ftools require statement to install.rb
 7594411  Adding a host test task
 86cc467  renaming the module, so it behaves better with people's svn clients
 2994cbc  fixing rakefile
 3b9c9be  Updated to version 0.9.4
 6af79cc  Removing tests from the list of tasks
 e611f2c  adding some better readme stuff
 b532a30  adding things to the change log, and modifying the order of the steps
 584652c  Disabling most documentation generation except for the API docs, and wrapping the StatusServer in the xmlrpc check
 0e0fdac  Updated to version 0.9.3
 
 0.9.3
 =====
 d4a9f3e  Adding release tag
 e2e2fb3  some updates to the typegen stuff, even though i may still not use it
 5302921  Fixing two reported bugs in cron jobs.  Cron jobs correctly change when fields other than the command are updated, and they do not continually refresh when the command has trailing spaces
 592c24d  adding some comments
 f9f84bf  removing "host" as a keyword; it was an alias for "node"
 4eaf13a  converting storage from Marshal to YAML
 3c14db1  adding Util.lock, and switching storage to using it
 5ce5b95  removing any direct references to /tmp in tests
 84bf289  fixing files being put directly into tmp
 a03b03f  removing ruby shebang at the top of all of the files
 2a5bbd0  final updates for 0.9.2
 58ef35d  updates
 dd727ef  removing marks
 9f942b0  fixing tests to work from any CWD
 58c0df1  fixing incredibly annoying bug where os x returns stupidly large uid when uid is below 0
 42c077f  updates from os x
 f815654  updates
 5082132  adding cfengine module, which required passing the cfengine classes all the way through the stack to the scope
 c205bf6  fixing filesources so that the first found file is copied, and adding a test case
 6960034  fixing puppet to default to using the console for output
 d5bd1bc  Mostly fixing exec so it either captures stderr or runs as a user; Process.euid was not working correctly
 a4562bf  Lots of refactoring, and added the capture_stderr method
 42a9d9a  Adding "isomorphic?" method to classes, and testing for isomorphism before throwing a conflict
 300a163  Further progress towards the next release.  Lots of small bugs fixed, the paths look much better now, and Transportable is much cleaner.
 14d8186  Making paths work a little more intelligently
 0335743  adding config file stuff, but not using it yet.  I have decided to release the next version without them.
 ba76eb2  Cleaning up tests resulting from the changes to the parser
 e605a5c  The language now verifies some resemblance to closurehood.  I now only need to fix the library to expect this behaviour.
 526deef  Fixed merging of state values, but I have not yet solved merging of parameter or metaparam values, since they are quite different.
 9e1c63a  Protecting from bug in Syslog, and fixing some more log messages
 76176a9  central logging is fully functional now, but it is painfully slow, so it is disabled by default
 b6c63f6  Central logging now works, although there appear to be a few kinks to work out.
 0ae5e33  Adding logging methods to all Puppet::Element instances, and converting all instance log statements to use those methods.  Additionally modified logging to take advantage of this by including the path of the logging object in the output.  Logs will still need some cleanup to avoid duplicate information.
 0d3db79  adding tags and path accessors
 a8645a4  Further small bug fixes towards running puppet on my network
 df8dbba  fixing sources so that they always have a corresponding checksum state
 e8912d5  files and directories are now created as the correct user and group if they are set
 1b74e8e  The Puppet::Util.asuser function now works; had to slightly modify user.rb to make checking work.  In addition, exec.rb now takes advantage of it.  I also decided to make a small change to type.rb -- validstates now only returns state names, not names and states.
 32d89ba  fixing certmgr tests
 f732880  Getting rid of the tc_ prefix to test cases
 8fe558c  general cleanup, as i move towards running it locally
 5ab12f9  fixing path to facter
 f036778  Apt-cache was showing more information that I thought, so I had to redo how I was collecting the most recent package version
 a232e5c  Made tweaks here and there to get it running better on my local network.  I am inches away from that happening.  All tests pass.
 a6d0292  adding better docs to packages
 3cd8ee9  "latest" is now a valid value for packages, and yum support is also included
 66db3d8  making service changes; it is still basically non-functional except in the degenerate case of using "init"
 194dab3  Adding some semantic tagging.  It is not exactly full-featured yet, and it is not used at all, but it was sufficient for some proof-of-concept stuff in preparation for the conference
 55d7bbd  adding tag support to scopes and the transportable class
 e563189  switching test classes back to modules -- making them classes causes too many empty tests to run every time
 9d3aaad  removing the redundant pfile from the pfile state file names
 ed42371  Switched @should to an array, so all objects can now handle that.  I have not yet gone through and done the other cool things that can result, but that will have to wait until tomorrow.  Also, I moved all of the pfile states into separate files, since the file was getting unweildy.
 6af0e0e  added overrides ability
 0d6241c  switching all relationships to be centrally maintained and to use symbolic references, rather than literal ones; also going through and making all tests pass again after mucking with services
 a96bdac  Okay, services are now managed, um, entirely differently.  I have the beginnings of a system for supporting different service management frameworks, although I currently only support <nothing> and init scripts
 47ba186  adding a test for includes
 9464224  moving specific packaging support into separate files
 f48f14a  fixing behaviour when files are missing
 5bb8c4a  fixing output in noop
 abcac81  Rearranging the packaging support a bit -- it is now more clear and significantly easier to understand, maintain, and enhance.
 8211df0  Many, many changes toward a completely functional system.  The only current problems with my home config are that apache's stupid init script does not do status and that packages are not working as non-root users (which makes sense).
 d20ac8e  Hoping this will get rid of the directory being printed
 4c13c10  Nodes now support inheritance, for better or for worse.
 781c69b  The new "include" syntax works now.
 400b103  fixing "ignore" documentation to parse RST correctly.
 5590148  Okay, all tests pass again.  The work done on nodes will take a little while to clarify and such, but it should work pretty well.
 f7d9b83  I am still somewhat in mid-change, but I have made the biggest changes to making nodes work correctly.  The core code works, but I still need to fix my various test cases
 03f5733  adding a ParsedFile class to handle figuring out whether a file has changed
 f757556  converting tc_relationships.rb to the test base class
 5dc3cb0  Okay, significant change -- classes no longer accept arguments (which makes things simpler but encourages the user of global variables, which is bad), and classes are finally singletons, meaning they will only ever be evaluated for each node a single time.  I still need to make nodes work correctly, but that is going to involve modifying the parsing system and a bit more
 0747b4c  adding stinkloads of comments to ast.rb (I am trying to go through and better comment my code over time), refactoring some of the AST classes, and working towards a more sensible class/definition/node distinction
 d6982d5  adding some new language tests
 48155b8  added log, metaloglevel and @metaparams to support setting loglevels
 041ca4b  switching log.rb to raise Puppet::DevError events
 16c9f83  My cfengine2puppet config now entirely parses.  The biggest problem I ran into is that my glob-based parsing was only returning the results of the last parsed file, instead of collecting all of the results.
 23d3c93  adding --noop to puppet executable, and removing some extraneous comments
 a345931  Successfully parsed my entire converted cfengine configuration; these are all fixes for bugs i found as a result.  I have not tried to execute the configuration yet.
 a8bdada  Users and groups now work on OS X.  I had to make some key changes to how transactions and state changes work -- the most important is that it is no longer an error to try to sync a state that is already in sync.  I could not find another way to handle all user states being out of sync but the first state actually syncs everything.
 6654c4c  fixing users on normal machines
 106d397  Users and groups now nearly work on normal machines and on os x, and I think I have a decent platform for expansion to some of the other important elements like hosts (probably most important after users and groups).  Some tests are still failing on os x, because netinfo sucks, but I will hopefully be able to figure out a solution soon.  Stupid OS X and NetInfo.
 42deabb  all tests for users and groups pass again on fedora, debian, and solaris
 e0d1d31  temporary commit so i can move to my workstation; groups and users are way b0rked
 29c291a  Creating a "change_to_s" method on State, so individual states can override and and determine how they get printed
 80a2808  Cron is now fully functional and tested on 3 platforms.  In order to make it work, I had to do some modifications to TransObject#to_type and Type.create, but all tests pass now.  Type.create is now handling errors on creating objects, so if you try to create an invalid object you will just get nil returned, rather than receiving an error.
 e25e8c6  adding keywords
 aebfef0  adding keywords
 11d3d24  cron is working, but i want to write quite a few more test cases
 036ba7a  small fixing to merge(), and changing output of statechange
 093963e  finishing up merge method
 ac0454a  making "Type.new" private, and switching to "Type.create", so that i can merge new objects with existing objects and such; converted all files, and tested them
 f7116e5  switching FileTesting to a class, and modifying test suites as appropriate
 7861269  removed directory output
 bf701dc  adding extra checks to make sure networking is secure, and refactoring a heckuva lot of test
 0c97bb1  fixed problem using arrays
 897de46  cleaning up tests a bit; mostly just making sure tests clean up after themselves, but also doing some rearrangement and fixing a list() call
 6767dd2  debugged ignore in fileserver, added tests to ignore tc and fixed server.list in tc for filesources and fileserver
 39aaa99  fixing some tests
 6c6ff03  moving some testing and debugging around
 192c07b  fixing non-netinfo group
 9ebb767  fixing non-netinfo group
 669ae38  modifications to eliminate code duplication in state creation, mostly to support cron
 ae00500  preparations for supporting netinfo in users
 610f95c  switching groups back to having namevar be a parameter instead of a state
 2a6710b  fileserver still has a bug
 ec66034  added ignore to fileserver and pfile
 3d5f5a1  adding cron stuff; it does not work at all yet
 0d3024f  adding globbing to import
 5438eff  removed comp.sync and replaced system mkdir -p
 79961e1  added test case for ignore
 157953a  added ignore to pfile
 51948bd  adding example configs
 d43dc86  tracked down some sticky bugs related to having false values and empty strings; all fixed now, and all tests pass again, including the new tests that cover the bugs i found
 aca4cf8  fixing error handling so that failed objects are completely destroyed; they were receiving events even though they were supposed to be gone
 0a4e392  fixing component flattening and sorting; it was not working for cases where objects inside of components had dependencies from other components
 58ca9d1  adding snippet test to verify correct behaviour with missing exec path; also, adding "creates" parameter to exec
 f9df523  intermediate commit so cron is not loaded
 4dd1dd8  adding more comments from talking to andy
 3306cc7  incorporating comments from talking to andrew
 29fa170  incorporating comments from talking to andrew
 d0eb566  some small fixes
 ee1eba2  small updates
 f69abc9  adding cfengine to puppet parser, but it is not even remotely close to functional yet
 8f7b191  fixing groups again after getting them to work with netinfo
 da6590d  group management now works on os x, although it is six shades of really nasty.  Netinfo is a nightmare.
 3726cee  adding debug setting to the top-level test class
 99db7bc  reverting changes in the reverse order of what i executed them
 8f0ef3f  removing debugging
 2213430  making states capable of being the namevar
 923226e  all tests now pass on solaris 10x86; i had to do some stupid hacking with base64 for it to work, and i am working getting a much better base class for all test classes
 edc392d  adding a break if randomization takes too long
 4cc12a8  finishing up user and group support for now
 9e4ed0c  rearranging some documentation
 24b1c67  adding scopetest
 b77d295  adding user and group classes (although user class is not yet functional), and added "is(state)" and "should(state)" methods for retrieving the respective values on a specified state
 4f2812a  changing rollback() to do event handling also
 72638e6  adding simple newcomp() method to base test class
 795a5a0  adding all of the work necessary for tidying
 f7a5f87  removing DEFAULTPORT stuff
 21244f4  fixing small bug in setting default port
 c0c958b  changing some documentation methods around
 3fb6f49  rearranging puppetdoc to not separate states and parameters, and to allow undocumented states
 75ec054  committing initial tidy stuff, so i can move to the laptop
 0d01770  cleaning up obviated methods
 747c3f6  defining $name in each component scope, and adding test case
 f49ffa3  defining configstatted
 750b880  removing if-related keywords
 008cea5  fixing error calls
 e1bf0e1  fixing bug where remote server name is ignored
 e1de002  Fixed small bug that caused the config files to be parsed on every connection
 5c0fb02  fixing documentation for file source state
 6a96fcc  adding file reread to master, although it is plenty hackish
 cff3a5b  fileserver config file now reloads when it is more than 60 seconds out of date
 998b415  correcting documentation on autosign in puppetmasterd, and switching the autosign.conf file to use the same authstore as fileserver.conf
 7f274a4  catching a potential security problem -- requiring that "path" always be set for a fileserver mount
 8a99636  adding a "--noop" option along with a test case for it
 f65563d  changing default hostname to "puppet", and adding --parseonly option along with a test case for it
 0629065  fixing puppet to use correct method and adding a real test case for it
 82ac86e  changing default manifest location to /etc/puppet/manifests/site.pp
 3087f85  changing version number for beta
 e28e11b  removing need for zip in rakefile
 fc20167  UPdated rakefile
 914764b  As Christian requested, I am no longer downcasing facts I receive from Facter.  Also, removing some outdated files
 eab7314  bumping up the default log level for changes from info to notice
 cc48367  I did not have good puppetd tests, so I missed the fact that I was calling the wrong class in puppetd.  Fixed.
 65d1375  disabling print of library warnings, since webrick and openssl have far too many warnings for comfort
 cdfaa5e  adding RDoc::usage documentation to all executables
 f279535  This should be the commit that brings us to Beta 1.  All tests pass, although I get some (gracefully handled) failures in tc_metrics.rb, and there is now a config file for the fileserver module, including authorization specification for it.  I have also reworked error handling in the xmlrpc client and server so errors should propagate more correctly.
 28be88c  Adding authorization store, initially just used for file serving but eventually for all authorization, most likely
 814a9b0  adding config file parsing
 9ec321e  recompiling parser after removing extraneous debugging
 773be96  Added GPL license
 48a2e0f  making array-as-name work in the language, and adding some more test snippets
 66b3355  Certificates now verify!
 386ebee  replacing if statements with case statement, and adding defaults for both selectors and case statements
 583a9c6  remote filecopying now works
 5b20c92  Have done a significant reorganization of how clients work, also, along with some interesting trouble shooting on components
 ba51e70  fixing checksum generation -- i was causing some weird bugs by using the same indicator in different cases, and i added a test for invalid checksum types
 fb3cff7  small comment change
 dde841f  Created a Handler base class for all of the server handlers, which allows a lot of the manual work to now be automatic
 49e3e37  splitting normal file tests and source tests into different files
 a8fff85  ignoring remote file owner when not running as root
 f68fe00  moving all server handlers into a specific server subdirectory
 129dad7  removing obsolete file
 51294a0  moving rake file to the trunk dir
 6029ef7  Moving all files into a consolidated trunk.  All tests pass except the known-failing certificate test, but there appear to be some errors that are incorrectly not resulting in failurs.  I will track those down ASAP.
 e87eb58  adding test to verify require does not kick off an event
 4741eef  Execution order is now based on dependency relationships, and those relationships correctly propagate up and descend into components.  There is also an event test suite now, along with a (currently simple) component test suite.
 63309c3  fixing test base class
 f026884  just fixed an incredibly ugly bug where @parent meant both parent array and parent class
 78939cc  passing file and line to all objects
 51ffd6f  trying to create a testing base class
 54e5eb4  moving
 4f0750b  adding
 9f84742  all tests pass except a certificate test i do not know how to fix
 163db7c  a basic first test of puppetmasterd now passes
 a3e03e2  all non-executable tests pass now
 d49a98e  further progress towards passing tests
 2be10b5  all tests pass except those related to puppetd; i am going to significantly reorganize how serving is done
 6eac358  updated version number to allow gem install
 8d71cd9  Added rake for Puppet, '--version' to puppet and test case for Puppet.version
 cfaee58  more progress towards a functional daemon
 3cb04cb  setting up http to log to a separate file
 adc10d8  setting up http to log to a separate file
 c7380c9  renaming
 cb1956d  adding daemon helper module
 bb4b5a5  done a lot of work on certificates; all tests except one puppetca test pass
 e2e2474  removing obsolete files
 0f7d185  fact.rb is obsolete
 af1b979  function.rb is obsolete
 fc0ba4b  fixing directory mode creation
 5bcae96  renaming again
 2687652  renaming openssl to certauthority
 aacd780  removing comments and making @csr a class attribute
 4b5c5bf  fixing error output
 c0b0975  adding creation rollback
 f654f2d  returning transaction from client.config()
 a6a1148  all tests now pass on os x
 f3c1487  adding better error handling for missing paths
 77e1cf0  fixing verbose output to be better and easier to manage
 9c7c71c  passing state, so more info can be extracted
 afcb2ee  adding a bit more output
 bc3a433  committing recent changes for testing
 7b14e39  a bit of refactoring, and a bit more functionality
 0fce775  okay, switch all cert management to the library, instead of using the openssl binary
 a1d206a  moving
 6ba0e10  certificate management; yay
 de4e5bf  oops; removing errant notice msg
 223cc9f  cleaning up the defaults system even more
 74dac8f  adding some consistency and tests to the whole puppet defaults system
 8bf85e2  adding tests for puppet defaults
 d14e1b4  uh
 4af2559  renaming to avoid name conflicts
 5fa0c20  all tests pass again
 edc2842  local filebuckets are now tested with files
 e041c8a  basic filebucketing is now working
 cf37c06  Moved documentation to project website.
 9f2aaac  more changes to documentation
 952a76c  working on documentation
 54895da  Updated README, moved the old one to documentation/
 2d1e643  Updated doc/big-picture doc/structures, Added rst formating to puppetdoc, and added doc strings for types, states, params, and metaparams.
 700b965  dpkg/apt package installation and removal now works
 e685ddb  fixing statefile creation
 01666f6  fixing lib loading test
 075ffd7  making changes necessary to pass tests on all available platforms
 b5f6a54  fixing solaris packaging
 ffe318c  fixing packaging to work with rpm, too
 64b55c1  creating FileTesting module in puppettest.rb, and getting recursion working with symlinks
 9d8f754  adding some attributes to errors
 dcbbef7  adding symlink back as a separate object
 e078329  adding symlink back as a separate object
 60965c5  removing silly message
 f624cd5  making the console output slightly less redundant
 848df27  okay, last try on sources hopefully -- no failures, and basic functionality all seems to be working
 cc67845  fixing package listing
 326b4ad  fixing exec tests to work with new event stuff
 fa6569d  okay, sources seem to be much more understandable here -- only the recursion function is recursive
 5351eb9  adding some error checking
 60e02de  not dump/loading for local client/server
 8ec8c8d  sources now pass all tests
 a33d5d4  everything seems to actually be working now, including getting the correct file list back
 2d34f8e  Ha! finally got recursion and sourcing working together
 bc38169  redoing how arguments are handled in type.rb -- it is much cleaner now
 973385f  first versions
 c577e57  reducing debugging
 99eedb3  reducing debugging
 8f718da  recursive file copying now works even with some limited number of errors
 aa59473  okay, file sourcing actually seems to work now
 9a5477b  checkpoint commit
 0e94644  moving setpath to parampath=, as a param method
 3a67efa  adding "=" to metaparam methods, and allowing types to use methods for params
 de91dbd  temp commit before i change the whole way that i am doing source + recursion
 9ba72f5  removing, since pfile now has link functionality
 311218b  removing, since pfile now has link functionality
 6f4f821  downcasing the values of all facts
 b1f3fb8  switching facts to be auto-provided by the client
 357afbb  removed type.method() syntax, and replaced it with Type { default => value} syntax -- i still need to add test cases
 f38bdef  changing path stuff to be service-specific
 84f721d  modifying failer stuff
 3d725d9  adding more validation methods
 f2b6762  reducing to one statefile definition
 ad9913b  converting debug() back to Puppet.debug()
 13945c5  converting debug() back to Puppet.debug()
 668b9de  converting debug() back to Puppet.debug()
 c04b337  converting debug() back to Puppet.debug()
 3c4181c  adding methods callable from language
 88071eb  making rpm the default package manager for all linuxes, with exceptions allowed
 ca87010  defaulting to rpm for everyone i don't know anything about
 ebe779f  adding rpm as the default type for Fedora
 fbafa84  updates
 b9c064e  Updated install script to include all bin files.
 96c37e3  using old name method, since it is required to make names unique given how classes currently work
 e97e2d9  fully qualifying warning method, because it is not being imported for some reason
 a984d66  disabling metrics tests on machines missing RRD
 78bcfdc  adding path stuff everywhere, although i had to keep component names kind of funky
 99a9f4b  adding link functionality
 d6e2102  toying with some doc stuff
 3f9bb25  removing an obsolete VERBOSE setting
 5ff4b02  removing some debugging
 bf09132  lots of refactoring
 cc78949  in the middle of a bunch of refactoring; committing so that others can try to replicate the segfault i am seeing
 1f2c866  doing some refactoring
 e19ca97  converting to "include Puppet" and not qualifing output methods
 8177700  hopefully, finally resolving recursive file creation problems
 01a9905  moving namevar translation to a method
 fffc09c  swapping console colors
 2062aac  changing comments
 75e27cf  cleaning up bugs in the tests, and adding more error checking around the bugs
 0417fb5  adding refreshonly parameter
 6e9975c  found a bunch of bugs in Puppet::Storage, plus some bugs in how file recursion was being tested and thus some real bugs in the system
 256b84e  adding a to_s method
 d14dc32  fixing storage class; it was not actually correctly retrieving state from disk
 96f3980  adding Puppet#recmkdir utility function, and making sure Log and Storage create their own files and directories as necessary
 649d59a  adding some more tests for recursion plus checksumming, because they are somewhat incompatible for directories
 cb95dc7  ok, verbose => info
 459287c  duh, somehow added Blink calls in there...
 600f272  adding cwd parameter to exec
 4157fa0  exec stuff all works now, end to end
 2c1f637  fixing some nasty bugs related to parameter checking
 05d59fd  fixing a nasty bug related to recursion and nonexistent files
 5b7fd63  fixing some nasty bugs related to parameter checking
 9e0ab28  adding string vs. symbol testing
 8f1da62  adding logdest config
 cf817e7  changing Log.destination to Log.destination=()
 d36b4c0  disabling debug by default
 420062d  changing Log.destination to Log.destination=()
 c718044  adding the exec stuff
 3441b82  finishing rename of file class
 f250d92  renaming to remove naming conflicts
 26bc12b  further output cleanup, and fixed the problem with tc_server.rb leaving sleeper processes lying around
 bb7e283  fixing debugging to severely reduce output but allow it when debugging a specific service
 c16ca53  changing warnings to debug
 00343e3  basic rpm stuff now works
 2b2975f  fixing metrics tests to work with everything else
 0ac91ef  correctly returning events
 0c4254a  metric testing and graphing now works in the library, although nothing has been done in the language
 573d301  adding some more tests for loglevel stuff
 0ba9d71  adding rpm as RedHat package manager
 b6b1f5a  logging now exactly supports the list of levels that syslog supports, and multiple destinations (syslog, files, and console) are now supported
 e3c3283  renaming message.rb to log.rb
 2b3b15e  temporary changes to prepare for a rename
 8395639  puppetest.rb should probably be puppettest.rb
 cd48af7  renaming blink to puppet
 60783f0  renaming blink to puppet
 8f95084  renaming blink to puppet
 6f07413  you can now at least test for whether a package is installed, although you still cannot do anything if it is not -- the barrier is knowing how to get the package
 65c2a69  adding validparam() to Blink::Type
 500a135  fixing file.rb so it works on Darwin, also
 90b9b2d  updates
 3f0687b  updates
 5324062  adding new classes and tests
 0dad57a  md5 summing now works, all the way through!
 d1f2187  checksums now work, but not all the way through yet
 18d755a  Rahh! component dependencies now work!
 922994e  everything passes all of the tests, but i do not think the component-level metaparams are working
 cdfdfb9  adding some more tests for Blink::Type
 d42efbe  done some more work on making components act like normal objects, but now i need to figure out how to spread events up the tree, rather than just point to point
 0ab9685  dependencies now work, although you cannot yet specify them for components
 2b97b47  there are now explicit tests for transactions, including rollback, and more tests involving querying
 b46135f  adding simple query syntax stuff
 7fecad3  i now have basic events: you can only specify simple object types as requirements, but hey, it works -- refresh() gets called
 02f1185  renaming events to event
 d70229b  update before rename
 c0d86a4  intermediate; no extra functionality yet, but moving away from discussing namevars outside of a given class
 d86e479  All tests pass again, and i have added Type.allclear to remove all existing type instances, thus making it much easier to run all of the parser and lexer and then server tests; i have also added remove server tests
 ebc02a8  okay, everything works again, although it still might be a touch fragile
 5477f36  i am giving up on fileparsing for now; it does not work yet
 576a031  okay, bin/blinker works again, and i have modified both client and server to be a bit easier to use non-networked
 03741b4  we now have networking it is very basic right now: the server gets passed a file name, and the client gets passed the server to which to connect.  The client gets its config, evaluates it, and exits
 4a4438d  okay, implicit iteration now occurs at least at object definition time
 4a9c1a2  enabling mucking with debug and noop
 f91451d  yep, arrays are always passed
 d0d8df9  final fixes on passing methods through to types
 3a07a4d  typesettings now correctly pass all the way through and can only run specified methods, using "allowedmethods"
 12418e1  the tree transformations work throughout the whole system now
 f9a223c  transformations from the client through to the transactional execution now works!
 00a620d  unmoving
 135134c  updates
 4da3b51  moving
 259692c  moving
 3b33738  switched to just passing scopes around, instead of passing the interpreter object around
 529b9a7  file recursion now works
 4e03ed1  i can now execute simple scripts manually!
 ec88acf  i can basically actually do work now
 42dadad  moving
 817f571  adding lots of verbosity, and starting to actually make sure things execute -- tests are failing, tho
 2cce619  basic components now work
 49da910  we now have nested scopes, and we've got the beginnings of components, although many tests are currently failing
 7689d19  simplifying argument parsing in Blink#message
 08d4260  initializing @noop in element.rb
 865dffe  dealing with having moved the examples to the language area
 a1a7ae4  moving to the language tree
 85b9f91  everything works again, including components
 9ea0c30  making components work
 1f95fe2  moving component.rb to type/
 7df572b  removing most functionality, since type.rb already has it
 565554f  finishing reorganization of base classes and such; there is now a clear tree heirarchy, with parents and children -- all tests pass on the types, but there are still some issues with client/server stuff
 9843da6  cleaning up object tree and adding a simple virtual base class for both types and states
 d0c6b0c  adding transactions
 89d2381  moving event info out of type.rb
 3c6c0f7  removing elements.rb
 e452f00  preparing to remove elements.rb
 cf08be1  renaming statetree to elements
 b6d0f0c  first version of finalized base classes
 f984192  noop seems to basically be working, but i need to reorganize the whole type/state structure -- that is starting after this commit
 c01bc81  using the example syslog.conf instead of the one in /etc
 57194eb  adding some example debian configs
 6cd71f8  filetypes now support multiple record types, and newlines can be escaped
 7378765  completed the first step to enabling multiple record types in filetypes
 490854a  the client now executes "evaluate", which might not be a good thing -- i am getting failures if files do not exist, for instance
 6127e43  filerecord.rb: duh, fixing a small debug string printing bug
 371235b  reorganizing the FileType/FileRecord into a base class (TypeGenerator) and basing them off it
 7deba97  adding typegenerator baseclass
 b18d071  fact.rb is no longer a subclass of Blink::Type
 43a63db  fixing filetype and component to take into account changes type interface.rb and type.rb
 a16493d  type.rb: adding methods to simplify type initialization, and adding eachtype() to simplify testing
 69a1276  adding some tests on the interface methods in Blink::Type
 de360c9  renaming objects to types, since they are just subclasses of Blink::Type
 b872b72  renaming types to type everywhere; all tests now pass
 a50d461  changing types to type internally
 c0bc63f  moving types to type
 b85ac7b  renaming types.rb to type.rb
 9d163d0  changing Types to Type
 68409ef  adding
 cb5f54c  deprecating interface.rb
 974969d  final changes before deprecating
 f8b08b2  adding an fqpath method to state.rb
 ae13f00  adding name information and a FileRecordState class
 a489639  moving some methods around
 14c2308  adding markers
 a1bd01d  changing type[param] to return the state instead of the value
 41b7fbd  renaming oparse to filetype
 98374bc  renaming oparse to filetype
 8ab03d0  renaming oparse to filetype
 c2e83c5  renaming oparse to filetype
 2360201  adding some comments
 3904d2e  fixing most of the function call stuff
 13f16b6  the client is now successfully creating objects from the hashes passed by the server
 6140bee  making fact a real type
 d94d7a3  moving state.rb to types/
 e86cf4c  renaming "value" to "is"
 d8e8b7b  renaming state, and adding modification class
 c0c1f1a  renaming attributes to states
 6dce8fc  renaming objects to types
 a90af49  renaming objects to types
 5e19d7d  renaming objects to types
 afd4349  updates
 67fae6d  updates
 b4bb680  removing link when done
 c6755f5  adding class collection and naming stuff
 e5676ab  testing keyword
 f3d1118  removing some excess libs from blink.rb
 585c4fc  cleaning up the start script
 61f8434  cleaning up a bit
 52fe914  removing evaluate test
 69651dd  removing bogus output
 8fd8d62  removing output, and fixing path so it is not hardcoded
 9da1485  temporarily removing inclusion of time in output
 4d7bbaa  creating extra message methods
 0187bf7  removing execute bit
 6a82d07  adding readme
 3824817  copy test script
 67b7b34  okay, all tests pass again
 35f742c  adding client stuff to the library tree
 02ed7d3  reorganizing tests
 8bc935e  adding comments
 a0d0fa8  adding
 11b0374  moving client.rb to the library tree
 cb785bd  moving client.rb to the library tree
 8788552  fixing [] method in function.rb
 c86a770  adding operatingsystemrelease
 21ca565  renaming tc_functions.rb, and adding to ts_other.rb
 1aab204  functions mostly work
 c45c5c4  renaming
 06734a9  updates so i can rename
 9bf82b6  adding package source, initially including only files as a source
 e40d5f2  returning value instead of fact
 9fa899d  reorganizing
 4642515  reorganizing
 5807dce  reorganizing
 6ee8b4e  reorganizing
 5416017  reorganizing
 54e9b5e  adding structure
 
diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd
index 9036b505c..b6cf05736 100755
--- a/conf/solaris/smf/svc-puppetd
+++ b/conf/solaris/smf/svc-puppetd
@@ -1,66 +1,66 @@
 #!/bin/sh
 # This is the /etc/init.d file for puppetd
 # Modified for CSW
 #
 # description: puppetd - Puppet Automation Client
 #
 
 . /lib/svc/share/smf_include.sh
 
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetd.pid
+pidfile=/var/lib/puppet/run/agent.pid
 
 case "$1" in
 start)
     cd /
     # Start daemons.
 
     printf "Starting Puppet client services:"
 
     /opt/csw/sbin/puppetd
 
     printf " puppetd"
     echo ""
     ;;
 stop)
     printf "Stopping Puppet client services:"
     kill `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet client services:"
     kill -HUP `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 reload)
     printf "Reloading Puppet client services:"
 
     kill -HUP `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 status)
     if [ -f $pidfile ]; then
         pid=`cat $pidfile`
         curpid=`pgrep puppetd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0
         else
             exit 1
         fi
     else
         exit 1
     fi
 esac
 exit 0
 
 # $Id$
diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd
index 34f5a62e6..80e3d464a 100755
--- a/conf/solaris/smf/svc-puppetmasterd
+++ b/conf/solaris/smf/svc-puppetmasterd
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 
 . /lib/svc/share/smf_include.sh
 
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetmasterd.pid
+pidfile=/var/lib/puppet/run/master.pid
 
 case "$1" in
 start)
     cd /
     # Start daemons.
 
     printf "Starting Puppet server services:"
 
     /opt/csw/sbin/puppetmasterd
 
     printf " puppetmaster"
     echo ""
     ;;
 stop)
     printf "Stopping Puppet server services:"
     kill `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet server services:"
     kill -HUP `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 reload)
     printf "Reloading Puppet server services:"
 
     kill -HUP `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 status)
     if [ -f $pidfile ]; then
         pid=`cat $pidfile`
         curpid=`pgrep puppetmasterd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0
         else
             exit 1
         fi
     else
         exit 1
     fi
 esac
 exit 0
 
 # $Id$
diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index 34dd72f5d..9b7b0c8a7 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -1,93 +1,93 @@
 #!/usr/bin/env ruby
 
 # Script to clean up stored configs for (a) given host(s)
 #
 # Credits:
 # Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
 # which haven been initially posted by James Turnbull
 # duritong adapted and improved the script a bit.
 
 require 'getoptlong'
 config = '/etc/puppet/puppet.conf'
 
 def printusage(error_code)
   puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
   puts "\n Options:"
   puts "--config <puppet config file>"
   exit(error_code)
 end
 
 
       opts = GetoptLong.new(
-                
+
     [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
     [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
     [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
-        
+
     [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
 )
 
 begin
   opts.each do |opt, arg|
     case opt
     when "--config"
       config = arg
 
     when "--help"
       printusage(0)
 
     when "--usage"
       printusage(0)
 
     when "--version"
       puts "#{Puppet.version}"
       exit
     end
   end
 rescue GetoptLong::InvalidOption => detail
   $stderr.puts "Try '#{$0} --help'"
   exit(1)
 end
 
 printusage(1) unless ARGV.size > 0
 
 require 'puppet/rails'
 Puppet[:config] = config
 Puppet.parse_config
-pm_conf = Puppet.settings.instance_variable_get(:@values)[:puppetmasterd]
+pm_conf = Puppet.settings.instance_variable_get(:@values)[:master]
 
 adapter = pm_conf[:dbadapter]
 args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}
 
 case adapter
   when "sqlite3"
     args[:dbfile] = pm_conf[:dblocation]
   when "mysql", "postgresql"
     args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
     args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
     args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
     args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
     args[:port]     = pm_conf[:dbport] unless pm_conf[:dbport].to_s.empty?
     socket          = pm_conf[:dbsocket]
     args[:socket]   = socket unless socket.to_s.empty?
     connections     = pm_conf[:dbconnections].to_i
     args[:pool]     = connections if connections > 0
   else
     raise ArgumentError, "Invalid db adapter #{adapter}"
 end
 
 args[:database] = "puppet" unless not args[:database].to_s.empty?
 
 ActiveRecord::Base.establish_connection(args)
 
 ARGV.each { |hostname|
   if @host = Puppet::Rails::Host.find_by_name(hostname.strip)
     print "Killing #{hostname}..."
     $stdout.flush
     @host.destroy
     puts "done."
   else
     puts "Can't find host #{hostname}."
   end
 }
 exit 0
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 902f5bf5c..18c1e8cbd 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -1,165 +1,165 @@
 # Try to load rubygems.  Hey rubygems, I hate you.
 begin
   require 'rubygems'
 rescue LoadError
 end
 
 # see the bottom of the file for further inclusions
 require 'singleton'
 require 'facter'
 require 'puppet/error'
 require 'puppet/util'
 require 'puppet/util/autoload'
 require 'puppet/util/settings'
 require 'puppet/util/feature'
 require 'puppet/util/suidmanager'
 require 'puppet/util/run_mode'
 
 #------------------------------------------------------------
 # the top-level module
 #
 # all this really does is dictate how the whole system behaves, through
 # preferences for things like debugging
 #
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.0'
+  PUPPETVERSION = '2.6.1'
 
   def Puppet.version
     PUPPETVERSION
   end
 
   class << self
     include Puppet::Util
     attr_reader :features
     attr_writer :name
   end
 
   # the hash that determines how our system behaves
   @@settings = Puppet::Util::Settings.new
 
   # The services running in this process.
   @services ||= []
 
   require 'puppet/util/logging'
 
   extend Puppet::Util::Logging
 
   # The feature collection
   @features = Puppet::Util::Feature.new('puppet/feature')
 
   # Load the base features.
   require 'puppet/feature/base'
 
   # Store a new default value.
   def self.setdefaults(section, hash)
     @@settings.setdefaults(section, hash)
   end
 
   # configuration parameter access and stuff
   def self.[](param)
     case param
     when :debug
       return Puppet::Util::Log.level == :debug
     else
       return @@settings[param]
     end
   end
 
   # configuration parameter access and stuff
   def self.[]=(param,value)
     @@settings[param] = value
   end
 
   def self.clear
     @@settings.clear
   end
 
   def self.debug=(value)
     if value
       Puppet::Util::Log.level=(:debug)
     else
       Puppet::Util::Log.level=(:notice)
     end
   end
 
   def self.settings
     @@settings
   end
 
   def self.run_mode
     $puppet_application_mode || Puppet::Util::RunMode[:user]
   end
 
   def self.application_name
     $puppet_application_name ||= "apply"
   end
 
   # Load all of the configuration parameters.
   require 'puppet/defaults'
 
   def self.genmanifest
     if Puppet[:genmanifest]
       puts Puppet.settings.to_manifest
       exit(0)
     end
   end
 
   # Parse the config file for this process.
   def self.parse_config
     Puppet.settings.parse
   end
 
   # XXX this should all be done using puppet objects, not using
   # normal mkdir
   def self.recmkdir(dir,mode = 0755)
     if FileTest.exist?(dir)
       return false
     else
       tmp = dir.sub(/^\//,'')
       path = [File::SEPARATOR]
       tmp.split(File::SEPARATOR).each { |dir|
         path.push dir
         if ! FileTest.exist?(File.join(path))
           begin
             Dir.mkdir(File.join(path), mode)
           rescue Errno::EACCES => detail
             Puppet.err detail.to_s
             return false
           rescue => detail
             Puppet.err "Could not create #{path}: #{detail}"
             return false
           end
         elsif FileTest.directory?(File.join(path))
           next
         else FileTest.exist?(File.join(path))
           raise Puppet::Error, "Cannot create #{dir}: basedir #{File.join(path)} is a file"
         end
       }
       return true
     end
   end
 
   # Create a new type.  Just proxy to the Type class.
   def self.newtype(name, options = {}, &block)
     Puppet::Type.newtype(name, options, &block)
   end
 
   # Retrieve a type by name.  Just proxy to the Type class.
   def self.type(name)
     # LAK:DEP Deprecation notice added 12/17/2008
     Puppet.warning "Puppet.type is deprecated; use Puppet::Type.type"
     Puppet::Type.type(name)
   end
 end
 
 require 'puppet/type'
 require 'puppet/parser'
 require 'puppet/resource'
 require 'puppet/network'
 require 'puppet/ssl'
 require 'puppet/module'
 require 'puppet/util/storage'
 require 'puppet/status'
 require 'puppet/file_bucket/file'
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
index 0a8fbc155..2fec38bf2 100644
--- a/lib/puppet/application.rb
+++ b/lib/puppet/application.rb
@@ -1,404 +1,404 @@
 require 'optparse'
 
 # This class handles all the aspects of a Puppet application/executable
 # * setting up options
 # * setting up logs
 # * choosing what to run
 # * representing execution status
 #
 # === Usage
 # An application is a subclass of Puppet::Application.
 #
 # For legacy compatibility,
 #      Puppet::Application[:example].run
 # is equivalent to
 #      Puppet::Application::Example.new.run
 #
 #
 # class Puppet::Application::Example << Puppet::Application
 #
 #     def preinit
 #         # perform some pre initialization
 #         @all = false
 #     end
 #
 #     # run_command is called to actually run the specified command
 #     def run_command
 #         send Puppet::Util::CommandLine.new.args.shift
 #     end
 #
 #     # option uses metaprogramming to create a method
 #     # and also tells the option parser how to invoke that method
 #     option("--arg ARGUMENT") do |v|
 #         @args << v
 #     end
 #
 #     option("--debug", "-d") do |v|
 #         @debug = v
 #     end
 #
 #     option("--all", "-a:) do |v|
 #         @all = v
 #     end
 #
 #     def handle_unknown(opt,arg)
 #         # last chance to manage an option
 #         ...
 #         # let's say to the framework we finally handle this option
 #         true
 #     end
 #
 #     def read
 #         # read action
 #     end
 #
 #     def write
 #         # writeaction
 #     end
 #
 # end
 #
 # === Preinit
 # The preinit block is the first code to be called in your application, before option parsing,
 # setup or command execution.
 #
 # === Options
 # Puppet::Application uses +OptionParser+ to manage the application options.
 # Options are defined with the +option+ method to which are passed various
 # arguments, including the long option, the short option, a description...
 # Refer to +OptionParser+ documentation for the exact format.
 # * If the option method is given a block, this one will be called whenever
 # the option is encountered in the command-line argument.
 # * If the option method has no block, a default functionnality will be used, that
 # stores the argument (or true/false if the option doesn't require an argument) in
 # the global (to the application) options array.
 # * If a given option was not defined by a the +option+ method, but it exists as a Puppet settings:
 #  * if +unknown+ was used with a block, it will be called with the option name and argument
 #  * if +unknown+ wasn't used, then the option/argument is handed to Puppet.settings.handlearg for
 #    a default behavior
 #
 # --help is managed directly by the Puppet::Application class, but can be overriden.
 #
 # === Setup
 # Applications can use the setup block to perform any initialization.
 # The defaul +setup+ behaviour is to: read Puppet configuration and manage log level and destination
 #
 # === What and how to run
 # If the +dispatch+ block is defined it is called. This block should return the name of the registered command
 # to be run.
 # If it doesn't exist, it defaults to execute the +main+ command if defined.
 #
 # === Execution state
 # The class attributes/methods of Puppet::Application serve as a global place to set and query the execution
 # status of the application: stopping, restarting, etc.  The setting of the application status does not directly
 # aftect its running status; it's assumed that the various components within the application will consult these
 # settings appropriately and affect their own processing accordingly.  Control operations (signal handlers and
 # the like) should set the status appropriately to indicate to the overall system that it's the process of
 # stopping or restarting (or just running as usual).
 #
 # So, if something in your application needs to stop the process, for some reason, you might consider:
 #
 #  def stop_me!
 #      # indicate that we're stopping
 #      Puppet::Application.stop!
 #      # ...do stuff...
 #  end
 #
 # And, if you have some component that involves a long-running process, you might want to consider:
 #
 #  def my_long_process(giant_list_to_munge)
 #      giant_list_to_munge.collect do |member|
 #          # bail if we're stopping
 #          return if Puppet::Application.stop_requested?
 #          process_member(member)
 #      end
 #  end
 module Puppet
 class Application
   require 'puppet/util'
   include Puppet::Util
 
   DOCPATTERN = File.expand_path(File.dirname(__FILE__) + "/util/command_line/*" )
 
   class << self
     include Puppet::Util
 
     attr_accessor :run_status
 
     def clear!
       self.run_status = nil
     end
 
     def stop!
       self.run_status = :stop_requested
     end
 
     def restart!
       self.run_status = :restart_requested
     end
 
     # Indicates that Puppet::Application.restart! has been invoked and components should
     # do what is necessary to facilitate a restart.
     def restart_requested?
       :restart_requested == run_status
     end
 
     # Indicates that Puppet::Application.stop! has been invoked and components should do what is necessary
     # for a clean stop.
     def stop_requested?
       :stop_requested == run_status
     end
 
     # Indicates that one of stop! or start! was invoked on Puppet::Application, and some kind of process
     # shutdown/short-circuit may be necessary.
     def interrupted?
       [:restart_requested, :stop_requested].include? run_status
     end
 
     # Indicates that Puppet::Application believes that it's in usual running run_mode (no stop/restart request
     # currently active).
     def clear?
       run_status.nil?
     end
 
     # Only executes the given block if the run status of Puppet::Application is clear (no restarts, stops,
     # etc. requested).
     # Upon block execution, checks the run status again; if a restart has been requested during the block's
     # execution, then controlled_run will send a new HUP signal to the current process.
     # Thus, long-running background processes can potentially finish their work before a restart.
     def controlled_run(&block)
       return unless clear?
       result = block.call
       Process.kill(:HUP, $PID) if restart_requested?
       result
     end
 
     def should_parse_config
       @parse_config = true
     end
 
     def should_not_parse_config
       @parse_config = false
     end
 
     def should_parse_config?
       @parse_config = true if ! defined?(@parse_config)
       @parse_config
     end
 
     # used to declare code that handle an option
     def option(*options, &block)
       long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).gsub('-','_')
       fname = symbolize("handle_#{long}")
       if (block_given?)
         define_method(fname, &block)
       else
         define_method(fname) do |value|
           self.options["#{long}".to_sym] = value
         end
       end
       self.option_parser_commands << [options, fname]
     end
 
     def banner(banner = nil)
       @banner ||= banner
     end
 
     def option_parser_commands
       @option_parser_commands ||= (
         superclass.respond_to?(:option_parser_commands) ? superclass.option_parser_commands.dup : []
       )
       @option_parser_commands
     end
 
     def find(name)
         self.const_get(name.to_s.capitalize)
     rescue
         puts "Unable to find application '#{name.to_s}'."
         Kernel::exit(1)
     end
 
     def [](name)
       find(name).new
     end
 
     # Sets or gets the run_mode name. Sets the run_mode name if a mode_name is
     # passed. Otherwise, gets the run_mode or a default run_mode
     #
     def run_mode( mode_name = nil)
       return @run_mode if @run_mode and not mode_name
 
       require 'puppet/util/run_mode'
       @run_mode = Puppet::Util::RunMode[ mode_name || :user ]
     end
   end
 
   attr_reader :options, :command_line
 
   # Every app responds to --version
   option("--version", "-V") do |arg|
     puts "#{Puppet.version}"
     exit
   end
 
   # Every app responds to --help
   option("--help", "-h") do |v|
     help
   end
 
   def should_parse_config?
     self.class.should_parse_config?
   end
 
   # override to execute code before running anything else
   def preinit
   end
 
   def option_parser
     return @option_parser if defined?(@option_parser)
 
     @option_parser = OptionParser.new(self.class.banner)
 
     self.class.option_parser_commands.each do |options, fname|
       @option_parser.on(*options) do |value|
         self.send(fname, value)
       end
     end
     @option_parser
   end
 
   def initialize(command_line = nil)
     require 'puppet/util/command_line'
     @command_line = command_line || Puppet::Util::CommandLine.new
     @run_mode = self.class.run_mode
     @options = {}
 
     $puppet_application_mode = @run_mode
     $puppet_application_name = name
 
     if Puppet.respond_to? :settings
       # This is to reduce the amount of confusion in rspec
       # because it might have loaded defaults.rb before the globals were set
       # and thus have the wrong defaults for the current application
       Puppet.settings.set_value(:confdir, Puppet.run_mode.conf_dir, :mutable_defaults)
       Puppet.settings.set_value(:vardir, Puppet.run_mode.var_dir, :mutable_defaults)
       Puppet.settings.set_value(:name, Puppet.application_name.to_s, :mutable_defaults)
       Puppet.settings.set_value(:logdir, Puppet.run_mode.logopts, :mutable_defaults)
       Puppet.settings.set_value(:rundir, Puppet.run_mode.run_dir, :mutable_defaults)
-      Puppet.settings.set_value(:mode, Puppet.run_mode.name.to_s, :mutable_defaults)
+      Puppet.settings.set_value(:run_mode, Puppet.run_mode.name.to_s, :mutable_defaults)
     end
 
     require 'puppet'
   end
 
   # This is the main application entry point
   def run
     exit_on_fail("initialize") { preinit }
     exit_on_fail("parse options") { parse_options }
     exit_on_fail("parse configuration file") { Puppet.settings.parse } if should_parse_config?
     exit_on_fail("prepare for execution") { setup }
     exit_on_fail("run") { run_command }
   end
 
   def main
     raise NotImplementedError, "No valid command or main"
   end
 
   def run_command
     main
   end
 
   def setup
     # Handle the logging settings
     if options[:debug] or options[:verbose]
       Puppet::Util::Log.newdestination(:console)
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
     end
 
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
   def parse_options
     # get all puppet options
     optparse_opt = []
     optparse_opt = Puppet.settings.optparse_addargs(optparse_opt)
 
     # convert them to OptionParser format
     optparse_opt.each do |option|
       self.option_parser.on(*option) do |arg|
         handlearg(option[0], arg)
       end
     end
 
     # scan command line argument
     begin
       self.option_parser.parse!(self.command_line.args)
     rescue OptionParser::ParseError => detail
       $stderr.puts detail
       $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'"
       exit(1)
     end
   end
 
   def handlearg(opt, arg)
     # rewrite --[no-]option to --no-option if that's what was given
     if opt =~ /\[no-\]/ and !arg
       opt = opt.gsub(/\[no-\]/,'no-')
     end
     # otherwise remove the [no-] prefix to not confuse everybody
     opt = opt.gsub(/\[no-\]/, '')
     unless respond_to?(:handle_unknown) and send(:handle_unknown, opt, arg)
       # Puppet.settings.handlearg doesn't handle direct true/false :-)
       if arg.is_a?(FalseClass)
         arg = "false"
       elsif arg.is_a?(TrueClass)
         arg = "true"
       end
       Puppet.settings.handlearg(opt, arg)
     end
   end
 
   # this is used for testing
   def self.exit(code)
     exit(code)
   end
 
   def name
     self.class.to_s.sub(/.*::/,"").downcase.to_sym
   end
 
   def help
     if Puppet.features.usage?
       # RH:FIXME: My goodness, this is ugly.
       ::RDoc.const_set("PuppetSourceFile", name)
       #:stopdoc: # Issue #4161
       def (::RDoc).caller
         docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{DOCPATTERN}`.chomp
         super << "#{docfile}:0"
       end
       #:startdoc:
       ::RDoc::usage && exit
     else
       puts "No help available unless you have RDoc::usage installed"
       exit
     end
   rescue Errno::ENOENT
     puts "No help available for puppet #{name}"
     exit
   end
 
   private
 
   def exit_on_fail(message, code = 1)
       yield
   rescue RuntimeError, NotImplementedError => detail
       puts detail.backtrace if Puppet[:trace]
       $stderr.puts "Could not #{message}: #{detail}"
       exit(code)
   end
 end
 end
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index f0e7f4d8f..2b75505fd 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -1,266 +1,270 @@
 require 'puppet/application'
 
 class Puppet::Application::Agent < Puppet::Application
 
   should_parse_config
   run_mode :agent
 
   attr_accessor :args, :agent, :daemon, :host
 
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     trap(:INT) do
       $stderr.puts "Cancelling startup"
       exit(0)
     end
 
     {
       :waitforcert => nil,
       :detailed_exitcodes => false,
       :verbose => false,
       :debug => false,
       :centrallogs => false,
       :setdest => false,
       :enable => false,
       :disable => false,
       :client => true,
       :fqdn => nil,
       :serve => [],
       :digest => :MD5,
       :fingerprint => false,
     }.each do |opt,val|
       options[opt] = val
     end
 
     @args = {}
     require 'puppet/daemon'
     @daemon = Puppet::Daemon.new
     @daemon.argv = ARGV.dup
   end
 
   option("--centrallogging")
   option("--disable")
   option("--enable")
   option("--debug","-d")
   option("--fqdn FQDN","-f")
   option("--test","-t")
   option("--verbose","-v")
 
   option("--fingerprint")
   option("--digest DIGEST")
 
   option("--serve HANDLER", "-s") do |arg|
     if Puppet::Network::Handler.handler(arg)
       options[:serve] << arg.to_sym
     else
       raise "Could not find handler for #{arg}"
     end
   end
 
   option("--no-client") do |arg|
     options[:client] = false
   end
 
   option("--detailed-exitcodes") do |arg|
     options[:detailed_exitcodes] = true
   end
 
   option("--logdest DEST", "-l DEST") do |arg|
     begin
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
       puts detail.backtrace if Puppet[:debug]
       $stderr.puts detail.to_s
     end
   end
 
   option("--waitforcert WAITFORCERT", "-w") do |arg|
     options[:waitforcert] = arg.to_i
   end
 
   option("--port PORT","-p") do |arg|
     @args[:Port] = arg
   end
 
   def run_command
     return fingerprint if options[:fingerprint]
     return onetime if Puppet[:onetime]
     main
   end
 
   def fingerprint
     unless cert = host.certificate || host.certificate_request
       $stderr.puts "Fingerprint asked but no certificate nor certificate request have yet been issued"
       exit(1)
       return
     end
     unless fingerprint = cert.fingerprint(options[:digest])
       raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'"
     end
     Puppet.notice fingerprint
   end
 
   def onetime
     unless options[:client]
       $stderr.puts "onetime is specified but there is no client"
       exit(43)
       return
     end
 
     @daemon.set_signal_traps
 
     begin
       report = @agent.run
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err detail.to_s
     end
 
     if not report
       exit(1)
     elsif not Puppet[:noop] and options[:detailed_exitcodes] then
       exit(report.exit_status)
     else
       exit(0)
     end
   end
 
   def main
     Puppet.notice "Starting Puppet client version #{Puppet.version}"
 
     @daemon.start
   end
 
   # Enable all of the most common test options.
   def setup_test
     Puppet.settings.handlearg("--ignorecache")
     Puppet.settings.handlearg("--no-usecacheonfailure")
     Puppet.settings.handlearg("--no-splay")
     Puppet.settings.handlearg("--show_diff")
     Puppet.settings.handlearg("--no-daemonize")
     options[:verbose] = true
     Puppet[:onetime] = true
     options[:detailed_exitcodes] = true
   end
 
   # Handle the logging settings.
   def setup_logs
     if options[:debug] or options[:verbose]
       Puppet::Util::Log.newdestination(:console)
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
     end
 
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
   def enable_disable_client(agent)
     if options[:enable]
       agent.enable
     elsif options[:disable]
       agent.disable
     end
     exit(0)
   end
 
   def setup_listen
     unless FileTest.exists?(Puppet[:authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}"
       exit(14)
     end
 
     handlers = nil
 
     if options[:serve].empty?
       handlers = [:Runner]
     else
       handlers = options[:serve]
     end
 
     require 'puppet/network/server'
     # No REST handlers yet.
     server = Puppet::Network::Server.new(:xmlrpc_handlers => handlers, :port => Puppet[:puppetport])
 
     @daemon.server = server
   end
 
   def setup_host
     @host = Puppet::SSL::Host.new
     waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : 120)
     cert = @host.wait_for_cert(waitforcert) unless options[:fingerprint]
   end
 
   def setup
     setup_test if options[:test]
 
     setup_logs
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     # If noop is set, then also enable diffs
     Puppet[:show_diff] = true if Puppet[:noop]
 
     args[:Server] = Puppet[:server]
     if options[:fqdn]
       args[:FQDN] = options[:fqdn]
       Puppet[:certname] = options[:fqdn]
     end
 
     if options[:centrallogs]
       logdest = args[:Server]
 
       logdest += ":" + args[:Port] if args.include?(:Port)
       Puppet::Util::Log.newdestination(logdest)
     end
 
     Puppet.settings.use :main, :agent, :ssl
 
+    # Always ignoreimport for agent. It really shouldn't even try to import,
+    # but this is just a temporary band-aid.
+    Puppet[:ignoreimport] = true
+
     # We need to specify a ca location for all of the SSL-related i
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.
     Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote
 
     Puppet::Transaction::Report.terminus_class = :rest
 
     # Override the default; puppetd needs this, usually.
     # You can still override this on the command-line with, e.g., :compiler.
     Puppet[:catalog_terminus] = :rest
 
     # Override the default.
     Puppet[:facts_terminus] = :facter
 
     Puppet::Resource::Catalog.cache_class = :yaml
 
 
     # We need tomake the client either way, we just don't start it
     # if --no-client is set.
     require 'puppet/agent'
     require 'puppet/configurer'
     @agent = Puppet::Agent.new(Puppet::Configurer)
 
     enable_disable_client(@agent) if options[:enable] or options[:disable]
 
     @daemon.agent = agent if options[:client]
 
     # It'd be nice to daemonize later, but we have to daemonize before the
     # waitforcert happens.
     @daemon.daemonize if Puppet[:daemonize]
 
     setup_host
 
     @objects = []
 
     # This has to go after the certs are dealt with.
     if Puppet[:listen]
       unless Puppet[:onetime]
         setup_listen
       else
         Puppet.notice "Ignoring --listen on onetime run"
       end
     end
   end
 end
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 66aa6c8a1..1f6c63286 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -1,215 +1,181 @@
 require 'puppet/application'
 
 class Puppet::Application::Doc < Puppet::Application
 
   should_not_parse_config
   run_mode :master
 
   attr_accessor :unknown_args, :manifest
 
   def preinit
     {:references => [], :mode => :text, :format => :to_rest }.each do |name,value|
       options[name] = value
     end
     @unknown_args = []
     @manifest = false
   end
 
   option("--all","-a")
   option("--outputdir OUTPUTDIR","-o")
   option("--verbose","-v")
   option("--debug","-d")
   option("--charset CHARSET")
 
   option("--format FORMAT", "-f") do |arg|
     method = "to_#{arg}"
     require 'puppet/util/reference'
     if Puppet::Util::Reference.method_defined?(method)
       options[:format] = method
     else
       raise "Invalid output format #{arg}"
     end
   end
 
   option("--mode MODE", "-m") do |arg|
     require 'puppet/util/reference'
     if Puppet::Util::Reference.modes.include?(arg) or arg.intern==:rdoc
       options[:mode] = arg.intern
     else
       raise "Invalid output mode #{arg}"
     end
   end
 
   option("--list", "-l") do |arg|
     require 'puppet/util/reference'
     puts Puppet::Util::Reference.references.collect { |r| Puppet::Util::Reference.reference(r).doc }.join("\n")
     exit(0)
   end
 
   option("--reference REFERENCE", "-r") do |arg|
     options[:references] << arg.intern
   end
 
   def handle_unknown( opt, arg )
     @unknown_args << {:opt => opt, :arg => arg }
     true
   end
 
   def run_command
-    return[:rdoc, :trac, :markdown].include?(options[:mode]) ? send(options[:mode]) : other
+    return[:rdoc].include?(options[:mode]) ? send(options[:mode]) : other
   end
 
   def rdoc
     exit_code = 0
     files = []
     unless @manifest
       env = Puppet::Node::Environment.new
       files += env.modulepath
       files << File.dirname(env[:manifest])
     end
     files += command_line.args
     Puppet.info "scanning: #{files.inspect}"
 
           Puppet.settings.setdefaults(
         "puppetdoc",
-        
+
       "document_all" => [false, "Document all resources"]
     )
     Puppet.settings[:document_all] = options[:all] || false
     begin
       require 'puppet/util/rdoc'
       if @manifest
         Puppet::Util::RDoc.manifestdoc(files)
       else
         options[:outputdir] = "doc" unless options[:outputdir]
         Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset])
       end
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       $stderr.puts "Could not generate documentation: #{detail}"
       exit_code = 1
     end
     exit exit_code
   end
 
-  def trac
-    require 'puppet/util/reference'
-    options[:references].each do |name|
-      section = Puppet::Util::Reference.reference(name) or raise "Could not find section #{name}"
-      section.trac unless options[:mode] == :pdf
-    end
-  end
-
-  def markdown
-    text = ""
-    with_contents = false
-    exit_code = 0
-    require 'puppet/util/reference'
-    options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      raise "Could not find reference #{name}" unless section = Puppet::Util::Reference.reference(name)
-
-      begin
-        # Add the per-section text, but with no ToC
-        text += section.send(options[:format], with_contents)
-        text += Puppet::Util::Reference.footer
-        text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
-        Puppet::Util::Reference.markdown(name, text)
-        text = ""
-      rescue => detail
-        puts detail.backtrace
-        $stderr.puts "Could not generate reference #{name}: #{detail}"
-        exit_code = 1
-        next
-      end
-    end
-
-    exit exit_code
-  end
-
   def other
     text = ""
     with_contents = options[:references].length <= 1
     exit_code = 0
     require 'puppet/util/reference'
     options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
       raise "Could not find reference #{name}" unless section = Puppet::Util::Reference.reference(name)
 
       begin
         # Add the per-section text, but with no ToC
         text += section.send(options[:format], with_contents)
       rescue => detail
         puts detail.backtrace
         $stderr.puts "Could not generate reference #{name}: #{detail}"
         exit_code = 1
         next
       end
     end
 
     text += Puppet::Util::Reference.footer unless with_contents # We've only got one reference
 
     # Replace the trac links, since they're invalid everywhere else
     text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
 
     if options[:mode] == :pdf
       Puppet::Util::Reference.pdf(text)
     else
       puts text
     end
 
     exit exit_code
   end
 
   def setup
     # sole manifest documentation
     if command_line.args.size > 0
       options[:mode] = :rdoc
       @manifest = true
     end
 
     if options[:mode] == :rdoc
       setup_rdoc
     else
       setup_reference
     end
   end
 
   def setup_reference
     if options[:all]
       # Don't add dynamic references to the "all" list.
       require 'puppet/util/reference'
       options[:references] = Puppet::Util::Reference.references.reject do |ref|
         Puppet::Util::Reference.reference(ref).dynamic?
       end
     end
 
     options[:references] << :type if options[:references].empty?
   end
 
   def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug)
     # consume the unknown options
     # and feed them as settings
     if @unknown_args.size > 0
       @unknown_args.each do |option|
         # force absolute path for modulepath when passed on commandline
         if option[:opt]=="--modulepath" or option[:opt] == "--manifestdir"
           option[:arg] = option[:arg].split(':').collect { |p| File.expand_path(p) }.join(':')
         end
         Puppet.settings.handlearg(option[:opt], option[:arg])
       end
     end
 
     # Now parse the config
     Puppet.parse_config
 
     # Handle the logging settings.
     if options[:debug] or options[:verbose]
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
 
       Puppet::Util::Log.newdestination(:console)
     end
   end
 end
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 777a50eaa..fde474907 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -1,156 +1,153 @@
 require 'puppet/application'
 
 class Puppet::Application::Master < Puppet::Application
 
   should_parse_config
   run_mode :master
 
   option("--debug", "-d")
   option("--verbose", "-v")
 
   # internal option, only to be used by ext/rack/config.ru
   option("--rack")
 
   option("--compile host",  "-c host") do |arg|
     options[:node] = arg
   end
 
   option("--logdest DEST",  "-l DEST") do |arg|
     begin
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
       puts detail.backtrace if Puppet[:debug]
       $stderr.puts detail.to_s
     end
   end
 
   def preinit
     trap(:INT) do
       $stderr.puts "Cancelling startup"
       exit(0)
     end
 
     # Create this first-off, so we have ARGV
     require 'puppet/daemon'
     @daemon = Puppet::Daemon.new
     @daemon.argv = ARGV.dup
   end
 
   def run_command
     if options[:node]
       compile
     elsif Puppet[:parseonly]
       parseonly
     else
       main
     end
   end
 
   def compile
     Puppet::Util::Log.newdestination :console
     raise ArgumentError, "Cannot render compiled catalogs without pson support" unless Puppet.features.pson?
     begin
       unless catalog = Puppet::Resource::Catalog.find(options[:node])
         raise "Could not compile catalog for #{options[:node]}"
       end
 
       jj catalog.to_resource
     rescue => detail
       $stderr.puts detail
       exit(30)
     end
     exit(0)
   end
 
   def parseonly
     begin
       Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types
     rescue => detail
       Puppet.err detail
       exit 1
     end
     exit(0)
   end
 
   def main
     require 'etc'
     require 'puppet/file_serving/content'
     require 'puppet/file_serving/metadata'
 
     xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket]
 
     xmlrpc_handlers << :CA if Puppet[:ca]
 
     # Make sure we've got a localhost ssl cert
     Puppet::SSL::Host.localhost
 
     # And now configure our server to *only* hit the CA for data, because that's
     # all it will have write access to.
     Puppet::SSL::Host.ca_location = :only if Puppet::SSL::CertificateAuthority.ca?
 
     if Puppet.features.root?
       begin
         Puppet::Util.chuser
       rescue => detail
         puts detail.backtrace if Puppet[:trace]
         $stderr.puts "Could not change user to #{Puppet[:user]}: #{detail}"
         exit(39)
       end
     end
 
     unless options[:rack]
       require 'puppet/network/server'
       @daemon.server = Puppet::Network::Server.new(:xmlrpc_handlers => xmlrpc_handlers)
       @daemon.daemonize if Puppet[:daemonize]
     else
       require 'puppet/network/http/rack'
       @app = Puppet::Network::HTTP::Rack.new(:xmlrpc_handlers => xmlrpc_handlers, :protocols => [:rest, :xmlrpc])
     end
 
     Puppet.notice "Starting Puppet master version #{Puppet.version}"
 
     unless options[:rack]
       @daemon.start
     else
       return @app
     end
   end
 
   def setup
     # Handle the logging settings.
     if options[:debug] or options[:verbose]
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
 
       unless Puppet[:daemonize] or options[:rack]
         Puppet::Util::Log.newdestination(:console)
         options[:setdest] = true
       end
     end
 
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     Puppet.settings.use :main, :master, :ssl
 
-    # A temporary solution, to at least make the master work for now.
-    Puppet::Node::Facts.terminus_class = :yaml
-
     # Cache our nodes in yaml.  Currently not configurable.
     Puppet::Node.cache_class = :yaml
 
     # Configure all of the SSL stuff.
     if Puppet::SSL::CertificateAuthority.ca?
       Puppet::SSL::Host.ca_location = :local
       Puppet.settings.use :ca
       Puppet::SSL::CertificateAuthority.instance
     else
       Puppet::SSL::Host.ca_location = :none
     end
   end
 end
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 327955b03..31d31c2d2 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -1,235 +1,239 @@
 # The client for interacting with the puppetmaster config server.
 require 'sync'
 require 'timeout'
 require 'puppet/network/http_pool'
 require 'puppet/util'
 
 class Puppet::Configurer
   class CommandHookError < RuntimeError; end
 
   require 'puppet/configurer/fact_handler'
   require 'puppet/configurer/plugin_handler'
 
   include Puppet::Configurer::FactHandler
   include Puppet::Configurer::PluginHandler
 
   # For benchmarking
   include Puppet::Util
 
   attr_reader :compile_time
 
   # Provide more helpful strings to the logging that the Agent does
   def self.to_s
     "Puppet configuration client"
   end
 
   class << self
     # Puppetd should only have one instance running, and we need a way
     # to retrieve it.
     attr_accessor :instance
     include Puppet::Util
   end
 
   # How to lock instances of this class.
   def self.lockfile_path
     Puppet[:puppetdlockfile]
   end
 
   def clear
     @catalog.clear(true) if @catalog
     @catalog = nil
   end
 
   def execute_postrun_command
     execute_from_setting(:postrun_command)
   end
 
   def execute_prerun_command
     execute_from_setting(:prerun_command)
   end
 
   # Initialize and load storage
   def dostorage
       Puppet::Util::Storage.load
       @compile_time ||= Puppet::Util::Storage.cache(:configuration)[:compile_time]
   rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err "Corrupt state file #{Puppet[:statefile]}: #{detail}"
       begin
         ::File.unlink(Puppet[:statefile])
         retry
       rescue => detail
         raise Puppet::Error.new("Cannot remove #{Puppet[:statefile]}: #{detail}")
       end
   end
 
   # Just so we can specify that we are "the" instance.
   def initialize
     Puppet.settings.use(:main, :ssl, :agent)
 
     self.class.instance = self
     @running = false
     @splayed = false
   end
 
   def initialize_report
     Puppet::Transaction::Report.new
   end
 
   # Prepare for catalog retrieval.  Downloads everything necessary, etc.
   def prepare
     dostorage
 
     download_plugins
 
     download_fact_plugins
 
     execute_prerun_command
   end
 
   # Get the remote catalog, yo.  Returns nil if no catalog can be found.
   def retrieve_catalog
     if Puppet::Resource::Catalog.indirection.terminus_class == :rest
       # This is a bit complicated.  We need the serialized and escaped facts,
       # and we need to know which format they're encoded in.  Thus, we
       # get a hash with both of these pieces of information.
       fact_options = facts_for_uploading
     else
       fact_options = {}
     end
 
     # First try it with no cache, then with the cache.
     unless (Puppet[:use_cached_catalog] and result = retrieve_catalog_from_cache(fact_options)) or result = retrieve_new_catalog(fact_options)
       if ! Puppet[:usecacheonfailure]
         Puppet.warning "Not using cache on failed catalog"
         return nil
       end
       result = retrieve_catalog_from_cache(fact_options)
     end
 
     return nil unless result
 
     convert_catalog(result, @duration)
   end
 
   # Convert a plain resource catalog into our full host catalog.
   def convert_catalog(result, duration)
     catalog = result.to_ral
     catalog.finalize
     catalog.retrieval_duration = duration
     catalog.write_class_file
     catalog
   end
 
   # The code that actually runs the catalog.
   # This just passes any options on to the catalog,
   # which accepts :tags and :ignoreschedules.
   def run(options = {})
     begin
       prepare
     rescue SystemExit,NoMemoryError
       raise
     rescue Exception => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err "Failed to prepare catalog: #{detail}"
     end
 
     options[:report] ||= initialize_report
     report = options[:report]
     Puppet::Util::Log.newdestination(report)
 
     if catalog = options[:catalog]
       options.delete(:catalog)
     elsif ! catalog = retrieve_catalog
       Puppet.err "Could not retrieve catalog; skipping run"
       return
     end
 
     transaction = nil
 
     begin
       benchmark(:notice, "Finished catalog run") do
         transaction = catalog.apply(options)
       end
       report
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err "Failed to apply catalog: #{detail}"
       return
     end
   ensure
+    # Make sure we forget the retained module_directories of any autoload
+    # we might have used.
+    Thread.current[:env_module_directories] = nil
+
     # Now close all of our existing http connections, since there's no
     # reason to leave them lying open.
     Puppet::Network::HttpPool.clear_http_instances
     execute_postrun_command
 
     Puppet::Util::Log.close(report)
 
     send_report(report, transaction)
   end
 
   def send_report(report, trans = nil)
     trans.generate_report if trans
     puts report.summary if Puppet[:summarize]
     report.save if Puppet[:report]
   rescue => detail
     puts detail.backtrace if Puppet[:trace]
     Puppet.err "Could not send report: #{detail}"
   end
 
   private
 
   def self.timeout
     timeout = Puppet[:configtimeout]
     case timeout
     when String
       if timeout =~ /^\d+$/
         timeout = Integer(timeout)
       else
         raise ArgumentError, "Configuration timeout must be an integer"
       end
     when Integer # nothing
     else
       raise ArgumentError, "Configuration timeout must be an integer"
     end
 
     timeout
   end
 
   def execute_from_setting(setting)
     return if (command = Puppet[setting]) == ""
 
     begin
       Puppet::Util.execute([command])
     rescue => detail
       raise CommandHookError, "Could not run command from #{setting}: #{detail}"
     end
   end
 
   def retrieve_catalog_from_cache(fact_options)
     result = nil
     @duration = thinmark do
       result = Puppet::Resource::Catalog.find(Puppet[:certname], fact_options.merge(:ignore_terminus => true))
     end
     Puppet.notice "Using cached catalog"
     result
   rescue => detail
     puts detail.backtrace if Puppet[:trace]
     Puppet.err "Could not retrieve catalog from cache: #{detail}"
     return nil
   end
 
   def retrieve_new_catalog(fact_options)
     result = nil
     @duration = thinmark do
       result = Puppet::Resource::Catalog.find(Puppet[:certname], fact_options.merge(:ignore_cache => true))
     end
     result
   rescue SystemExit,NoMemoryError
     raise
   rescue Exception => detail
     puts detail.backtrace if Puppet[:trace]
     Puppet.err "Could not retrieve catalog from remote server: #{detail}"
     return nil
   end
 end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 84e2d93fc..318ff416b 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1,796 +1,790 @@
 # The majority of the system configuration parameters are set in this file.
 module Puppet
   setdefaults(:main,
     :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process
-    is running as root or the user that ``puppet master`` is supposed to run as, it defaults to a system directory, but if it's running as any other user,
-    it defaults to being in ``~``."],
+    is running as root or the user that `puppet master` is supposed to run as, it defaults to a system directory, but if it's running as any other user,
+    it defaults to being in `~`."],
     :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this parameter is calculated specially, like `confdir`_."],
     :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
-      default is essentially $0 without the path or ``.rb``."],
-    :mode => [Puppet.run_mode.name.to_s, "The effective 'run mode' of the application: master, agent, or user."]
+      default is essentially $0 without the path or `.rb`."],
+    :run_mode => [Puppet.run_mode.name.to_s, "The effective 'run mode' of the application: master, agent, or user."]
   )
 
   setdefaults(:main, :logdir => Puppet.run_mode.logopts)
 
   setdefaults(:main,
     :trace => [false, "Whether to print stack traces on some errors"],
     :autoflush => [false, "Whether log files should always flush to disk."],
     :syslogfacility => ["daemon", "What syslog facility to use when logging to
       syslog.  Syslog has a fixed list of valid facilities, and you must
       choose one of those; you cannot just make one up."],
     :statedir => { :default => "$vardir/state",
       :mode => 01755,
       :desc => "The directory where Puppet state is stored.  Generally,
         this directory can be removed without causing harm (although it
         might result in spurious service restarts)."
     },
     :rundir => {
       :default => Puppet.run_mode.run_dir,
       :mode => 01777,
       :desc => "Where Puppet PID files are kept."
     },
     :genconfig => [false,
       "Whether to just print a configuration to stdout and exit.  Only makes
       sense when used interactively.  Takes into account arguments specified
       on the CLI."],
     :genmanifest => [false,
       "Whether to just print a manifest to stdout and exit.  Only makes
       sense when used interactively.  Takes into account arguments specified
       on the CLI."],
     :configprint => ["",
       "Print the value of a specific configuration parameter.  If a
       parameter is provided for this, then the value is printed and puppet
       exits.  Comma-separate multiple values.  For a list of all values,
       specify 'all'.  This feature is only available in Puppet versions
       higher than 0.18.4."],
     :color => ["ansi", "Whether to use colors when logging to the console.
-      Valid values are ``ansi`` (equivalent to ``true``), ``html`` (mostly
-      used during testing with TextMate), and ``false``, which produces
+      Valid values are `ansi` (equivalent to `true`), `html` (mostly
+      used during testing with TextMate), and `false`, which produces
       no color."],
     :mkusers => [false,
       "Whether to create the necessary user and group that puppet agent will
       run as."],
     :manage_internal_file_permissions => [true,
       "Whether Puppet should manage the owner, group, and mode of files
       it uses internally"
       ],
     :onetime => {:default => false,
       :desc => "Run the configuration once, rather than as a long-running
       daemon. This is useful for interactively running puppetd.",
       :short => 'o'
       },
     :path => {:default => "none",
       :desc => "The shell search path.  Defaults to whatever is inherited
         from the parent process.",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         ENV["PATH"] = "" if ENV["PATH"].nil?
         ENV["PATH"] = value unless value == "none"
         paths = ENV["PATH"].split(File::PATH_SEPARATOR)
         %w{/usr/sbin /sbin}.each do |path|
           ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
         end
         value
       end
     },
     :libdir => {:default => "$vardir/lib",
       :desc => "An extra search path for Puppet.  This is only useful
         for those files that Puppet will load on demand, and is only
         guaranteed to work for those cases.  In fact, the autoload
         mechanism is responsible for making sure this directory
         is in Ruby's search path",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         $LOAD_PATH.delete(@oldlibdir) if defined?(@oldlibdir) and $LOAD_PATH.include?(@oldlibdir)
         @oldlibdir = value
         $LOAD_PATH << value
       end
     },
     :ignoreimport => [false, "A parameter that can be used in commit
       hooks, since it enables you to parse-check a single file rather
       than requiring that all files exist."],
     :authconfig => [ "$confdir/namespaceauth.conf",
       "The configuration file that defines the rights to the different
       namespaces and methods.  This can be used as a coarse-grained
-      authorization system for both ``puppet agent`` and ``puppet master``."
+      authorization system for both `puppet agent` and `puppet master`."
     ],
     :environment => {:default => "production", :desc => "The environment Puppet is running in.  For clients
-      (e.g., ``puppet agent``) this determines the environment itself, which
-      is used to find modules and much more.  For servers (i.e., ``puppet master``) this provides the default environment for nodes
+      (e.g., `puppet agent`) this determines the environment itself, which
+      is used to find modules and much more.  For servers (i.e., `puppet master`) this provides the default environment for nodes
       we know nothing about."
     },
     :diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."],
     :diff => ["diff", "Which diff command to use when printing differences between files."],
     :show_diff => [false, "Whether to print a contextual diff when files are being replaced.  The diff
       is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
-      This feature currently requires the ``diff/lcs`` Ruby library."],
+      This feature currently requires the `diff/lcs` Ruby library."],
     :daemonize => { :default => true,
       :desc => "Send the process into the background.  This is the default.",
       :short => "D"
     },
     :maximum_uid => [4294967290, "The maximum allowed UID.  Some platforms use negative UIDs
       but then ship with tools that do not know how to handle signed ints, so the UIDs show up as
       huge numbers that can then not be fed back into the system.  This is a hackish way to fail in a
       slightly more useful way when that happens."],
     :node_terminus => ["plain", "Where to find information about nodes."],
     :catalog_terminus => ["compiler", "Where to get node catalogs.  This is useful to change if, for instance,
       you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
-    :facts_terminus => ["facter", "Where to get node facts."],
+    :facts_terminus => [Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', "The node facts terminus."],
     :httplog => { :default => "$logdir/http.log",
       :owner => "root",
       :mode => 0640,
       :desc => "Where the puppet agent web server logs."
     },
     :http_proxy_host => ["none",
       "The HTTP proxy host to use for outgoing connections.  Note: You
       may need to use a FQDN for the server hostname when using a proxy."],
     :http_proxy_port => [3128, "The HTTP proxy port to use for outgoing connections"],
     :filetimeout => [ 15,
       "The minimum time to wait (in seconds) between checking for updates in
       configuration files.  This timeout determines how quickly Puppet checks whether
       a file (such as manifests or templates) has changed on disk."
     ],
     :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
     :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
     :queue_source => ["stomp://localhost:61613/", "Which type of queue to use for asynchronous processing.  If your stomp server requires
       authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1"],
     :async_storeconfigs => {:default => false, :desc => "Whether to use a queueing system to provide asynchronous database integration.
-      Requires that ``puppetqd`` be running and that 'PSON' support for ruby be installed.",
+      Requires that `puppetqd` be running and that 'PSON' support for ruby be installed.",
       :hook => proc do |value|
         if value
           # This reconfigures the terminii for Node, Facts, and Catalog
           Puppet.settings[:storeconfigs] = true
 
           # But then we modify the configuration
           Puppet::Resource::Catalog.cache_class = :queue
         else
           raise "Cannot disable asynchronous storeconfigs in a running process"
         end
       end
     },
     :thin_storeconfigs => {:default => false, :desc =>
       "Boolean; wether storeconfigs store in the database only the facts and exported resources.
       If true, then storeconfigs performance will be higher and still allow exported/collected
       resources, but other usage external to Puppet might not work",
       :hook => proc do |value|
         Puppet.settings[:storeconfigs] = true if value
         end
       },
     :config_version => ["", "How to determine the configuration version.  By default, it will be the
       time that the configuration is parsed, but you can provide a shell script to override how the
       version is determined.  The output of this script will be added to every log message in the
       reports, allowing you to correlate changes on your hosts to the source version on the server."],
     :zlib => [true,
       "Boolean; whether to use the zlib library",
     ],
     :prerun_command => ["", "A command to run before every agent run.  If this command returns a non-zero
       return code, the entire Puppet run will fail."],
     :postrun_command => ["", "A command to run after every agent run.  If this command returns a non-zero
       return code, the entire Puppet run will be considered to have failed, even though it might have
       performed work during the normal run."],
     :freeze_main => [false, "Freezes the 'main' class, disallowing any code to be added to it.  This
       essentially means that you can't have any code outside of a node, class, or definition other
       than in the site manifest."]
   )
 
   hostname = Facter["hostname"].value
   domain = Facter["domain"].value
   if domain and domain != ""
     fqdn = [hostname, domain].join(".")
   else
     fqdn = hostname
   end
 
 
     Puppet.setdefaults(
     :main,
 
     # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for
     # manipulating naming.
     :certname => {:default => fqdn.downcase, :desc => "The name to use when handling certificates.  Defaults
       to the fully qualified domain name.",
       :call_on_define => true, # Call our hook with the default value, so we're always downcased
       :hook => proc { |value| raise(ArgumentError, "Certificate names must be lower case; see #1168") unless value == value.downcase }},
     :certdnsnames => ['', "The DNS names on the Server certificate as a colon-separated list.
       If it's anything other than an empty string, it will be used as an alias in the created
       certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],
     :certdir => {
       :default => "$ssldir/certs",
       :owner => "service",
       :desc => "The certificate directory."
     },
     :ssldir => {
       :default => "$confdir/ssl",
       :mode => 0771,
       :owner => "service",
       :desc => "Where SSL certificates are kept."
     },
     :publickeydir => {
       :default => "$ssldir/public_keys",
       :owner => "service",
       :desc => "The public key directory."
     },
     :requestdir => {
       :default => "$ssldir/certificate_requests",
       :owner => "service",
       :desc => "Where host certificate requests are stored."
     },
     :privatekeydir => { :default => "$ssldir/private_keys",
       :mode => 0750,
       :owner => "service",
       :desc => "The private key directory."
     },
     :privatedir => { :default => "$ssldir/private",
       :mode => 0750,
       :owner => "service",
       :desc => "Where the client stores private certificate information."
     },
     :passfile => { :default => "$privatedir/password",
       :mode => 0640,
       :owner => "service",
       :desc => "Where puppet agent stores the password for its private key.
         Generally unused."
     },
     :hostcsr => { :default => "$ssldir/csr_$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificate requests."
     },
     :hostcert => { :default => "$certdir/$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificates."
     },
     :hostprivkey => { :default => "$privatekeydir/$certname.pem",
       :mode => 0600,
       :owner => "service",
       :desc => "Where individual hosts store and look for their private key."
     },
     :hostpubkey => { :default => "$publickeydir/$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their public key."
     },
     :localcacert => { :default => "$certdir/ca.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where each client stores the CA certificate."
     },
     :hostcrl => { :default => "$ssldir/crl.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where the host's certificate revocation list can be found.
         This is distinct from the certificate authority's CRL."
     },
     :certificate_revocation => [true, "Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL)
       to all clients.  If enabled, CA chaining will almost definitely not work."]
   )
 
-
     setdefaults(
     :ca,
     :ca_name => ["$certname", "The name to use the Certificate Authority certificate."],
     :cadir => {  :default => "$ssldir/ca",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "The root directory for the certificate authority."
     },
     :cacert => { :default => "$cadir/ca_crt.pem",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA certificate."
     },
     :cakey => { :default => "$cadir/ca_key.pem",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA private key."
     },
     :capub => { :default => "$cadir/ca_pub.pem",
       :owner => "service",
       :group => "service",
       :desc => "The CA public key."
     },
     :cacrl => { :default => "$cadir/ca_crl.pem",
       :owner => "service",
       :group => "service",
       :mode => 0664,
 
       :desc => "The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored.",
       :hook => proc do |value|
         if value == 'false'
           Puppet.warning "Setting the :cacrl to 'false' is deprecated; Puppet will just ignore the crl if yours is missing"
         end
       end
     },
     :caprivatedir => { :default => "$cadir/private",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores private certificate information."
     },
     :csrdir => { :default => "$cadir/requests",
       :owner => "service",
       :group => "service",
       :desc => "Where the CA stores certificate requests"
     },
     :signeddir => { :default => "$cadir/signed",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores signed certificates."
     },
     :capass => { :default => "$caprivatedir/ca.pass",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "Where the CA stores the password for the private key"
     },
     :serial => { :default => "$cadir/serial",
       :owner => "service",
       :group => "service",
       :mode => 0644,
       :desc => "Where the serial number for certificates is stored."
     },
     :autosign => { :default => "$confdir/autosign.conf",
       :mode => 0644,
       :desc => "Whether to enable autosign.  Valid values are true (which
         autosigns any key request, and is a very bad idea), false (which
         never autosigns any key request), and the path to a file, which
         uses that configuration file to determine which keys to sign."},
     :ca_days => ["", "How long a certificate should be valid.
       This parameter is deprecated, use ca_ttl instead"],
     :ca_ttl => ["5y", "The default TTL for new certificates; valid values
       must be an integer, optionally followed by one of the units
       'y' (years of 365 days), 'd' (days), 'h' (hours), or
       's' (seconds). The unit defaults to seconds. If this parameter
       is set, ca_days is ignored. Examples are '3600' (one hour)
       and '1825d', which is the same as '5y' (5 years) "],
     :ca_md => ["md5", "The type of hash used in certificates."],
     :req_bits => [2048, "The bit length of the certificates."],
     :keylength => [1024, "The bit length of keys."],
     :cert_inventory => {
       :default => "$cadir/inventory.txt",
       :mode => 0644,
       :owner => "service",
       :group => "service",
       :desc => "A Complete listing of all certificates"
     }
   )
 
   # Define the config default.
 
     setdefaults(
     Puppet.settings[:name],
     :config => ["$confdir/puppet.conf",
       "The configuration file for #{Puppet[:name]}."],
     :pidfile => ["$rundir/$name.pid", "The pid file"],
     :bindaddress => ["", "The address a listening server should bind to.  Mongrel servers
       default to 127.0.0.1 and WEBrick defaults to 0.0.0.0."],
     :servertype => {:default => "webrick", :desc => "The type of server to use.  Currently supported
       options are webrick and mongrel.  If you use mongrel, you will need
       a proxy in front of the process or processes, since Mongrel cannot
       speak SSL.",
 
       :call_on_define => true, # Call our hook with the default value, so we always get the correct bind address set.
       :hook => proc { |value|  value == "webrick" ? Puppet.settings[:bindaddress] = "0.0.0.0" : Puppet.settings[:bindaddress] = "127.0.0.1" if Puppet.settings[:bindaddress] == "" }
     }
   )
 
   setdefaults(:master,
     :user => ["puppet", "The user puppet master should run as."],
     :group => ["puppet", "The group puppet master should run as."],
     :manifestdir => ["$confdir/manifests", "Where puppet master looks for its manifests."],
     :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppet master."],
     :code => ["", "Code to parse directly.  This is essentially only used
-      by ``puppet``, and should only be set if you're writing your own Puppet
+      by `puppet`, and should only be set if you're writing your own Puppet
       executable"],
     :masterlog => { :default => "$logdir/puppetmaster.log",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "Where puppet master logs.  This is generally not used,
         since syslog is the default log destination."
     },
     :masterhttplog => { :default => "$logdir/masterhttp.log",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :create => true,
       :desc => "Where the puppet master web server logs."
     },
     :masterport => [8140, "Which port puppet master listens on."],
     :parseonly => [false, "Just check the syntax of the manifests."],
     :node_name => ["cert", "How the puppetmaster determines the client's identity
       and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
       in particular for determining which 'node' statement applies to the client.
       Possible values are 'cert' (use the subject's CN in the client's
       certificate) and 'facter' (use the hostname that the client
       reported in its facts)"],
     :bucketdir => {
       :default => "$vardir/bucket",
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "Where FileBucket files are stored."
     },
     :rest_authconfig => [ "$confdir/auth.conf",
       "The configuration file that defines the rights to the different
       rest indirections.  This can be used as a fine-grained
-      authorization system for ``puppet master``."
+      authorization system for `puppet master`."
     ],
     :ca => [true, "Wether the master should function as a certificate authority."],
     :modulepath => {:default => "$confdir/modules:/usr/share/puppet/modules",
       :desc => "The search path for modules as a colon-separated list of
       directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
     :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
       client's SSL DN.  Only used with Mongrel.  This header must be set by the proxy
-      to the authenticated client's SSL DN (e.g., ``/CN=puppet.puppetlabs.com``).
+      to the authenticated client's SSL DN (e.g., `/CN=puppet.puppetlabs.com`).
       See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information."],
     :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
       message of the client verification. Only used with Mongrel.  This header must be set by the proxy
       to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
       See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information."],
     # To make sure this directory is created before we try to use it on the server, we need
     # it to be in the server section (#1138).
     :yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
       :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
     :server_datadir => {:default => "$vardir/server_data", :owner => "service", :group => "service", :mode => "750",
       :desc => "The directory in which serialized data is stored, usually in a subdirectory."},
     :reports => ["store",
       "The list of reports to generate.  All reports are looked for
-      in puppet/reports/name.rb, and multiple report names should be
+      in `puppet/reports/name.rb`, and multiple report names should be
       comma-separated (whitespace is okay)."
     ],
+    :reportdir => {:default => "$vardir/reports",
+      :mode => 0750,
+      :owner => "service",
+      :group => "service",
+      :desc => "The directory in which to store reports
+        received from the client.  Each client gets a separate
+        subdirectory."},
+    :reporturl => ["http://localhost:3000/reports",
+      "The URL used by the http reports processor to send reports"],
     :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."],
     :rrddir => {:default => "$vardir/rrd",
       :owner => "service",
       :group => "service",
       :desc => "The directory where RRD database files are stored.
         Directories for each reporting host will be created under
         this directory."
     },
     :rrdinterval => ["$runinterval", "How often RRD should expect data.
       This should match how often the hosts report back to the server."],
     :strict_hostname_checking => [false, "Whether to only search for the complete
       hostname as it is in the certificate when searching for node information
       in the catalogs."]
   )
 
   setdefaults(:agent,
     :localconfig => { :default => "$statedir/localconfig",
       :owner => "root",
       :mode => 0660,
       :desc => "Where puppet agent caches the local configuration.  An
         extension indicating the cache format is added automatically."},
     :statefile => { :default => "$statedir/state.yaml",
       :mode => 0660,
       :desc => "Where puppet agent and puppet master store state associated
         with the running configuration.  In the case of puppet master,
         this file reflects the state discovered through interacting
         with clients."
       },
     :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750", :desc => "The directory in which client-side YAML data is stored."},
     :client_datadir => {:default => "$vardir/client_data", :mode => "750", :desc => "The directory in which serialized data is stored on the client."},
     :classfile => { :default => "$statedir/classes.txt",
       :owner => "root",
       :mode => 0644,
       :desc => "The file in which puppet agent stores a list of the classes
         associated with the retrieved configuration.  Can be loaded in
-        the separate ``puppet`` executable using the ``--loadclasses``
+        the separate `puppet` executable using the `--loadclasses`
         option."},
     :puppetdlog => { :default => "$logdir/puppetd.log",
       :owner => "root",
       :mode => 0640,
       :desc => "The log file for puppet agent.  This is generally not used."
     },
     :server => ["puppet", "The server to which server puppet agent should connect"],
     :ignoreschedules => [false,
       "Boolean; whether puppet agent should ignore schedules.  This is useful
       for initial puppet agent runs."],
     :puppetport => [8139, "Which port puppet agent listens on."],
     :noop => [false, "Whether puppet agent should be run in noop mode."],
     :runinterval => [1800, # 30 minutes
       "How often puppet agent applies the client configuration; in seconds."],
     :listen => [false, "Whether puppet agent should listen for
       connections.  If this is true, then by default only the
-      ``runner`` server is started, which allows remote authorized
-      and authenticated nodes to connect and trigger ``puppet agent``
+      `runner` server is started, which allows remote authorized
+      and authenticated nodes to connect and trigger `puppet agent`
       runs."],
     :ca_server => ["$server", "The server to use for certificate
       authority requests.  It's a separate server because it cannot
       and does not need to horizontally scale."],
     :ca_port => ["$masterport", "The port to use for the certificate authority."],
     :catalog_format => {
       :default => "",
       :desc => "(Deprecated for 'preferred_serialization_format') What format to
         use to dump the catalog.  Only supports 'marshal' and 'yaml'.  Only
         matters on the client, since it asks the server for a specific format.",
       :hook => proc { |value|
         if value
           Puppet.warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
           Puppet.settings[:preferred_serialization_format] = value
         end
       }
     },
     :preferred_serialization_format => ["pson", "The preferred means of serializing
       ruby instances for passing over the wire.  This won't guarantee that all
       instances will be serialized using this method, since not all classes
       can be guaranteed to support this format, but it will be used for all
       classes that support it."],
     :puppetdlockfile => [ "$statedir/puppetdlock", "A lock file to temporarily stop puppet agent from doing anything."],
     :usecacheonfailure => [true,
       "Whether to use the cached configuration when the remote
       configuration will not compile.  This option is useful for testing
       new configurations, where you want to fix the broken configuration
       rather than reverting to a known-good one."
     ],
     :use_cached_catalog => [false,
       "Whether to only use the cached catalog rather than compiling a new catalog
       on every run.  Puppet can be run with this enabled by default and then selectively
       disabled when a recompile is desired."],
     :ignorecache => [false,
       "Ignore cache and always recompile the configuration.  This is
       useful for testing new configurations, where the local cache may in
       fact be stale even if the timestamps are up to date - if the facts
       change or if the server changes."
     ],
     :downcasefacts => [false, "Whether facts should be made all lowercase when sent to the server."],
     :dynamicfacts => ["memorysize,memoryfree,swapsize,swapfree",
       "Facts that are dynamic; these facts will be ignored when deciding whether
       changed facts should result in a recompile.  Multiple facts should be
       comma-separated."],
     :splaylimit => ["$runinterval",
       "The maximum time to delay before runs.  Defaults to being the same as the
       run interval."],
     :splay => [false,
       "Whether to sleep for a pseudo-random (but consistent) amount of time before
       a run."],
     :clientbucketdir => {
       :default => "$vardir/clientbucket",
       :mode => 0750,
       :desc => "Where FileBucket files are stored locally."
     },
     :configtimeout => [120,
       "How long the client should wait for the configuration to be retrieved
       before considering it a failure.  This can help reduce flapping if too
       many clients contact the server at one time."
     ],
     :reportserver => {
       :default => "$server",
       :call_on_define => false,
       :desc => "(Deprecated for 'report_server') The server to which to send transaction reports.",
       :hook => proc do |value|
         Puppet.settings[:report_server] = value if value
       end
     },
     :report_server => ["$server",
       "The server to which to send transaction reports."
     ],
     :report_port => ["$masterport",
       "The port to communicate with the report_server."
     ],
     :report => [false,
       "Whether to send reports after every transaction."
     ],
     :graph => [false, "Whether to create dot graph files for the different
       configuration graphs.  These dot files can be interpreted by tools
       like OmniGraffle or dot (which is part of ImageMagick)."],
     :graphdir => ["$statedir/graphs", "Where to store dot-outputted graphs."],
     :http_compression => [false, "Allow http compression in REST communication with the master.
       This setting might improve performance for agent -> master communications over slow WANs.
       Your puppetmaster needs to support compression (usually by activating some settings in a reverse-proxy
       in front of the puppetmaster, which rules out webrick).
       It is harmless to activate this settings if your master doesn't support
       compression, but if it supports it, this setting might reduce performance on high-speed LANs."]
   )
 
   # Plugin information.
 
     setdefaults(
     :main,
     :plugindest => ["$libdir",
       "Where Puppet should store plugins that it pulls down from the central
       server."],
     :pluginsource => ["puppet://$server/plugins",
-      "From where to retrieve plugins.  The standard Puppet ``file`` type
+      "From where to retrieve plugins.  The standard Puppet `file` type
       is used for retrieval, so anything that is a valid file source can
       be used here."],
     :pluginsync => [false, "Whether plugins should be synced with the central server."],
 
     :pluginsignore => [".svn CVS .git", "What files to ignore when pulling down plugins."]
   )
 
   # Central fact information.
 
     setdefaults(
     :main,
-    :factpath => {:default => "$vardir/lib/facter/${File::PATH_SEPARATOR}$vardir/facts",
+    :factpath => {:default => "$vardir/lib/facter:$vardir/facts",
       :desc => "Where Puppet should look for facts.  Multiple directories should
         be colon-separated, like normal PATH variables.",
 
       :call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.
       :type => :setting, # Don't consider it a file, because it could be multiple colon-separated files
       :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }},
     :factdest => ["$vardir/facts/",
       "Where Puppet should store facts that it pulls down from the central
       server."],
     :factsource => ["puppet://$server/facts/",
-      "From where to retrieve facts.  The standard Puppet ``file`` type
+      "From where to retrieve facts.  The standard Puppet `file` type
       is used for retrieval, so anything that is a valid file source can
       be used here."],
     :factsync => [false, "Whether facts should be synced with the central server."],
-    :factsignore => [".svn CVS", "What files to ignore when pulling down facts."],
-    :reportdir => {:default => "$vardir/reports",
-      :mode => 0750,
-      :owner => "service",
-      :group => "service",
-      :desc => "The directory in which to store reports
-        received from the client.  Each client gets a separate
-        subdirectory."},
-    :reporturl => ["http://localhost:3000/reports",
-      "The URL used by the http reports processor to send reports"]
+    :factsignore => [".svn CVS", "What files to ignore when pulling down facts."]
   )
 
 
     setdefaults(
     :tagmail,
     :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."],
     :sendmail => [%x{which sendmail 2>/dev/null}.chomp, "Where to find the sendmail binary with which to send email."],
 
     :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."), "The 'from' email address for the reports."],
     :smtpserver => ["none", "The server through which to send email reports."]
   )
 
-
     setdefaults(
     :rails,
     :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
       :mode => 0660,
       :owner => "service",
       :group => "service",
       :desc => "The database cache for client configurations.  Used for
         querying within the language."
     },
     :dbadapter => [ "sqlite3", "The type of database to use." ],
     :dbmigrate => [ false, "Whether to automatically migrate the database." ],
     :dbname => [ "puppet", "The name of the database to use." ],
     :dbserver => [ "localhost", "The database server for caching. Only
       used when networked databases are used."],
     :dbport => [ "", "The database password for caching. Only
       used when networked databases are used."],
     :dbuser => [ "puppet", "The database user for caching. Only
       used when networked databases are used."],
     :dbpassword => [ "puppet", "The database password for caching. Only
       used when networked databases are used."],
     :dbsocket => [ "", "The database socket location. Only used when networked
       databases are used.  Will be ignored if the value is an empty string."],
     :dbconnections => [ 0, "The number of database connections. Only used when
       networked databases are used.  Will be ignored if the value is an empty
       string or is less than 1."],
     :railslog => {:default => "$logdir/rails.log",
       :mode => 0600,
       :owner => "service",
       :group => "service",
       :desc => "Where Rails-specific logs are sent"
     },
 
     :rails_loglevel => ["info", "The log level for Rails connections.  The value must be
-      a valid log level within Rails.  Production environments normally use ``info``
-      and other environments normally use ``debug``."]
+      a valid log level within Rails.  Production environments normally use `info`
+      and other environments normally use `debug`."]
   )
 
-
     setdefaults(
     :couchdb,
 
     :couchdb_url => ["http://127.0.0.1:5984/puppet", "The url where the puppet couchdb database will be created"]
   )
 
-
     setdefaults(
     :transaction,
     :tags => ["", "Tags to use to find resources.  If this is set, then
       only resources tagged with the specified tags will be applied.
       Values must be comma-separated."],
     :evaltrace => [false, "Whether each resource should log when it is
       being evaluated.  This allows you to interactively see exactly
       what is being done."],
     :summarize => [false,
 
       "Whether to print a transaction summary."
     ]
   )
 
-
     setdefaults(
     :main,
     :external_nodes => ["none",
 
       "An external command that can produce node information.  The output
       must be a YAML dump of a hash, and that hash must have one or both of
-      ``classes`` and ``parameters``, where ``classes`` is an array and
-      ``parameters`` is a hash.  For unknown nodes, the commands should
+      `classes` and `parameters`, where `classes` is an array and
+      `parameters` is a hash.  For unknown nodes, the commands should
       exit with a non-zero exit code.
 
       This command makes it straightforward to store your node mapping
       information in other data sources like databases."])
 
-
         setdefaults(
         :ldap,
     :ldapnodes => [false,
       "Whether to search for node configurations in LDAP.  See
       http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information."],
     :ldapssl => [false,
       "Whether SSL should be used when searching for nodes.
       Defaults to false because SSL usually requires certificates
       to be set up on the client side."],
     :ldaptls => [false,
       "Whether TLS should be used when searching for nodes.
       Defaults to false because TLS usually requires certificates
       to be set up on the client side."],
     :ldapserver => ["ldap",
-      "The LDAP server.  Only used if ``ldapnodes`` is enabled."],
+      "The LDAP server.  Only used if `ldapnodes` is enabled."],
     :ldapport => [389,
-      "The LDAP port.  Only used if ``ldapnodes`` is enabled."],
+      "The LDAP port.  Only used if `ldapnodes` is enabled."],
 
     :ldapstring => ["(&(objectclass=puppetClient)(cn=%s))",
       "The search string used to find an LDAP node."],
     :ldapclassattrs => ["puppetclass",
       "The LDAP attributes to use to define Puppet classes.  Values
       should be comma-separated."],
     :ldapstackedattrs => ["puppetvar",
       "The LDAP attributes that should be stacked to arrays by adding
       the values in all hierarchy elements of the tree.  Values
       should be comma-separated."],
     :ldapattrs => ["all",
       "The LDAP attributes to include when querying LDAP for nodes.  All
       returned attributes are set as variables in the top-level scope.
       Multiple values should be comma-separated.  The value 'all' returns
       all attributes."],
     :ldapparentattr => ["parentnode",
       "The attribute to use to define the parent node."],
     :ldapuser => ["",
       "The user to use to connect to LDAP.  Must be specified as a
       full DN."],
     :ldappassword => ["", "The password to use to connect to LDAP."],
     :ldapbase => ["",
       "The search base for LDAP searches.  It's impossible to provide
       a meaningful default here, although the LDAP libraries might
       have one already set.  Generally, it should be the 'ou=Hosts'
       branch under your main directory."]
   )
 
   setdefaults(:master,
     :storeconfigs => {:default => false, :desc => "Whether to store each client's configuration.  This
       requires ActiveRecord from Ruby on Rails.",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         require 'puppet/node'
         require 'puppet/node/facts'
         if value
           require 'puppet/rails'
           raise "StoreConfigs not supported without ActiveRecord 2.1 or higher" unless Puppet.features.rails?
           Puppet::Resource::Catalog.cache_class = :active_record unless Puppet.settings[:async_storeconfigs]
           Puppet::Node::Facts.cache_class = :active_record
           Puppet::Node.cache_class = :active_record
         end
       end
     }
   )
 
   # This doesn't actually work right now.
 
     setdefaults(
     :parser,
 
     :lexical => [false, "Whether to use lexical scoping (vs. dynamic)."],
     :templatedir => ["$vardir/templates",
       "Where Puppet looks for template files.  Can be a list of colon-seperated
       directories."
     ]
   )
 end
diff --git a/lib/puppet/indirector/facts/memory.rb b/lib/puppet/indirector/facts/memory.rb
index c4ca19da5..93682f456 100644
--- a/lib/puppet/indirector/facts/memory.rb
+++ b/lib/puppet/indirector/facts/memory.rb
@@ -1,9 +1,9 @@
 require 'puppet/node/facts'
 require 'puppet/indirector/memory'
 
 class Puppet::Node::Facts::Memory < Puppet::Indirector::Memory
   desc "Keep track of facts in memory but nowhere else.  This is used for
-    one-time compiles, such as what the stand-alone ``puppet`` does.
+    one-time compiles, such as what the stand-alone `puppet` does.
     To use this terminus, you must load it with the data you want it
     to contain."
 end
diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb
index b9fe35575..ecebc8279 100644
--- a/lib/puppet/indirector/node/ldap.rb
+++ b/lib/puppet/indirector/node/ldap.rb
@@ -1,300 +1,256 @@
 require 'puppet/node'
 require 'puppet/indirector/ldap'
 
 class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   desc "Search in LDAP for node configuration information.  See
   the `LdapNodes`:trac: page for more information.  This will first
   search for whatever the certificate name is, then (if that name
   contains a '.') for the short name, then 'default'."
 
   # The attributes that Puppet class information is stored in.
   def class_attributes
     # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
     x = Puppet[:ldapclassattrs].split(/\s*,\s*/)
   end
 
   # Separate this out so it's relatively atomic.  It's tempting to call
   # process instead of name2hash() here, but it ends up being
   # difficult to test because all exceptions get caught by ldapsearch.
   # LAK:NOTE Unfortunately, the ldap support is too stupid to throw anything
   # but LDAP::ResultError, even on bad connections, so we are rough handed
   # with our error handling.
-  def name2hash(name,name_env,node_type)
+  def name2hash(name)
     info = nil
-    ldapsearch(search_filter(name)) {
-      |entry| info = entry2hash(entry)
-      if info[:environment]
-        if name_env == info[:environment]
-          return info
-          else
-            info = nil
-          end
-          else
-          info_env = "production"
-          if name_env == info[:environment]
-            return info
-          else
-            info = nil
-          end
-          end
-        }
-    if node_type == 'parent'
-      raise Puppet::Error.new("Could not find node '#{name}' with environment '#{name_env}'")
-    end
-
-    info = name2hash('default',name_env,'parent')
+    ldapsearch(search_filter(name)) { |entry| info = entry2hash(entry) }
+    info
   end
 
   # Look for our node in ldap.
   def find(request)
     names = [request.key]
     names << request.key.sub(/\..+/, '') if request.key.include?(".") # we assume it's an fqdn
     names << "default"
 
     node = nil
     names.each do |name|
-      facts = Puppet::Node::Facts.find(name)
-      if facts.values["environment"]
-        name_env = facts.values["environment"]
-      else
-        name_env = "production"
-      end
-      info = name2hash(name,name_env,'child')
-      next if info == nil
-
-      if info
-        break if node = info2node(request.key, info)
-      end
+      next unless info = name2hash(name)
+ 
+      break if node = info2node(request.key, info)
     end
 
     node
   end
 
   # Find more than one node.  LAK:NOTE This is a bit of a clumsy API, because the 'search'
   # method currently *requires* a key.  It seems appropriate in some cases but not others,
   # and I don't really know how to get rid of it as a requirement but allow it when desired.
   def search(request)
     if classes = request.options[:class]
       classes = [classes] unless classes.is_a?(Array)
       filter = "(&(objectclass=puppetClient)(puppetclass=" + classes.join(")(puppetclass=") + "))"
     else
       filter = "(objectclass=puppetClient)"
     end
 
     infos = []
     ldapsearch(filter) { |entry| infos << entry2hash(entry, request.options[:fqdn]) }
 
     return infos.collect do |info|
       info2node(info[:name], info)
     end
   end
 
   # The parent attribute, if we have one.
   def parent_attribute
     if pattr = Puppet[:ldapparentattr] and ! pattr.empty?
       pattr
     else
       nil
     end
   end
 
   # The attributes that Puppet will stack as array over the full
   # hierarchy.
   def stacked_attributes(dummy_argument=:work_arround_for_ruby_GC_bug)
     Puppet[:ldapstackedattrs].split(/\s*,\s*/)
   end
 
   # Convert the found entry into a simple hash.
   def entry2hash(entry, fqdn = false)
     result = {}
 
     cn  = entry.dn[     /cn\s*=\s*([^,\s]+)/i,1]
     dcs = entry.dn.scan(/dc\s*=\s*([^,\s]+)/i)
     result[:name]    = fqdn ? ([cn]+dcs).join('.') : cn
     result[:parent] = get_parent_from_entry(entry) if parent_attribute
     result[:classes] = get_classes_from_entry(entry)
     result[:stacked] = get_stacked_values_from_entry(entry)
     result[:parameters] = get_parameters_from_entry(entry)
 
     result[:environment] = result[:parameters]["environment"] if result[:parameters]["environment"]
 
     result[:stacked_parameters] = {}
 
     if result[:stacked]
       result[:stacked].each do |value|
         param = value.split('=', 2)
         result[:stacked_parameters][param[0]] = param[1]
       end
     end
 
     if result[:stacked_parameters]
       result[:stacked_parameters].each do |param, value|
         result[:parameters][param] = value unless result[:parameters].include?(param)
       end
     end
 
     result[:parameters] = convert_parameters(result[:parameters])
 
     result
   end
 
   # Default to all attributes.
   def search_attributes
     ldapattrs = Puppet[:ldapattrs]
 
     # results in everything getting returned
     return nil if ldapattrs == "all"
 
     search_attrs = class_attributes + ldapattrs.split(/\s*,\s*/)
 
     if pattr = parent_attribute
       search_attrs << pattr
     end
 
     search_attrs
   end
 
   # The ldap search filter to use.
   def search_filter(name)
     filter = Puppet[:ldapstring]
 
     if filter.include? "%s"
       # Don't replace the string in-line, since that would hard-code our node
       # info.
       filter = filter.gsub('%s', name)
     end
     filter
   end
 
   private
 
   # Add our hash of ldap information to the node instance.
   def add_to_node(node, information)
     node.classes = information[:classes].uniq unless information[:classes].nil? or information[:classes].empty?
     node.parameters = information[:parameters] unless information[:parameters].nil? or information[:parameters].empty?
     node.environment = information[:environment] if information[:environment]
   end
 
   def convert_parameters(parameters)
     result = {}
     parameters.each do |param, value|
       if value.is_a?(Array)
         result[param] = value.collect { |v| convert(v) }
       else
         result[param] = convert(value)
       end
     end
     result
   end
 
   # Convert any values if necessary.
   def convert(value)
     case value
     when Integer, Fixnum, Bignum; value
     when "true"; true
     when "false"; false
     else
       value
     end
   end
 
   # Find information for our parent and merge it into the current info.
   def find_and_merge_parent(parent, information)
-
-    if information[:environment]
-      name_env = information[:environment]
-    else
-      name_env = 'production'
-    end
-
-    parent_info = name2hash(parent,name_env,'parent')
-    if parent_info
+    parent_info = name2hash(parent) || raise(Puppet::Error.new("Could not find parent node '#{parent}'"))
     information[:classes] += parent_info[:classes]
     parent_info[:parameters].each do |param, value|
-      # Specifically test for whether it's set, so false values are handled
-      # correctly.
+      # Specifically test for whether it's set, so false values are handled correctly.
       information[:parameters][param] = value unless information[:parameters].include?(param)
     end
-
     information[:environment] ||= parent_info[:environment]
     parent_info[:parent]
-    else
-    raise Puppet::Error.new("Could not find parent node '#{parent}'")
-    nil
-    end
-
   end
 
   # Take a name and a hash, and return a node instance.
   def info2node(name, info)
     merge_parent(info) if info[:parent]
 
     node = Puppet::Node.new(name)
 
     add_to_node(node, info)
 
     node.fact_merge
 
     node
   end
 
   def merge_parent(info)
     parent_info = nil
     parent = info[:parent]
 
     # Preload the parent array with the node name.
     parents = [info[:name]]
     while parent
       raise ArgumentError, "Found loop in LDAP node parents; #{parent} appears twice" if parents.include?(parent)
       parents << parent
       parent = find_and_merge_parent(parent, info)
     end
 
     info
   end
 
   def get_classes_from_entry(entry)
     result = class_attributes.inject([]) do |array, attr|
       if values = entry.vals(attr)
         values.each do |v| array << v end
       end
       array
     end
     result.uniq
   end
 
   def get_parameters_from_entry(entry)
     stacked_params = stacked_attributes
     entry.to_hash.inject({}) do |hash, ary|
       unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
         if ary[1].length == 1
           hash[ary[0]] = ary[1].shift
         else
           hash[ary[0]] = ary[1]
         end
       end
       hash
     end
   end
 
   def get_parent_from_entry(entry)
     pattr = parent_attribute
 
     return nil unless values = entry.vals(pattr)
 
     if values.length > 1
       raise Puppet::Error,
         "Node entry #{entry.dn} specifies more than one parent: #{values.inspect}"
     end
     return(values.empty? ? nil : values.shift)
   end
 
   def get_stacked_values_from_entry(entry)
     stacked_attributes.inject([]) do |result, attr|
       if values = entry.vals(attr)
         result += values
       end
       result
     end
   end
 end
diff --git a/lib/puppet/indirector/node/memory.rb b/lib/puppet/indirector/node/memory.rb
index ce4a52a8f..029926af8 100644
--- a/lib/puppet/indirector/node/memory.rb
+++ b/lib/puppet/indirector/node/memory.rb
@@ -1,10 +1,10 @@
 require 'puppet/node'
 require 'puppet/indirector/memory'
 
 class Puppet::Node::Memory < Puppet::Indirector::Memory
   desc "Keep track of nodes in memory but nowhere else.  This is used for
-    one-time compiles, such as what the stand-alone ``puppet`` does.
+    one-time compiles, such as what the stand-alone `puppet` does.
     To use this terminus, you must load it with the data you want it
     to contain; it is only useful for developers and should generally not
     be chosen by a normal user."
 end
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 03d24b3fe..61ae2d2fc 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -1,229 +1,229 @@
 module Puppet::Network::HTTP
 end
 
 require 'puppet/network/http/api/v1'
 require 'puppet/network/rest_authorization'
 require 'puppet/network/rights'
 require 'resolv'
 
 module Puppet::Network::HTTP::Handler
   include Puppet::Network::HTTP::API::V1
   include Puppet::Network::RestAuthorization
 
   attr_reader :server, :handler
 
   # Retrieve the accept header from the http request.
   def accept_header(request)
     raise NotImplementedError
   end
 
   # Retrieve the Content-Type header from the http request.
   def content_type_header(request)
     raise NotImplementedError
   end
 
   # Which format to use when serializing our response or interpreting the request.
   # IF the client provided a Content-Type use this, otherwise use the Accept header
   # and just pick the first value.
   def format_to_use(request)
     unless header = accept_header(request)
       raise ArgumentError, "An Accept header must be provided to pick the right format"
     end
 
     format = nil
     header.split(/,\s*/).each do |name|
       next unless format = Puppet::Network::FormatHandler.format(name)
       next unless format.suitable?
       return format
     end
 
     raise "No specified acceptable formats (#{header}) are functional on this machine"
   end
 
   def request_format(request)
     if header = content_type_header(request)
       header.gsub!(/\s*;.*$/,'') # strip any charset
       format = Puppet::Network::FormatHandler.mime(header)
       raise "Client sent a mime-type (#{header}) that doesn't correspond to a format we support" if format.nil?
       return format.name.to_s if format.suitable?
     end
 
     raise "No Content-Type header was received, it isn't possible to unserialize the request"
   end
 
   def format_to_mime(format)
     format.is_a?(Puppet::Network::Format) ? format.mime : format
   end
 
   def initialize_for_puppet(server)
     @server = server
   end
 
   # handle an HTTP request
   def process(request, response)
     indirection_request = uri2indirection(http_method(request), path(request), params(request))
 
     check_authorization(indirection_request)
 
     send("do_#{indirection_request.method}", indirection_request, request, response)
   rescue SystemExit,NoMemoryError
     raise
   rescue Exception => e
     return do_exception(response, e)
   end
 
   # Set the response up, with the body and status.
   def set_response(response, body, status = 200)
     raise NotImplementedError
   end
 
   # Set the specified format as the content type of the response.
   def set_content_type(response, format)
     raise NotImplementedError
   end
 
   def do_exception(response, exception, status=400)
     if exception.is_a?(Puppet::Network::AuthorizationError)
       # make sure we return the correct status code
       # for authorization issues
       status = 403 if status == 400
     end
     if exception.is_a?(Exception)
       puts exception.backtrace if Puppet[:trace]
       Puppet.err(exception)
     end
     set_content_type(response, "text/plain")
     set_response(response, exception.to_s, status)
   end
 
   # Execute our find.
   def do_find(indirection_request, request, response)
     unless result = indirection_request.model.find(indirection_request.key, indirection_request.to_hash)
       Puppet.info("Could not find #{indirection_request.indirection_name} for '#{indirection_request.key}'")
       return do_exception(response, "Could not find #{indirection_request.indirection_name} #{indirection_request.key}", 404)
     end
 
     # The encoding of the result must include the format to use,
     # and it needs to be used for both the rendering and as
     # the content type.
     format = format_to_use(request)
     set_content_type(response, format)
 
     set_response(response, result.render(format))
   end
 
   # Execute our search.
   def do_search(indirection_request, request, response)
     result = indirection_request.model.search(indirection_request.key, indirection_request.to_hash)
 
     if result.nil? or (result.is_a?(Array) and result.empty?)
-      return do_exception(response, "Could not find instances in #{indirection_request.indirection_name} with '#{indirection_request.to_hash.inspect}'", 404)
+      return do_exception(response, "Could not find instances in #{indirection_request.indirection_name} with '#{indirection_request.key}'", 404)
     end
 
     format = format_to_use(request)
     set_content_type(response, format)
 
     set_response(response, indirection_request.model.render_multiple(format, result))
   end
 
   # Execute our destroy.
   def do_destroy(indirection_request, request, response)
     result = indirection_request.model.destroy(indirection_request.key, indirection_request.to_hash)
 
     return_yaml_response(response, result)
   end
 
   # Execute our save.
   def do_save(indirection_request, request, response)
     data = body(request).to_s
     raise ArgumentError, "No data to save" if !data or data.empty?
 
     format = request_format(request)
     obj = indirection_request.model.convert_from(format, data)
     result = save_object(indirection_request, obj)
     return_yaml_response(response, result)
   end
 
   # resolve node name from peer's ip address
   # this is used when the request is unauthenticated
   def resolve_node(result)
     begin
       return Resolv.getname(result[:ip])
     rescue => detail
       Puppet.err "Could not resolve #{result[:ip]}: #{detail}"
     end
     result[:ip]
   end
 
   private
 
   def return_yaml_response(response, body)
     set_content_type(response, Puppet::Network::FormatHandler.format("yaml"))
     set_response(response, body.to_yaml)
   end
 
   # LAK:NOTE This has to be here for testing; it's a stub-point so
   # we keep infinite recursion from happening.
   def save_object(ind_request, object)
     object.save(ind_request.key)
   end
 
   def get?(request)
     http_method(request) == 'GET'
   end
 
   def put?(request)
     http_method(request) == 'PUT'
   end
 
   def delete?(request)
     http_method(request) == 'DELETE'
   end
 
   # methods to be overridden by the including web server class
 
   def http_method(request)
     raise NotImplementedError
   end
 
   def path(request)
     raise NotImplementedError
   end
 
   def request_key(request)
     raise NotImplementedError
   end
 
   def body(request)
     raise NotImplementedError
   end
 
   def params(request)
     raise NotImplementedError
   end
 
   def decode_params(params)
     params.inject({}) do |result, ary|
       param, value = ary
       next result if param.nil? || param.empty?
 
       param = param.to_sym
 
       # These shouldn't be allowed to be set by clients
       # in the query string, for security reasons.
       next result if param == :node
       next result if param == :ip
       value = CGI.unescape(value)
       if value =~ /^---/
         value = YAML.load(value)
       else
         value = true if value == "true"
         value = false if value == "false"
         value = Integer(value) if value =~ /^\d+$/
         value = value.to_f if value =~ /^\d+\.\d+$/
       end
       result[param] = value
       result
     end
   end
 end
diff --git a/lib/puppet/network/http/rack/rest.rb b/lib/puppet/network/http/rack/rest.rb
index e5f50c465..b7e1d9709 100644
--- a/lib/puppet/network/http/rack/rest.rb
+++ b/lib/puppet/network/http/rack/rest.rb
@@ -1,102 +1,102 @@
 require 'puppet/network/http/handler'
 require 'puppet/network/http/rack/httphandler'
 
 class Puppet::Network::HTTP::RackREST < Puppet::Network::HTTP::RackHttpHandler
 
   include Puppet::Network::HTTP::Handler
 
   HEADER_ACCEPT = 'HTTP_ACCEPT'.freeze
   ContentType = 'Content-Type'.freeze
 
   CHUNK_SIZE = 8192
 
   class RackFile
     def initialize(file)
       @file = file
     end
 
     def each
       while chunk = @file.read(CHUNK_SIZE)
         yield chunk
       end
     end
 
     def close
       @file.close
     end
   end
 
   def initialize(args={})
     super()
     initialize_for_puppet(args)
   end
 
   def set_content_type(response, format)
     response[ContentType] = format_to_mime(format)
   end
 
   # produce the body of the response
   def set_response(response, result, status = 200)
     response.status = status
     unless result.is_a?(File)
       response.write result
     else
-      response["Content-Length"] = result.stat.size
+      response["Content-Length"] = result.stat.size.to_s
       response.body = RackFile.new(result)
     end
   end
 
   # Retrieve the accept header from the http request.
   def accept_header(request)
     request.env[HEADER_ACCEPT]
   end
 
   # Retrieve the accept header from the http request.
   def content_type_header(request)
     request.content_type
   end
 
   # Return which HTTP verb was used in this request.
   def http_method(request)
     request.request_method
   end
 
   # Return the query params for this request.
   def params(request)
     result = decode_params(request.params)
     result.merge(extract_client_info(request))
   end
 
   # what path was requested? (this is, without any query parameters)
   def path(request)
     request.path
   end
 
   # return the request body
   # request.body has some limitiations, so we need to concat it back
   # into a regular string, which is something puppet can use.
   def body(request)
     body = ''
     request.body.each { |part| body += part }
     body
   end
 
   def extract_client_info(request)
     result = {}
     result[:ip] = request.ip
 
     # if we find SSL info in the headers, use them to get a hostname.
     # try this with :ssl_client_header, which defaults should work for
     # Apache with StdEnvVars.
     if dn = request.env[Puppet[:ssl_client_header]] and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
       result[:node] = dn_matchdata[1].to_str
       result[:authenticated] = (request.env[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
     else
       result[:node] = resolve_node(result)
       result[:authenticated] = false
     end
 
     result
   end
 
 end
diff --git a/lib/puppet/parameter/value_collection.rb b/lib/puppet/parameter/value_collection.rb
index a9fd20233..619e0731d 100644
--- a/lib/puppet/parameter/value_collection.rb
+++ b/lib/puppet/parameter/value_collection.rb
@@ -1,143 +1,143 @@
 require 'puppet/parameter/value'
 
 # A collection of values and regexes, used for specifying
 # what values are allowed in a given parameter.
 class Puppet::Parameter::ValueCollection
 
   def aliasvalue(name, other)
     other = other.to_sym
     unless value = match?(other)
       raise Puppet::DevError, "Cannot alias nonexistent value #{other}"
     end
 
     value.alias(name)
   end
 
   # Return a doc string for all of the values in this parameter/property.
   def doc
     unless defined?(@doc)
       @doc = ""
       unless values.empty?
         @doc += "  Valid values are "
         @doc += @strings.collect do |value|
           if aliases = value.aliases and ! aliases.empty?
-            "``#{value.name}`` (also called ``#{aliases.join(", ")}``)"
+            "`#{value.name}` (also called `#{aliases.join(", ")}`)"
           else
-            "``#{value.name}``"
+            "`#{value.name}`"
           end
         end.join(", ") + "."
       end
 
-      @doc += "  Values can match ``" + regexes.join("``, ``") + "``." unless regexes.empty?
+      @doc += "  Values can match `" + regexes.join("`, `") + "`." unless regexes.empty?
     end
 
     @doc
   end
 
   # Does this collection contain any value definitions?
   def empty?
     @values.empty?
   end
 
   def initialize
     # We often look values up by name, so a hash makes more sense.
     @values = {}
 
     # However, we want to retain the ability to match values in order,
     # but we always prefer directly equality (i.e., strings) over regex matches.
     @regexes = []
     @strings = []
   end
 
   # Can we match a given value?
   def match?(test_value)
     # First look for normal values
     if value = @strings.find { |v| v.match?(test_value) }
       return value
     end
 
     # Then look for a regex match
     @regexes.find { |v| v.match?(test_value) }
   end
 
   # If the specified value is allowed, then munge appropriately.
   def munge(value)
     return value if empty?
 
     if instance = match?(value)
       if instance.regex?
         return value
       else
         return instance.name
       end
     else
       return value
     end
   end
 
   # Define a new valid value for a property.  You must provide the value itself,
   # usually as a symbol, or a regex to match the value.
   #
   # The first argument to the method is either the value itself or a regex.
   # The second argument is an option hash; valid options are:
   # * <tt>:event</tt>: The event that should be returned when this value is set.
   # * <tt>:call</tt>: When to call any associated block.  The default value
   #   is ``instead``, which means to call the value instead of calling the
   #   provider.  You can also specify ``before`` or ``after``, which will
   #   call both the block and the provider, according to the order you specify
   #   (the ``first`` refers to when the block is called, not the provider).
   def newvalue(name, options = {}, &block)
     value = Puppet::Parameter::Value.new(name)
     @values[value.name] = value
     if value.regex?
       @regexes << value
     else
       @strings << value
     end
 
     options.each { |opt, arg| value.send(opt.to_s + "=", arg) }
     if block_given?
       value.block = block
     else
       value.call = options[:call] || :none
     end
 
     value.method ||= "set_#{value.name}" if block_given? and ! value.regex?
 
     value
   end
 
   # Define one or more new values for our parameter.
   def newvalues(*names)
     names.each { |name| newvalue(name) }
   end
 
   def regexes
     @regexes.collect { |r| r.name.inspect }
   end
 
   # Verify that the passed value is valid.
   def validate(value)
     return if empty?
 
     unless @values.detect { |name, v| v.match?(value) }
       str = "Invalid value #{value.inspect}. "
 
       str += "Valid values are #{values.join(", ")}. " unless values.empty?
 
       str += "Valid values match #{regexes.join(", ")}." unless regexes.empty?
 
       raise ArgumentError, str
     end
   end
 
   # Return a single value instance.
   def value(name)
     @values[name]
   end
 
   # Return the list of valid values.
   def values
     @strings.collect { |s| s.name }
   end
 end
diff --git a/lib/puppet/parser/ast/function.rb b/lib/puppet/parser/ast/function.rb
index 602016c75..74023f631 100644
--- a/lib/puppet/parser/ast/function.rb
+++ b/lib/puppet/parser/ast/function.rb
@@ -1,51 +1,50 @@
 require 'puppet/parser/ast/branch'
 
 class Puppet::Parser::AST
   # An AST object to call a function.
   class Function < AST::Branch
 
     associates_doc
 
     attr_accessor :name, :arguments
 
     @settor = true
 
     def evaluate(scope)
-
       # Make sure it's a defined function
       raise Puppet::ParseError, "Unknown function #{@name}" unless Puppet::Parser::Functions.function(@name)
 
       # Now check that it's been used correctly
       case @ftype
       when :rvalue
         raise Puppet::ParseError, "Function '#{@name}' does not return a value" unless Puppet::Parser::Functions.rvalue?(@name)
       when :statement
         if Puppet::Parser::Functions.rvalue?(@name)
           raise Puppet::ParseError,
             "Function '#{@name}' must be the value of a statement"
         end
       else
         raise Puppet::DevError, "Invalid function type #{@ftype.inspect}"
       end
 
       # We don't need to evaluate the name, because it's plaintext
       args = @arguments.safeevaluate(scope)
 
       scope.send("function_#{@name}", args)
     end
 
     def initialize(hash)
       @ftype = hash[:ftype] || :rvalue
       hash.delete(:ftype) if hash.include? :ftype
 
       super(hash)
 
       # Lastly, check the parity
     end
 
     def to_s
       args = arguments.is_a?(ASTArray) ? arguments.to_s.gsub(/\[(.*)\]/,'\1') : arguments
       "#{name}(#{args})"
     end
   end
 end
diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb
index 49cde63ca..090d75c4e 100644
--- a/lib/puppet/parser/ast/leaf.rb
+++ b/lib/puppet/parser/ast/leaf.rb
@@ -1,213 +1,213 @@
 class Puppet::Parser::AST
   # The base class for all of the leaves of the parse trees.  These
   # basically just have types and values.  Both of these parameters
   # are simple values, not AST objects.
   class Leaf < AST
     attr_accessor :value, :type
 
     # Return our value.
     def evaluate(scope)
       @value
     end
 
     def match(value)
       @value == value
     end
 
     def to_s
       @value.to_s unless @value.nil?
     end
   end
 
   # The boolean class.  True or false.  Converts the string it receives
   # to a Ruby boolean.
   class Boolean < AST::Leaf
 
     # Use the parent method, but then convert to a real boolean.
     def initialize(hash)
       super
 
       unless @value == true or @value == false
         raise Puppet::DevError,
           "'#{@value}' is not a boolean"
       end
       @value
     end
 
     def to_s
       @value ? "true" : "false"
     end
   end
 
   # The base string class.
   class String < AST::Leaf
     def evaluate(scope)
-      @value
+      @value.dup
     end
 
     def to_s
       "\"#{@value}\""
     end
   end
 
   # An uninterpreted string.
   class FlatString < AST::Leaf
     def evaluate(scope)
       @value
     end
 
     def to_s
       "\"#{@value}\""
     end
   end
 
   class Concat < AST::Leaf
     def evaluate(scope)
       @value.collect { |x| x.evaluate(scope) }.collect{ |x| x == :undef ? '' : x }.join
     end
 
     def to_s
       "concat(#{@value.join(',')})"
     end
   end
 
   # The 'default' option on case statements and selectors.
   class Default < AST::Leaf; end
 
   # Capitalized words; used mostly for type-defaults, but also
   # get returned by the lexer any other time an unquoted capitalized
   # word is found.
   class Type < AST::Leaf; end
 
   # Lower-case words.
   class Name < AST::Leaf; end
 
   # double-colon separated class names
   class ClassName < AST::Leaf; end
 
   # undef values; equiv to nil
   class Undef < AST::Leaf; end
 
   # Host names, either fully qualified or just the short name, or even a regex
   class HostName < AST::Leaf
     def initialize(hash)
       super
 
       # Note that this is an AST::Regex, not a Regexp
       @value = @value.to_s.downcase unless @value.is_a?(Regex)
       if @value =~ /[^-\w.]/
         raise Puppet::DevError,
           "'#{@value}' is not a valid hostname"
       end
     end
 
     # implementing eql? and hash so that when an HostName is stored
     # in a hash it has the same hashing properties as the underlying value
     def eql?(value)
       value = value.value if value.is_a?(HostName)
       @value.eql?(value)
     end
 
     def hash
       @value.hash
     end
 
     def to_s
       @value.to_s
     end
   end
 
   # A simple variable.  This object is only used during interpolation;
   # the VarDef class is used for assignment.
   class Variable < Name
     # Looks up the value of the object in the scope tree (does
     # not include syntactical constructs, like '$' and '{}').
     def evaluate(scope)
       parsewrap do
         if (var = scope.lookupvar(@value, false)) == :undefined
           var = :undef
         end
         var
       end
     end
 
     def to_s
       "\$#{value}"
     end
   end
 
   class HashOrArrayAccess < AST::Leaf
     attr_accessor :variable, :key
 
     def evaluate_container(scope)
       container = variable.respond_to?(:evaluate) ? variable.safeevaluate(scope) : variable
       (container.is_a?(Hash) or container.is_a?(Array)) ? container : scope.lookupvar(container)
     end
 
     def evaluate_key(scope)
       key.respond_to?(:evaluate) ? key.safeevaluate(scope) : key
     end
 
     def evaluate(scope)
       object = evaluate_container(scope)
 
       raise Puppet::ParseError, "#{variable} is not an hash or array when accessing it with #{accesskey}" unless object.is_a?(Hash) or object.is_a?(Array)
 
       object[evaluate_key(scope)]
     end
 
     # Assign value to this hashkey or array index
     def assign(scope, value)
       object = evaluate_container(scope)
       accesskey = evaluate_key(scope)
 
       if object.is_a?(Hash) and object.include?(accesskey)
         raise Puppet::ParseError, "Assigning to the hash '#{variable}' with an existing key '#{accesskey}' is forbidden"
       end
 
       # assign to hash or array
       object[accesskey] = value
     end
 
     def to_s
       "\$#{variable.to_s}[#{key.to_s}]"
     end
   end
 
   class Regex < AST::Leaf
     def initialize(hash)
       super
       @value = Regexp.new(@value) unless @value.is_a?(Regexp)
     end
 
     # we're returning self here to wrap the regexp and to be used in places
     # where a string would have been used, without modifying any client code.
     # For instance, in many places we have the following code snippet:
     #  val = @val.safeevaluate(@scope)
     #  if val.match(otherval)
     #      ...
     #  end
     # this way, we don't have to modify this test specifically for handling
     # regexes.
     def evaluate(scope)
       self
     end
 
     def evaluate_match(value, scope, options = {})
       value = value.is_a?(String) ? value : value.to_s
 
       if matched = @value.match(value)
         scope.ephemeral_from(matched, options[:file], options[:line])
       end
       matched
     end
 
     def match(value)
       @value.match(value)
     end
 
     def to_s
       "/#{@value.source}/"
     end
   end
 end
diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb
index 1b063c984..0c58538d5 100644
--- a/lib/puppet/parser/ast/resource.rb
+++ b/lib/puppet/parser/ast/resource.rb
@@ -1,77 +1,78 @@
 require 'puppet/parser/ast/resource_reference'
 
 # Any normal puppet resource declaration.  Can point to a definition or a
 # builtin type.
 class Puppet::Parser::AST
 class Resource < AST::ResourceReference
 
   associates_doc
 
   attr_accessor :title, :type, :exported, :virtual
   attr_reader :parameters
 
   # Does not actually return an object; instead sets an object
   # in the current scope.
   def evaluate(scope)
     # Evaluate all of the specified params.
     paramobjects = parameters.collect { |param|
       param.safeevaluate(scope)
     }
 
     resource_titles = @title.safeevaluate(scope)
 
     # it's easier to always use an array, even for only one name
     resource_titles = [resource_titles] unless resource_titles.is_a?(Array)
 
     # We want virtual to be true if exported is true.  We can't
     # just set :virtual => self.virtual in the initialization,
     # because sometimes the :virtual attribute is set *after*
     # :exported, in which case it clobbers :exported if :exported
     # is true.  Argh, this was a very tough one to track down.
     virt = self.virtual || self.exported
 
     # This is where our implicit iteration takes place; if someone
     # passed an array as the name, then we act just like the called us
     # many times.
+    fully_qualified_type, resource_titles = scope.resolve_type_and_titles(type, resource_titles)
+
     resource_titles.flatten.collect { |resource_title|
       exceptwrap :type => Puppet::ParseError do
-
-              resource = Puppet::Parser::Resource.new(
-        type, resource_title,
+        resource = Puppet::Parser::Resource.new(
+          fully_qualified_type, resource_title,
           :parameters => paramobjects,
           :file => self.file,
           :line => self.line,
           :exported => self.exported,
           :virtual => virt,
           :source => scope.source,
           :scope => scope,
         
           :strict => true
         )
 
         # And then store the resource in the compiler.
         # At some point, we need to switch all of this to return
         # resources instead of storing them like this.
         scope.compiler.add_resource(scope, resource)
         resource
       end
     }.reject { |resource| resource.nil? }
   end
 
   # Set the parameters for our object.
   def parameters=(params)
     if params.is_a?(AST::ASTArray)
       @parameters = params
     else
 
             @parameters = AST::ASTArray.new(
                 
         :line => params.line,
         :file => params.file,
         
         :children => [params]
       )
     end
   end
 end
 end
diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb
index 5d8334335..0f8e655bf 100644
--- a/lib/puppet/parser/ast/resource_reference.rb
+++ b/lib/puppet/parser/ast/resource_reference.rb
@@ -1,21 +1,28 @@
 require 'puppet/parser/ast'
 require 'puppet/parser/ast/branch'
 
 class Puppet::Parser::AST::ResourceReference < Puppet::Parser::AST::Branch
   attr_accessor :title, :type
 
   # Evaluate our object, but just return a simple array of the type
   # and name.
   def evaluate(scope)
-    titles = Array(title.safeevaluate(scope)).collect { |t| Puppet::Resource.new(type, t, :namespaces => scope.namespaces) }
-    return(titles.length == 1 ? titles.pop : titles)
+    titles = Array(title.safeevaluate(scope))
+
+    a_type, titles = scope.resolve_type_and_titles(type, titles)
+
+    resources = titles.collect{ |a_title|
+      Puppet::Resource.new(a_type, a_title)
+    }
+
+    return(resources.length == 1 ? resources.pop : resources)
   end
 
   def to_s
     if title.is_a?(Puppet::Parser::AST::ASTArray)
       "#{type.to_s.capitalize}#{title}"
     else
       "#{type.to_s.capitalize}[#{title}]"
     end
   end
 end
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index 61bb13cb6..98cad952c 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -1,480 +1,481 @@
 #  Created by Luke A. Kanies on 2007-08-13.
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/node'
 require 'puppet/resource/catalog'
 require 'puppet/util/errors'
 
 require 'puppet/resource/type_collection_helper'
 
 # Maintain a graph of scopes, along with a bunch of data
 # about the individual catalog we're compiling.
 class Puppet::Parser::Compiler
   include Puppet::Util
   include Puppet::Util::Errors
   include Puppet::Resource::TypeCollectionHelper
 
   def self.compile(node)
     new(node).compile.to_resource
   rescue => detail
     puts detail.backtrace if Puppet[:trace]
     raise Puppet::Error, "#{detail} on node #{node.name}"
   ensure
     # We get these from the environment and only cache them in a thread 
     # variable for the duration of the compilation.
     Thread.current[:known_resource_types] = nil
+    Thread.current[:env_module_directories] = nil
  end
 
   attr_reader :node, :facts, :collections, :catalog, :node_scope, :resources, :relationships
 
   # Add a collection to the global list.
   def add_collection(coll)
     @collections << coll
   end
 
   def add_relationship(dep)
     @relationships << dep
   end
 
   # Store a resource override.
   def add_override(override)
     # If possible, merge the override in immediately.
     if resource = @catalog.resource(override.ref)
       resource.merge(override)
     else
       # Otherwise, store the override for later; these
       # get evaluated in Resource#finish.
       @resource_overrides[override.ref] << override
     end
   end
 
   # Store a resource in our resource table.
   def add_resource(scope, resource)
     @resources << resource
 
     # Note that this will fail if the resource is not unique.
     @catalog.add_resource(resource)
 
     set_container_resource(scope, resource)
   end
 
   # Add our container edge.  If we're a class, then we get treated specially - we can
   # control the stage that the class is applied in.  Otherwise, we just
   # get added to our parent container.
   def set_container_resource(scope, resource)
     return if resource.type.to_s.downcase == "stage"
 
     if resource.type.to_s.downcase != "class"
       raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage" if resource[:stage]
       return @catalog.add_edge(scope.resource, resource)
     end
 
     unless stage = @catalog.resource(:stage, resource[:stage] || :main)
       raise ArgumentError, "Could not find stage #{resource[:stage] || :main} specified by #{resource}"
     end
 
     @catalog.add_edge(stage, resource)
   end
 
   private :set_container_resource
 
   # Do we use nodes found in the code, vs. the external node sources?
   def ast_nodes?
     known_resource_types.nodes?
   end
 
   # Store the fact that we've evaluated a class
   def add_class(name)
     @catalog.add_class(name) unless name == ""
   end
 
 
   # Return a list of all of the defined classes.
   def classlist
     @catalog.classes
   end
 
   # Compiler our catalog.  This mostly revolves around finding and evaluating classes.
   # This is the main entry into our catalog.
   def compile
     # Set the client's parameters into the top scope.
     set_node_parameters
     create_settings_scope
 
     evaluate_main
 
     evaluate_ast_node
 
     evaluate_node_classes
 
     evaluate_generators
 
     finish
 
     fail_on_unevaluated
 
     @catalog
   end
 
   # LAK:FIXME There are no tests for this.
   def delete_collection(coll)
     @collections.delete(coll) if @collections.include?(coll)
   end
 
   # Return the node's environment.
   def environment
     unless defined?(@environment)
       @environment = (node.environment and node.environment != "") ? node.environment : nil
     end
     Puppet::Node::Environment.current = @environment
     @environment
   end
 
   # Evaluate all of the classes specified by the node.
   def evaluate_node_classes
     evaluate_classes(@node.classes, topscope)
   end
 
   # Evaluate each specified class in turn.  If there are any classes we can't
   # find, just tag the catalog and move on.  This method really just
   # creates resource objects that point back to the classes, and then the
   # resources are themselves evaluated later in the process.
   def evaluate_classes(classes, scope, lazy_evaluate = true)
     raise Puppet::DevError, "No source for scope passed to evaluate_classes" unless scope.source
     found = []
     classes.each do |name|
       # If we can find the class, then make a resource that will evaluate it.
       if klass = scope.find_hostclass(name)
         found << name and next if scope.class_scope(klass)
 
         resource = klass.mk_plain_resource(scope)
 
         # If they've disabled lazy evaluation (which the :include function does),
         # then evaluate our resource immediately.
         resource.evaluate unless lazy_evaluate
         found << name
       else
         Puppet.info "Could not find class #{name} for #{node.name}"
         @catalog.tag(name)
       end
     end
     found
   end
 
   def evaluate_relationships
     @relationships.each { |rel| rel.evaluate(catalog) }
   end
 
   # Return a resource by either its ref or its type and title.
   def findresource(*args)
     @catalog.resource(*args)
   end
 
   def initialize(node, options = {})
     @node = node
 
     options.each do |param, value|
       begin
         send(param.to_s + "=", value)
       rescue NoMethodError
         raise ArgumentError, "Compiler objects do not accept #{param}"
       end
     end
 
     initvars
   end
 
   # Create a new scope, with either a specified parent scope or
   # using the top scope.
   def newscope(parent, options = {})
     parent ||= topscope
     options[:compiler] = self
     scope = Puppet::Parser::Scope.new(options)
     scope.parent = parent
     scope
   end
 
   # Return any overrides for the given resource.
   def resource_overrides(resource)
     @resource_overrides[resource.ref]
   end
 
   # The top scope is usually the top-level scope, but if we're using AST nodes,
   # then it is instead the node's scope.
   def topscope
     node_scope || @topscope
   end
 
   private
 
   # If ast nodes are enabled, then see if we can find and evaluate one.
   def evaluate_ast_node
     return unless ast_nodes?
 
     # Now see if we can find the node.
     astnode = nil
     @node.names.each do |name|
       break if astnode = known_resource_types.node(name.to_s.downcase)
     end
 
     unless (astnode ||= known_resource_types.node("default"))
       raise Puppet::ParseError, "Could not find default node or by name with '#{node.names.join(", ")}'"
     end
 
     # Create a resource to model this node, and then add it to the list
     # of resources.
     resource = astnode.mk_plain_resource(topscope)
 
     resource.evaluate
 
     # Now set the node scope appropriately, so that :topscope can
     # behave differently.
     @node_scope = topscope.class_scope(astnode)
   end
 
   # Evaluate our collections and return true if anything returned an object.
   # The 'true' is used to continue a loop, so it's important.
   def evaluate_collections
     return false if @collections.empty?
 
     found_something = false
     exceptwrap do
       # We have to iterate over a dup of the array because
       # collections can delete themselves from the list, which
       # changes its length and causes some collections to get missed.
       @collections.dup.each do |collection|
         found_something = true if collection.evaluate
       end
     end
 
     found_something
   end
 
   # Make sure all of our resources have been evaluated into native resources.
   # We return true if any resources have, so that we know to continue the
   # evaluate_generators loop.
   def evaluate_definitions
     exceptwrap do
       !unevaluated_resources.each { |resource| resource.evaluate }.empty?
     end
   end
 
   # Iterate over collections and resources until we're sure that the whole
   # compile is evaluated.  This is necessary because both collections
   # and defined resources can generate new resources, which themselves could
   # be defined resources.
   def evaluate_generators
     count = 0
     loop do
       done = true
 
       # Call collections first, then definitions.
       done = false if evaluate_collections
       done = false if evaluate_definitions
       break if done
 
       count += 1
 
       if count > 1000
         raise Puppet::ParseError, "Somehow looped more than 1000 times while evaluating host catalog"
       end
     end
   end
 
   # Find and evaluate our main object, if possible.
   def evaluate_main
     @main = known_resource_types.find_hostclass([""], "") || known_resource_types.add(Puppet::Resource::Type.new(:hostclass, ""))
     @topscope.source = @main
     @main_resource = Puppet::Parser::Resource.new("class", :main, :scope => @topscope, :source => @main)
     @topscope.resource = @main_resource
 
     @resources << @main_resource
     @catalog.add_resource(@main_resource)
 
     set_container_resource(@topscope, @main_resource)
 
     @main_resource.evaluate
   end
 
   # Make sure the entire catalog is evaluated.
   def fail_on_unevaluated
     fail_on_unevaluated_overrides
     fail_on_unevaluated_resource_collections
   end
 
   # If there are any resource overrides remaining, then we could
   # not find the resource they were supposed to override, so we
   # want to throw an exception.
   def fail_on_unevaluated_overrides
     remaining = []
     @resource_overrides.each do |name, overrides|
       remaining += overrides
     end
 
     unless remaining.empty?
       fail Puppet::ParseError,
         "Could not find resource(s) %s for overriding" % remaining.collect { |o|
           o.ref
         }.join(", ")
     end
   end
 
   # Make sure we don't have any remaining collections that specifically
   # look for resources, because we want to consider those to be
   # parse errors.
   def fail_on_unevaluated_resource_collections
     remaining = []
     @collections.each do |coll|
       # We're only interested in the 'resource' collections,
       # which result from direct calls of 'realize'.  Anything
       # else is allowed not to return resources.
       # Collect all of them, so we have a useful error.
       if r = coll.resources
         if r.is_a?(Array)
           remaining += r
         else
           remaining << r
         end
       end
     end
 
     raise Puppet::ParseError, "Failed to realize virtual resources #{remaining.join(', ')}" unless remaining.empty?
   end
 
   # Make sure all of our resources and such have done any last work
   # necessary.
   def finish
     evaluate_relationships
 
     resources.each do |resource|
       # Add in any resource overrides.
       if overrides = resource_overrides(resource)
         overrides.each do |over|
           resource.merge(over)
         end
 
         # Remove the overrides, so that the configuration knows there
         # are none left.
         overrides.clear
       end
 
       resource.finish if resource.respond_to?(:finish)
     end
 
     add_resource_metaparams
   end
 
   def add_resource_metaparams
     unless main = catalog.resource(:class, :main)
       raise "Couldn't find main"
     end
 
     names = []
     Puppet::Type.eachmetaparam do |name|
       next if Puppet::Parser::Resource.relationship_parameter?(name)
       names << name
     end
 
     data = {}
     catalog.walk(main, :out) do |source, target|
       if source_data = data[source] || metaparams_as_data(source, names)
         # only store anything in the data hash if we've actually got
         # data
         data[source] ||= source_data
         source_data.each do |param, value|
           target[param] = value if target[param].nil?
         end
         data[target] = source_data.merge(metaparams_as_data(target, names))
       end
 
       target.tag(*(source.tags))
     end
   end
 
   def metaparams_as_data(resource, params)
     data = nil
     params.each do |param|
       unless resource[param].nil?
         # Because we could be creating a hash for every resource,
         # and we actually probably don't often have any data here at all,
         # we're optimizing a bit by only creating a hash if there's
         # any data to put in it.
         data ||= {}
         data[param] = resource[param]
       end
     end
     data
   end
 
   # Set up all of our internal variables.
   def initvars
     # The list of objects that will available for export.
     @exported_resources = {}
 
     # The list of overrides.  This is used to cache overrides on objects
     # that don't exist yet.  We store an array of each override.
     @resource_overrides = Hash.new do |overs, ref|
       overs[ref] = []
     end
 
     # The list of collections that have been created.  This is a global list,
     # but they each refer back to the scope that created them.
     @collections = []
 
     # The list of relationships to evaluate.
     @relationships = []
 
     # For maintaining the relationship between scopes and their resources.
     @catalog = Puppet::Resource::Catalog.new(@node.name)
     @catalog.version = known_resource_types.version
 
     # Create our initial scope and a resource that will evaluate main.
     @topscope = Puppet::Parser::Scope.new(:compiler => self)
 
     @main_stage_resource = Puppet::Parser::Resource.new("stage", :main, :scope => @topscope)
     @catalog.add_resource(@main_stage_resource)
 
     # local resource array to maintain resource ordering
     @resources = []
 
     # Make sure any external node classes are in our class list
     @catalog.add_class(*@node.classes)
   end
 
   # Set the node's parameters into the top-scope as variables.
   def set_node_parameters
     node.parameters.each do |param, value|
       @topscope.setvar(param, value)
     end
 
     # These might be nil.
     catalog.client_version = node.parameters["clientversion"]
     catalog.server_version = node.parameters["serverversion"]
   end
 
   def create_settings_scope
     unless settings_type = environment.known_resource_types.hostclass("settings")
       settings_type = Puppet::Resource::Type.new :hostclass, "settings"
       environment.known_resource_types.add(settings_type)
     end
 
     settings_resource = Puppet::Parser::Resource.new("class", "settings", :scope => @topscope)
     settings_type.evaluate_code(settings_resource)
 
     @catalog.add_resource(settings_resource)
 
     scope = @topscope.class_scope(settings_type)
 
     Puppet.settings.each do |name, setting|
       next if name.to_s == "name"
       scope.setvar name.to_s, environment[name]
     end
   end
 
   # Return an array of all of the unevaluated resources.  These will be definitions,
   # which need to get evaluated into native resources.
   def unevaluated_resources
     # The order of these is significant for speed due to short-circuting
     resources.reject { |resource| resource.evaluated? or resource.virtual? or resource.builtin_type? }
   end
 end
diff --git a/lib/puppet/parser/files.rb b/lib/puppet/parser/files.rb
index 9ef05e102..f34683153 100644
--- a/lib/puppet/parser/files.rb
+++ b/lib/puppet/parser/files.rb
@@ -1,88 +1,88 @@
 require 'puppet/module'
 require 'puppet/parser/parser'
 
 # This is a silly central module for finding
 # different kinds of files while parsing.  This code
 # doesn't really belong in the Puppet::Module class,
 # but it doesn't really belong anywhere else, either.
 module Puppet::Parser::Files
   module_function
 
   # Return a list of manifests (as absolute filenames) that match +pat+
   # with the current directory set to +cwd+. If the first component of
   # +pat+ does not contain any wildcards and is an existing module, return
   # a list of manifests in that module matching the rest of +pat+
   # Otherwise, try to find manifests matching +pat+ relative to +cwd+
   def find_manifests(start, options = {})
     cwd = options[:cwd] || Dir.getwd
     module_name, pattern = split_file_path(start)
     begin
       if mod = Puppet::Module.find(module_name, options[:environment])
         return [mod.name, mod.match_manifests(pattern)]
       end
     rescue Puppet::Module::InvalidName
       # Than that would be a "no."
     end
     abspat = File::expand_path(start, cwd)
-    [nil, Dir.glob(abspat + (File.extname(abspat).empty? ? '{,.pp,.rb}' : '' )).uniq.reject { |f| FileTest.directory?(f) }]
+    [nil, Dir.glob(abspat + (File.extname(abspat).empty? ? '{.pp,.rb}' : '' )).uniq.reject { |f| FileTest.directory?(f) }]
   end
 
   # Find the concrete file denoted by +file+. If +file+ is absolute,
   # return it directly. Otherwise try to find it as a template in a
   # module. If that fails, return it relative to the +templatedir+ config
   # param.
   # In all cases, an absolute path is returned, which does not
   # necessarily refer to an existing file
   def find_template(template, environment = nil)
     if template == File.expand_path(template)
       return template
     end
 
     if template_paths = templatepath(environment)
       # If we can find the template in :templatedir, we return that.
       template_paths.collect { |path|
         File::join(path, template)
       }.each do |f|
         return f if FileTest.exist?(f)
       end
     end
 
     # check in the default template dir, if there is one
     if td_file = find_template_in_module(template, environment)
       return td_file
     end
 
     nil
   end
 
   def find_template_in_module(template, environment = nil)
     path, file = split_file_path(template)
 
     # Because templates don't have an assumed template name, like manifests do,
     # we treat templates with no name as being templates in the main template
     # directory.
     return nil unless file
 
     if mod = Puppet::Module.find(path, environment) and t = mod.template(file)
       return t
     end
     nil
   end
 
   # Return an array of paths by splitting the +templatedir+ config
   # parameter.
   def templatepath(environment = nil)
     dirs = Puppet.settings.value(:templatedir, environment).split(File::PATH_SEPARATOR)
     dirs.select do |p|
       File::directory?(p)
     end
   end
 
   # Split the path into the module and the rest of the path, or return
   # nil if the path is empty or absolute (starts with a /).
   # This method can return nil & anyone calling it needs to handle that.
   def split_file_path(path)
     path.split(File::SEPARATOR, 2) unless path == "" or path == File.expand_path(path)
   end
 
 end
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index c238da5d4..b0deac5bc 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -1,122 +1,122 @@
 require 'puppet/util/autoload'
 require 'puppet/parser/scope'
 require 'monitor'
 
 # A module for managing parser functions.  Each specified function
 # is added to a central module that then gets included into the Scope
 # class.
 module Puppet::Parser::Functions
 
   (@functions = Hash.new { |h,k| h[k] = {} }).extend(MonitorMixin)
   (@modules   = {}                          ).extend(MonitorMixin)
 
   class << self
     include Puppet::Util
   end
 
   def self.autoloader
     unless defined?(@autoloader)
 
             @autoloader = Puppet::Util::Autoload.new(
         self,
         "puppet/parser/functions",
-        
+
         :wrap => false
       )
     end
 
     @autoloader
   end
 
   Environment = Puppet::Node::Environment
 
   def self.environment_module(env = nil)
     @modules.synchronize {
       @modules[ env || Environment.current || Environment.root ] ||= Module.new
     }
   end
 
   # Create a new function type.
   def self.newfunction(name, options = {}, &block)
     name = symbolize(name)
 
     raise Puppet::DevError, "Function #{name} already defined" if functions.include?(name)
 
     ftype = options[:type] || :statement
 
     unless ftype == :statement or ftype == :rvalue
       raise Puppet::DevError, "Invalid statement type #{ftype.inspect}"
     end
 
     fname = "function_#{name}"
     environment_module.send(:define_method, fname, &block)
 
     # Someday we'll support specifying an arity, but for now, nope
     #functions[name] = {:arity => arity, :type => ftype}
     functions[name] = {:type => ftype, :name => fname}
     functions[name][:doc] = options[:doc] if options[:doc]
   end
 
   # Remove a function added by newfunction
   def self.rmfunction(name)
     name = symbolize(name)
 
     raise Puppet::DevError, "Function #{name} is not defined" unless functions.include? name
 
     functions.delete name
 
     fname = "function_#{name}"
     environment_module.send(:remove_method, fname)
   end
 
   # Determine if a given name is a function
   def self.function(name)
     name = symbolize(name)
 
     unless functions.include?(name) or functions(Puppet::Node::Environment.root).include?(name)
       autoloader.load(name,Environment.current || Environment.root)
     end
 
     ( functions(Environment.root)[name] || functions[name] || {:name => false} )[:name]
   end
 
   def self.functiondocs
     autoloader.loadall
 
     ret = ""
 
     functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
       #ret += "#{name}\n#{hash[:type]}\n"
       ret += "#{name}\n#{"-" * name.to_s.length}\n"
       if hash[:doc]
         ret += Puppet::Util::Docs.scrub(hash[:doc])
       else
         ret += "Undocumented.\n"
       end
 
-      ret += "\n\n- **Type**: #{hash[:type]}\n\n"
+      ret += "\n\n- *Type*: #{hash[:type]}\n\n"
     end
 
     ret
   end
 
   def self.functions(env = nil)
     @functions.synchronize {
       @functions[ env || Environment.current || Environment.root ]
     }
   end
 
   # Determine if a given function returns a value or not.
   def self.rvalue?(name)
     (functions[symbolize(name)] || {})[:type] == :rvalue
   end
 
   # Runs a newfunction to create a function for each of the log levels
 
   Puppet::Util::Log.levels.each do |level|
     newfunction(level, :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
       send(level, vals.join(" "))
     end
   end
 
 end
diff --git a/lib/puppet/parser/functions/defined.rb b/lib/puppet/parser/functions/defined.rb
index 2930a65cc..90632af2f 100644
--- a/lib/puppet/parser/functions/defined.rb
+++ b/lib/puppet/parser/functions/defined.rb
@@ -1,27 +1,27 @@
 # Test whether a given class or definition is defined
 Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Determine whether a given
   type is defined, either as a native type or a defined type, or whether a class is defined.
   This is useful for checking whether a class is defined and only including it if it is.
   This function can also test whether a resource has been defined, using resource references
-  (e.g., ``if defined(File['/tmp/myfile']) { ... }``).  This function is unfortunately
+  (e.g., `if defined(File['/tmp/myfile']) { ... }`).  This function is unfortunately
   dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals|
     result = false
     vals = [vals] unless vals.is_a?(Array)
     vals.each do |val|
       case val
       when String
         if Puppet::Type.type(val) or find_definition(val) or find_hostclass(val)
           result = true
           break
         end
       when Puppet::Resource
         if findresource(val.to_s)
           result = true
           break
         end
       else
         raise ArgumentError, "Invalid argument of type '#{val.class}' to 'defined'"
       end
     end
     result
 end
diff --git a/lib/puppet/parser/functions/extlookup.rb b/lib/puppet/parser/functions/extlookup.rb
index ee230e7ce..a4786f5da 100644
--- a/lib/puppet/parser/functions/extlookup.rb
+++ b/lib/puppet/parser/functions/extlookup.rb
@@ -1,173 +1,166 @@
 # Puppet External Data Sources
 #
 # This is a parser function to read data from external files, this version
 # uses CSV files but the concept can easily be adjust for databases, yaml
 # or any other queryable data source.
 #
 # The object of this is to make it obvious when it's being used, rather than
 # magically loading data in when an module is loaded I prefer to look at the code
 # and see statements like:
 #
 #     $snmp_contact = extlookup("snmp_contact")
 #
 # The above snippet will load the snmp_contact value from CSV files, this in its
 # own is useful but a common construct in puppet manifests is something like this:
 #
 # case $domain {
 #      "myclient.com": { $snmp_contact = "John Doe <john@myclient.com>" }
 #      default:        { $snmp_contact = "My Support <support@my.com>" }
 # }
 #
 # Over time there will be a lot of this kind of thing spread all over your manifests
 # and adding an additional client involves grepping through manifests to find all the
 # places where you have constructs like this.
 #
 # This is a data problem and shouldn't be handled in code, a using this function you
 # can do just that.
 #
 # First you configure it in site.pp:
 # $extlookup_datadir = "/etc/puppet/manifests/extdata"
 # $extlookup_precedence = ["%{fqdn}", "domain_%{domain}", "common"]
 #
 # The array tells the code how to resolve values, first it will try to find it in
 # web1.myclient.com.csv then in domain_myclient.com.csv and finally in common.csv
 #
 # Now create the following data files in /etc/puppet/manifests/extdata
 #
 # domain_myclient.com.csv:
 #    snmp_contact,John Doe <john@myclient.com>
 #    root_contact,support@%{domain}
 #    client_trusted_ips,192.168.1.130,192.168.10.0/24
 #
 # common.csv:
 #    snmp_contact,My Support <support@my.com>
 #    root_contact,support@my.com
 #
 # Now you can replace the case statement with the simple single line to achieve
 # the exact same outcome:
 #
 #    $snmp_contact = extlookup("snmp_contact")
 #
 # The obove code shows some other features, you can use any fact or variable that
 # is in scope by simply using %{varname} in your data files, you can return arrays
 # by just having multiple values in the csv after the initial variable name.
 #
 # In the event that a variable is nowhere to be found a critical error will be raised
 # that will prevent your manifest from compiling, this is to avoid accidentally putting
 # in empty values etc.  You can however specify a default value:
 #
 #    $ntp_servers = extlookup("ntp_servers", "1.${country}.pool.ntp.org")
 #
 # In this case it will default to "1.${country}.pool.ntp.org" if nothing is defined in
 # any data file.
 #
 # You can also specify an additional data file to search first before any others at use
 # time, for example:
 #
 # $version = extlookup("rsyslog_version", "present", "packages")
 #
 # package{"rsyslog": ensure => $version }
 #
 # This will look for a version configured in packages.csv and then in the rest as configured
 # by $extlookup_precedence if it's not found anywhere it will default to "present", this kind
 # of use case makes puppet a lot nicer for managing large amounts of packages since you do not
 # need to edit a load of manifests to do simple things like adjust a desired version number.
 #
 # For more information on installing and writing your own custom functions see:
 #    http://docs.puppetlabs.com/guides/custom_functions.html
 #
 # For further help contact Volcane on #puppet
 require 'csv'
 
 module Puppet::Parser::Functions
   newfunction(:extlookup, :type => :rvalue) do |args|
     key = args[0]
 
     default  = args[1]
     datafile = args[2]
 
     raise Puppet::ParseError, ("extlookup(): wrong number of arguments (#{args.length}; must be <= 3)") if args.length > 3
 
     extlookup_datadir = lookupvar('extlookup_datadir')
     extlookup_precedence = Array.new
 
     # precedence values can have variables embedded in them
     # in the form %{fqdn}, you could for example do
     #
     #    $extlookup_precedence = ["hosts/%{fqdn}", "common"]
     #
     # this will result in /path/to/extdata/hosts/your.box.com.csv
     # being searched.
     #
-    # we parse the precedence here because the best place to specify
-    # it would be in site.pp but site.pp is only evaluated at startup
-    # so $fqdn etc would have no meaning there, this way it gets evaluated
-    # each run and has access to the right variables for that run
-    lookupvar('extlookup_precedence').each do |prec|
-      while prec =~ /%\{(.+?)\}/
-        prec.gsub!(/%\{#{$1}\}/, lookupvar($1))
+    # This is for back compatibility to interpolate variables with %.
+    # % interpolation is a workaround for a problem that has been fixed: Puppet variable
+    # interpolation at top scope used to only happen on each run
+    extlookup_precedence = lookupvar('extlookup_precedence').collect do |var|
+      var.gsub(/%\{(.+?)\}/) do |capture|
+        lookupvar($1)
       end
-
-      extlookup_precedence << prec
     end
 
-
     datafiles = Array.new
 
     # if we got a custom data file, put it first in the array of search files
     if datafile != ""
       datafiles << extlookup_datadir + "/#{datafile}.csv" if File.exists?(extlookup_datadir + "/#{datafile}.csv")
     end
 
     extlookup_precedence.each do |d|
       datafiles << extlookup_datadir + "/#{d}.csv"
     end
 
     desired = nil
 
     datafiles.each do |file|
-      parser = Puppet::Parser::Parser.new(environment)
-      parser.watch_file(file) if File.exists?(file)
-
       if desired.nil?
         if File.exists?(file)
           result = CSV.read(file).find_all do |r|
             r[0] == key
           end
 
 
           # return just the single result if theres just one,
           # else take all the fields in the csv and build an array
           if result.length > 0
             if result[0].length == 2
               val = result[0][1].to_s
 
               # parse %{}'s in the CSV into local variables using lookupvar()
               while val =~ /%\{(.+?)\}/
                 val.gsub!(/%\{#{$1}\}/, lookupvar($1))
               end
 
               desired = val
             elsif result[0].length > 1
               length = result[0].length
               cells = result[0][1,length]
 
               # Individual cells in a CSV result are a weird data type and throws
               # puppets yaml parsing, so just map it all to plain old strings
               desired = cells.map do |c|
                 # parse %{}'s in the CSV into local variables using lookupvar()
                 while c =~ /%\{(.+?)\}/
                   c.gsub!(/%\{#{$1}\}/, lookupvar($1))
                 end
 
                 c.to_s
               end
             end
           end
         end
       end
     end
 
     desired || default or raise Puppet::ParseError, "No match found for '#{key}' in any data file during extlookup()"
   end
 end
diff --git a/lib/puppet/parser/functions/file.rb b/lib/puppet/parser/functions/file.rb
index 963111260..19ab9ba2e 100644
--- a/lib/puppet/parser/functions/file.rb
+++ b/lib/puppet/parser/functions/file.rb
@@ -1,23 +1,23 @@
 # Returns the contents of a file
 
       Puppet::Parser::Functions::newfunction(
         :file, :type => :rvalue,
-        
+
     :doc => "Return the contents of a file.  Multiple files
     can be passed, and the first file that exists will be read in.") do |vals|
       ret = nil
       vals.each do |file|
         unless file =~ /^#{File::SEPARATOR}/
           raise Puppet::ParseError, "Files must be fully qualified"
         end
         if FileTest.exists?(file)
           ret = File.read(file)
           break
         end
       end
       if ret
         ret
       else
         raise Puppet::ParseError, "Could not find any files from #{vals.join(", ")}"
       end
 end
diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb
index 46e000383..9759ff6e1 100644
--- a/lib/puppet/parser/functions/inline_template.rb
+++ b/lib/puppet/parser/functions/inline_template.rb
@@ -1,20 +1,21 @@
 Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc =>
-  "Evaluate a template string and return its value.  See `the templating docs
-  <http://docs.puppetlabs.com/guides/templating.html>`_ for more information.  Note that
-  if multiple template strings are specified, their output is all concatenated
-  and returned as the output of the function.") do |vals|
-    require 'erb'
+  "Evaluate a template string and return its value.  See 
+  [the templating docs](http://docs.puppetlabs.com/guides/templating.html) for 
+  more information.  Note that if multiple template strings are specified, their 
+  output is all concatenated and returned as the output of the function.") do |vals|
+  
+  require 'erb'
 
     vals.collect do |string|
       # Use a wrapper, so the template can't get access to the full
       # Scope object.
 
       wrapper = Puppet::Parser::TemplateWrapper.new(self)
       begin
         wrapper.result(string)
       rescue => detail
         raise Puppet::ParseError,
           "Failed to parse inline template: #{detail}"
       end
     end.join("")
 end
diff --git a/lib/puppet/parser/functions/md5.rb b/lib/puppet/parser/functions/md5.rb
new file mode 100644
index 000000000..f7a4f7222
--- /dev/null
+++ b/lib/puppet/parser/functions/md5.rb
@@ -0,0 +1,5 @@
+Puppet::Parser::Functions::newfunction(:md5, :type => :rvalue, :doc => "Returns a MD5 hash value from a provided string.") do |args|
+      require 'md5'
+
+      Digest::MD5.hexdigest(args[0])
+end
diff --git a/lib/puppet/parser/functions/realize.rb b/lib/puppet/parser/functions/realize.rb
index 4247b8af8..c21ccd14a 100644
--- a/lib/puppet/parser/functions/realize.rb
+++ b/lib/puppet/parser/functions/realize.rb
@@ -1,14 +1,14 @@
 # This is just syntactic sugar for a collection, although it will generally
 # be a good bit faster.
 
 Puppet::Parser::Functions::newfunction(:realize, :doc => "Make a virtual object real.  This is useful
     when you want to know the name of the virtual object and don't want to
     bother with a full collection.  It is slightly faster than a collection,
     and, of course, is a bit shorter.  You must pass the object using a
-    reference; e.g.: ``realize User[luke]``." ) do |vals|
+    reference; e.g.: `realize User[luke]`." ) do |vals|
     coll = Puppet::Parser::Collector.new(self, :nomatter, nil, nil, :virtual)
     vals = [vals] unless vals.is_a?(Array)
     coll.resources = vals.flatten
 
     compiler.add_collection(coll)
 end
diff --git a/lib/puppet/parser/functions/regsubst.rb b/lib/puppet/parser/functions/regsubst.rb
index c0aeef222..f655db7b3 100644
--- a/lib/puppet/parser/functions/regsubst.rb
+++ b/lib/puppet/parser/functions/regsubst.rb
@@ -1,100 +1,100 @@
 module Puppet::Parser::Functions
 
   newfunction(
   :regsubst, :type => :rvalue,
 
   :doc => "
   Perform regexp replacement on a string or array of strings.
 
-- **Parameters** (in order):
+* *Parameters* (in order):
 
-:target:  The string or array of strings to operate on.  If an array, the replacement will be performed on each of the elements in the array, and the return value will be an array.
+    _target_  The string or array of strings to operate on.  If an array, the replacement will be performed on each of the elements in the array, and the return value will be an array.
 
-:regexp:  The regular expression matching the target string.  If you want it anchored at the start and or end of the string, you must do that with ^ and $ yourself.
+    _regexp_  The regular expression matching the target string.  If you want it anchored at the start and or end of the string, you must do that with ^ and $ yourself.
 
-:replacement:  Replacement string. Can contain back references to what was matched using \\0, \\1, and so on.
+    _replacement_  Replacement string. Can contain back references to what was matched using \\0, \\1, and so on.
 
-:flags:  Optional. String of single letter flags for how the regexp is interpreted:
+    _flags_  Optional. String of single letter flags for how the regexp is interpreted:
 
-  - **E**         Extended regexps
-  - **I**         Ignore case in regexps
-  - **M**         Multiline regexps
-  - **G**         Global replacement; all occurrences of the regexp in each target string will be replaced.  Without this, only the first occurrence will be replaced.
+        - *E*         Extended regexps
+        - *I*         Ignore case in regexps
+        - *M*         Multiline regexps
+        - *G*         Global replacement; all occurrences of the regexp in each target string will be replaced.  Without this, only the first occurrence will be replaced.
 
-:lang:  Optional.  How to handle multibyte characters.  A single-character string with the following values:
+    _lang_  Optional.  How to handle multibyte characters.  A single-character string with the following values:
 
-  - **N**         None
-  - **E**         EUC
-  - **S**         SJIS
-  - **U**         UTF-8
+        - *N*         None
+        - *E*         EUC
+        - *S*         SJIS
+        - *U*         UTF-8
 
-- **Examples**
+* *Examples*
 
-Get the third octet from the node's IP address::
+Get the third octet from the node's IP address:
 
-  $i3 = regsubst($ipaddress,'^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$','\\3')
+    $i3 = regsubst($ipaddress,'^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$','\\3')
 
-Put angle brackets around each octet in the node's IP address::
+Put angle brackets around each octet in the node's IP address:
 
-  $x = regsubst($ipaddress, '([0-9]+)', '<\\1>', 'G')
+    $x = regsubst($ipaddress, '([0-9]+)', '<\\1>', 'G')
 ") \
   do |args|
     unless args.length.between?(3, 5)
 
       raise(
         Puppet::ParseError,
 
           "regsubst(): got #{args.length} arguments, expected 3 to 5")
     end
     target, regexp, replacement, flags, lang = args
     reflags = 0
     operation = :sub
     if flags == nil
       flags = []
     elsif flags.respond_to?(:split)
       flags = flags.split('')
     else
 
       raise(
         Puppet::ParseError,
 
           "regsubst(): bad flags parameter #{flags.class}:`#{flags}'")
     end
     flags.each do |f|
       case f
       when 'G' then operation = :gsub
       when 'E' then reflags |= Regexp::EXTENDED
       when 'I' then reflags |= Regexp::IGNORECASE
       when 'M' then reflags |= Regexp::MULTILINE
       else raise(Puppet::ParseError, "regsubst(): bad flag `#{f}'")
       end
     end
     begin
       re = Regexp.compile(regexp, reflags, lang)
     rescue RegexpError, TypeError
 
       raise(
         Puppet::ParseError,
 
           "regsubst(): Bad regular expression `#{regexp}'")
     end
     if target.respond_to?(operation)
       # String parameter -> string result
       result = target.send(operation, re, replacement)
     elsif target.respond_to?(:collect) and
       target.respond_to?(:all?) and
       target.all? { |e| e.respond_to?(operation) }
       # Array parameter -> array result
       result = target.collect { |e|
         e.send(operation, re, replacement)
       }
     else
 
       raise(
         Puppet::ParseError,
 
           "regsubst(): bad target #{target.class}:`#{target}'")
     end
     return result
   end
 end
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index 3f98c9523..f15046b91 100644
--- a/lib/puppet/parser/functions/require.rb
+++ b/lib/puppet/parser/functions/require.rb
@@ -1,58 +1,57 @@
 # Requires the specified classes
 
   Puppet::Parser::Functions::newfunction(
     :require,
 
     :doc =>"Evaluate one or more classes,  adding the required class as a dependency.
 
 The relationship metaparameters work well for specifying relationships
 between individual resources, but they can be clumsy for specifying
 relationships between classes.  This function is a superset of the
 'include' function, adding a class relationship so that the requiring
 class depends on the required class.
 
 Warning: using require in place of include can lead to unwanted dependency cycles.
-  For instance the following manifest, with 'require' instead of 'include'
-  would produce a nasty dependence cycle, because notify imposes a before
-  between File[/foo] and Service[foo]::
+  
+For instance the following manifest, with 'require' instead of 'include' would produce a nasty dependence cycle, because notify imposes a before between File[/foo] and Service[foo]:
 
     class myservice {
       service { foo: ensure => running }
     }
 
     class otherstuff {
       include myservice
       file { '/foo': notify => Service[foo] }
     }
 
 Note that this function only works with clients 0.25 and later, and it will
 fail if used with earlier clients.
 
 ") do |vals|
   # Verify that the 'include' function is loaded
   method = Puppet::Parser::Functions.function(:include)
 
   send(method, vals)
   if resource.metaparam_compatibility_mode?
     warning "The 'require' function is only compatible with clients at 0.25 and above; including class but not adding dependency"
   else
     vals = [vals] unless vals.is_a?(Array)
 
     vals.each do |klass|
       # lookup the class in the scopes
       if classobj = find_hostclass(klass)
         klass = classobj.name
       else
         raise Puppet::ParseError, "Could not find class #{klass}"
       end
 
       # This is a bit hackish, in some ways, but it's the only way
       # to configure a dependency that will make it to the client.
       # The 'obvious' way is just to add an edge in the catalog,
       # but that is considered a containment edge, not a dependency
       # edge, so it usually gets lost on the client.
       ref = Puppet::Resource.new(:class, klass)
       resource.set_parameter(:require, [resource[:require]].flatten.compact << ref)
     end
   end
 end
diff --git a/lib/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
index 5d0a9dabc..52394095a 100644
--- a/lib/puppet/parser/functions/split.rb
+++ b/lib/puppet/parser/functions/split.rb
@@ -1,29 +1,29 @@
 module Puppet::Parser::Functions
 
   newfunction(
   :split, :type => :rvalue,
 
     :doc => "\
 Split a string variable into an array using the specified split regexp.
 
-  Usage::
+  Usage:
 
     $string     = 'v1.v2:v3.v4'
     $array_var1 = split($string, ':')
     $array_var2 = split($string, '[.]')
     $array_var3 = split($string, '[.:]')
 
 $array_var1 now holds the result ['v1.v2', 'v3.v4'],
 while $array_var2 holds ['v1', 'v2:v3', 'v4'], and
 $array_var3 holds ['v1', 'v2', 'v3', 'v4'].
 
 Note that in the second example, we split on a string that contains
 a regexp meta-character (.), and that needs protection.  A simple
 way to do that for a single character is to enclose it in square
 brackets.") do |args|
 
   raise Puppet::ParseError, ("split(): wrong number of arguments (#{args.length}; must be 2)") if args.length != 2
 
   return args[0].split(Regexp.compile(args[1]))
   end
 end
diff --git a/lib/puppet/parser/functions/sprintf.rb b/lib/puppet/parser/functions/sprintf.rb
index 5ada0fed7..5eb4a4f9d 100644
--- a/lib/puppet/parser/functions/sprintf.rb
+++ b/lib/puppet/parser/functions/sprintf.rb
@@ -1,13 +1,13 @@
 module Puppet::Parser::Functions
 
   newfunction(
   :sprintf, :type => :rvalue,
 
     :doc => "Perform printf-style formatting of text.
 
-      The first parameter is format string describing how the rest of the parameters should be formatted.  See the documentation for the ``Kernel::sprintf`` function in Ruby for all the details.") do |args|
+      The first parameter is format string describing how the rest of the parameters should be formatted.  See the documentation for the `Kernel::sprintf` function in Ruby for all the details.") do |args|
     raise Puppet::ParseError, 'sprintf() needs at least one argument' if args.length < 1
     fmt = args.shift
     return sprintf(fmt, *args)
   end
 end
diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb
index f51bcc1e2..6fa110332 100644
--- a/lib/puppet/parser/functions/template.rb
+++ b/lib/puppet/parser/functions/template.rb
@@ -1,22 +1,24 @@
 Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
-  "Evaluate a template and return its value.  See `the templating docs
-  <http://docs.puppetlabs.com/guides/templating.html>`_ for more information.
+  "Evaluate a template and return its value.  See
+  [the templating docs](http://docs.puppetlabs.com/guides/templating.html) for 
+  more information.
+  
   Note that if multiple templates are specified, their output is all
   concatenated and returned as the output of the function.") do |vals|
     require 'erb'
 
     vals.collect do |file|
       # Use a wrapper, so the template can't get access to the full
       # Scope object.
       debug "Retrieving template #{file}"
 
       wrapper = Puppet::Parser::TemplateWrapper.new(self)
       wrapper.file = file
       begin
         wrapper.result
       rescue => detail
         raise Puppet::ParseError,
           "Failed to parse template #{file}: #{detail}"
       end
     end.join("")
 end
diff --git a/lib/puppet/parser/functions/versioncmp.rb b/lib/puppet/parser/functions/versioncmp.rb
index b38406532..94ba3886f 100644
--- a/lib/puppet/parser/functions/versioncmp.rb
+++ b/lib/puppet/parser/functions/versioncmp.rb
@@ -1,34 +1,34 @@
 require 'puppet/util/package'
 
 
       Puppet::Parser::Functions::newfunction(
         :versioncmp, :type => :rvalue,
-        
+
   :doc => "Compares two versions
 
-Prototype::
+Prototype:
 
-  \$result = versioncmp(a, b)
+    \$result = versioncmp(a, b)
 
-  where a and b are arbitrary version strings
+Where a and b are arbitrary version strings
 
-This functions returns a number::
+This functions returns a number:
 
-  * > 0 if version a is greater than version b
-  * == 0 if both version are equals
-  * < 0 if version a is less than version b
+* > 0 if version a is greater than version b
+* == 0 if both version are equals
+* < 0 if version a is less than version b
 
-Example::
+Example:
 
-  if versioncmp('2.6-1', '2.4.5') > 0 {
-    notice('2.6-1 is > than 2.4.5')
-  }
+    if versioncmp('2.6-1', '2.4.5') > 0 {
+        notice('2.6-1 is > than 2.4.5')
+    }
 
 ") do |args|
 
   unless args.length == 2
     raise Puppet::ParseError, "versioncmp should have 2 arguments"
   end
 
   return Puppet::Util::Package.versioncmp(args[0], args[1])
 end
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index aa04f17a0..a25a17e3f 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -1,578 +1,578 @@
 # the scanner/lexer
 
 require 'strscan'
 require 'puppet'
 
 
 module Puppet
   class LexError < RuntimeError; end
 end
 
 module Puppet::Parser; end
 
 class Puppet::Parser::Lexer
   attr_reader :last, :file, :lexing_context, :token_queue
 
   attr_accessor :line, :indefine
 
   def lex_error msg
     raise Puppet::LexError.new(msg)
   end
 
   class Token
     attr_accessor :regex, :name, :string, :skip, :incr_line, :skip_text, :accumulate
 
     def initialize(regex, name)
       if regex.is_a?(String)
         @name, @string = name, regex
         @regex = Regexp.new(Regexp.escape(@string))
       else
         @name, @regex = name, regex
       end
     end
 
     # MQR: Why not just alias?
     %w{skip accumulate}.each do |method|
       define_method(method+"?") do
         self.send(method)
       end
     end
 
     def to_s
       if self.string
         @string
       else
         @name.to_s
       end
     end
 
     def acceptable?(context={})
       # By default tokens are aceeptable in any context
       true
     end
   end
 
   # Maintain a list of tokens.
   class TokenList
     attr_reader :regex_tokens, :string_tokens
 
     def [](name)
       @tokens[name]
     end
 
     # Create a new token.
     def add_token(name, regex, options = {}, &block)
       token = Token.new(regex, name)
       raise(ArgumentError, "Token #{name} already exists") if @tokens.include?(name)
       @tokens[token.name] = token
       if token.string
         @string_tokens << token
         @tokens_by_string[token.string] = token
       else
         @regex_tokens << token
       end
 
       options.each do |name, option|
         token.send(name.to_s + "=", option)
       end
 
       token.meta_def(:convert, &block) if block_given?
 
       token
     end
 
     def initialize
       @tokens = {}
       @regex_tokens = []
       @string_tokens = []
       @tokens_by_string = {}
     end
 
     # Look up a token by its value, rather than name.
     def lookup(string)
       @tokens_by_string[string]
     end
 
     # Define more tokens.
     def add_tokens(hash)
       hash.each do |regex, name|
         add_token(name, regex)
       end
     end
 
     # Sort our tokens by length, so we know once we match, we're done.
     # This helps us avoid the O(n^2) nature of token matching.
     def sort_tokens
       @string_tokens.sort! { |a, b| b.string.length <=> a.string.length }
     end
   end
 
   TOKENS = TokenList.new
 
     TOKENS.add_tokens(
 
       '[' => :LBRACK,
       ']' => :RBRACK,
       '{' => :LBRACE,
       '}' => :RBRACE,
       '(' => :LPAREN,
 
       ')' => :RPAREN,
       '=' => :EQUALS,
       '+=' => :APPENDS,
       '==' => :ISEQUAL,
       '>=' => :GREATEREQUAL,
       '>' => :GREATERTHAN,
       '<' => :LESSTHAN,
       '<=' => :LESSEQUAL,
       '!=' => :NOTEQUAL,
       '!' => :NOT,
       ',' => :COMMA,
       '.' => :DOT,
       ':' => :COLON,
       '@' => :AT,
       '<<|' => :LLCOLLECT,
       '->' => :IN_EDGE,
       '<-' => :OUT_EDGE,
       '~>' => :IN_EDGE_SUB,
       '<~' => :OUT_EDGE_SUB,
       '|>>' => :RRCOLLECT,
       '<|' => :LCOLLECT,
       '|>' => :RCOLLECT,
       ';' => :SEMIC,
       '?' => :QMARK,
       '\\' => :BACKSLASH,
       '=>' => :FARROW,
       '+>' => :PARROW,
       '+' => :PLUS,
       '-' => :MINUS,
       '/' => :DIV,
       '*' => :TIMES,
       '<<' => :LSHIFT,
       '>>' => :RSHIFT,
       '=~' => :MATCH,
       '!~' => :NOMATCH,
       %r{([a-z][-\w]*)?(::[a-z][-\w]*)+} => :CLASSNAME, # Require '::' in the class name, else we'd compete with NAME
       %r{((::){0,1}[A-Z][-\w]*)+} => :CLASSREF,
       "<string>" => :STRING,
       "<dqstring up to first interpolation>" => :DQPRE,
       "<dqstring between two interpolations>" => :DQMID,
       "<dqstring after final interpolation>" => :DQPOST,
       "<boolean>" => :BOOLEAN
       )
 
   TOKENS.add_token :NUMBER, %r{\b(?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?)\b} do |lexer, value|
     [TOKENS[:NAME], value]
   end
   #:stopdoc: # Issue #4161
   def (TOKENS[:NUMBER]).acceptable?(context={})
     ![:DQPRE,:DQMID].include? context[:after]
   end
   #:startdoc:
 
   TOKENS.add_token :NAME, %r{[a-z0-9][-\w]*} do |lexer, value|
     string_token = self
     # we're looking for keywords here
     if tmp = KEYWORDS.lookup(value)
       string_token = tmp
       if [:TRUE, :FALSE].include?(string_token.name)
         value = eval(value)
         string_token = TOKENS[:BOOLEAN]
       end
     end
     [string_token, value]
   end
   [:NAME,:CLASSNAME,:CLASSREF].each { |name_token|
     #:stopdoc: # Issue #4161
     def (TOKENS[name_token]).acceptable?(context={})
       ![:DQPRE,:DQMID].include? context[:after]
     end
     #:startdoc:
   }
 
   TOKENS.add_token :COMMENT, %r{#.*}, :accumulate => true, :skip => true do |lexer,value|
     value.sub!(/# ?/,'')
     [self, value]
   end
 
   TOKENS.add_token :MLCOMMENT, %r{/\*(.*?)\*/}m, :accumulate => true, :skip => true do |lexer, value|
     lexer.line += value.count("\n")
     value.sub!(/^\/\* ?/,'')
     value.sub!(/ ?\*\/$/,'')
     [self,value]
   end
 
   TOKENS.add_token :REGEX, %r{/[^/\n]*/} do |lexer, value|
     # Make sure we haven't matched an escaped /
     while value[-2..-2] == '\\'
       other = lexer.scan_until(%r{/})
       value += other
     end
     regex = value.sub(%r{\A/}, "").sub(%r{/\Z}, '').gsub("\\/", "/")
     [self, Regexp.new(regex)]
   end
 
   #:stopdoc: # Issue #4161
   def (TOKENS[:REGEX]).acceptable?(context={})
     [:NODE,:LBRACE,:RBRACE,:MATCH,:NOMATCH,:COMMA].include? context[:after]
   end
   #:startdoc:
 
   TOKENS.add_token :RETURN, "\n", :skip => true, :incr_line => true, :skip_text => true
 
   TOKENS.add_token :SQUOTE, "'" do |lexer, value|
-    [TOKENS[:STRING], lexer.slurpstring(value,["'"],:ignore_invalid_esapes).first ]
+    [TOKENS[:STRING], lexer.slurpstring(value,["'"],:ignore_invalid_escapes).first ]
   end
 
   DQ_initial_token_types      = {'$' => :DQPRE,'"' => :STRING}
   DQ_continuation_token_types = {'$' => :DQMID,'"' => :DQPOST}
 
   TOKENS.add_token :DQUOTE, /"/ do |lexer, value|
     lexer.tokenize_interpolated_string(DQ_initial_token_types)
   end
 
   TOKENS.add_token :DQCONT, /\}/ do |lexer, value|
     lexer.tokenize_interpolated_string(DQ_continuation_token_types)
   end
   #:stopdoc: # Issue #4161
   def (TOKENS[:DQCONT]).acceptable?(context={})
     context[:string_interpolation_depth] > 0
   end
   #:startdoc:
 
   TOKENS.add_token :DOLLAR_VAR, %r{\$(\w*::)*\w+} do |lexer, value|
     [TOKENS[:VARIABLE],value[1..-1]]
   end
 
   TOKENS.add_token :VARIABLE, %r{(\w*::)*\w+}
   #:stopdoc: # Issue #4161
   def (TOKENS[:VARIABLE]).acceptable?(context={})
     [:DQPRE,:DQMID].include? context[:after]
   end
   #:startdoc:
 
 
   TOKENS.sort_tokens
 
   @@pairs = {
     "{" => "}",
     "(" => ")",
     "[" => "]",
     "<|" => "|>",
     "<<|" => "|>>"
   }
 
   KEYWORDS = TokenList.new
 
 
     KEYWORDS.add_tokens(
 
       "case" => :CASE,
       "class" => :CLASS,
       "default" => :DEFAULT,
       "define" => :DEFINE,
       "import" => :IMPORT,
       "if" => :IF,
       "elsif" => :ELSIF,
       "else" => :ELSE,
       "inherits" => :INHERITS,
       "node" => :NODE,
       "and"  => :AND,
       "or"   => :OR,
       "undef"   => :UNDEF,
       "false" => :FALSE,
       "true" => :TRUE,
 
       "in" => :IN
   )
 
   def clear
     initvars
   end
 
   def expected
     return nil if @expected.empty?
     name = @expected[-1]
     TOKENS.lookup(name) or lex_error "Could not find expected token #{name}"
   end
 
   # scan the whole file
   # basically just used for testing
   def fullscan
     array = []
 
     self.scan { |token, str|
       # Ignore any definition nesting problems
       @indefine = false
       array.push([token,str])
     }
     array
   end
 
   def file=(file)
     @file = file
     @line = 1
     @scanner = StringScanner.new(File.read(file))
   end
 
   def shift_token
     @token_queue.shift
   end
 
   def find_string_token
     # We know our longest string token is three chars, so try each size in turn
     # until we either match or run out of chars.  This way our worst-case is three
     # tries, where it is otherwise the number of string token we have.  Also,
     # the lookups are optimized hash lookups, instead of regex scans.
     #
     s = @scanner.peek(3)
     token = TOKENS.lookup(s[0,3]) || TOKENS.lookup(s[0,2]) || TOKENS.lookup(s[0,1])
     [ token, token && @scanner.scan(token.regex) ]
   end
 
   # Find the next token that matches a regex.  We look for these first.
   def find_regex_token
     @regex += 1
     best_token = nil
     best_length = 0
 
     # I tried optimizing based on the first char, but it had
     # a slightly negative affect and was a good bit more complicated.
     TOKENS.regex_tokens.each do |token|
       if length = @scanner.match?(token.regex) and token.acceptable?(lexing_context)
         # We've found a longer match
         if length > best_length
           best_length = length
           best_token = token
         end
       end
     end
 
     return best_token, @scanner.scan(best_token.regex) if best_token
   end
 
   # Find the next token, returning the string and the token.
   def find_token
     @find += 1
     shift_token || find_regex_token || find_string_token
   end
 
   def indefine?
     if defined?(@indefine)
       @indefine
     else
       false
     end
   end
 
   def initialize
     @find = 0
     @regex = 0
     initvars
   end
 
   def initvars
     @line = 1
     @previous_token = nil
     @scanner = nil
     @file = nil
     # AAARRGGGG! okay, regexes in ruby are bloody annoying
     # no one else has "\n" =~ /\s/
     @skip = %r{[ \t\r]+}
 
     @namestack = []
     @token_queue = []
     @indefine = false
     @expected = []
     @commentstack = [ ['', @line] ]
     @lexing_context = {
       :after => nil,
       :start_of_line => true,
       :string_interpolation_depth => 0
       }
   end
 
   # Make any necessary changes to the token and/or value.
   def munge_token(token, value)
     @line += 1 if token.incr_line
 
     skip if token.skip_text
 
     return if token.skip and not token.accumulate?
 
     token, value = token.convert(self, value) if token.respond_to?(:convert)
 
     return unless token
 
     if token.accumulate?
       comment = @commentstack.pop
       comment[0] << value + "\n"
       @commentstack.push(comment)
     end
 
     return if token.skip
 
     return token, { :value => value, :line => @line }
   end
 
   # Go up one in the namespace.
   def namepop
     @namestack.pop
   end
 
   # Collect the current namespace.
   def namespace
     @namestack.join("::")
   end
 
   # This value might have :: in it, but we don't care -- it'll be
   # handled normally when joining, and when popping we want to pop
   # this full value, however long the namespace is.
   def namestack(value)
     @namestack << value
   end
 
   def rest
     @scanner.rest
   end
 
   # this is the heart of the lexer
   def scan
     #Puppet.debug("entering scan")
     lex_error "Invalid or empty string" unless @scanner
 
     # Skip any initial whitespace.
     skip
 
     until token_queue.empty? and @scanner.eos? do
       yielded = false
       matched_token, value = find_token
 
       # error out if we didn't match anything at all
       lex_error "Could not match #{@scanner.rest[/^(\S+|\s+|.*)/]}" unless matched_token
 
       newline = matched_token.name == :RETURN
 
       # this matches a blank line; eat the previously accumulated comments
       getcomment if lexing_context[:start_of_line] and newline
       lexing_context[:start_of_line] = newline
 
       final_token, token_value = munge_token(matched_token, value)
 
       unless final_token
         skip
         next
       end
 
       lexing_context[:after]         = final_token.name unless newline
       lexing_context[:string_interpolation_depth] += 1 if final_token.name == :DQPRE
       lexing_context[:string_interpolation_depth] -= 1 if final_token.name == :DQPOST
 
       value = token_value[:value]
 
       if match = @@pairs[value] and final_token.name != :DQUOTE and final_token.name != :SQUOTE
         @expected << match
       elsif exp = @expected[-1] and exp == value and final_token.name != :DQUOTE and final_token.name != :SQUOTE
         @expected.pop
       end
 
       if final_token.name == :LBRACE
         commentpush
       end
 
       yield [final_token.name, token_value]
 
       if @previous_token
-        namestack(value) if @previous_token.name == :CLASS
+        namestack(value) if @previous_token.name == :CLASS and value != '{'
 
         if @previous_token.name == :DEFINE
           if indefine?
             msg = "Cannot nest definition #{value} inside #{@indefine}"
             self.indefine = false
             raise Puppet::ParseError, msg
           end
 
           @indefine = value
         end
       end
       @previous_token = final_token
       skip
     end
     @scanner = nil
 
     # This indicates that we're done parsing.
     yield [false,false]
   end
 
   # Skip any skipchars in our remaining string.
   def skip
     @scanner.skip(@skip)
   end
 
   # Provide some limited access to the scanner, for those
   # tokens that need it.
   def scan_until(regex)
     @scanner.scan_until(regex)
   end
 
   # we've encountered the start of a string...
   # slurp in the rest of the string and return it
   def slurpstring(terminators,escapes=%w{ \\  $ ' " n t s }+["\n"],ignore_invalid_escapes=false)
     # we search for the next quote that isn't preceded by a
     # backslash; the caret is there to match empty strings
     str = @scanner.scan_until(/([^\\]|^)[#{terminators}]/) or lex_error "Unclosed quote after '#{last}' in '#{rest}'"
     @line += str.count("\n") # literal carriage returns add to the line count.
     str.gsub!(/\\(.)/) {
-      case ch=$1
-      when 'n'; "\n"
-      when 't'; "\t"
-      when 's'; " "
-      else
-        if escapes.include? ch
-          ch
-        else
-          Puppet.warning "Unrecognised escape sequence '\\#{ch}'#{file && " in file #{file}"}#{line && " at line #{line}"}" unless ignore_invalid_escapes
-          "\\#{ch}"
+      ch = $1
+      if escapes.include? ch
+        case ch
+        when 'n'; "\n"
+        when 't'; "\t"
+        when 's'; " "
+        else      ch
         end
+      else
+        Puppet.warning "Unrecognised escape sequence '\\#{ch}'#{file && " in file #{file}"}#{line && " at line #{line}"}" unless ignore_invalid_escapes
+        "\\#{ch}"
       end
     }
     [ str[0..-2],str[-1,1] ]
   end
 
   def tokenize_interpolated_string(token_type,preamble='')
     value,terminator = slurpstring('"$')
     token_queue << [TOKENS[token_type[terminator]],preamble+value]
     if terminator != '$' or @scanner.scan(/\{/)
       token_queue.shift 
     elsif var_name = @scanner.scan(%r{(\w*::)*\w+|[0-9]})
       token_queue << [TOKENS[:VARIABLE],var_name]
       tokenize_interpolated_string(DQ_continuation_token_types)
     else
       tokenize_interpolated_string(token_type,token_queue.pop.last + terminator)
     end
   end
 
   # just parse a string, not a whole file
   def string=(string)
     @scanner = StringScanner.new(string)
   end
 
   # returns the content of the currently accumulated content cache
   def commentpop
     @commentstack.pop[0]
   end
 
   def getcomment(line = nil)
     comment = @commentstack.last
     if line.nil? or comment[1] <= line
       @commentstack.pop
       @commentstack.push(['', @line])
       return comment[0]
     end
     ''
   end
 
   def commentpush
     @commentstack.push(['', @line])
   end
 end
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 3c451929e..8a5ae886c 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -1,322 +1,318 @@
 require 'puppet/resource'
 
 # The primary difference between this class and its
 # parent is that this class has rules on who can set
 # parameters
 class Puppet::Parser::Resource < Puppet::Resource
   require 'puppet/parser/resource/param'
   require 'puppet/util/tagging'
   require 'puppet/file_collection/lookup'
   require 'puppet/parser/yaml_trimmer'
   require 'puppet/resource/type_collection_helper'
 
   include Puppet::FileCollection::Lookup
   include Puppet::Resource::TypeCollectionHelper
 
   include Puppet::Util
   include Puppet::Util::MethodHelper
   include Puppet::Util::Errors
   include Puppet::Util::Logging
   include Puppet::Util::Tagging
   include Puppet::Parser::YamlTrimmer
 
   attr_accessor :source, :scope, :rails_id
   attr_accessor :virtual, :override, :translated, :catalog, :evaluated
 
   attr_reader :exported, :parameters
 
   # Determine whether the provided parameter name is a relationship parameter.
   def self.relationship_parameter?(name)
     @relationship_names ||= Puppet::Type.relationship_params.collect { |p| p.name }
     @relationship_names.include?(name)
   end
 
   # Set up some boolean test methods
   def translated?; !!@translated; end
   def override?;   !!@override;   end
   def evaluated?;  !!@evaluated;  end
 
   def [](param)
     param = symbolize(param)
     if param == :title
       return self.title
     end
     if @parameters.has_key?(param)
       @parameters[param].value
     else
       nil
     end
   end
 
   def []=(param, value)
     set_parameter(param, value)
   end
 
   def eachparam
     @parameters.each do |name, param|
       yield param
     end
   end
 
   def environment
     scope.environment
   end
 
   # Retrieve the associated definition and evaluate it.
   def evaluate
     @evaluated = true
     if klass = resource_type and ! builtin_type?
       finish
       return klass.evaluate_code(self)
     elsif builtin?
       devfail "Cannot evaluate a builtin type (#{type})"
     else
       self.fail "Cannot find definition #{type}"
     end
   end
 
   # Mark this resource as both exported and virtual,
   # or remove the exported mark.
   def exported=(value)
     if value
       @virtual = true
       @exported = value
     else
       @exported = value
     end
   end
 
   # Do any finishing work on this object, called before evaluation or
   # before storage/translation.
   def finish
     return if finished?
     @finished = true
     add_defaults
     add_metaparams
     validate
   end
 
   # Has this resource already been finished?
   def finished?
     @finished
   end
 
   def initialize(*args)
+    raise ArgumentError, "Resources require a scope" unless args.last[:scope]
     super
 
-    raise ArgumentError, "Resources require a scope" unless scope
     @source ||= scope.source
   end
 
   # Is this resource modeling an isomorphic resource type?
   def isomorphic?
     if builtin_type?
       return resource_type.isomorphic?
     else
       return true
     end
   end
 
   # Merge an override resource in.  This will throw exceptions if
   # any overrides aren't allowed.
   def merge(resource)
     # Test the resource scope, to make sure the resource is even allowed
     # to override.
     unless self.source.object_id == resource.source.object_id || resource.source.child_of?(self.source)
       raise Puppet::ParseError.new("Only subclasses can override parameters", resource.line, resource.file)
     end
     # Some of these might fail, but they'll fail in the way we want.
     resource.parameters.each do |name, param|
       override_parameter(param)
     end
   end
 
   # Unless we're running >= 0.25, we're in compat mode.
   def metaparam_compatibility_mode?
     ! (catalog and ver = (catalog.client_version||'0.0.0').split(".") and (ver[0] > "0" or ver[1].to_i >= 25))
   end
 
   def name
     self[:name] || self.title
   end
 
-  def namespaces
-    scope.namespaces
-  end
-
   # A temporary occasion, until I get paths in the scopes figured out.
   def path
     to_s
   end
 
   # Define a parameter in our resource.
   # if we ever receive a parameter named 'tag', set
   # the resource tags with its value.
   def set_parameter(param, value = nil)
     if ! value.nil?
       param = Puppet::Parser::Resource::Param.new(
         :name => param, :value => value, :source => self.source
       )
     elsif ! param.is_a?(Puppet::Parser::Resource::Param)
       raise ArgumentError, "Must pass a parameter or all necessary values"
     end
 
     tag(*param.value) if param.name == :tag
 
     # And store it in our parameter hash.
     @parameters[param.name] = param
   end
 
   def to_hash
     @parameters.inject({}) do |hash, ary|
       param = ary[1]
       # Skip "undef" values.
       hash[param.name] = param.value if param.value != :undef
       hash
     end
   end
 
 
   # Create a Puppet::Resource instance from this parser resource.
   # We plan, at some point, on not needing to do this conversion, but
   # it's sufficient for now.
   def to_resource
     result = Puppet::Resource.new(type, title)
 
     to_hash.each do |p, v|
       if v.is_a?(Puppet::Resource)
         v = Puppet::Resource.new(v.type, v.title)
       elsif v.is_a?(Array)
         # flatten resource references arrays
         v = v.flatten if v.flatten.find { |av| av.is_a?(Puppet::Resource) }
         v = v.collect do |av|
           av = Puppet::Resource.new(av.type, av.title) if av.is_a?(Puppet::Resource)
           av
         end
       end
 
       # If the value is an array with only one value, then
       # convert it to a single value.  This is largely so that
       # the database interaction doesn't have to worry about
       # whether it returns an array or a string.
       result[p] = if v.is_a?(Array) and v.length == 1
         v[0]
           else
             v
               end
     end
 
     result.file = self.file
     result.line = self.line
     result.exported = self.exported
     result.virtual = self.virtual
     result.tag(*self.tags)
 
     result
   end
 
   # Translate our object to a transportable object.
   def to_trans
     return nil if virtual?
 
     to_resource.to_trans
   end
 
   # Convert this resource to a RAL resource.  We hackishly go via the
   # transportable stuff.
   def to_ral
     to_resource.to_ral
   end
 
   private
 
   # Add default values from our definition.
   def add_defaults
     scope.lookupdefaults(self.type).each do |name, param|
       unless @parameters.include?(name)
         self.debug "Adding default for #{name}"
 
         @parameters[name] = param.dup
       end
     end
   end
 
   def add_backward_compatible_relationship_param(name)
     # Skip metaparams for which we get no value.
     return unless val = scope.lookupvar(name.to_s, false) and val != :undefined
 
     # The default case: just set the value
     set_parameter(name, val) and return unless @parameters[name]
 
     # For relationship params, though, join the values (a la #446).
     @parameters[name].value = [@parameters[name].value, val].flatten
   end
 
   # Add any metaparams defined in our scope. This actually adds any metaparams
   # from any parent scope, and there's currently no way to turn that off.
   def add_metaparams
     compat_mode = metaparam_compatibility_mode?
 
     Puppet::Type.eachmetaparam do |name|
       next unless self.class.relationship_parameter?(name)
       add_backward_compatible_relationship_param(name) if compat_mode
     end
   end
 
   # Accept a parameter from an override.
   def override_parameter(param)
     # This can happen if the override is defining a new parameter, rather
     # than replacing an existing one.
     (set_parameter(param) and return) unless current = @parameters[param.name]
 
     # The parameter is already set.  Fail if they're not allowed to override it.
     unless param.source.child_of?(current.source)
       puts caller if Puppet[:trace]
       msg = "Parameter '#{param.name}' is already set on #{self}"
       msg += " by #{current.source}" if current.source.to_s != ""
       if current.file or current.line
         fields = []
         fields << current.file if current.file
         fields << current.line.to_s if current.line
         msg += " at #{fields.join(":")}"
       end
       msg += "; cannot redefine"
       raise Puppet::ParseError.new(msg, param.line, param.file)
     end
 
     # If we've gotten this far, we're allowed to override.
 
     # Merge with previous value, if the parameter was generated with the +>
     # syntax.  It's important that we use a copy of the new param instance
     # here, not the old one, and not the original new one, so that the source
     # is registered correctly for later overrides but the values aren't
     # implcitly shared when multiple resources are overrriden at once (see
     # ticket #3556).
     if param.add
       param = param.dup
       param.value = [current.value, param.value].flatten
     end
 
     set_parameter(param)
   end
 
   # Make sure the resource's parameters are all valid for the type.
   def validate
     @parameters.each do |name, param|
       validate_parameter(name)
     end
   rescue => detail
     fail Puppet::ParseError, detail.to_s
   end
 
   private
 
   def extract_parameters(params)
     params.each do |param|
       # Don't set the same parameter twice
       self.fail Puppet::ParseError, "Duplicate parameter '#{param.name}' for on #{self}" if @parameters[param.name]
 
       set_parameter(param)
     end
   end
 end
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index af2d98fe8..c28322337 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -1,27 +1,27 @@
 require 'puppet/file_collection/lookup'
 require 'puppet/parser/yaml_trimmer'
 
 # The parameters we stick in Resources.
 class Puppet::Parser::Resource::Param
   attr_accessor :name, :value, :source, :add
   include Puppet::Util
   include Puppet::Util::Errors
   include Puppet::Util::MethodHelper
 
   include Puppet::FileCollection::Lookup
   include Puppet::Parser::YamlTrimmer
 
   def initialize(hash)
     set_options(hash)
-    requiredopts(:name, :value, :source)
+    requiredopts(:name, :value)
     @name = symbolize(@name)
   end
 
   def line_to_i
     line ? Integer(line) : nil
   end
 
   def to_s
     "#{self.name} => #{self.value}"
   end
 end
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index ae0f9ea4a..24f1d01f7 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -1,483 +1,518 @@
 # The scope class, which handles storing and retrieving variables and types and
 # such.
 
 require 'puppet/parser/parser'
 require 'puppet/parser/templatewrapper'
 require 'puppet/transportable'
 require 'strscan'
 
 require 'puppet/resource/type_collection_helper'
 
 class Puppet::Parser::Scope
   include Puppet::Resource::TypeCollectionHelper
   require 'puppet/parser/resource'
 
   AST = Puppet::Parser::AST
 
   Puppet::Util.logmethods(self)
 
   include Enumerable
   include Puppet::Util::Errors
   attr_accessor :level, :source, :resource
   attr_accessor :base, :keyword
   attr_accessor :top, :translated, :compiler
   attr_accessor :parent
   attr_reader :namespaces
 
   # thin wrapper around an ephemeral
   # symbol table.
   # when a symbol
   class Ephemeral
     def initialize(parent=nil)
       @symbols = {}
       @parent = parent
     end
 
     [:include?, :delete, :[]=].each do |m|
       define_method(m) do |*args|
         @symbols.send(m, *args)
       end
     end
 
     def [](name)
       unless @symbols.include?(name) or @parent.nil?
         @parent[name]
       else
         @symbols[name]
       end
     end
   end
 
   # A demeterific shortcut to the catalog.
   def catalog
     compiler.catalog
   end
 
   def environment
     compiler.environment
   end
 
   # Proxy accessors
   def host
     @compiler.node.name
   end
 
   # Is the value true?  This allows us to control the definition of truth
   # in one place.
   def self.true?(value)
     (value != false and value != "" and value != :undef)
   end
 
   # Is the value a number?, return the correct object or nil if not a number
   def self.number?(value)
     return nil unless value.is_a?(Fixnum) or value.is_a?(Bignum) or value.is_a?(Float) or value.is_a?(String)
 
     if value.is_a?(String)
       if value =~ /^-?\d+(:?\.\d+|(:?\.\d+)?e\d+)$/
         return value.to_f
       elsif value =~ /^0x[0-9a-f]+$/i
         return value.to_i(16)
       elsif value =~ /^0[0-7]+$/
         return value.to_i(8)
       elsif value =~ /^-?\d+$/
         return value.to_i
       else
         return nil
       end
     end
     # it is one of Fixnum,Bignum or Float
     value
   end
 
   # Add to our list of namespaces.
   def add_namespace(ns)
     return false if @namespaces.include?(ns)
     if @namespaces == [""]
       @namespaces = [ns]
     else
       @namespaces << ns
     end
   end
 
   # Remove this when rebasing
   def environment
     compiler.environment
   end
 
   # Are we the top scope?
   def topscope?
     @level == 1
   end
 
   def find_hostclass(name)
     known_resource_types.find_hostclass(namespaces, name)
   end
 
   def find_definition(name)
     known_resource_types.find_definition(namespaces, name)
   end
 
   def findresource(string, name = nil)
     compiler.findresource(string, name)
   end
 
   # Initialize our new scope.  Defaults to having no parent.
   def initialize(hash = {})
     if hash.include?(:namespace)
       if n = hash[:namespace]
         @namespaces = [n]
       end
       hash.delete(:namespace)
     else
       @namespaces = [""]
     end
     hash.each { |name, val|
       method = name.to_s + "="
       if self.respond_to? method
         self.send(method, val)
       else
         raise Puppet::DevError, "Invalid scope argument #{name}"
       end
     }
 
     extend_with_functions_module
 
     @tags = []
 
     # The symbol table for this scope.  This is where we store variables.
     @symtable = {}
 
     # the ephemeral symbol tables
     # those should not persist long, and are used for the moment only
     # for $0..$xy capture variables of regexes
     # this is actually implemented as a stack, with each ephemeral scope
     # shadowing the previous one
     @ephemeral = [ Ephemeral.new ]
 
     # All of the defaults set for types.  It's a hash of hashes,
     # with the first key being the type, then the second key being
     # the parameter.
     @defaults = Hash.new { |dhash,type|
       dhash[type] = {}
     }
 
     # The table for storing class singletons.  This will only actually
     # be used by top scopes and node scopes.
     @class_scopes = {}
   end
 
   # Store the fact that we've evaluated a class, and store a reference to
   # the scope in which it was evaluated, so that we can look it up later.
   def class_set(name, scope)
     return parent.class_set(name,scope) if parent
     @class_scopes[name] = scope
   end
 
   # Return the scope associated with a class.  This is just here so
   # that subclasses can set their parent scopes to be the scope of
   # their parent class, and it's also used when looking up qualified
   # variables.
   def class_scope(klass)
     # They might pass in either the class or class name
     k = klass.respond_to?(:name) ? klass.name : klass
     @class_scopes[k] || (parent && parent.class_scope(k))
   end
 
   # Collect all of the defaults set at any higher scopes.
   # This is a different type of lookup because it's additive --
   # it collects all of the defaults, with defaults in closer scopes
   # overriding those in later scopes.
   def lookupdefaults(type)
     values = {}
 
     # first collect the values from the parents
     unless parent.nil?
       parent.lookupdefaults(type).each { |var,value|
         values[var] = value
       }
     end
 
     # then override them with any current values
     # this should probably be done differently
     if @defaults.include?(type)
       @defaults[type].each { |var,value|
         values[var] = value
       }
     end
 
     #Puppet.debug "Got defaults for %s: %s" %
     #    [type,values.inspect]
     values
   end
 
   # Look up a defined type.
   def lookuptype(name)
     find_definition(name) || find_hostclass(name)
   end
 
   def lookup_qualified_var(name, usestring)
     parts = name.split(/::/)
     shortname = parts.pop
     klassname = parts.join("::")
     klass = find_hostclass(klassname)
     unless klass
       warning "Could not look up qualified variable '#{name}'; class #{klassname} could not be found"
       return usestring ? "" : :undefined
     end
     unless kscope = class_scope(klass)
       warning "Could not look up qualified variable '#{name}'; class #{klassname} has not been evaluated"
       return usestring ? "" : :undefined
     end
     kscope.lookupvar(shortname, usestring)
   end
 
   private :lookup_qualified_var
 
   # Look up a variable.  The simplest value search we do.  Default to returning
   # an empty string for missing values, but support returning a constant.
   def lookupvar(name, usestring = true)
     table = ephemeral?(name) ? @ephemeral.last : @symtable
     # If the variable is qualified, then find the specified scope and look the variable up there instead.
     if name =~ /::/
       return lookup_qualified_var(name, usestring)
     end
     # We can't use "if table[name]" here because the value might be false
     if ephemeral_include?(name) or table.include?(name)
       if usestring and table[name] == :undef
         return ""
       else
         return table[name]
       end
     elsif self.parent
       return parent.lookupvar(name, usestring)
     elsif usestring
       return ""
     else
       return :undefined
     end
   end
 
   # Return a hash containing our variables and their values, optionally (and
   # by default) including the values defined in our parent.  Local values
   # shadow parent values.
   def to_hash(recursive = true)
     target = parent.to_hash(recursive) if recursive and parent
     target ||= Hash.new
     @symtable.keys.each { |name|
       value = @symtable[name]
       if value == :undef
         target.delete(name)
       else
         target[name] = value
       end
     }
     target
   end
 
   def namespaces
     @namespaces.dup
   end
 
   # Create a new scope and set these options.
   def newscope(options = {})
     compiler.newscope(self, options)
   end
 
   def parent_module_name
     return nil unless @parent
     return nil unless @parent.source
     @parent.source.module_name
   end
 
   # Return the list of scopes up to the top scope, ordered with our own first.
   # This is used for looking up variables and defaults.
   def scope_path
     if parent
       [self, parent.scope_path].flatten.compact
     else
       [self]
     end
   end
 
   # Set defaults for a type.  The typename should already be downcased,
   # so that the syntax is isolated.  We don't do any kind of type-checking
   # here; instead we let the resource do it when the defaults are used.
   def setdefaults(type, params)
     table = @defaults[type]
 
     # if we got a single param, it'll be in its own array
     params = [params] unless params.is_a?(Array)
 
     params.each { |param|
       #Puppet.debug "Default for %s is %s => %s" %
       #    [type,ary[0].inspect,ary[1].inspect]
       if table.include?(param.name)
         raise Puppet::ParseError.new("Default already defined for #{type} { #{param.name} }; cannot redefine", param.line, param.file)
       end
       table[param.name] = param
     }
   end
 
   # Set a variable in the current scope.  This will override settings
   # in scopes above, but will not allow variables in the current scope
   # to be reassigned.
   def setvar(name,value, options = {})
     table = options[:ephemeral] ? @ephemeral.last : @symtable
     #Puppet.debug "Setting %s to '%s' at level %s mode append %s" %
     #    [name.inspect,value,self.level, append]
     if table.include?(name)
       unless options[:append]
         error = Puppet::ParseError.new("Cannot reassign variable #{name}")
       else
         error = Puppet::ParseError.new("Cannot append, variable #{name} is defined in this scope")
       end
       error.file = options[:file] if options[:file]
       error.line = options[:line] if options[:line]
       raise error
     end
 
     unless options[:append]
       table[name] = value
     else # append case
       # lookup the value in the scope if it exists and insert the var
       table[name] = lookupvar(name)
       # concatenate if string, append if array, nothing for other types
       case value
       when Array
         table[name] += value
       when Hash
         raise ArgumentError, "Trying to append to a hash with something which is not a hash is unsupported" unless value.is_a?(Hash)
         table[name].merge!(value)
       else
         table[name] << value
       end
     end
   end
 
   # Return an interpolated string.
   def strinterp(string, file = nil, line = nil)
     # Most strings won't have variables in them.
     ss = StringScanner.new(string)
     out = ""
     while not ss.eos?
       if ss.scan(/^\$\{((\w*::)*\w+|[0-9]+)\}|^\$([0-9])|^\$((\w*::)*\w+)/)
         # If it matches the backslash, then just retun the dollar sign.
         if ss.matched == '\\$'
           out << '$'
         else # look the variable up
           # make sure $0-$9 are lookupable only if ephemeral
           var = ss[1] || ss[3] || ss[4]
           if var and var =~ /^[0-9]+$/ and not ephemeral_include?(var)
             next
           end
           out << lookupvar(var).to_s || ""
         end
       elsif ss.scan(/^\\(.)/)
         # Puppet.debug("Got escape: pos:%d; m:%s" % [ss.pos, ss.matched])
         case ss[1]
         when 'n'
           out << "\n"
         when 't'
           out << "\t"
         when 's'
           out << " "
         when '\\'
           out << '\\'
         when '$'
           out << '$'
         else
           str = "Unrecognised escape sequence '#{ss.matched}'"
           str += " in file #{file}" if file
           str += " at line #{line}" if line
           Puppet.warning str
           out << ss.matched
         end
       elsif ss.scan(/^\$/)
         out << '$'
       elsif ss.scan(/^\\\n/) # an escaped carriage return
         next
       else
         tmp = ss.scan(/[^\\$]+/)
         # Puppet.debug("Got other: pos:%d; m:%s" % [ss.pos, tmp])
         unless tmp
           error = Puppet::ParseError.new("Could not parse string #{string.inspect}")
           {:file= => file, :line= => line}.each do |m,v|
             error.send(m, v) if v
           end
           raise error
         end
         out << tmp
       end
     end
 
     out
   end
 
   # Return the tags associated with this scope.  It's basically
   # just our parents' tags, plus our type.  We don't cache this value
   # because our parent tags might change between calls.
   def tags
     resource.tags
   end
 
   # Used mainly for logging
   def to_s
     "Scope(#{@resource})"
   end
 
   # Undefine a variable; only used for testing.
   def unsetvar(var)
     table = ephemeral?(var) ? @ephemeral.last : @symtable
     table.delete(var) if table.include?(var)
   end
 
   # remove ephemeral scope up to level
   def unset_ephemeral_var(level=:all)
     if level == :all
       @ephemeral = [ Ephemeral.new ]
     else
       (@ephemeral.size - level).times do
         @ephemeral.pop
       end
     end
   end
 
   # check if name exists in one of the ephemeral scope.
   def ephemeral_include?(name)
     @ephemeral.reverse.each do |eph|
       return true if eph.include?(name)
     end
     false
   end
 
   # is name an ephemeral variable?
   def ephemeral?(name)
     name =~ /^\d+$/
   end
 
   def ephemeral_level
     @ephemeral.size
   end
 
   def new_ephemeral
     @ephemeral.push(Ephemeral.new(@ephemeral.last))
   end
 
   def ephemeral_from(match, file = nil, line = nil)
     raise(ArgumentError,"Invalid regex match data") unless match.is_a?(MatchData)
 
     new_ephemeral
 
     setvar("0", match[0], :file => file, :line => line, :ephemeral => true)
     match.captures.each_with_index do |m,i|
       setvar("#{i+1}", m, :file => file, :line => line, :ephemeral => true)
     end
   end
 
+  def find_resource_type(type)
+    # It still works fine without the type == 'class' short-cut, but it is a lot slower.
+    return nil if ["class", "node"].include? type.to_s.downcase
+    find_builtin_resource_type(type) || find_defined_resource_type(type)
+  end
+
+  def find_builtin_resource_type(type)
+    Puppet::Type.type(type.to_s.downcase.to_sym)
+  end
+
+  def find_defined_resource_type(type)
+    environment.known_resource_types.find_definition(namespaces, type.to_s.downcase)
+  end
+
+  def resolve_type_and_titles(type, titles)
+    raise ArgumentError, "titles must be an array" unless titles.is_a?(Array)
+
+    case type.downcase
+    when "class"
+      # resolve the titles
+      titles = titles.collect do |a_title|
+        hostclass = find_hostclass(a_title)
+        hostclass ?  hostclass.name : a_title
+      end
+    when "node"
+      # no-op
+    else
+      # resolve the type
+      resource_type = find_resource_type(type)
+      type = resource_type.name if resource_type
+    end
+
+    return [type, titles]
+  end
+
   private
 
   def extend_with_functions_module
     extend Puppet::Parser::Functions.environment_module(Puppet::Node::Environment.root)
     extend Puppet::Parser::Functions.environment_module(compiler ? environment : nil)
   end
 end
diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb
index 282a52cf4..84e1a0360 100644
--- a/lib/puppet/property.rb
+++ b/lib/puppet/property.rb
@@ -1,324 +1,324 @@
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
 require 'puppet'
 require 'puppet/parameter'
 
 class Puppet::Property < Puppet::Parameter
   require 'puppet/property/ensure'
 
   # Because 'should' uses an array, we have a special method for handling
   # it.  We also want to keep copies of the original values, so that
   # they can be retrieved and compared later when merging.
   attr_reader :shouldorig
 
   attr_writer :noop
 
   class << self
     attr_accessor :unmanaged
     attr_reader :name
 
     # Return array matching info, defaulting to just matching
     # the first value.
     def array_matching
       @array_matching ||= :first
     end
 
     # Set whether properties should match all values or just the first one.
     def array_matching=(value)
       value = value.intern if value.is_a?(String)
       raise ArgumentError, "Supported values for Property#array_matching are 'first' and 'all'" unless [:first, :all].include?(value)
       @array_matching = value
     end
   end
 
   # Look up a value's name, so we can find options and such.
   def self.value_name(name)
     if value = value_collection.match?(name)
       value.name
     end
   end
 
   # Retrieve an option set when a value was defined.
   def self.value_option(name, option)
     if value = value_collection.value(name)
       value.send(option)
     end
   end
 
   # Define a new valid value for a property.  You must provide the value itself,
   # usually as a symbol, or a regex to match the value.
   #
   # The first argument to the method is either the value itself or a regex.
   # The second argument is an option hash; valid options are:
   # * <tt>:method</tt>: The name of the method to define.  Defaults to 'set_<value>'.
   # * <tt>:required_features</tt>: A list of features this value requires.
   # * <tt>:event</tt>: The event that should be returned when this value is set.
   # * <tt>:call</tt>: When to call any associated block.  The default value
-  #   is ``instead``, which means to call the value instead of calling the
-  #   provider.  You can also specify ``before`` or ``after``, which will
+  #   is `instead`, which means to call the value instead of calling the
+  #   provider.  You can also specify `before` or `after`, which will
   #   call both the block and the provider, according to the order you specify
-  #   (the ``first`` refers to when the block is called, not the provider).
+  #   (the `first` refers to when the block is called, not the provider).
   def self.newvalue(name, options = {}, &block)
     value = value_collection.newvalue(name, options, &block)
 
     define_method(value.method, &value.block) if value.method and value.block
     value
   end
 
   # Call the provider method.
   def call_provider(value)
       provider.send(self.class.name.to_s + "=", value)
   rescue NoMethodError
       self.fail "The #{provider.class.name} provider can not handle attribute #{self.class.name}"
   end
 
   # Call the dynamically-created method associated with our value, if
   # there is one.
   def call_valuemethod(name, value)
     if method = self.class.value_option(name, :method) and self.respond_to?(method)
       begin
         event = self.send(method)
       rescue Puppet::Error
         raise
       rescue => detail
         puts detail.backtrace if Puppet[:trace]
         error = Puppet::Error.new("Could not set '#{value} on #{self.class.name}: #{detail}", @resource.line, @resource.file)
         error.set_backtrace detail.backtrace
         raise error
       end
     elsif block = self.class.value_option(name, :block)
       # FIXME It'd be better here to define a method, so that
       # the blocks could return values.
       self.instance_eval(&block)
     else
       devfail "Could not find method for value '#{name}'"
     end
   end
 
   # How should a property change be printed as a string?
   def change_to_s(current_value, newvalue)
     begin
       if current_value == :absent
         return "defined '#{name}' as '#{should_to_s(newvalue)}'"
       elsif newvalue == :absent or newvalue == [:absent]
         return "undefined '#{name}' from '#{is_to_s(current_value)}'"
       else
         return "#{name} changed '#{is_to_s(current_value)}' to '#{should_to_s(newvalue)}'"
       end
     rescue Puppet::Error, Puppet::DevError
       raise
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       raise Puppet::DevError, "Could not convert change '#{name}' to string: #{detail}"
     end
   end
 
   # Figure out which event to return.
   def event_name
     value = self.should
 
     event_name = self.class.value_option(value, :event) and return event_name
 
     name == :ensure or return (name.to_s + "_changed").to_sym
 
     return (resource.type.to_s + case value
     when :present; "_created"
     when :absent; "_removed"
     else
       "_changed"
     end).to_sym
   end
 
   # Return a modified form of the resource event.
   def event
     resource.event :name => event_name, :desired_value => should, :property => self, :source_description => path
   end
 
   attr_reader :shadow
 
   # initialize our property
   def initialize(hash = {})
     super
 
     if ! self.metaparam? and klass = Puppet::Type.metaparamclass(self.class.name)
       setup_shadow(klass)
     end
   end
 
   # Determine whether the property is in-sync or not.  If @should is
   # not defined or is set to a non-true value, then we do not have
   # a valid value for it and thus consider the property to be in-sync
   # since we cannot fix it.  Otherwise, we expect our should value
   # to be an array, and if @is matches any of those values, then
   # we consider it to be in-sync.
   def insync?(is)
     return true unless @should
 
     self.devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
 
     # an empty array is analogous to no should values
     return true if @should.empty?
 
     # Look for a matching value
     return (is == @should or is == @should.collect { |v| v.to_s }) if match_all?
 
     @should.each { |val| return true if is == val or is == val.to_s }
 
     # otherwise, return false
     false
   end
 
   # because the @should and @is vars might be in weird formats,
   # we need to set up a mechanism for pretty printing of the values
   # default to just the values, but this way individual properties can
   # override these methods
   def is_to_s(currentvalue)
     currentvalue
   end
 
   # Send a log message.
   def log(msg)
 
           Puppet::Util::Log.create(
-                
+
       :level => resource[:loglevel],
       :message => msg,
-        
+
       :source => self
     )
   end
 
   # Should we match all values, or just the first?
   def match_all?
     self.class.array_matching == :all
   end
 
   # Execute our shadow's munge code, too, if we have one.
   def munge(value)
     self.shadow.munge(value) if self.shadow
 
     super
   end
 
   # each property class must define the name method, and property instances
   # do not change that name
   # this implicitly means that a given object can only have one property
   # instance of a given property class
   def name
     self.class.name
   end
 
   # for testing whether we should actually do anything
   def noop
     # This is only here to make testing easier.
     if @resource.respond_to?(:noop?)
       @resource.noop?
     else
       if defined?(@noop)
         @noop
       else
         Puppet[:noop]
       end
     end
   end
 
   # By default, call the method associated with the property name on our
   # provider.  In other words, if the property name is 'gid', we'll call
   # 'provider.gid' to retrieve the current value.
   def retrieve
     provider.send(self.class.name)
   end
 
   # Set our value, using the provider, an associated block, or both.
   def set(value)
     # Set a name for looking up associated options like the event.
     name = self.class.value_name(value)
 
     call = self.class.value_option(name, :call) || :none
 
     if call == :instead
       call_valuemethod(name, value)
     elsif call == :none
       # They haven't provided a block, and our parent does not have
       # a provider, so we have no idea how to handle this.
       self.fail "#{self.class.name} cannot handle values of type #{value.inspect}" unless @resource.provider
       call_provider(value)
     else
       # LAK:NOTE 20081031 This is a change in behaviour -- you could
       # previously specify :call => [;before|:after], which would call
       # the setter *in addition to* the block.  I'm convinced this
       # was never used, and it makes things unecessarily complicated.
       # If you want to specify a block and still call the setter, then
       # do so in the block.
       devfail "Cannot use obsolete :call value '#{call}' for property '#{self.class.name}'"
     end
   end
 
   # If there's a shadowing metaparam, instantiate it now.
   # This allows us to create a property or parameter with the
   # same name as a metaparameter, and the metaparam will only be
   # stored as a shadow.
   def setup_shadow(klass)
     @shadow = klass.new(:resource => self.resource)
   end
 
   # Only return the first value
   def should
     return nil unless defined?(@should)
 
     self.devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
 
     if match_all?
       return @should.collect { |val| self.unmunge(val) }
     else
       return self.unmunge(@should[0])
     end
   end
 
   # Set the should value.
   def should=(values)
     values = [values] unless values.is_a?(Array)
 
     @shouldorig = values
 
     values.each { |val| validate(val) }
     @should = values.collect { |val| self.munge(val) }
   end
 
   def should_to_s(newvalue)
     [newvalue].flatten.join(" ")
   end
 
   def sync
     devfail "Got a nil value for should" unless should
     set(should)
   end
 
   # Verify that the passed value is valid.
   # If the developer uses a 'validate' hook, this method will get overridden.
   def unsafe_validate(value)
     super
     validate_features_per_value(value)
   end
 
   # Make sure that we've got all of the required features for a given value.
   def validate_features_per_value(value)
     if features = self.class.value_option(self.class.value_name(value), :required_features)
       features = Array(features)
       needed_features = features.collect { |f| f.to_s }.join(", ")
       raise ArgumentError, "Provider must have features '#{needed_features}' to set '#{self.class.name}' to '#{value}'" unless provider.satisfies?(features)
     end
   end
 
   # Just return any should value we might have.
   def value
     self.should
   end
 
   # Match the Parameter interface, but we really just use 'should' internally.
   # Note that the should= method does all of the validation and such.
   def value=(value)
     self.should = value
   end
 end
diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb
index 8f993dbc1..af792b623 100644
--- a/lib/puppet/provider.rb
+++ b/lib/puppet/provider.rb
@@ -1,281 +1,281 @@
 # The container class for implementations.
 class Puppet::Provider
   include Puppet::Util
   include Puppet::Util::Errors
   include Puppet::Util::Warnings
   extend Puppet::Util::Warnings
 
   require 'puppet/provider/confiner'
 
   extend Puppet::Provider::Confiner
 
   Puppet::Util.logmethods(self, true)
 
   class << self
     # Include the util module so we have access to things like 'binary'
     include Puppet::Util, Puppet::Util::Docs
     include Puppet::Util::Logging
     attr_accessor :name
 
     # The source parameter exists so that providers using the same
     # source can specify this, so reading doesn't attempt to read the
     # same package multiple times.
     attr_writer :source
 
     # LAK 2007-05-09: Keep the model stuff around for backward compatibility
     attr_reader :model
     attr_accessor :resource_type
     attr_writer :doc
   end
 
   # LAK 2007-05-09: Keep the model stuff around for backward compatibility
   attr_reader :model
   attr_accessor :resource
 
   def self.command(name)
     name = symbolize(name)
 
     if defined?(@commands) and command = @commands[name]
       # nothing
     elsif superclass.respond_to? :command and command = superclass.command(name)
       # nothing
     else
       raise Puppet::DevError, "No command #{name} defined for provider #{self.name}"
     end
 
     binary(command)
   end
 
   # Define commands that are not optional.
   def self.commands(hash)
     optional_commands(hash) do |name, path|
       confine :exists => path, :for_binary => true
     end
   end
 
   # Is the provided feature a declared feature?
   def self.declared_feature?(name)
     defined?(@declared_features) and @declared_features.include?(name)
   end
 
   # Does this implementation match all of the default requirements?  If
   # defaults are empty, we return false.
   def self.default?
     return false if @defaults.empty?
     if @defaults.find do |fact, values|
         values = [values] unless values.is_a? Array
         if fval = Facter.value(fact).to_s and fval != ""
           fval = fval.to_s.downcase.intern
         else
           return false
         end
 
         # If any of the values match, we're a default.
         if values.find do |value| fval == value.to_s.downcase.intern end
           false
         else
           true
         end
       end
       return false
     else
       return true
     end
   end
 
   # Store how to determine defaults.
   def self.defaultfor(hash)
     hash.each do |d,v|
       @defaults[d] = v
     end
   end
 
   def self.specificity
     (@defaults.length * 100) + ancestors.select { |a| a.is_a? Class }.length
   end
 
   def self.initvars
     @defaults = {}
     @commands = {}
   end
 
   # The method for returning a list of provider instances.  Note that it returns providers, preferably with values already
   # filled in, not resources.
   def self.instances
     raise Puppet::DevError, "Provider #{self.name} has not defined the 'instances' class method"
   end
 
   # Create the methods for a given command.
   def self.make_command_methods(name)
     # Now define a method for that command
     unless singleton_class.method_defined?(name)
       meta_def(name) do |*args|
         raise Puppet::Error, "Command #{name} is missing" unless command(name)
         if args.empty?
           cmd = [command(name)]
         else
           cmd = [command(name)] + args
         end
         # This might throw an ExecutionFailure, but the system above
         # will catch it, if so.
         return execute(cmd)
       end
 
       # And then define an instance method that just calls the class method.
       # We need both, so both instances and classes can easily run the commands.
       unless method_defined?(name)
         define_method(name) do |*args|
           self.class.send(name, *args)
         end
       end
     end
   end
 
   # Create getter/setter methods for each property our resource type supports.
   # They all get stored in @property_hash.  This method is useful
   # for those providers that use prefetch and flush.
   def self.mkmodelmethods
     warnonce "Provider.mkmodelmethods is deprecated; use Provider.mk_resource_methods"
     mk_resource_methods
   end
 
   # Create getter/setter methods for each property our resource type supports.
   # They all get stored in @property_hash.  This method is useful
   # for those providers that use prefetch and flush.
   def self.mk_resource_methods
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
       attr = symbolize(attr)
       next if attr == :name
       define_method(attr) do
         @property_hash[attr] || :absent
       end
 
       define_method(attr.to_s + "=") do |val|
         @property_hash[attr] = val
       end
     end
   end
 
   self.initvars
 
   # Define one or more binaries we'll be using.  If a block is passed, yield the name
   # and path to the block (really only used by 'commands').
   def self.optional_commands(hash)
     hash.each do |name, path|
       name = symbolize(name)
       @commands[name] = path
 
       yield(name, path) if block_given?
 
       # Now define the class and instance methods.
       make_command_methods(name)
     end
   end
 
   # Retrieve the data source.  Defaults to the provider name.
   def self.source
     @source ||= self.name
   end
 
   # Does this provider support the specified parameter?
   def self.supports_parameter?(param)
     if param.is_a?(Class)
       klass = param
     else
       unless klass = resource_type.attrclass(param)
         raise Puppet::DevError, "'#{param}' is not a valid parameter for #{resource_type.name}"
       end
     end
     return true unless features = klass.required_features
 
     !!satisfies?(*features)
   end
 
 #    def self.to_s
 #        unless defined?(@str)
 #            if self.resource_type
 #                @str = "#{resource_type.name} provider #{self.name}"
 #            else
 #                @str = "unattached provider #{self.name}"
 #            end
 #        end
 #        @str
 #    end
 
   dochook(:defaults) do
     if @defaults.length > 0
       return "  Default for " + @defaults.collect do |f, v|
-        "``#{f}`` == ``#{v}``"
+        "`#{f}` == `#{v}`"
       end.join(" and ") + "."
     end
   end
 
   dochook(:commands) do
     if @commands.length > 0
       return "  Required binaries: " + @commands.collect do |n, c|
-        "``#{c}``"
+        "`#{c}`"
       end.join(", ") + "."
     end
   end
 
   dochook(:features) do
     if features.length > 0
       return "  Supported features: " + features.collect do |f|
-        "``#{f}``"
+        "`#{f}`"
       end.join(", ") + "."
     end
   end
 
   # Remove the reference to the resource, so GC can clean up.
   def clear
     @resource = nil
     @model = nil
   end
 
   # Retrieve a named command.
   def command(name)
     self.class.command(name)
   end
 
   # Get a parameter value.
   def get(param)
     @property_hash[symbolize(param)] || :absent
   end
 
   def initialize(resource = nil)
     if resource.is_a?(Hash)
       # We don't use a duplicate here, because some providers (ParsedFile, at least)
       # use the hash here for later events.
       @property_hash = resource
     elsif resource
       @resource = resource
       # LAK 2007-05-09: Keep the model stuff around for backward compatibility
       @model = resource
       @property_hash = {}
     else
       @property_hash = {}
     end
   end
 
   def name
     if n = @property_hash[:name]
       return n
     elsif self.resource
       resource.name
     else
       raise Puppet::DevError, "No resource and no name in property hash in #{self.class.name} instance"
     end
   end
 
   # Set passed params as the current values.
   def set(params)
     params.each do |param, value|
       @property_hash[symbolize(param)] = value
     end
   end
 
   def to_s
     "#{@resource}(provider=#{self.class.name})"
   end
 end
 
diff --git a/lib/puppet/provider/group/groupadd.rb b/lib/puppet/provider/group/groupadd.rb
index e661ddd7f..82ed4c0c7 100644
--- a/lib/puppet/provider/group/groupadd.rb
+++ b/lib/puppet/provider/group/groupadd.rb
@@ -1,29 +1,29 @@
 require 'puppet/provider/nameservice/objectadd'
 
 Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameService::ObjectAdd do
-  desc "Group management via ``groupadd`` and its ilk.
+  desc "Group management via `groupadd` and its ilk.
 
   The default for most platforms
 
   "
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
 
   def addcmd
     cmd = [command(:add)]
     if gid = @resource.should(:gid)
       unless gid == :absent
         cmd << flag(:gid) << gid
       end
     end
     cmd << "-o" if @resource.allowdupe?
     cmd << @resource[:name]
 
     cmd
   end
 end
 
diff --git a/lib/puppet/provider/group/ldap.rb b/lib/puppet/provider/group/ldap.rb
index 2737feea6..86c72a5d3 100644
--- a/lib/puppet/provider/group/ldap.rb
+++ b/lib/puppet/provider/group/ldap.rb
@@ -1,47 +1,47 @@
 require 'puppet/provider/ldap'
 
 Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
-  desc "Group management via ``ldap``.
+  desc "Group management via `ldap`.
 
   This provider requires that you have valid values for all of the
-  ldap-related settings, including ``ldapbase``.  You will also almost
-  definitely need settings for ``ldapuser`` and ``ldappassword``, so that
+  ldap-related settings, including `ldapbase`.  You will also almost
+  definitely need settings for `ldapuser` and `ldappassword`, so that
   your clients can write to ldap.
 
   Note that this provider will automatically generate a GID for you if you do
   not specify one, but it is a potentially expensive operation, as it
   iterates across all existing groups to pick the appropriate next one.
 
   "
 
   confine :true => Puppet.features.ldap?, :false => (Puppet[:ldapuser] == "")
 
   # We're mapping 'members' here because we want to make it
   # easy for the ldap user provider to manage groups.  This
   # way it can just use the 'update' method in the group manager,
   # whereas otherwise it would need to replicate that code.
   manages(:posixGroup).at("ou=Groups").and.maps :name => :cn, :gid => :gidNumber, :members => :memberUid
 
   # Find the next gid after the current largest gid.
   provider = self
   manager.generates(:gidNumber).with do
     largest = 500
     if existing = provider.manager.search
         existing.each do |hash|
         next unless value = hash[:gid]
         num = value[0].to_i
         largest = num if num > largest
       end
     end
     largest + 1
   end
 
   # Convert a group name to an id.
   def self.name2id(group)
     return nil unless result = manager.search("cn=#{group}") and result.length > 0
 
     # Only use the first result.
     group = result[0]
     gid = group[:gid][0]
   end
 end
diff --git a/lib/puppet/provider/group/pw.rb b/lib/puppet/provider/group/pw.rb
index e3dd714ee..a054d1ff1 100644
--- a/lib/puppet/provider/group/pw.rb
+++ b/lib/puppet/provider/group/pw.rb
@@ -1,34 +1,34 @@
 require 'puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do
-  desc "Group management via ``pw``.
+  desc "Group management via `pw`.
 
   Only works on FreeBSD.
 
   "
 
   commands :pw => "/usr/sbin/pw"
   defaultfor :operatingsystem => :freebsd
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
 
   def addcmd
     cmd = [command(:pw), "groupadd", @resource[:name]]
     if gid = @resource.should(:gid)
       unless gid == :absent
         cmd << flag(:gid) << gid
       end
     end
 
     # Apparently, contrary to the man page, groupadd does
     # not accept -o.
     #if @parent[:allowdupe] == :true
     #    cmd << "-o"
     #end
 
     cmd
   end
 end
 
diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb
index 0946de47f..b5bb9102f 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -1,51 +1,51 @@
 require 'puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
 Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package do
   desc "Package management based on OS X's builtin packaging system.  This is
     essentially the simplest and least functional package system in existence --
     it only supports installation; no deletion or upgrades.  The provider will
-    automatically add the ``.pkg`` extension, so leave that off when specifying
+    automatically add the `.pkg` extension, so leave that off when specifying
     the package name."
 
   confine :operatingsystem => :darwin
   commands :installer => "/usr/sbin/installer"
 
   def self.instances
     instance_by_name.collect do |name|
 
             self.new(
                 
         :name => name,
         :provider => :apple,
         
         :ensure => :installed
       )
     end
   end
 
   def self.instance_by_name
     Dir.entries("/Library/Receipts").find_all { |f|
       f =~ /\.pkg$/
     }.collect { |f|
       name = f.sub(/\.pkg/, '')
       yield name if block_given?
 
       name
     }
   end
 
   def query
     FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
   end
 
   def install
     source = nil
     unless source = @resource[:source]
       self.fail "Mac OS X packages must specify a package source"
     end
 
     installer "-pkg", source, "-target", "/"
   end
 end
 
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index d055e7552..b6ded39fd 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -1,108 +1,108 @@
 Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # Provide sorting functionality
   include Puppet::Util::Package
 
-  desc "Package management via ``apt-get``."
+  desc "Package management via `apt-get`."
 
   has_feature :versionable
 
   commands :aptget => "/usr/bin/apt-get"
   commands :aptcache => "/usr/bin/apt-cache"
   commands :preseed => "/usr/bin/debconf-set-selections"
 
   defaultfor :operatingsystem => [:debian, :ubuntu]
 
   ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
   # A derivative of DPKG; this is how most people actually manage
   # Debian boxes, and the only thing that differs is that it can
   # install packages from remote sites.
 
   def checkforcdrom
     unless defined?(@@checkedforcdrom)
       if FileTest.exists? "/etc/apt/sources.list"
         @@checkedforcdrom = !!(File.read("/etc/apt/sources.list") =~ /^[^#]*cdrom:/)
       else
         # This is basically a pathalogical case, but we'll just
         # ignore it
         @@checkedforcdrom = false
       end
     end
 
     if @@checkedforcdrom and @resource[:allowcdrom] != :true
       raise Puppet::Error,
         "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
     end
   end
 
   # Install a package using 'apt-get'.  This function needs to support
   # installing a specific version.
   def install
     self.run_preseed if @resource[:responsefile]
     should = @resource[:ensure]
 
     checkforcdrom
     cmd = %w{-q -y}
 
     keep = ""
     if config = @resource[:configfiles]
       if config == :keep
         cmd << "-o" << 'DPkg::Options::=--force-confold'
       else
         cmd << "-o" << 'DPkg::Options::=--force-confnew'
       end
     end
 
     str = @resource[:name]
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version and --force-yes option
       str += "=#{should}"
       cmd << "--force-yes"
     end
 
     cmd << :install << str
 
     aptget(*cmd)
   end
 
   # What's the latest package version available?
   def latest
     output = aptcache :policy,  @resource[:name]
 
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
     else
       self.err "Could not find latest version"
       return nil
     end
   end
 
   #
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
     if response = @resource[:responsefile] and FileTest.exist?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response
     else
       self.info "No responsefile specified or non existant, not preseeding anything"
     end
   end
 
   def uninstall
     self.run_preseed if @resource[:responsefile]
     aptget "-y", "-q", :remove, @resource[:name]
   end
 
   def purge
     self.run_preseed if @resource[:responsefile]
     aptget '-y', '-q', :remove, '--purge', @resource[:name]
     # workaround a "bug" in apt, that already removed packages are not purged
     super
   end
 end
 
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index 557e657a4..8bdf984e6 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -1,29 +1,29 @@
 Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg do
-  desc "Package management via ``aptitude``."
+  desc "Package management via `aptitude`."
 
   has_feature :versionable
 
   commands :aptitude => "/usr/bin/aptitude"
   commands :aptcache => "/usr/bin/apt-cache"
 
   ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
   def aptget(*args)
     args.flatten!
     # Apparently aptitude hasn't always supported a -q flag.
     args.delete("-q") if args.include?("-q")
     output = aptitude(*args)
 
     # Yay, stupid aptitude doesn't throw an error when the package is missing.
     if args.include?(:install) and output =~ /Couldn't find any package/
       raise Puppet::Error.new(
         "Could not find package #{self.name}"
       )
     end
   end
 
   def purge
     aptitude '-y', 'purge', @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb
index d7842089f..2eb33c72b 100644
--- a/lib/puppet/provider/package/aptrpm.rb
+++ b/lib/puppet/provider/package/aptrpm.rb
@@ -1,84 +1,84 @@
 Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
   # Provide sorting functionality
   include Puppet::Util::Package
 
-  desc "Package management via ``apt-get`` ported to ``rpm``."
+  desc "Package management via `apt-get` ported to `rpm`."
 
   has_feature :versionable
 
   commands :aptget => "apt-get"
   commands :aptcache => "apt-cache"
   commands :rpm => "rpm"
 
   if command('rpm')
     confine :true => begin
       rpm('-ql', 'rpm')
       rescue Puppet::ExecutionFailure
         false
       else
         true
       end
   end
 
   # Install a package using 'apt-get'.  This function needs to support
   # installing a specific version.
   def install
     should = @resource.should(:ensure)
 
     str = @resource[:name]
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version
       str += "=#{should}"
     end
     cmd = %w{-q -y}
 
     cmd << 'install' << str
 
     aptget(*cmd)
   end
 
   # What's the latest package version available?
   def latest
     output = aptcache :showpkg,  @resource[:name]
 
     if output =~ /Versions:\s*\n((\n|.)+)^$/
       versions = $1
       available_versions = versions.split(/\n/).collect { |version|
         if version =~ /^([^\(]+)\(/
           $1
         else
           self.warning "Could not match version '#{version}'"
           nil
         end
       }.reject { |vers| vers.nil? }.sort { |a,b|
         versioncmp(a,b)
       }
 
       if available_versions.length == 0
         self.debug "No latest version"
         print output if Puppet[:debug]
       end
 
       # Get the latest and greatest version number
       return available_versions.pop
     else
       self.err "Could not match string"
     end
   end
 
   def update
     self.install
   end
 
   def uninstall
     aptget "-y", "-q", 'remove', @resource[:name]
   end
 
   def purge
     aptget '-y', '-q', 'remove', '--purge', @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb
index 9f1f1ec19..e9c84845f 100755
--- a/lib/puppet/provider/package/blastwave.rb
+++ b/lib/puppet/provider/package/blastwave.rb
@@ -1,112 +1,112 @@
 # Packaging using Blastwave's pkg-get program.
 Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun do
-  desc "Package management using Blastwave.org's ``pkg-get`` command on Solaris."
+  desc "Package management using Blastwave.org's `pkg-get` command on Solaris."
   pkgget = "pkg-get"
   pkgget = "/opt/csw/bin/pkg-get" if FileTest.executable?("/opt/csw/bin/pkg-get")
 
   confine :operatingsystem => :solaris
 
   commands :pkgget => pkgget
 
   def pkgget_with_cat(*args)
     Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget(*args) }
   end
 
   def self.extended(mod)
     unless command(:pkgget) != "pkg-get"
       raise Puppet::Error,
         "The pkg-get command is missing; blastwave packaging unavailable"
     end
 
     unless FileTest.exists?("/var/pkg-get/admin")
       Puppet.notice "It is highly recommended you create '/var/pkg-get/admin'."
       Puppet.notice "See /var/pkg-get/admin-fullauto"
     end
   end
 
   def self.instances(hash = {})
     blastlist(hash).collect do |bhash|
       bhash.delete(:avail)
       new(bhash)
     end
   end
 
   # Turn our blastwave listing into a bunch of hashes.
   def self.blastlist(hash)
     command = ["-c"]
 
     command << hash[:justme] if hash[:justme]
 
     output = Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget command }
 
     list = output.split("\n").collect do |line|
       next if line =~ /^#/
       next if line =~ /^WARNING/
       next if line =~ /localrev\s+remoterev/
 
       blastsplit(line)
     end.reject { |h| h.nil? }
 
     if hash[:justme]
       return list[0]
     else
       list.reject! { |h|
         h[:ensure] == :absent
       }
       return list
     end
 
   end
 
   # Split the different lines into hashes.
   def self.blastsplit(line)
     if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/
       hash = {}
       hash[:name] = $1
       hash[:ensure] = if $2 == "[Not installed]"
         :absent
       else
         $2
       end
       hash[:avail] = $5
 
       hash[:avail] = hash[:ensure] if hash[:avail] == "SAME"
 
       # Use the name method, so it works with subclasses.
       hash[:provider] = self.name
 
       return hash
     else
       Puppet.warning "Cannot match #{line}"
       return nil
     end
   end
 
   def install
     pkgget_with_cat "-f", :install, @resource[:name]
   end
 
   # Retrieve the version from the current package file.
   def latest
     hash = self.class.blastlist(:justme => @resource[:name])
     hash[:avail]
   end
 
   def query
     if hash = self.class.blastlist(:justme => @resource[:name])
       hash
     else
       {:ensure => :absent}
     end
   end
 
   # Remove the old package, and install the new one
   def update
     pkgget_with_cat "-f", :upgrade, @resource[:name]
   end
 
   def uninstall
     pkgget_with_cat "-f", :remove, @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index bee63bfba..7b34b09af 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -1,156 +1,156 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package do
-  desc "Package management via ``dpkg``.  Because this only uses ``dpkg``
-    and not ``apt``, you must specify the source of any packages you want
+  desc "Package management via `dpkg`.  Because this only uses `dpkg`
+    and not `apt`, you must specify the source of any packages you want
     to manage."
 
   has_feature :holdable
 
   commands :dpkg => "/usr/bin/dpkg"
   commands :dpkg_deb => "/usr/bin/dpkg-deb"
   commands :dpkgquery => "/usr/bin/dpkg-query"
 
   def self.instances
     packages = []
 
     # list out all of the packages
     cmd = "#{command(:dpkgquery)} -W --showformat '${Status} ${Package} ${Version}\\n'"
     Puppet.debug "Executing '#{cmd}'"
     execpipe(cmd) do |process|
       # our regex for matching dpkg output
       regex = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
       fields = [:desired, :error, :status, :name, :ensure]
       hash = {}
 
       # now turn each returned line into a package object
       process.each { |line|
         if hash = parse_line(line)
           packages << new(hash)
         end
       }
     end
 
     packages
   end
 
   self::REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
   self::FIELDS = [:desired, :error, :status, :name, :ensure]
 
   def self.parse_line(line)
     if match = self::REGEX.match(line)
       hash = {}
 
       self::FIELDS.zip(match.captures) { |field,value|
         hash[field] = value
       }
 
       hash[:provider] = self.name
 
       if hash[:status] == 'not-installed'
         hash[:ensure] = :purged
       elsif ['config-files', 'half-installed', 'unpacked', 'half-configured'].include?(hash[:status])
         hash[:ensure] = :absent
       end
       hash[:ensure] = :held if hash[:desired] == 'hold'
     else
       Puppet.warning "Failed to match dpkg-query line #{line.inspect}"
       return nil
     end
 
     hash
   end
 
   def install
     unless file = @resource[:source]
       raise ArgumentError, "You cannot install dpkg packages without a source"
     end
 
     args = []
 
     # We always unhold when installing to remove any prior hold.
     self.unhold
 
     if @resource[:configfiles] == :keep
       args << '--force-confold'
     else
       args << '--force-confnew'
     end
     args << '-i' << file
 
     dpkg(*args)
   end
 
   def update
     self.install
   end
 
   # Return the version from the package.
   def latest
     output = dpkg_deb "--show", @resource[:source]
     matches = /^(\S+)\t(\S+)$/.match(output).captures
     warning "source doesn't contain named package, but #{matches[0]}" unless matches[0].match( Regexp.escape(@resource[:name]) )
     matches[1]
   end
 
   def query
     packages = []
 
     fields = [:desired, :error, :status, :name, :ensure]
 
     hash = {}
 
     # list out our specific package
     begin
 
             output = dpkgquery(
         "-W", "--showformat",
         
         '${Status} ${Package} ${Version}\\n', @resource[:name]
       )
     rescue Puppet::ExecutionFailure
       # dpkg-query exits 1 if the package is not found.
       return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
     end
 
     hash = self.class.parse_line(output) || {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
     if hash[:error] != "ok"
       raise Puppet::Error.new(
         "Package #{hash[:name]}, version #{hash[:ensure]} is in error state: #{hash[:error]}"
       )
     end
 
     hash
   end
 
   def uninstall
     dpkg "-r", @resource[:name]
   end
 
   def purge
     dpkg "--purge", @resource[:name]
   end
 
   def hold
     self.install
     begin
       Tempfile.open('puppet_dpkg_set_selection') { |tmpfile|
         tmpfile.write("#{@resource[:name]} hold\n")
         tmpfile.flush
         execute([:dpkg, "--set-selections"], :stdinfile => tmpfile.path.to_s)
       }
     end
   end
 
   def unhold
     begin
       Tempfile.open('puppet_dpkg_set_selection') { |tmpfile|
         tmpfile.write("#{@resource[:name]} install\n")
         tmpfile.flush
         execute([:dpkg, "--set-selections"], :stdinfile => tmpfile.path.to_s)
       }
     end
   end
 end
diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb
index 5cf47860e..db991397a 100755
--- a/lib/puppet/provider/package/fink.rb
+++ b/lib/puppet/provider/package/fink.rb
@@ -1,82 +1,82 @@
 Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   # Provide sorting functionality
   include Puppet::Util::Package
 
-  desc "Package management via ``fink``."
+  desc "Package management via `fink`."
 
   commands :fink => "/sw/bin/fink"
   commands :aptget => "/sw/bin/apt-get"
   commands :aptcache => "/sw/bin/apt-cache"
   commands :dpkgquery => "/sw/bin/dpkg-query"
 
   has_feature :versionable
 
   # A derivative of DPKG; this is how most people actually manage
   # Debian boxes, and the only thing that differs is that it can
   # install packages from remote sites.
 
   def finkcmd(*args)
     fink(*args)
   end
 
   # Install a package using 'apt-get'.  This function needs to support
   # installing a specific version.
   def install
     self.run_preseed if @resource[:responsefile]
     should = @resource.should(:ensure)
 
     str = @resource[:name]
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version
       str += "=#{should}"
     end
     cmd = %w{-b -q -y}
 
     keep = ""
 
     cmd << :install << str
 
     finkcmd(cmd)
   end
 
   # What's the latest package version available?
   def latest
     output = aptcache :policy,  @resource[:name]
 
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
         else
       self.err "Could not find latest version"
       return nil
         end
         end
 
   #
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
     if response = @resource[:responsefile] and FileTest.exists?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response
     else
       self.info "No responsefile specified or non existant, not preseeding anything"
     end
   end
 
   def update
     self.install
   end
 
   def uninstall
     finkcmd "-y", "-q", :remove, @model[:name]
   end
 
   def purge
     aptget '-y', '-q', 'remove', '--purge', @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb
index 8d70b756f..19414cec4 100755
--- a/lib/puppet/provider/package/gem.rb
+++ b/lib/puppet/provider/package/gem.rb
@@ -1,124 +1,124 @@
 require 'puppet/provider/package'
 require 'uri'
 
 # Ruby gems support.
 Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
-  desc "Ruby Gem support.  If a URL is passed via ``source``, then that URL is used as the
+  desc "Ruby Gem support.  If a URL is passed via `source`, then that URL is used as the
     remote gem repository; if a source is present but is not a valid URL, it will be
     interpreted as the path to a local gem file.  If source is not present at all,
     the gem will be installed from the default gem repositories."
 
   has_feature :versionable
 
   commands :gemcmd => "gem"
 
   def self.gemlist(hash)
     command = [command(:gemcmd), "list"]
 
     if hash[:local]
       command << "--local"
     else
       command << "--remote"
     end
 
     if name = hash[:justme]
       command << name
     end
 
     begin
       list = execute(command).split("\n").collect do |set|
         if gemhash = gemsplit(set)
           gemhash[:provider] = :gem
           gemhash
         else
           nil
         end
       end.compact
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not list gems: #{detail}"
     end
 
     if hash[:justme]
       return list.shift
     else
       return list
     end
   end
 
   def self.gemsplit(desc)
     case desc
     when /^\*\*\*/, /^\s*$/, /^\s+/; return nil
     when /^(\S+)\s+\((.+)\)/
       name = $1
       version = $2.split(/,\s*/)[0]
       return {
         :name => name,
         :ensure => version
       }
     else
       Puppet.warning "Could not match #{desc}"
       nil
     end
   end
 
   def self.instances(justme = false)
     gemlist(:local => true).collect do |hash|
       new(hash)
     end
   end
 
   def install(useversion = true)
     command = [command(:gemcmd), "install"]
     command << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
     # Always include dependencies
     command << "--include-dependencies"
 
     if source = resource[:source]
       begin
         uri = URI.parse(source)
       rescue => detail
         fail "Invalid source '#{uri}': #{detail}"
       end
 
       case uri.scheme
       when nil
         # no URI scheme => interpret the source as a local file
         command << source
       when /file/i
         command << uri.path
       when 'puppet'
         # we don't support puppet:// URLs (yet)
         raise Puppet::Error.new("puppet:// URLs are not supported as gem sources")
       else
         # interpret it as a gem repository
         command << "--source" << "#{source}" << resource[:name]
       end
     else
       command << resource[:name]
     end
 
     output = execute(command)
     # Apparently some stupid gem versions don't exit non-0 on failure
     self.fail "Could not install: #{output.chomp}" if output.include?("ERROR")
   end
 
   def latest
     # This always gets the latest version available.
     hash = self.class.gemlist(:justme => resource[:name])
 
     hash[:ensure]
   end
 
   def query
     self.class.gemlist(:justme => resource[:name], :local => true)
   end
 
   def uninstall
     gemcmd "uninstall", "-x", "-a", resource[:name]
   end
 
   def update
     self.install(false)
   end
 end
 
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index ca477e56a..22df14d62 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -1,120 +1,120 @@
 require 'puppet/provider/package'
 
 # Packaging on OpenBSD.  Doesn't work anywhere else that I know of.
 Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Package do
   include Puppet::Util::Execution
-  desc "OpenBSD's form of ``pkg_add`` support."
+  desc "OpenBSD's form of `pkg_add` support."
 
   commands :pkginfo => "pkg_info", :pkgadd => "pkg_add", :pkgdelete => "pkg_delete"
 
   defaultfor :operatingsystem => :openbsd
   confine :operatingsystem => :openbsd
 
   has_feature :versionable
 
   def self.instances
     packages = []
 
     begin
       execpipe(listcmd) do |process|
         # our regex for matching pkg_info output
         regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/
         fields = [:name, :ensure, :flavor ]
         hash = {}
 
         # now turn each returned line into a package object
         process.each { |line|
           if match = regex.match(line.split[0])
             fields.zip(match.captures) { |field,value|
               hash[field] = value
             }
             yup = nil
             name = hash[:name]
 
             hash[:provider] = self.name
 
             packages << new(hash)
             hash = {}
           else
             # Print a warning on lines we can't match, but move
             # on, since it should be non-fatal
             warning("Failed to match line #{line}")
           end
         }
       end
 
       return packages
     rescue Puppet::ExecutionFailure
       return nil
     end
   end
 
   def self.listcmd
     [command(:pkginfo), " -a"]
   end
 
   def install
     should = @resource.should(:ensure)
 
     unless @resource[:source]
       raise Puppet::Error,
         "You must specify a package source for BSD packages"
     end
 
     old_ensure = @resource[:ensure]
 
     if @resource[:source] =~ /\/$/
       withenv :PKG_PATH => @resource[:source] do
         @resource[:ensure] = old_ensure if (@resource[:ensure] = get_version) == nil
         full_name = [ @resource[:name], @resource[:ensure], @resource[:flavor] ]
         pkgadd full_name.join('-').chomp('-')
       end
     else
       pkgadd @resource[:source]
     end
 
   end
 
   def get_version
       execpipe([command(:pkginfo), " -I ", @resource[:name]]) do |process|
         # our regex for matching pkg_info output
         regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/
         fields = [ :name, :version, :flavor ]
         master_version = 0
 
         process.each do |line|
           if match = regex.match(line.split[0])
             # now we return the first version, unless ensure is latest
             version = match.captures[1]
             return version unless @resource[:ensure] == "latest"
 
             master_version = version unless master_version > version
           end
         end
 
         return master_version unless master_version == 0
         raise Puppet::Error, "#{version} is not available for this package"
       end
   rescue Puppet::ExecutionFailure
       return nil
   end
 
   def query
     hash = {}
     info = pkginfo @resource[:name]
 
     # Search for the version info
     if info =~ /Information for (inst:)?#{@resource[:name]}-(\S+)/
       hash[:ensure] = $2
     else
       return nil
     end
 
     hash
   end
 
   def uninstall
     pkgdelete @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index d33a4f2f3..72dc260a4 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -1,132 +1,132 @@
 require 'puppet/provider/package'
 # RPM packaging.  Should work anywhere that has rpm installed.
 Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Provider::Package do
-  desc "RPM packaging support; should work anywhere with a working ``rpm``
+  desc "RPM packaging support; should work anywhere with a working `rpm`
     binary."
 
   has_feature :versionable
 
   # The query format by which we identify installed packages
   NEVRAFORMAT = "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}"
   NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
 
   commands :rpm => "rpm"
 
   if command('rpm')
     confine :true => begin
       rpm('--version')
       rescue Puppet::ExecutionFailure
         false
       else
         true
       end
   end
 
   def self.instances
     packages = []
 
     # rpm < 4.1 don't support --nosignature
     output = rpm "--version"
     sig = "--nosignature"
     if output =~ /RPM version (([123].*)|(4\.0.*))/
       sig = ""
     end
 
     # list out all of the packages
     begin
       execpipe("#{command(:rpm)} -qa #{sig} --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
         # now turn each returned line into a package object
         process.each { |line|
           hash = nevra_to_hash(line)
           packages << new(hash)
         }
       }
     rescue Puppet::ExecutionFailure
       raise Puppet::Error, "Failed to list packages"
     end
 
     packages
   end
 
   # Find the fully versioned package name and the version alone. Returns
   # a hash with entries :instance => fully versioned package name, and
   # :ensure => version-release
   def query
     #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
     #IF YOU CALL THIS METHOD, IT WILL CALL RPM
     #Use get(:property) to check if cached values are available
     cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
 
     begin
       output = rpm(*cmd)
     rescue Puppet::ExecutionFailure
       return nil
     end
 
     # FIXME: We could actually be getting back multiple packages
     # for multilib
     @property_hash.update(self.class.nevra_to_hash(output))
 
     @property_hash.dup
   end
 
   # Here we just retrieve the version from the file specified in the source.
   def latest
     unless source = @resource[:source]
       @resource.fail "RPMs must specify a package source"
     end
 
     cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"]
     h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error))
     h[:ensure]
   end
 
   def install
     source = nil
     unless source = @resource[:source]
       @resource.fail "RPMs must specify a package source"
     end
     # RPM gets pissy if you try to install an already
     # installed package
     if @resource.should(:ensure) == @property_hash[:ensure] or
       @resource.should(:ensure) == :latest && @property_hash[:ensure] == latest
       return
     end
 
     flag = "-i"
     flag = "-U" if @property_hash[:ensure] and @property_hash[:ensure] != :absent
 
     rpm flag, "--oldpackage", source
   end
 
   def uninstall
     query unless get(:arch)
     nvr = "#{get(:name)}-#{get(:version)}-#{get(:release)}"
     arch = ".#{get(:arch)}"
     # If they specified an arch in the manifest, erase that Otherwise,
     # erase the arch we got back from the query. If multiple arches are
     # installed and only the package name is specified (without the
     # arch), this will uninstall all of them on successive runs of the
     # client, one after the other
     if @resource[:name][-arch.size, arch.size] == arch
       nvr += arch
     else
       nvr += ".#{get(:arch)}"
     end
     rpm "-e", nvr
   end
 
   def update
     self.install
   end
 
   def self.nevra_to_hash(line)
     line.chomp!
     hash = {}
     NEVRA_FIELDS.zip(line.split) { |f, v| hash[f] = v }
     hash[:provider] = self.name
     hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
     hash
   end
 end
 
diff --git a/lib/puppet/provider/package/rug.rb b/lib/puppet/provider/package/rug.rb
index 7028cc9e5..28729952d 100644
--- a/lib/puppet/provider/package/rug.rb
+++ b/lib/puppet/provider/package/rug.rb
@@ -1,52 +1,52 @@
 Puppet::Type.type(:package).provide :rug, :parent => :rpm do
-  desc "Support for suse ``rug`` package manager."
+  desc "Support for suse `rug` package manager."
 
   has_feature :versionable
 
   commands :rug => "/usr/bin/rug"
   commands :rpm => "rpm"
   defaultfor :operatingsystem => [:suse, :sles]
   confine    :operatingsystem => [:suse, :sles]
 
   # Install a package using 'rug'.
   def install
     should = @resource.should(:ensure)
     self.debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version
       wanted += "-#{should}"
     end
     output = rug "--quiet", :install, "-y", wanted
 
     unless self.query
       raise Puppet::ExecutionFailure.new(
         "Could not find package #{self.name}"
       )
     end
   end
 
   # What's the latest package version available?
   def latest
     #rug can only get a list of *all* available packages?
     output = rug "list-updates"
 
     if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/
       return $1
     else
       # rug didn't find updates, pretend the current
       # version is the latest
       return @property_hash[:ensure]
     end
   end
 
   def update
     # rug install can be used for update, too
     self.install
   end
 end
diff --git a/lib/puppet/provider/package/sunfreeware.rb b/lib/puppet/provider/package/sunfreeware.rb
index 53f03ed6e..4745ea1eb 100755
--- a/lib/puppet/provider/package/sunfreeware.rb
+++ b/lib/puppet/provider/package/sunfreeware.rb
@@ -1,11 +1,11 @@
 # At this point, it's an exact copy of the Blastwave stuff.
 Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source => :sun do
-  desc "Package management using sunfreeware.com's ``pkg-get`` command on Solaris.
-    At this point, support is exactly the same as ``blastwave`` support and
+  desc "Package management using sunfreeware.com's `pkg-get` command on Solaris.
+    At this point, support is exactly the same as `blastwave` support and
     has not actually been tested."
   commands :pkgget => "pkg-get"
 
   confine :operatingsystem => :solaris
 
 end
 
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index 5ff32bedc..243bc6c6b 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -1,42 +1,42 @@
 Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
-  desc "Support for Red Hat's proprietary ``up2date`` package update
+  desc "Support for Red Hat's proprietary `up2date` package update
     mechanism."
 
   commands :up2date => "/usr/sbin/up2date-nox"
 
   defaultfor :operatingsystem => [:redhat, :oel, :ovm],
     :lsbdistrelease => ["2.1", "3", "4"]
 
   confine    :operatingsystem => [:redhat, :oel, :ovm]
 
   # Install a package using 'up2date'.
   def install
     up2date "-u", @resource[:name]
 
     unless self.query
       raise Puppet::ExecutionFailure.new(
         "Could not find package #{self.name}"
       )
     end
   end
 
   # What's the latest package version available?
   def latest
     #up2date can only get a list of *all* available packages?
     output = up2date "--showall"
 
     if output =~ /^#{Regexp.escape @resource[:name]}-(\d+.*)\.\w+/
       return $1
     else
       # up2date didn't find updates, pretend the current
       # version is the latest
       return @property_hash[:ensure]
     end
   end
 
   def update
     # Install in up2date can be used for update, too
     self.install
   end
 end
 
diff --git a/lib/puppet/provider/package/urpmi.rb b/lib/puppet/provider/package/urpmi.rb
index 88a17ccb4..425d77849 100644
--- a/lib/puppet/provider/package/urpmi.rb
+++ b/lib/puppet/provider/package/urpmi.rb
@@ -1,60 +1,60 @@
 Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
-  desc "Support via ``urpmi``."
+  desc "Support via `urpmi`."
   commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm"
 
   if command('rpm')
     confine :true => begin
       rpm('-ql', 'rpm')
       rescue Puppet::ExecutionFailure
         false
       else
         true
       end
   end
 
   defaultfor :operatingsystem => [:mandriva, :mandrake]
 
   has_feature :versionable
 
   def install
     should = @resource.should(:ensure)
     self.debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version
       wanted += "-#{should}"
     end
 
     output = urpmi "--auto", wanted
 
     unless self.query
       raise Puppet::Error.new(
         "Could not find package #{self.name}"
       )
     end
   end
 
   # What's the latest package version available?
   def latest
     output = urpmq "-S", @resource[:name]
 
     if output =~ /^#{Regexp.escape @resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
       return $1
     else
       # urpmi didn't find updates, pretend the current
       # version is the latest
       return @resource[:ensure]
     end
   end
 
   def update
     # Install in urpmi can be used for update, too
     self.install
   end
 end
 
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
index 07f68ddb1..fcda5ba8c 100755
--- a/lib/puppet/provider/package/yum.rb
+++ b/lib/puppet/provider/package/yum.rb
@@ -1,100 +1,100 @@
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
-  desc "Support via ``yum``."
+  desc "Support via `yum`."
 
   has_feature :versionable
 
   commands :yum => "yum", :rpm => "rpm", :python => "python"
 
   YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
 
   attr_accessor :latest_info
 
   if command('rpm')
     confine :true => begin
       rpm('--version')
       rescue Puppet::ExecutionFailure
         false
       else
         true
       end
   end
 
   defaultfor :operatingsystem => [:fedora, :centos, :redhat]
 
   def self.prefetch(packages)
     raise Puppet::Error, "The yum provider can only be used as root" if Process.euid != 0
     super
     return unless packages.detect { |name, package| package.should(:ensure) == :latest }
 
     # collect our 'latest' info
     updates = {}
     python(YUMHELPER).each_line do |l|
       l.chomp!
       next if l.empty?
       if l[0,4] == "_pkg"
         hash = nevra_to_hash(l[5..-1])
         [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each  do |n|
           updates[n] ||= []
           updates[n] << hash
         end
       end
     end
 
     # Add our 'latest' info to the providers.
     packages.each do |name, package|
       if info = updates[package[:name]]
         package.provider.latest_info = info[0]
       end
     end
   end
 
   def install
     should = @resource.should(:ensure)
     self.debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
     case should
     when true, false, Symbol
       # pass
       should = nil
     else
       # Add the package version
       wanted += "-#{should}"
     end
 
     output = yum "-d", "0", "-e", "0", "-y", :install, wanted
 
     is = self.query
     raise Puppet::Error, "Could not find package #{self.name}" unless is
 
     # FIXME: Should we raise an exception even if should == :latest
     # and yum updated us to a version other than @param_hash[:ensure] ?
     raise Puppet::Error, "Failed to update to version #{should}, got version #{is[:ensure]} instead" if should && should != is[:ensure]
   end
 
   # What's the latest package version available?
   def latest
     upd = latest_info
     unless upd.nil?
       # FIXME: there could be more than one update for a package
       # because of multiarch
       return "#{upd[:version]}-#{upd[:release]}"
     else
       # Yum didn't find updates, pretend the current
       # version is the latest
       raise Puppet::DevError, "Tried to get latest on a missing package" if properties[:ensure] == :absent
       return properties[:ensure]
     end
   end
 
   def update
     # Install in yum can be used for update, too
     self.install
   end
 
   def purge
     yum "-y", :erase, @resource[:name]
   end
 end
 
diff --git a/lib/puppet/provider/package/zypper.rb b/lib/puppet/provider/package/zypper.rb
index d56c72549..f129ef6e6 100644
--- a/lib/puppet/provider/package/zypper.rb
+++ b/lib/puppet/provider/package/zypper.rb
@@ -1,52 +1,52 @@
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
-  desc "Support for SuSE ``zypper`` package manager. Found in SLES10sp2+ and SLES11"
+  desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11"
 
   has_feature :versionable
 
   commands :zypper => "/usr/bin/zypper"
   commands :rpm    => "rpm"
 
   confine    :operatingsystem => [:suse, :sles, :sled, :opensuse]
 
   # Install a package using 'zypper'.
   def install
     should = @resource.should(:ensure)
     self.debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
     case should
     when true, false, Symbol
       # pass
     else
       # Add the package version
       wanted = "#{wanted}-#{should}"
     end
     output = zypper "--quiet", :install, "-l", "-y", wanted
 
     unless self.query
       raise Puppet::ExecutionFailure.new(
         "Could not find package #{self.name}"
       )
     end
   end
 
   # What's the latest package version available?
   def latest
     #zypper can only get a list of *all* available packages?
     output = zypper "list-updates"
 
     if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/
       return $1
     else
       # zypper didn't find updates, pretend the current
       # version is the latest
       return @property_hash[:ensure]
     end
   end
 
   def update
     # zypper install can be used for update, too
     self.install
   end
 end
diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index 70d764187..211e7f964 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -1,144 +1,144 @@
 Puppet::Type.type(:service).provide :base do
   desc "The simplest form of service support.
 
   You have to specify enough about your service for this to work; the
   minimum you can specify is a binary for starting the process, and this
   same binary will be searched for in the process table to stop the
   service.  It is preferable to specify start, stop, and status commands,
-  akin to how you would do so using ``init``.
+  akin to how you would do so using `init`.
 
   "
 
   commands :kill => "kill"
 
   def self.instances
     []
   end
 
   # Get the process ID for a running process. Requires the 'pattern'
   # parameter.
   def getpid
     @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
     ps = Facter["ps"].value
     @resource.fail "You must upgrade Facter to a version that includes 'ps'" unless ps and ps != ""
     regex = Regexp.new(@resource[:pattern])
     self.debug "Executing '#{ps}'"
     IO.popen(ps) { |table|
       table.each { |line|
         if regex.match(line)
           ary = line.sub(/^\s+/, '').split(/\s+/)
           return ary[1]
         end
       }
     }
 
     nil
   end
 
   # How to restart the process.
   def restart
     if @resource[:restart] or restartcmd
       ucommand(:restart)
     else
       self.stop
       self.start
     end
   end
 
   # There is no default command, which causes other methods to be used
   def restartcmd
   end
 
   # Check if the process is running.  Prefer the 'status' parameter,
   # then 'statuscmd' method, then look in the process table.  We give
   # the object the option to not return a status command, which might
   # happen if, for instance, it has an init script (and thus responds to
   # 'statuscmd') but does not have 'hasstatus' enabled.
   def status
     if @resource[:status] or statuscmd
       # Don't fail when the exit status is not 0.
       ucommand(:status, false)
 
       # Expicitly calling exitstatus to facilitate testing
       if $CHILD_STATUS.exitstatus == 0
         return :running
       else
         return :stopped
       end
     elsif pid = self.getpid
       self.debug "PID is #{pid}"
       return :running
     else
       return :stopped
     end
   end
 
   # There is no default command, which causes other methods to be used
   def statuscmd
   end
 
   # Run the 'start' parameter command, or the specified 'startcmd'.
   def start
     ucommand(:start)
   end
 
   # The command used to start.  Generated if the 'binary' argument
   # is passed.
   def startcmd
     if @resource[:binary]
       return @resource[:binary]
     else
       raise Puppet::Error,
         "Services must specify a start command or a binary"
     end
   end
 
   # Stop the service.  If a 'stop' parameter is specified, it
   # takes precedence; otherwise checks if the object responds to
   # a 'stopcmd' method, and if so runs that; otherwise, looks
   # for the process in the process table.
   # This method will generally not be overridden by submodules.
   def stop
     if @resource[:stop] or stopcmd
       ucommand(:stop)
     else
       pid = getpid
       unless pid
         self.info "#{self.name} is not running"
         return false
       end
       begin
         output = kill pid
       rescue Puppet::ExecutionFailure => detail
         @resource.fail "Could not kill #{self.name}, PID #{pid}: #{output}"
       end
       return true
     end
   end
 
   # There is no default command, which causes other methods to be used
   def stopcmd
   end
 
   # A simple wrapper so execution failures are a bit more informative.
   def texecute(type, command, fof = true)
     begin
       # #565: Services generally produce no output, so squelch them.
       execute(command, :failonfail => fof, :squelch => true)
     rescue Puppet::ExecutionFailure => detail
       @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
     end
     nil
   end
 
   # Use either a specified command or the default for our provider.
   def ucommand(type, fof = true)
     if c = @resource[type]
       cmd = [c]
     else
       cmd = [send("#{type}cmd")].flatten
     end
     texecute(type, cmd, fof)
   end
 end
 
diff --git a/lib/puppet/provider/service/bsd.rb b/lib/puppet/provider/service/bsd.rb
index 2e00c33f1..e2a0e35f7 100644
--- a/lib/puppet/provider/service/bsd.rb
+++ b/lib/puppet/provider/service/bsd.rb
@@ -1,48 +1,48 @@
 # Manage FreeBSD services.
 Puppet::Type.type(:service).provide :bsd, :parent => :init do
-  desc "FreeBSD's (and probably NetBSD?) form of ``init``-style service management.
+  desc "FreeBSD's (and probably NetBSD?) form of `init`-style service management.
 
-  Uses ``rc.conf.d`` for service enabling and disabling.
+  Uses `rc.conf.d` for service enabling and disabling.
 
 "
 
   confine :operatingsystem => [:freebsd, :netbsd, :openbsd]
 
   @@rcconf_dir = '/etc/rc.conf.d'
 
   def self.defpath
     superclass.defpath
   end
 
   # remove service file from rc.conf.d to disable it
   def disable
     rcfile = File.join(@@rcconf_dir, @model[:name])
     File.delete(rcfile) if File.exists?(rcfile)
   end
 
   # if the service file exists in rc.conf.d then it's already enabled
   def enabled?
     rcfile = File.join(@@rcconf_dir, @model[:name])
     return :true if File.exists?(rcfile)
 
     :false
   end
 
   # enable service by creating a service file under rc.conf.d with the
   # proper contents
   def enable
     Dir.mkdir(@@rcconf_dir) if not File.exists?(@@rcconf_dir)
     rcfile = File.join(@@rcconf_dir, @model[:name])
     open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
   end
 
   # Override stop/start commands to use one<cmd>'s and the avoid race condition
   # where provider trys to stop/start the service before it is enabled
   def startcmd
     [self.initscript, :onestart]
   end
 
   def stopcmd
     [self.initscript, :onestop]
   end
 end
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index 4379f1b59..3d09e2849 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -1,48 +1,48 @@
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :debian, :parent => :init do
-  desc "Debian's form of ``init``-style management.
+  desc "Debian's form of `init`-style management.
 
   The only difference is that this supports service enabling and disabling
-  via ``update-rc.d`` and determines enabled status via ``invoke-rc.d``.
+  via `update-rc.d` and determines enabled status via `invoke-rc.d`.
 
   "
 
   commands :update_rc => "/usr/sbin/update-rc.d"
   # note this isn't being used as a command until
   # http://projects.reductivelabs.com/issues/2538
   # is resolved.
   commands :invoke_rc => "/usr/sbin/invoke-rc.d"
 
   defaultfor :operatingsystem => [:debian, :ubuntu]
 
   def self.defpath
     superclass.defpath
   end
 
   # Remove the symlinks
   def disable
     update_rc "-f", @resource[:name], "remove"
     update_rc @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
   end
 
   def enabled?
     # TODO: Replace system call when Puppet::Util.execute gives us a way
     # to determine exit status.  http://projects.reductivelabs.com/issues/2538
     system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
 
     # 104 is the exit status when you query start an enabled service.
     # 106 is the exit status when the policy layer supplies a fallback action
     # See x-man-page://invoke-rc.d
     if [104, 106].include?($CHILD_STATUS.exitstatus)
       return :true
     else
       return :false
     end
   end
 
   def enable
     update_rc "-f", @resource[:name], "remove"
     update_rc @resource[:name], "defaults"
   end
 end
diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
index 08250a06a..382c74267 100644
--- a/lib/puppet/provider/service/gentoo.rb
+++ b/lib/puppet/provider/service/gentoo.rb
@@ -1,52 +1,52 @@
 # Manage gentoo services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :gentoo, :parent => :init do
-  desc "Gentoo's form of ``init``-style service management.
+  desc "Gentoo's form of `init`-style service management.
 
-  Uses ``rc-update`` for service enabling and disabling.
+  Uses `rc-update` for service enabling and disabling.
 
   "
 
   commands :update => "/sbin/rc-update"
 
   confine :operatingsystem => :gentoo
 
   defaultfor :operatingsystem => :gentoo
 
   def self.defpath
     superclass.defpath
   end
 
   def disable
       output = update :del, @resource[:name], :default
   rescue Puppet::ExecutionFailure
       raise Puppet::Error, "Could not disable #{self.name}: #{output}"
   end
 
   def enabled?
     begin
       output = update :show
     rescue Puppet::ExecutionFailure
       return :false
     end
 
     line = output.split(/\n/).find { |l| l.include?(@resource[:name]) }
 
     return :false unless line
 
     # If it's enabled then it will print output showing service | runlevel
     if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
       return :true
     else
       return :false
     end
   end
 
   def enable
       output = update :add, @resource[:name], :default
   rescue Puppet::ExecutionFailure
       raise Puppet::Error, "Could not enable #{self.name}: #{output}"
   end
 end
 
 # $Id $
diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb
index 6abff12db..447c01aa5 100755
--- a/lib/puppet/provider/service/init.rb
+++ b/lib/puppet/provider/service/init.rb
@@ -1,141 +1,141 @@
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
   desc "Standard init service management.
 
-  This provider assumes that the init script has no ``status`` command,
+  This provider assumes that the init script has no `status` command,
   because so few scripts do, so you need to either provide a status
-  command or specify via ``hasstatus`` that one already exists in the
+  command or specify via `hasstatus` that one already exists in the
   init script.
 
 "
 
   class << self
     attr_accessor :defpath
   end
 
   case Facter["operatingsystem"].value
   when "FreeBSD"
     @defpath = ["/etc/rc.d", "/usr/local/etc/rc.d"]
   when "HP-UX"
     @defpath = "/sbin/init.d"
   else
     @defpath = "/etc/init.d"
   end
 
   # We can't confine this here, because the init path can be overridden.
   #confine :exists => @defpath
 
   # List all services of this type.
   def self.instances
     get_services(self.defpath)
   end
 
   def self.get_services(defpath, exclude=[])
     defpath = [defpath] unless defpath.is_a? Array
     instances = []
     defpath.each do |path|
       unless FileTest.directory?(path)
         Puppet.debug "Service path #{path} does not exist"
         next
       end
 
       check = [:ensure]
 
       check << :enable if public_method_defined? :enabled?
 
       Dir.entries(path).each do |name|
         fullpath = File.join(path, name)
         next if name =~ /^\./
         next if exclude.include? name
         next if not FileTest.executable?(fullpath)
         instances << new(:name => name, :path => path, :hasstatus => true)
       end
     end
     instances
   end
 
   # Mark that our init script supports 'status' commands.
   def hasstatus=(value)
     case value
     when true, "true"; @parameters[:hasstatus] = true
     when false, "false"; @parameters[:hasstatus] = false
     else
       raise Puppet::Error, "Invalid 'hasstatus' value #{value.inspect}"
     end
   end
 
   # Where is our init script?
   def initscript
     @initscript ||= self.search(@resource[:name])
   end
 
   def paths
     @paths ||= @resource[:path].find_all do |path|
       if File.directory?(path)
         true
       else
         if File.exist?(path) and ! File.directory?(path)
           self.debug "Search path #{path} is not a directory"
         else
           self.debug "Search path #{path} does not exist"
         end
         false
       end
     end
   end
 
   def search(name)
     paths.each { |path|
       fqname = File.join(path,name)
       begin
         stat = File.stat(fqname)
       rescue
         # should probably rescue specific errors...
         self.debug("Could not find #{name} in #{path}")
         next
       end
 
       # if we've gotten this far, we found a valid script
       return fqname
     }
 
     paths.each { |path|
       fqname_sh = File.join(path,"#{name}.sh")
       begin
         stat = File.stat(fqname_sh)
       rescue
         # should probably rescue specific errors...
         self.debug("Could not find #{name}.sh in #{path}")
         next
       end
 
       # if we've gotten this far, we found a valid script
       return fqname_sh
     }
     raise Puppet::Error, "Could not find init script for '#{name}'"
   end
 
   # The start command is just the init scriptwith 'start'.
   def startcmd
     [initscript, :start]
   end
 
   # The stop command is just the init script with 'stop'.
   def stopcmd
     [initscript, :stop]
   end
 
   def restartcmd
     (@resource[:hasrestart] == :true) && [initscript, :restart]
   end
 
   # If it was specified that the init script has a 'status' command, then
   # we just return that; otherwise, we return false, which causes it to
   # fallback to other mechanisms.
   def statuscmd
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
 end
 
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index 3ca67d66f..e851a488d 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -1,76 +1,76 @@
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
-  desc "Red Hat's (and probably many others) form of ``init``-style service management:
+  desc "Red Hat's (and probably many others) form of `init`-style service management:
 
-  Uses ``chkconfig`` for service enabling and disabling.
+  Uses `chkconfig` for service enabling and disabling.
 
   "
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
   defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles, :oel, :ovm]
 
   def self.instances
     # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
     self.get_services(['/etc/init.d'], ['functions', 'halt', 'killall', 'single', 'linuxconf'])
   end
 
   def self.defpath
     superclass.defpath
   end
 
   # Remove the symlinks
   def disable
       output = chkconfig(@resource[:name], :off)
   rescue Puppet::ExecutionFailure
       raise Puppet::Error, "Could not disable #{self.name}: #{output}"
   end
 
   def enabled?
     begin
       output = chkconfig(@resource[:name])
     rescue Puppet::ExecutionFailure
       return :false
     end
 
     # If it's disabled on SuSE, then it will print output showing "off"
     # at the end
     if output =~ /.* off$/
       return :false
     end
 
     :true
   end
 
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
       output = chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
   end
 
   def initscript
     raise Puppet::Error, "Do not directly call the init script for '#{@resource[:name]}'; use 'service' instead"
   end
 
   # use hasstatus=>true when its set for the provider.
   def statuscmd
     ((@resource.provider.get(:hasstatus) == true) || (@resource[:hasstatus] == :true)) && [command(:service), @resource[:name], "status"]
   end
 
   def restartcmd
     (@resource[:hasrestart] == :true) && [command(:service), @resource[:name], "restart"]
   end
 
   def startcmd
     [command(:service), @resource[:name], "start"]
   end
 
   def stopcmd
     [command(:service), @resource[:name], "stop"]
   end
 
 end
 
diff --git a/lib/puppet/provider/user/ldap.rb b/lib/puppet/provider/user/ldap.rb
index df082c569..75a9667b3 100644
--- a/lib/puppet/provider/user/ldap.rb
+++ b/lib/puppet/provider/user/ldap.rb
@@ -1,129 +1,129 @@
 require 'puppet/provider/ldap'
 
 Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
-  desc "User management via ``ldap``.  This provider requires that you
+  desc "User management via `ldap`.  This provider requires that you
     have valid values for all of the ldap-related settings,
-    including ``ldapbase``.  You will also almost definitely need settings
-    for ``ldapuser`` and ``ldappassword``, so that your clients can write
+    including `ldapbase`.  You will also almost definitely need settings
+    for `ldapuser` and `ldappassword`, so that your clients can write
     to ldap.
 
     Note that this provider will automatically generate a UID for you if
     you do not specify one, but it is a potentially expensive operation,
     as it iterates across all existing users to pick the appropriate next
     one."
 
   confine :feature => :ldap, :false => (Puppet[:ldapuser] == "")
 
   has_feature :manages_passwords
 
   manages(:posixAccount, :person).at("ou=People").named_by(:uid).and.maps :name => :uid,
     :password => :userPassword,
     :comment => :cn,
     :uid => :uidNumber,
     :gid => :gidNumber,
     :home => :homeDirectory,
     :shell => :loginShell
 
   # Use the last field of a space-separated array as
   # the sn.  LDAP requires a surname, for some stupid reason.
   manager.generates(:sn).from(:cn).with do |cn|
     x = 1
     cn[0].split(/\s+/)[-1]
   end
 
   # Find the next uid after the current largest uid.
   provider = self
   manager.generates(:uidNumber).with do
     largest = 500
     if existing = provider.manager.search
       existing.each do |hash|
         next unless value = hash[:uid]
         num = value[0].to_i
         largest = num if num > largest
       end
     end
     largest + 1
   end
 
   # Convert our gid to a group name, if necessary.
   def gid=(value)
     value = group2id(value) unless [Fixnum, Bignum].include?(value.class)
 
     @property_hash[:gid] = value
   end
 
   # Find all groups this user is a member of in ldap.
   def groups
     # We want to cache the current result, so we know if we
     # have to remove old values.
     unless @property_hash[:groups]
       unless result = group_manager.search("memberUid=#{name}")
         return @property_hash[:groups] = :absent
       end
 
       return @property_hash[:groups] = result.collect { |r| r[:name] }.sort.join(",")
     end
     @property_hash[:groups]
   end
 
   # Manage the list of groups this user is a member of.
   def groups=(values)
     should = values.split(",")
 
     if groups == :absent
       is = []
     else
       is = groups.split(",")
     end
 
     modes = {}
     [is, should].flatten.uniq.each do |group|
       # Skip it when they're in both
       next if is.include?(group) and should.include?(group)
 
       # We're adding a group.
       modes[group] = :add and next unless is.include?(group)
 
       # We're removing a group.
       modes[group] = :remove and next unless should.include?(group)
     end
 
     modes.each do |group, form|
       self.fail "Could not find ldap group #{group}" unless ldap_group = group_manager.find(group)
 
       current = ldap_group[:members]
 
       if form == :add
         if current.is_a?(Array) and ! current.empty?
           new = current + [name]
         else
           new = [name]
         end
       else
         new = current - [name]
         new = :absent if new.empty?
       end
 
       group_manager.update(group, {:ensure => :present, :members => current}, {:ensure => :present, :members => new})
     end
   end
 
   # Convert a gropu name to an id.
   def group2id(group)
     Puppet::Type.type(:group).provider(:ldap).name2id(group)
   end
 
   private
 
   def group_manager
     Puppet::Type.type(:group).provider(:ldap).manager
   end
 
   def group_properties(values)
     if values.empty? or values == :absent
       {:ensure => :present}
     else
       {:ensure => :present, :members => values}
     end
   end
 end
diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb
index 345d924bf..a5988cad1 100644
--- a/lib/puppet/provider/user/pw.rb
+++ b/lib/puppet/provider/user/pw.rb
@@ -1,41 +1,41 @@
 require 'puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::PW do
-  desc "User management via ``pw`` on FreeBSD."
+  desc "User management via `pw` on FreeBSD."
 
   commands :pw => "pw"
   has_features :manages_homedir, :allows_duplicates
 
   defaultfor :operatingsystem => :freebsd
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
 
   verify :groups, "Groups must be comma-separated" do |value|
     value !~ /\s/
   end
 
   def addcmd
     cmd = [command(:pw), "useradd", @resource[:name]]
     @resource.class.validproperties.each do |property|
       next if property == :ensure
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       if value = @resource.should(property) and value != ""
         cmd << flag(property) << value
       end
     end
 
     cmd << "-o" if @resource.allowdupe?
 
     cmd << "-m" if @resource.managehome?
 
     cmd
   end
 end
 
diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb
index ea1b01b3b..c13125925 100644
--- a/lib/puppet/provider/user/user_role_add.rb
+++ b/lib/puppet/provider/user/user_role_add.rb
@@ -1,178 +1,178 @@
 require 'puppet/util/user_attr'
 
 Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => :useradd do
 
-  desc "User management inherits ``useradd`` and adds logic to manage roles on Solaris using roleadd."
+  desc "User management inherits `useradd` and adds logic to manage roles on Solaris using roleadd."
 
   defaultfor :operatingsystem => :solaris
 
   commands :add => "useradd", :delete => "userdel", :modify => "usermod", :role_add => "roleadd", :role_delete => "roledel", :role_modify => "rolemod"
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
   options :roles, :flag => "-R"
   options :auths, :flag => "-A"
   options :profiles, :flag => "-P"
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
 
   verify :groups, "Groups must be comma-separated" do |value|
     value !~ /\s/
   end
 
   has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords
 
   #must override this to hand the keyvalue pairs
   def add_properties
     cmd = []
     Puppet::Type.type(:user).validproperties.each do |property|
       #skip the password because we can't create it with the solaris useradd
       next if [:ensure, :password].include?(property)
       # 1680 Now you can set the hashed passwords on solaris:lib/puppet/provider/user/user_role_add.rb
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       if value = @resource.should(property) and value != ""
         if property == :keys
           cmd += build_keys_cmd(value)
         else
           cmd << flag(property) << value
         end
       end
     end
     cmd
   end
 
   def user_attributes
     @user_attributes ||= UserAttr.get_attributes_by_name(@resource[:name])
   end
 
   def flush
     @user_attributes = nil
   end
 
   def command(cmd)
     cmd = ("role_#{cmd}").intern if is_role? or (!exists? and @resource[:ensure] == :role)
     super(cmd)
   end
 
   def is_role?
     user_attributes and user_attributes[:type] == "role"
   end
 
   def run(cmd, msg)
       execute(cmd)
   rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}"
   end
 
   def transition(type)
     cmd = [command(:modify)]
     cmd << "-K" << "type=#{type}"
     cmd += add_properties
     cmd << @resource[:name]
   end
 
   def create
     if is_role?
       run(transition("normal"), "transition role to")
     else
       run(addcmd, "create")
     end
     # added to handle case when password is specified
     self.password = @resource[:password] if @resource[:password]
   end
 
   def destroy
     run(deletecmd, "delete "+ (is_role? ? "role" : "user"))
   end
 
   def create_role
     if exists? and !is_role?
       run(transition("role"), "transition user to")
     else
       run(addcmd, "create role")
     end
   end
 
   def roles
     user_attributes[:roles] if user_attributes
   end
 
   def auths
     user_attributes[:auths] if user_attributes
   end
 
   def profiles
     user_attributes[:profiles] if user_attributes
   end
 
   def project
     user_attributes[:project] if user_attributes
   end
 
   def managed_attributes
     [:name, :type, :roles, :auths, :profiles, :project]
   end
 
   def remove_managed_attributes
     managed = managed_attributes
     user_attributes.select { |k,v| !managed.include?(k) }.inject({}) { |hash, array| hash[array[0]] = array[1]; hash }
   end
 
   def keys
     if user_attributes
       #we have to get rid of all the keys we are managing another way
       remove_managed_attributes
     end
   end
 
   def build_keys_cmd(keys_hash)
     cmd = []
     keys_hash.each do |k,v|
       cmd << "-K" << "#{k}=#{v}"
     end
     cmd
   end
 
   def keys=(keys_hash)
     run([command(:modify)] + build_keys_cmd(keys_hash) << @resource[:name], "modify attribute key pairs")
   end
 
   #Read in /etc/shadow, find the line for this user (skipping comments, because who knows) and return the hashed pw (the second entry)
   #No abstraction, all esoteric knowledge of file formats, yay
   def password
     #got perl?
     if ary = File.readlines("/etc/shadow").reject { |r| r =~ /^[^\w]/}.collect { |l| l.split(':')[0..1] }.find { |user, passwd| user == @resource[:name] }
       pass = ary[1]
     end
     pass
   end
 
   #Read in /etc/shadow, find the line for our used and rewrite it with the new pw
   #Smooth like 80 grit
   def password=(cryptopw)
     begin
       File.open("/etc/shadow", "r") do |shadow|
         File.open("/etc/shadow_tmp", "w", 0600) do |shadow_tmp|
           while line = shadow.gets
             line_arr = line.split(':')
             if line_arr[0] == @resource[:name]
               line_arr[1] = cryptopw
               line = line_arr.join(':')
             end
             shadow_tmp.print line
           end
         end
       end
       File.rename("/etc/shadow_tmp", "/etc/shadow")
     rescue => detail
       fail "Could not write temporary shadow file: #{detail}"
     ensure
       # Make sure this *always* gets deleted
       File.unlink("/etc/shadow_tmp") if File.exist?("/etc/shadow_tmp")
     end
   end
 end
 
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index ec87694d7..7ef217d9e 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -1,69 +1,69 @@
 require 'puppet/provider/nameservice/objectadd'
 
 Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameService::ObjectAdd do
-  desc "User management via ``useradd`` and its ilk.  Note that you will need to install the ``Shadow Password`` Ruby library often known as ruby-libshadow to manage user passwords."
+  desc "User management via `useradd` and its ilk.  Note that you will need to install the `Shadow Password` Ruby library often known as ruby-libshadow to manage user passwords."
 
   commands :add => "useradd", :delete => "userdel", :modify => "usermod"
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
 
   verify :groups, "Groups must be comma-separated" do |value|
     value !~ /\s/
   end
 
   has_features :manages_homedir, :allows_duplicates
 
   has_feature :manages_passwords if Puppet.features.libshadow?
 
   def check_allow_dup
     @resource.allowdupe? ? ["-o"] : []
   end
 
   def check_manage_home
     cmd = []
     if @resource.managehome?
       cmd << "-m"
     elsif %w{Fedora RedHat CentOS OEL OVS}.include?(Facter.value("operatingsystem"))
       cmd << "-M"
     end
     cmd
   end
 
   def add_properties
     cmd = []
     Puppet::Type.type(:user).validproperties.each do |property|
       next if property == :ensure
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       if value = @resource.should(property) and value != ""
         cmd << flag(property) << value
       end
     end
     cmd
   end
 
   def addcmd
     cmd = [command(:add)]
     cmd += add_properties
     cmd += check_allow_dup
     cmd += check_manage_home
     cmd << @resource[:name]
   end
 
   # Retrieve the password using the Shadow Password library
   def password
     if Puppet.features.libshadow?
       if ent = Shadow::Passwd.getspnam(@resource.name)
         return ent.sp_pwdp
       end
     end
     :absent
   end
 end
 
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index bfa2cb802..fadd1a423 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -1,146 +1,149 @@
 config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all configuration parameters") do
   docs = {}
   Puppet.settings.each do |name, object|
     docs[name] = object
   end
 
   str = ""
   docs.sort { |a, b|
     a[0].to_s <=> b[0].to_s
   }.each do |name, object|
     # Make each name an anchor
     header = name.to_s
     str += h(header, 3)
 
     # Print the doc string itself
     begin
       str += object.desc.gsub(/\n/, " ")
     rescue => detail
       puts detail.backtrace
       puts detail
     end
     str += "\n\n"
 
     # Now print the data about the item.
     str += ""
     val = object.default
     if name.to_s == "vardir"
       val = "/var/lib/puppet"
     elsif name.to_s == "confdir"
       val = "/etc/puppet"
     end
 
     # Leave out the section information; it was apparently confusing people.
     #str += "- **Section**: #{object.section}\n"
     unless val == ""
-      str += "- **Default**: #{val}\n"
+      str += "- *Default*: #{val}\n"
     end
     str += "\n"
   end
 
   return str
 end
 
 config.header = "
 Specifying Configuration Parameters
 -----------------------------------
 
 On The Command-Line
 +++++++++++++++++++
-Every Puppet executable (with the exception of ``puppetdoc``) accepts all of
+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.
 
 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
 options or in the configuration file.  For instance, the command-line
-invocation below would set the configuration directory to ``/private/puppet``::
+invocation below would set the configuration directory to `/private/puppet`:
 
-  $ puppet agent --confdir=/private/puppet
+    $ puppet agent --confdir=/private/puppet
 
 Note that boolean options are turned on and off with a slightly different
-syntax on the command line::
+syntax on the command line:
 
-  $ puppet agent --storeconfigs
+    $ puppet agent --storeconfigs
 
-  $ puppet agent --no-storeconfigs
+    $ puppet agent --no-storeconfigs
 
 The invocations above will enable and disable, respectively, the storage of
 the client configuration.
 
 Configuration Files
 +++++++++++++++++++
+
 As mentioned above, the configuration parameters can also be stored in a
 configuration file, located in the configuration directory.  As root, the
-default configuration directory is ``/etc/puppet``, and as a regular user, the
-default configuration directory is ``~user/.puppet``.  As of 0.23.0, all
-executables look for ``puppet.conf`` in their configuration directory
+default configuration directory is `/etc/puppet`, and as a regular user, the
+default configuration directory is `~user/.puppet`.  As of 0.23.0, all
+executables look for `puppet.conf` in their configuration directory
 (although they previously looked for separate files).  For example,
-``puppet.conf`` is located at ``/etc/puppet/puppet.conf`` as root and
-``~user/.puppet/puppet.conf`` as a regular user by default.
+`puppet.conf` is located at `/etc/puppet/puppet.conf` as `root` and
+`~user/.puppet/puppet.conf` as a regular user by default.
 
-All executables will set any parameters set within the ``main`` section,
-and each executable will also use one of the ``master``, ``agent``, or
-``user`` sections.
+All executables will set any parameters set within the `[main]` section,
+and each executable will also use one of the `[master]`, `[agent]`.
 
 File Format
 '''''''''''
+
 The file follows INI-style formatting.  Here is an example of a very simple
-``puppet.conf`` file::
+`puppet.conf` file:
 
-  [main]
-    confdir = /private/puppet
-    storeconfigs = true
+    [main]
+      confdir = /private/puppet
+      storeconfigs = true
 
 Note that boolean parameters must be explicitly specified as `true` or
 `false` as seen above.
 
 If you need to change file parameters (e.g., reset the mode or owner), do
-so within curly braces on the same line::
+so within curly braces on the same line:
 
-  [main]
-    myfile = /tmp/whatever {owner = root, mode = 644}
+    [main]
+      myfile = /tmp/whatever {owner = root, mode = 644}
 
 If you're starting out with a fresh configuration, you may wish to let
 the executable generate a template configuration file for you by invoking
 the executable in question with the `--genconfig` command.  The executable
 will print a template configuration to standard output, which can be
-redirected to a file like so::
+redirected to a file like so:
 
-  $ puppet agent --genconfig > /etc/puppet/puppet.conf
+    $ puppet agent --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
 Puppet's directories and files and prints it to standard output.  This can
-likewise be redirected to a file::
+likewise be redirected to a file:
 
-  $ puppet agent --genmanifest > /etc/puppet/manifests/site.pp
+    $ puppet agent --genmanifest > /etc/puppet/manifests/site.pp
 
 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::
+and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument:
 
-  $ puppet agent --mkusers
+    $ puppet agent --mkusers
 
 Signals
 -------
-The ``puppet agent`` and ``puppet master`` 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 ``puppet agent`` or ``puppet master``.
 
-Sending the ``SIGUSR1`` signal to an instance of ``puppet agent`` will cause it to
+The `puppet agent` and `puppet master` 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 `puppet agent` or `puppet master`.
+
+Sending the `SIGUSR1` signal to an instance of `puppet agent` will cause it to
 immediately begin a new configuration transaction with the server.  This
-signal has no effect on ``puppet master``.
+signal has no effect on `puppet master`.
 
 Configuration Parameter Reference
 ---------------------------------
+
 Below is a list of all documented parameters.  Not all of them are valid with all
 Puppet executables, but the executables will ignore any inappropriate values.
 
 "
 
diff --git a/lib/puppet/reference/indirection.rb b/lib/puppet/reference/indirection.rb
index d14510c16..0cdbb2510 100644
--- a/lib/puppet/reference/indirection.rb
+++ b/lib/puppet/reference/indirection.rb
@@ -1,34 +1,33 @@
 require 'puppet/indirector/indirection'
 require 'puppet/util/checksums'
 require 'puppet/file_serving/content'
 require 'puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
   text = ""
   Puppet::Indirector::Indirection.instances.sort { |a,b| a.to_s <=> b.to_s }.each do |indirection|
     ind = Puppet::Indirector::Indirection.instance(indirection)
     name = indirection.to_s.capitalize
     text += indirection.to_s + "\n" + ("-" * name.length) + "\n\n"
 
     text += ind.doc + "\n\n"
 
     Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
       text += terminus.to_s + "\n" + ("+" * terminus.to_s.length) + "\n\n"
 
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
 
       text += Puppet::Util::Docs.scrub(term_class.doc) + "\n\n"
     end
   end
 
   text
 end
 
 reference.header = "This is the list of all indirections, their associated terminus classes, and how you select between them.
 
-In general, the appropriate terminus class is selected by the application for you (e.g., ``puppet agent`` would always use the ``rest``
-terminus for most of its indirected classes), but some classes are tunable via normal settings.  These will have ``terminus setting``
-documentation listed with them.
+In general, the appropriate terminus class is selected by the application for you (e.g., `puppet agent` would always use the `rest`
+terminus for most of its indirected classes), but some classes are tunable via normal settings.  These will have `terminus setting` documentation listed with them.
 
 
 "
diff --git a/lib/puppet/reference/metaparameter.rb b/lib/puppet/reference/metaparameter.rb
index 6a319f1c2..39c4b7f5f 100644
--- a/lib/puppet/reference/metaparameter.rb
+++ b/lib/puppet/reference/metaparameter.rb
@@ -1,48 +1,40 @@
 metaparameter = Puppet::Util::Reference.newreference :metaparameter, :doc => "All Puppet metaparameters and all their details" do
   types = {}
   Puppet::Type.loadall
 
   Puppet::Type.eachtype { |type|
     next if type.name == :puppet
     next if type.name == :component
     types[type.name] = type
   }
 
   str = %{
     Metaparameters
     --------------
     Metaparameters are parameters that work with any resource type; they are part of the
     Puppet framework itself rather than being part of the implementation of any
     given instance.  Thus, any defined metaparameter can be used with any instance
     in your manifest, including defined components.
 
     Available Metaparameters
     ++++++++++++++++++++++++
     }
   begin
     params = []
     Puppet::Type.eachmetaparam { |param|
       params << param
     }
 
     params.sort { |a,b|
       a.to_s <=> b.to_s
     }.each { |param|
       str += paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)), :level => 4)
-      #puts "<dt>#{param}</dt>"
-      #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ')
-      #puts "<dd>"
-      #puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
-      #puts scrub(Puppet::Type.metaparamdoc(param))
-      #puts "</dd>"
-
-      #puts ""
     }
   rescue => detail
     puts detail.backtrace
     puts "incorrect metaparams: #{detail}"
     exit(1)
   end
 
   str
 end
diff --git a/lib/puppet/reference/network.rb b/lib/puppet/reference/network.rb
index 15e4f6769..fda7931fb 100644
--- a/lib/puppet/reference/network.rb
+++ b/lib/puppet/reference/network.rb
@@ -1,39 +1,39 @@
 require 'puppet/network/handler'
 
 network = Puppet::Util::Reference.newreference :network, :depth => 2, :doc => "Available network handlers and clients" do
   ret = ""
   Puppet::Network::Handler.subclasses.sort { |a,b| a.to_s <=> b.to_s }.each do |name|
     handler = Puppet::Network::Handler.handler(name)
 
     next if ! handler.doc or handler.doc == ""
 
     interface = handler.interface
 
     ret += h(name, 2)
 
     ret += scrub(handler.doc)
     ret += "\n\n"
     ret += option(:prefix, interface.prefix)
     ret += option(:side, handler.side.to_s.capitalize)
     ret += option(:methods, interface.methods.collect { |ary| ary[0] }.join(", ") )
     ret += "\n\n"
   end
 
   ret
 end
 
 network.header = "
 This is a list of all Puppet network interfaces.  Each interface is
 implemented in the form of a client and a handler; the handler is loaded
 on the server, and the client knows how to call the handler's methods
 appropriately.
 
 Most handlers are meant to be started on the server, usually within
-``puppet master``, and the clients are mostly started on the client,
-usually within ``puppet agent``.
+`puppet master`, and the clients are mostly started on the client,
+usually within `puppet agent`.
 
 You can find the server-side handler for each interface at
-``puppet/network/handler/<name>.rb`` and the client class at
-``puppet/network/client/<name>.rb``.
+`puppet/network/handler/<name>.rb` and the client class at
+`puppet/network/client/<name>.rb`.
 
 "
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index ef33a559b..c85ad23ab 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -1,123 +1,123 @@
 # This doesn't get stored in trac, since it changes every time.
 providers = Puppet::Util::Reference.newreference :providers, :title => "Provider Suitability Report", :depth => 1, :dynamic => true, :doc => "Which providers are valid for this machine" do
   types = []
   Puppet::Type.loadall
   Puppet::Type.eachtype do |klass|
     next unless klass.providers.length > 0
     types << klass
   end
   types.sort! { |a,b| a.name.to_s <=> b.name.to_s }
 
   command_line = Puppet::Util::CommandLine.new
   types.reject! { |type| ! command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
 
   ret = "Details about this host:\n\n"
 
   # Throw some facts in there, so we know where the report is from.
   ["Ruby Version", "Puppet Version", "Operating System", "Operating System Release"].each do |label|
     name = label.gsub(/\s+/, '')
     value = Facter.value(name)
     ret += option(label, value)
   end
   ret += "\n"
 
   count = 1
 
   # Produce output for each type.
   types.each do |type|
     features = type.features
     ret += "\n" # add a trailing newline
 
     # Now build up a table of provider suitability.
     headers = %w{Provider Suitable?} + features.collect { |f| f.to_s }.sort
 
     table_data = {}
 
     functional = false
     notes = []
     begin
       default = type.defaultprovider.name
     rescue Puppet::DevError
       default = "none"
     end
     type.providers.sort { |a,b| a.to_s <=> b.to_s }.each do |pname|
       data = []
       table_data[pname] = data
       provider = type.provider(pname)
 
       # Add the suitability note
       if missing = provider.suitable?(false) and missing.empty?
-        data << "**X**"
+        data << "*X*"
         suit = true
         functional = true
       else
         data << "[#{count}]_" # A pointer to the appropriate footnote
         suit = false
       end
 
       # Add a footnote with the details about why this provider is unsuitable, if that's the case
       unless suit
         details = ".. [#{count}]\n"
         missing.each do |test, values|
           case test
           when :exists
             details += "  - Missing files #{values.join(", ")}\n"
           when :variable
             values.each do |name, facts|
               if Puppet.settings.valid?(name)
                 details += "  - Setting #{name} (currently #{Puppet.settings.value(name).inspect}) not in list #{facts.join(", ")}\n"
               else
                 details += "  - Fact #{name} (currently #{Facter.value(name).inspect}) not in list #{facts.join(", ")}\n"
               end
             end
           when :true
             details += "  - Got #{values} true tests that should have been false\n"
           when :false
             details += "  - Got #{values} false tests that should have been true\n"
           when :feature
             details += "  - Missing features #{values.collect { |f| f.to_s }.join(",")}\n"
           end
         end
         notes << details
 
         count += 1
       end
 
       # Add a note for every feature
       features.each do |feature|
         if provider.features.include?(feature)
-          data << "**X**"
+          data << "*X*"
         else
           data << ""
         end
       end
     end
 
     ret += h(type.name.to_s + "_", 2)
 
-    ret += ".. _#{type.name}: #{"http://docs.puppetlabs.com/references/stable/type.html##{type.name}"}\n\n"
+    ret += "[#{type.name}](#{"http://docs.puppetlabs.com/references/stable/type.html##{type.name}"})\n\n"
     ret += option("Default provider", default)
     ret += doctable(headers, table_data)
 
     notes.each do |note|
       ret += note + "\n"
     end
 
     ret += "\n"
   end
 
   ret += "\n"
 
   ret
 end
 providers.header = "
-Puppet resource types are usually backed by multiple implementations called ``providers``,
+Puppet resource types are usually backed by multiple implementations called `providers`,
 which handle variance between platforms and tools.
 
 Different providers are suitable or unsuitable on different platforms based on things
 like the presence of a given tool.
 
 Here are all of the provider-backed types and their different providers.  Any unmentioned
 types do not use providers yet.
 
 "
diff --git a/lib/puppet/reference/report.rb b/lib/puppet/reference/report.rb
index 481ca2dc1..47fc779ab 100644
--- a/lib/puppet/reference/report.rb
+++ b/lib/puppet/reference/report.rb
@@ -1,24 +1,23 @@
 require 'puppet/reports'
 
 report = Puppet::Util::Reference.newreference :report, :doc => "All available transaction reports" do
   Puppet::Reports.reportdocs
 end
 
 report.header = "
 Puppet clients can report back to the server after each transaction.  This
 transaction report is sent as a YAML dump of the
-``Puppet::Transaction::Report`` class and includes every log message that was
+`Puppet::Transaction::Report` class and includes every log message that was
 generated during the transaction along with as many metrics as Puppet knows how
-to collect.  See `ReportsAndReporting Reports and Reporting`:trac:
-for more information on how to use reports.
+to collect.  See [Reports and Reporting](http://projects.puppetlabs.com/projects/puppet/wiki/Reports_And_Reporting) for more information on how to use reports.
 
 Currently, clients default to not sending in reports; you can enable reporting
-by setting the ``report`` parameter to true.
+by setting the `report` parameter to true.
 
-To use a report, set the ``reports`` parameter on the server; multiple
-reports must be comma-separated.  You can also specify ``none`` to disable
+To use a report, set the `reports` parameter on the server; multiple
+reports must be comma-separated.  You can also specify `none` to disable
 reports entirely.
 
 Puppet provides multiple report handlers that will process client reports:
 
 "
diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb
index be8742edc..2378bb83a 100644
--- a/lib/puppet/reference/type.rb
+++ b/lib/puppet/reference/type.rb
@@ -1,113 +1,113 @@
 type = Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types and all their details" do
   types = {}
   Puppet::Type.loadall
 
   Puppet::Type.eachtype { |type|
     next if type.name == :puppet
     next if type.name == :component
     types[type.name] = type
   }
 
   str = %{
 
     Resource Types
     --------------
 
     - The *namevar* is the parameter used to uniquely identify a type instance.
   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``.
+  worry about which parameter is the `namevar`.
 
-  In the following code::
+  In the following code:
 
-    file { "/etc/passwd":
-      owner => root,
-      group => root,
-      mode => 644
-    }
+      file { "/etc/passwd":
+        owner => root,
+        group => root,
+        mode => 644
+      }
 
-  ``/etc/passwd`` is considered the title of the file object (used for things like
-  dependency handling), and because ``path`` is the namevar for ``file``, that
-  string is assigned to the ``path`` parameter.
+  `/etc/passwd` is considered the title of the file object (used for things like
+  dependency handling), and because `path` is the namevar for `file`, that
+  string is assigned to the `path` parameter.
 
-- *Parameters* determine the specific configuration of the instance.  They either
+  - *Parameters* determine the specific configuration of the instance.  They either
   directly modify the system (internally, these are called properties) or they affect
-  how the instance behaves (e.g., adding a search path for ``exec`` instances or determining recursion on ``file`` instances).
+  how the instance behaves (e.g., adding a search path for `exec` instances or determining recursion on `file` instances).
 
-- *Providers* provide low-level functionality for a given resource type.  This is
+  - *Providers* provide low-level functionality for a given resource type.  This is
   usually in the form of calling out to external commands.
 
   When required binaries are specified for providers, fully qualifed paths
   indicate that the binary must exist at that specific path and unqualified
   binaries indicate that Puppet will search for the binary using the shell
   path.
 
-- *Features* are abilities that some providers might not support.  You can use the list
+  - *Features* are abilities that some providers might not support.  You can use the list
   of supported features to determine how a given provider can be used.
 
   Resource types define features they can use, and providers can be tested to see
   which features they provide.
 
     }
 
     types.sort { |a,b|
       a.to_s <=> b.to_s
     }.each { |name,type|
 
       str += "
 
 ----------------
 
 "
 
   str += h(name, 3)
   str += scrub(type.doc) + "\n\n"
 
   # Handle the feature docs.
   if featuredocs = type.featuredocs
     str += h("Features", 4)
     str += featuredocs
     end
 
     docs = {}
     type.validproperties.sort { |a,b|
       a.to_s <=> b.to_s
     }.reject { |sname|
       property = type.propertybyname(sname)
       property.nodoc
     }.each { |sname|
       property = type.propertybyname(sname)
 
       raise "Could not retrieve property #{sname} on type #{type.name}" unless property
 
       doc = nil
       unless doc = property.doc
         $stderr.puts "No docs for #{type}[#{sname}]"
         next
       end
       doc = doc.dup
       tmp = doc
       tmp = scrub(tmp)
 
       docs[sname]  = tmp
     }
 
     str += h("Parameters", 4) + "\n"
     type.parameters.sort { |a,b|
       a.to_s <=> b.to_s
     }.each { |name,param|
       #docs[name] = indent(scrub(type.paramdoc(name)), $tab)
       docs[name] = scrub(type.paramdoc(name))
     }
 
     additional_key_attributes = type.key_attributes - [:name]
     docs.sort { |a, b|
       a[0].to_s <=> b[0].to_s
     }.each { |name, doc|
       str += paramwrap(name, doc, :namevar => additional_key_attributes.include?(name))
     }
     str += "\n"
   }
 
   str
 end
diff --git a/lib/puppet/reports/http.rb b/lib/puppet/reports/http.rb
index f1a74195d..7ac54dfbd 100644
--- a/lib/puppet/reports/http.rb
+++ b/lib/puppet/reports/http.rb
@@ -1,22 +1,22 @@
 require 'puppet'
 require 'net/http'
 require 'uri'
 
 Puppet::Reports.register_report(:http) do
 
   desc <<-DESC
-  Send report information via HTTP to the ``reporturl``. Each host sends
+  Send report information via HTTP to the `reporturl`. Each host sends
   its report as a YAML dump and this sends this YAML to a client via HTTP POST.
   The YAML is the `report` parameter of the request."
   DESC
 
   def process
     url = URI.parse(Puppet[:reporturl])
     req = Net::HTTP::Post.new(url.path)
     req.body = self.to_yaml
     req.content_type = "application/x-yaml"
     Net::HTTP.new(url.host, url.port).start {|http|
       http.request(req)
     }
   end
 end
diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb
index 9fbeb60e8..2357e233e 100644
--- a/lib/puppet/reports/rrdgraph.rb
+++ b/lib/puppet/reports/rrdgraph.rb
@@ -1,129 +1,128 @@
 Puppet::Reports.register_report(:rrdgraph) do
   desc "Graph all available data about hosts using the RRD library.  You
     must have the Ruby RRDtool library installed to use this report, which
-    you can get from `the RubyRRDTool RubyForge page`_.  This package may also
-    be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
-    management system.  The library and/or package will both require the binary
-    ``rrdtool`` package from your distribution to be installed.
-
-    .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
+    you can get from 
+    [the RubyRRDTool RubyForge page](http://rubyforge.org/projects/rubyrrdtool/).  
+    This package may also be available as `ruby-rrd` or `rrdtool-ruby` in your 
+    distribution's package management system.  The library and/or package will both 
+    require the binary `rrdtool` package from your distribution to be installed.
 
     This report will create, manage, and graph RRD database files for each
     of the metrics generated during transactions, and it will create a
     few simple html files to display the reporting host's graphs.  At this
     point, it will not create a common index file to display links to
     all hosts.
 
-    All RRD files and graphs get created in the ``rrddir`` directory.  If
+    All RRD files and graphs get created in the `rrddir` directory.  If
     you want to serve these publicly, you should be able to just alias that
     directory in a web server.
 
-    If you really know what you're doing, you can tune the ``rrdinterval``,
-    which defaults to the ``runinterval``."
+    If you really know what you're doing, you can tune the `rrdinterval`,
+    which defaults to the `runinterval`."
 
   def hostdir
     @hostdir ||= File.join(Puppet[:rrddir], self.host)
   end
 
   def htmlfile(type, graphs, field)
     file = File.join(hostdir, "#{type}.html")
     File.open(file, "w") do |of|
       of.puts "<html><head><title>#{type.capitalize} graphs for #{host}</title></head><body>"
 
       graphs.each do |graph|
         if field == :first
           name = graph.sub(/-\w+.png/, '').capitalize
         else
           name = graph.sub(/\w+-/, '').sub(".png", '').capitalize
         end
         of.puts "<img src=#{graph}><br>"
       end
       of.puts "</body></html>"
     end
 
     file
   end
 
   def mkhtml
     images = Dir.entries(hostdir).find_all { |d| d =~ /\.png/ }
 
     periodorder = %w{daily weekly monthly yearly}
 
     periods = {}
     types = {}
     images.each do |n|
       type, period = n.sub(".png", '').split("-")
       periods[period] ||= []
       types[type] ||= []
       periods[period] << n
       types[type] << n
     end
 
     files = []
     # Make the period html files
     periodorder.each do |period|
       unless ary = periods[period]
         raise Puppet::Error, "Could not find graphs for #{period}"
       end
       files << htmlfile(period, ary, :first)
     end
 
     # make the type html files
     types.sort { |a,b| a[0] <=> b[0] }.each do |type, ary|
       newary = []
       periodorder.each do |period|
         if graph = ary.find { |g| g.include?("-#{period}.png") }
           newary << graph
         else
           raise "Could not find #{type}-#{period} graph"
         end
       end
 
       files << htmlfile(type, newary, :second)
     end
 
     File.open(File.join(hostdir, "index.html"), "w") do |of|
       of.puts "<html><head><title>Report graphs for #{host}</title></head><body>"
       files.each do |file|
         of.puts "<a href='#{File.basename(file)}'>#{File.basename(file).sub(".html",'').capitalize}</a><br/>"
       end
       of.puts "</body></html>"
     end
   end
 
   def process(time = nil)
     time ||= Time.now.to_i
 
     unless File.directory?(hostdir) and FileTest.writable?(hostdir)
       # Some hackishness to create the dir with all of the right modes and ownership
       config = Puppet::Util::Settings.new
       config.setdefaults(:reports, :hostdir => {:default => hostdir, :owner => 'service', :mode => 0755, :group => 'service', :desc => "eh"})
 
       # This creates the dir.
       config.use(:reports)
     end
 
     self.metrics.each do |name, metric|
       metric.basedir = hostdir
 
       if name == "time"
         timeclean(metric)
       end
 
       metric.store(time)
 
       metric.graph
     end
 
     mkhtml unless FileTest.exists?(File.join(hostdir, "index.html"))
   end
 
   # Unfortunately, RRD does not deal well with changing lists of values,
   # so we have to pick a list of values and stick with it.  In this case,
   # that means we record the total time, the config time, and that's about
   # it.  We should probably send each type's time as a separate metric.
   def timeclean(metric)
     metric.values = metric.values.find_all { |name, label, value| [:total, :config_retrieval].include?(name) }
   end
 end
 
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index 65159fc07..30f24591c 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -1,60 +1,60 @@
 require 'puppet'
 
 Puppet::Reports.register_report(:store) do
   desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
-    and this just stores the file on disk, in the ``reportdir`` directory.
+    and this just stores the file on disk, in the `reportdir` directory.
 
     These files collect quickly -- one every half hour -- so it is a good idea
     to perform some maintenance on them if you use this report (it's the only
     default report)."
 
   def mkclientdir(client, dir)
     config = Puppet::Util::Settings.new
 
           config.setdefaults(
         "reportclient-#{client}".to_sym,
       "client-#{client}-dir" => { :default => dir,
         :mode => 0750,
         :desc => "Client dir for #{client}",
         :owner => 'service',
         :group => 'service'
       },
-        
+
       :noop => [false, "Used by settings internally."]
     )
 
     config.use("reportclient-#{client}".to_sym)
   end
 
   def process
     # We don't want any tracking back in the fs.  Unlikely, but there
     # you go.
     client = self.host.gsub("..",".")
 
     dir = File.join(Puppet[:reportdir], client)
 
     mkclientdir(client, dir) unless FileTest.exists?(dir)
 
     # Now store the report.
     now = Time.now.gmtime
     name = %w{year month day hour min}.collect do |method|
       # Make sure we're at least two digits everywhere
       "%02d" % now.send(method).to_s
     end.join("") + ".yaml"
 
     file = File.join(dir, name)
 
     begin
       File.open(file, "w", 0640) do |f|
         f.print to_yaml
       end
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.warning "Could not write report for #{client} at #{file}: #{detail}"
     end
 
     # Only testing cares about the return value
     file
   end
 end
 
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 652104096..71bafb2da 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -1,169 +1,168 @@
 require 'puppet'
 require 'pp'
 
 require 'net/smtp'
 require 'time'
 
 Puppet::Reports.register_report(:tagmail) do
   desc "This report sends specific log messages to specific email addresses
-    based on the tags in the log messages.  See the
-    `UsingTags tag documentation`:trac: for more information
-    on tags.
+    based on the tags in the log messages.  
 
-    To use this report, you must create a ``tagmail.conf`` (in the location
-    specified by ``tagmap``).  This is a simple file that maps tags to
+    See the [UsingTags tag documentation](http://projects.puppetlabs.com/projects/puppet/wiki/Using_Tags) for more information on tags.
+
+    To use this report, you must create a `tagmail.conf` (in the location
+    specified by `tagmap`).  This is a simple file that maps tags to
     email addresses:  Any log messages in the report that match the specified
     tags will be sent to the specified email addresses.
 
     Tags must be comma-separated, and they can be negated so that messages
     only match when they do not have that tag.  The tags are separated from
     the email addresses by a colon, and the email addresses should also
     be comma-separated.
 
-    Lastly, there is an ``all`` tag that will always match all log messages.
+    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
+        all: me@domain.com
+        webserver, !mailserver: httpadmins@domain.com
 
-    This will send all messages to ``me@domain.com``, and all messages from
-    webservers that are not also from mailservers to ``httpadmins@domain.com``.
+    This will send all messages to `me@domain.com`, and all messages from
+    webservers that are not also from mailservers to `httpadmins@domain.com`.
 
     If you are using anti-spam controls, such as grey-listing, on your mail
-    server you should whitelist the sending email (controlled by ``reportform`` configuration option) to ensure your email is not discarded as spam.
+    server you should whitelist the sending email (controlled by `reportform` configuration option) to ensure your email is not discarded as spam.
     "
 
-
   # Find all matching messages.
   def match(taglists)
     matching_logs = []
     taglists.each do |emails, pos, neg|
       # First find all of the messages matched by our positive tags
       messages = nil
       if pos.include?("all")
         messages = self.logs
       else
         # Find all of the messages that are tagged with any of our
         # tags.
         messages = self.logs.find_all do |log|
           pos.detect { |tag| log.tagged?(tag) }
         end
       end
 
       # Now go through and remove any messages that match our negative tags
       messages = messages.reject do |log|
         true if neg.detect do |tag| log.tagged?(tag) end
       end
 
       if messages.empty?
         Puppet.info "No messages to report to #{emails.join(",")}"
         next
       else
         matching_logs << [emails, messages.collect { |m| m.to_report }.join("\n")]
       end
     end
 
     matching_logs
   end
 
   # Load the config file
   def parse(text)
     taglists = []
     text.split("\n").each do |line|
       taglist = emails = nil
       case line.chomp
       when /^\s*#/; next
       when /^\s*$/; next
       when /^\s*(.+)\s*:\s*(.+)\s*$/
         taglist = $1
         emails = $2.sub(/#.*$/,'')
       else
         raise ArgumentError, "Invalid tagmail config file"
       end
 
       pos = []
       neg = []
       taglist.sub(/\s+$/,'').split(/\s*,\s*/).each do |tag|
         unless tag =~ /^!?[-\w]+$/
           raise ArgumentError, "Invalid tag #{tag.inspect}"
         end
         case tag
         when /^\w+/; pos << tag
         when /^!\w+/; neg << tag.sub("!", '')
         else
           raise Puppet::Error, "Invalid tag '#{tag}'"
         end
       end
 
       # Now split the emails
       emails = emails.sub(/\s+$/,'').split(/\s*,\s*/)
       taglists << [emails, pos, neg]
     end
     taglists
   end
 
   # Process the report.  This just calls the other associated messages.
   def process
     unless FileTest.exists?(Puppet[:tagmap])
       Puppet.notice "Cannot send tagmail report; no tagmap file #{Puppet[:tagmap]}"
       return
     end
 
     taglists = parse(File.read(Puppet[:tagmap]))
 
     # Now find any appropriately tagged messages.
     reports = match(taglists)
 
     send(reports)
   end
 
   # Send the email reports.
   def send(reports)
     pid = fork do
       if Puppet[:smtpserver] != "none"
         begin
           Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
             reports.each do |emails, messages|
               smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
                 p.puts "From: #{Puppet[:reportfrom]}"
                 p.puts "Subject: Puppet Report for #{self.host}"
                 p.puts "To: " + emails.join(", ")
                 p.puts "Date: #{Time.now.rfc2822}"
                 p.puts
                 p.puts messages
               end
             end
           end
         rescue => detail
           puts detail.backtrace if Puppet[:debug]
           raise Puppet::Error,
             "Could not send report emails through smtp: #{detail}"
         end
       elsif Puppet[:sendmail] != ""
         begin
           reports.each do |emails, messages|
             # We need to open a separate process for every set of email addresses
             IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
               p.puts "From: #{Puppet[:reportfrom]}"
               p.puts "Subject: Puppet Report for #{self.host}"
               p.puts "To: " + emails.join(", ")
 
               p.puts messages
             end
           end
         rescue => detail
           puts detail.backtrace if Puppet[:debug]
           raise Puppet::Error,
             "Could not send report emails via sendmail: #{detail}"
         end
       else
         raise Puppet::Error, "SMTP server is unset and could not find sendmail"
       end
     end
 
     # Don't bother waiting for the pid to return.
     Process.detach(pid)
   end
 end
 
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
index 96d22e414..c4e52af18 100644
--- a/lib/puppet/resource.rb
+++ b/lib/puppet/resource.rb
@@ -1,494 +1,394 @@
 require 'puppet'
 require 'puppet/util/tagging'
 require 'puppet/util/pson'
 
 # The simplest resource class.  Eventually it will function as the
 # base class for all resource-like behaviour.
 class Puppet::Resource
   include Puppet::Util::Tagging
 
   require 'puppet/resource/type_collection_helper'
   include Puppet::Resource::TypeCollectionHelper
 
   extend Puppet::Util::Pson
   include Enumerable
   attr_accessor :file, :line, :catalog, :exported, :virtual, :validate_parameters, :strict
-  attr_reader :namespaces
+  attr_reader :type, :title
 
   require 'puppet/indirector'
   extend Puppet::Indirector
   indirects :resource, :terminus_class => :ral
 
   ATTRIBUTES = [:file, :line, :exported]
 
   def self.from_pson(pson)
     raise ArgumentError, "No resource type provided in pson data" unless type = pson['type']
     raise ArgumentError, "No resource title provided in pson data" unless title = pson['title']
 
     resource = new(type, title)
 
     if params = pson['parameters']
       params.each { |param, value| resource[param] = value }
     end
 
     if tags = pson['tags']
       tags.each { |tag| resource.tag(tag) }
     end
 
     ATTRIBUTES.each do |a|
       if value = pson[a.to_s]
         resource.send(a.to_s + "=", value)
       end
     end
 
     resource.exported ||= false
 
     resource
   end
 
   def to_pson_data_hash
     data = ([:type, :title, :tags] + ATTRIBUTES).inject({}) do |hash, param|
       next hash unless value = self.send(param)
       hash[param.to_s] = value
       hash
     end
 
     data["exported"] ||= false
 
     params = self.to_hash.inject({}) do |hash, ary|
       param, value = ary
 
       # Don't duplicate the title as the namevar
       next hash if param == namevar and value == title
 
       hash[param] = Puppet::Resource.value_to_pson_data(value)
       hash
     end
 
     data["parameters"] = params unless params.empty?
 
     data
   end
 
   def self.value_to_pson_data(value)
     if value.is_a? Array
       value.map{|v| value_to_pson_data(v) }
     elsif value.is_a? Puppet::Resource
       value.to_s
     else
       value
     end
   end
 
   def to_pson(*args)
     to_pson_data_hash.to_pson(*args)
   end
 
   # Proxy these methods to the parameters hash.  It's likely they'll
   # be overridden at some point, but this works for now.
   %w{has_key? keys length delete empty? <<}.each do |method|
     define_method(method) do |*args|
       @parameters.send(method, *args)
     end
   end
 
   # Set a given parameter.  Converts all passed names
   # to lower-case symbols.
   def []=(param, value)
     validate_parameter(param) if validate_parameters
     @parameters[parameter_name(param)] = value
   end
 
   # Return a given parameter's value.  Converts all passed names
   # to lower-case symbols.
   def [](param)
     @parameters[parameter_name(param)]
   end
 
   def ==(other)
     return false unless other.respond_to?(:title) and self.type == other.type and self.title == other.title
 
     return false unless to_hash == other.to_hash
     true
   end
 
   # Compatibility method.
   def builtin?
     builtin_type?
   end
 
   # Is this a builtin resource type?
   def builtin_type?
     resource_type.is_a?(Class)
   end
 
   # Iterate over each param/value pair, as required for Enumerable.
   def each
     @parameters.each { |p,v| yield p, v }
   end
 
   def include?(parameter)
     super || @parameters.keys.include?( parameter_name(parameter) )
   end
 
   # These two methods are extracted into a Helper
   # module, but file load order prevents me
   # from including them in the class, and I had weird
   # behaviour (i.e., sometimes it didn't work) when
   # I directly extended each resource with the helper.
   def environment
     Puppet::Node::Environment.new(@environment)
   end
 
   def environment=(env)
     if env.is_a?(String) or env.is_a?(Symbol)
       @environment = env
     else
       @environment = env.name
     end
   end
 
   %w{exported virtual strict}.each do |m|
     define_method(m+"?") do
       self.send(m)
     end
   end
 
   # Create our resource.
   def initialize(type, title = nil, attributes = {})
     @parameters = {}
-    @namespaces = [""]
 
-    # Set things like namespaces and strictness first.
+    # Set things like strictness first.
     attributes.each do |attr, value|
       next if attr == :parameters
       send(attr.to_s + "=", value)
     end
 
-    # We do namespaces first, and use tmp variables, so our title
-    # canonicalization works (i.e., namespaces are set and resource
-    # types can be looked up)
-    tmp_type, tmp_title = extract_type_and_title(type, title)
-    self.type = tmp_type
-    self.title = tmp_title
+    @type, @title = extract_type_and_title(type, title)
+
+    @type = munge_type_name(@type)
+
+    if @type == "Class"
+      @title = :main if @title == ""
+      @title = munge_type_name(@title)
+    end
 
     if params = attributes[:parameters]
       extract_parameters(params)
     end
 
-    resolve_type_and_title
-
     tag(self.type)
     tag(self.title) if valid_tag?(self.title)
 
     raise ArgumentError, "Invalid resource type #{type}" if strict? and ! resource_type
   end
 
   def ref
     to_s
   end
 
   # Find our resource.
   def resolve
     return(catalog ? catalog.resource(to_s) : nil)
   end
 
-  def title=(value)
-    @unresolved_title = value
-    @title = nil
-  end
-
   def resource_type
     @resource_type ||= case type
-    when "Class"; find_hostclass(title)
-    when "Node"; find_node(title)
+    when "Class"; known_resource_types.hostclass(title == :main ? "" : title)
+    when "Node"; known_resource_types.node(title)
     else
-      find_resource_type(type)
+      Puppet::Type.type(type.to_s.downcase.to_sym) || known_resource_types.definition(type)
     end
   end
 
   # Produce a simple hash of our parameters.
   def to_hash
     parse_title.merge @parameters
   end
 
   def to_s
     "#{type}[#{title}]"
   end
 
   def uniqueness_key
     # Temporary kludge to deal with inconsistant use patters
     h = self.to_hash
     h[namevar] ||= h[:name]
     h[:name]   ||= h[namevar]
     h.values_at(*key_attributes.sort_by { |k| k.to_s })
   end
 
   def key_attributes
     return(resource_type.respond_to? :key_attributes) ? resource_type.key_attributes : [:name]
   end
 
   # Convert our resource to Puppet code.
   def to_manifest
     "%s { '%s':\n%s\n}" % [self.type.to_s.downcase, self.title,
       @parameters.collect { |p, v|
         if v.is_a? Array
           "    #{p} => [\'#{v.join("','")}\']"
         else
           "    #{p} => \'#{v}\'"
         end
       }.join(",\n")
       ]
   end
 
   def to_ref
     ref
   end
 
   # Convert our resource to a RAL resource instance.  Creates component
   # instances for resource types that don't exist.
   def to_ral
     if typeklass = Puppet::Type.type(self.type)
       return typeklass.new(self)
     else
       return Puppet::Type::Component.new(self)
     end
   end
 
   # Translate our object to a backward-compatible transportable object.
   def to_trans
     if builtin_type? and type.downcase.to_s != "stage"
       result = to_transobject
     else
       result = to_transbucket
     end
 
     result.file = self.file
     result.line = self.line
 
     result
   end
 
   def to_trans_ref
     [type.to_s, title.to_s]
   end
 
   # Create an old-style TransObject instance, for builtin resource types.
   def to_transobject
     # Now convert to a transobject
     result = Puppet::TransObject.new(title, type)
     to_hash.each do |p, v|
       if v.is_a?(Puppet::Resource)
         v = v.to_trans_ref
       elsif v.is_a?(Array)
         v = v.collect { |av|
           av = av.to_trans_ref if av.is_a?(Puppet::Resource)
           av
         }
       end
 
       # If the value is an array with only one value, then
       # convert it to a single value.  This is largely so that
       # the database interaction doesn't have to worry about
       # whether it returns an array or a string.
       result[p.to_s] = if v.is_a?(Array) and v.length == 1
         v[0]
           else
             v
               end
     end
 
     result.tags = self.tags
 
     result
   end
 
   def name
     # this is potential namespace conflict
     # between the notion of an "indirector name"
     # and a "resource name"
     [ type, title ].join('/')
   end
 
   def to_resource
     self
   end
 
-  # We have to lazy-evaluate this.
-  def title=(value)
-    @title = nil
-    @unresolved_title = value
-  end
-
-  # We have to lazy-evaluate this.
-  def type=(value)
-    @type = nil
-    @unresolved_type = value || "Class"
-  end
-
-  def title
-    resolve_type_and_title unless @title
-    @title
-  end
-
-  def type
-    resolve_type_and_title unless @type
-    @type
-  end
-
   def valid_parameter?(name)
     resource_type.valid_parameter?(name)
   end
 
   def validate_parameter(name)
     raise ArgumentError, "Invalid parameter #{name}" unless valid_parameter?(name)
   end
 
   private
 
-  def find_node(name)
-    known_resource_types.node(name)
-  end
-
-  def find_hostclass(title)
-    name = title == :main ? "" : title
-    known_resource_types.find_hostclass(namespaces, name)
-  end
-
-  def find_resource_type(type)
-    # It still works fine without the type == 'class' short-cut, but it is a lot slower.
-    return nil if ["class", "node"].include? type.to_s.downcase
-    find_builtin_resource_type(type) || find_defined_resource_type(type)
-  end
-
-  def find_builtin_resource_type(type)
-    Puppet::Type.type(type.to_s.downcase.to_sym)
-  end
-
-  def find_defined_resource_type(type)
-    known_resource_types.find_definition(namespaces, type.to_s.downcase)
-  end
-
   # Produce a canonical method name.
   def parameter_name(param)
     param = param.to_s.downcase.to_sym
     if param == :name and n = namevar
       param = namevar
     end
     param
   end
 
-  def namespaces=(ns)
-    @namespaces = Array(ns)
-  end
-
   # The namevar for our resource type. If the type doesn't exist,
   # always use :name.
   def namevar
     if builtin_type? and t = resource_type and t.key_attributes.length == 1
       t.key_attributes.first
     else
       :name
     end
   end
 
   # Create an old-style TransBucket instance, for non-builtin resource types.
   def to_transbucket
     bucket = Puppet::TransBucket.new([])
 
     bucket.type = self.type
     bucket.name = self.title
 
     # TransBuckets don't support parameters, which is why they're being deprecated.
     bucket
   end
 
   def extract_parameters(params)
     params.each do |param, value|
       validate_parameter(param) if strict?
       self[param] = value
     end
   end
 
   def extract_type_and_title(argtype, argtitle)
     if    (argtitle || argtype) =~ /^([^\[\]]+)\[(.+)\]$/m then [ $1,                 $2            ]
     elsif argtitle                                         then [ argtype,            argtitle      ]
     elsif argtype.is_a?(Puppet::Type)                      then [ argtype.class.name, argtype.title ]
     elsif argtype.is_a?(Hash)                              then
       raise ArgumentError, "Puppet::Resource.new does not take a hash as the first argument. "+
         "Did you mean (#{(argtype[:type] || argtype["type"]).inspect}, #{(argtype[:title] || argtype["title"]).inspect }) ?"
     else raise ArgumentError, "No title provided and #{argtype.inspect} is not a valid resource reference"
     end
   end
 
   def munge_type_name(value)
     return :main if value == :main
     return "Class" if value == "" or value.nil? or value.to_s.downcase == "component"
 
     value.to_s.split("::").collect { |s| s.capitalize }.join("::")
   end
 
-  # This is an annoyingly complicated method for resolving qualified
-  # types as necessary, and putting them in type or title attributes.
-  def resolve_type_and_title
-    if @unresolved_type
-      @type = resolve_type
-      @unresolved_type = nil
-    end
-    if @unresolved_title
-      @title = resolve_title
-      @unresolved_title = nil
-    end
-  end
-
-  def resolve_type
-    case type = munge_type_name(@unresolved_type)
-    when "Class", "Node";
-      type
-    else
-      # Otherwise, some kind of builtin or defined resource type
-      munge_type_name( (r = find_resource_type(type)) ? r.name : type)
-    end
-  end
-
-  # This method only works if resolve_type was called first
-  def resolve_title
-    case @type
-    when "Node"; return @unresolved_title
-    when "Class";
-      resolve_title_for_class(@unresolved_title)
-    else
-      @unresolved_title
-    end
-  end
-
-  def resolve_title_for_class(title)
-    if title == "" or title == :main
-      return :main
-    end
-
-    if klass = find_hostclass(title)
-      result = klass.name
-    end
-    munge_type_name(result || title)
-  end
-
   def parse_title
     h = {}
-    type = find_resource_type(@type)
+    type = resource_type
     if type.respond_to? :title_patterns
       type.title_patterns.each { |regexp, symbols_and_lambdas|
         if captures = regexp.match(title.to_s)
           symbols_and_lambdas.zip(captures[1..-1]).each { |symbol_and_lambda,capture|
             sym, lam = symbol_and_lambda
             #self[sym] = lam.call(capture)
             h[sym] = lam.call(capture)
           }
           return h
         end
       }
     else
       return { :name => title.to_s }
     end
   end
 end
diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb
index 90b6df9c1..63d110395 100644
--- a/lib/puppet/resource/type_collection.rb
+++ b/lib/puppet/resource/type_collection.rb
@@ -1,218 +1,214 @@
 class Puppet::Resource::TypeCollection
   attr_reader :environment
 
   def clear
     @hostclasses.clear
     @definitions.clear
     @nodes.clear
   end
 
   def initialize(env)
     @environment = env.is_a?(String) ? Puppet::Node::Environment.new(env) : env
     @hostclasses = {}
     @definitions = {}
     @nodes = {}
 
     # So we can keep a list and match the first-defined regex
     @node_list = []
 
     @watched_files = {}
   end
 
   def <<(thing)
     add(thing)
     self
   end
 
   def add(instance)
     if instance.type == :hostclass and other = @hostclasses[instance.name] and other.type == :hostclass
       other.merge(instance)
       return other
     end
     method = "add_#{instance.type}"
     send(method, instance)
     instance.resource_type_collection = self
     instance
   end
 
   def add_hostclass(instance)
     dupe_check(instance, @hostclasses) { |dupe| "Class '#{instance.name}' is already defined#{dupe.error_context}; cannot redefine" }
     dupe_check(instance, @definitions) { |dupe| "Definition '#{instance.name}' is already defined#{dupe.error_context}; cannot be redefined as a class" }
 
     @hostclasses[instance.name] = instance
     instance
   end
 
   def hostclass(name)
     @hostclasses[munge_name(name)]
   end
 
   def add_node(instance)
     dupe_check(instance, @nodes) { |dupe| "Node '#{instance.name}' is already defined#{dupe.error_context}; cannot redefine" }
 
     @node_list << instance
     @nodes[instance.name] = instance
     instance
   end
 
   def loader
     require 'puppet/parser/type_loader'
     @loader ||= Puppet::Parser::TypeLoader.new(environment)
   end
 
   def node(name)
     name = munge_name(name)
 
     if node = @nodes[name]
       return node
     end
 
     @node_list.each do |node|
       next unless node.name_is_regex?
       return node if node.match(name)
     end
     nil
   end
 
   def node_exists?(name)
     @nodes[munge_name(name)]
   end
 
   def nodes?
     @nodes.length > 0
   end
 
   def add_definition(instance)
     dupe_check(instance, @hostclasses) { |dupe| "'#{instance.name}' is already defined#{dupe.error_context} as a class; cannot redefine as a definition" }
     dupe_check(instance, @definitions) { |dupe| "Definition '#{instance.name}' is already defined#{dupe.error_context}; cannot be redefined" }
     @definitions[instance.name] = instance
   end
 
   def definition(name)
     @definitions[munge_name(name)]
   end
 
   def find(namespaces, name, type)
     #Array("") == [] for some reason
     namespaces = [namespaces] unless namespaces.is_a?(Array)
 
-    if r = find_fully_qualified(name, type)
-      return r
+    if name =~ /^::/
+      return send(type, name.sub(/^::/, ''))
     end
 
     namespaces.each do |namespace|
       ary = namespace.split("::")
 
       while ary.length > 0
         tmp_namespace = ary.join("::")
         if r = find_partially_qualified(tmp_namespace, name, type)
           return r
         end
 
         # Delete the second to last object, which reduces our namespace by one.
         ary.pop
       end
 
       if result = send(type, name)
         return result
       end
     end
     nil
   end
 
   def find_or_load(namespaces, name, type)
     name      = name.downcase
     namespaces = [namespaces] unless namespaces.is_a?(Array)
     namespaces = namespaces.collect { |ns| ns.downcase }
 
     # This could be done in the load_until, but the knowledge seems to
     # belong here.
     if r = find(namespaces, name, type)
       return r
     end
 
     loader.load_until(namespaces, name) { find(namespaces, name, type) }
   end
 
   def find_node(namespaces, name)
     find("", name, :node)
   end
 
   def find_hostclass(namespaces, name)
     find_or_load(namespaces, name, :hostclass)
   end
 
   def find_definition(namespaces, name)
     find_or_load(namespaces, name, :definition)
   end
 
   [:hostclasses, :nodes, :definitions].each do |m|
     define_method(m) do
       instance_variable_get("@#{m}").dup
     end
   end
 
   def perform_initial_import
     return if Puppet.settings[:ignoreimport]
     parser = Puppet::Parser::Parser.new(environment)
     if code = Puppet.settings.uninterpolated_value(:code, environment.to_s) and code != ""
       parser.string = code
     else
       file = Puppet.settings.value(:manifest, environment.to_s)
       return unless File.exist?(file)
       parser.file = file
     end
     parser.parse
   rescue => detail
     msg = "Could not parse for environment #{environment}: #{detail}"
     error = Puppet::Error.new(msg)
     error.set_backtrace(detail.backtrace)
     raise error
   end
 
   def stale?
     @watched_files.values.detect { |file| file.changed? }
   end
 
   def version
     return @version if defined?(@version)
 
     if environment[:config_version] == ""
       @version = Time.now.to_i
       return @version
     end
 
     @version = Puppet::Util.execute([environment[:config_version]]).strip
 
   rescue Puppet::ExecutionFailure => e
     raise Puppet::ParseError, "Unable to set config_version: #{e.message}"
   end
 
   def watch_file(file)
     @watched_files[file] = Puppet::Util::LoadedFile.new(file)
   end
 
   def watching_file?(file)
     @watched_files.include?(file)
   end
 
   private
 
-  def find_fully_qualified(name, type)
-    send(type, name.sub(/^::/, ''))
-  end
-
   def find_partially_qualified(namespace, name, type)
     send(type, [namespace, name].join("::"))
   end
 
   def munge_name(name)
     name.to_s.downcase
   end
 
   def dupe_check(instance, hash)
     return unless dupe = hash[instance.name]
     message = yield dupe
     instance.fail Puppet::ParseError, message
   end
 end
diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb
index aace6a38a..29ec9a539 100644
--- a/lib/puppet/transaction/resource_harness.rb
+++ b/lib/puppet/transaction/resource_harness.rb
@@ -1,150 +1,150 @@
 require 'puppet/resource/status'
 
 class Puppet::Transaction::ResourceHarness
   extend Forwardable
   def_delegators :@transaction, :relationship_graph
 
   attr_reader :transaction
 
   def allow_changes?(resource)
     return true unless resource.purging? and resource.deleting?
     return true unless deps = relationship_graph.dependents(resource) and ! deps.empty? and deps.detect { |d| ! d.deleting? }
 
     deplabel = deps.collect { |r| r.ref }.join(",")
     plurality = deps.length > 1 ? "":"s"
     resource.warning "#{deplabel} still depend#{plurality} on me -- not purging"
     false
   end
 
   def apply_changes(status, changes)
     changes.each do |change|
       status << change.apply
 
       cache(change.property.resource, change.property.name, change.is) if change.auditing?
     end
     status.changed = true
   end
 
   # Used mostly for scheduling at this point.
   def cached(resource, name)
     Puppet::Util::Storage.cache(resource)[name]
   end
 
   # Used mostly for scheduling at this point.
   def cache(resource, name, value)
     Puppet::Util::Storage.cache(resource)[name] = value
   end
 
   def changes_to_perform(status, resource)
     current = resource.retrieve_resource
 
     cache resource, :checked, Time.now
 
     return [] if ! allow_changes?(resource)
 
     audited = copy_audited_parameters(resource, current)
 
     if param = resource.parameter(:ensure)
       return [] if absent_and_not_being_created?(current, param)
       return [Puppet::Transaction::Change.new(param, current[:ensure])] unless ensure_is_insync?(current, param)
       return [] if ensure_should_be_absent?(current, param)
     end
 
     resource.properties.reject { |p| p.name == :ensure }.reject do |param|
       param.should.nil?
     end.reject do |param|
       param_is_insync?(current, param)
     end.collect do |param|
       change = Puppet::Transaction::Change.new(param, current[param.name])
       change.auditing = true if audited.include?(param.name)
       change
     end
   end
 
   def copy_audited_parameters(resource, current)
     return [] unless audit = resource[:audit]
     audit = Array(audit).collect { |p| p.to_sym }
     audited = []
     audit.find_all do |param|
       next if resource[param]
 
       if value = cached(resource, param)
         resource[param] = value
         audited << param
       else
-        resource.info "Storing newly-audited value #{current[param]} for #{param}"
+        resource.debug "Storing newly-audited value #{current[param]} for #{param}"
         cache(resource, param, current[param])
       end
     end
 
     audited
   end
 
   def evaluate(resource)
     start = Time.now
     status = Puppet::Resource::Status.new(resource)
 
     if changes = changes_to_perform(status, resource) and ! changes.empty?
       status.out_of_sync = true
       status.change_count = changes.length
       apply_changes(status, changes)
       if ! resource.noop?
         cache(resource, :synced, Time.now)
         resource.flush if resource.respond_to?(:flush)
       end
     end
     return status
   rescue => detail
     resource.fail "Could not create resource status: #{detail}" unless status
     puts detail.backtrace if Puppet[:trace]
     resource.err "Could not evaluate: #{detail}"
     status.failed = true
     return status
   ensure
     (status.evaluation_time = Time.now - start) if status
   end
 
   def initialize(transaction)
     @transaction = transaction
   end
 
   def scheduled?(status, resource)
     return true if Puppet[:ignoreschedules]
     return true unless schedule = schedule(resource)
 
     # We use 'checked' here instead of 'synced' because otherwise we'll
     # end up checking most resources most times, because they will generally
     # have been synced a long time ago (e.g., a file only gets updated
     # once a month on the server and its schedule is daily; the last sync time
     # will have been a month ago, so we'd end up checking every run).
     schedule.match?(cached(resource, :checked).to_i)
   end
 
   def schedule(resource)
     unless resource.catalog
       resource.warning "Cannot schedule without a schedule-containing catalog"
       return nil
     end
 
     return nil unless name = resource[:schedule]
     resource.catalog.resource(:schedule, name) || resource.fail("Could not find schedule #{name}")
   end
 
   private
 
   def absent_and_not_being_created?(current, param)
     current[:ensure] == :absent and param.should.nil?
   end
 
   def ensure_is_insync?(current, param)
     param.insync?(current[:ensure])
   end
 
   def ensure_should_be_absent?(current, param)
     param.should == :absent
   end
 
   def param_is_insync?(current, param)
     param.insync?(current[param.name])
   end
 end
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index c3855a400..53c23aa32 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1,1889 +1,1889 @@
 require 'puppet'
 require 'puppet/util/log'
 require 'puppet/util/metric'
 require 'puppet/property'
 require 'puppet/parameter'
 require 'puppet/util'
 require 'puppet/util/autoload'
 require 'puppet/metatype/manager'
 require 'puppet/util/errors'
 require 'puppet/util/log_paths'
 require 'puppet/util/logging'
 require 'puppet/util/cacher'
 require 'puppet/file_collection/lookup'
 require 'puppet/util/tagging'
 
 # see the bottom of the file for the rest of the inclusions
 
 module Puppet
 class Type
   include Puppet::Util
   include Puppet::Util::Errors
   include Puppet::Util::LogPaths
   include Puppet::Util::Logging
   include Puppet::Util::Cacher
   include Puppet::FileCollection::Lookup
   include Puppet::Util::Tagging
 
   ###############################
   # Code related to resource type attributes.
   class << self
     include Puppet::Util::ClassGen
     include Puppet::Util::Warnings
     attr_reader :properties
   end
 
   def self.states
     warnonce "The states method is deprecated; use properties"
     properties
   end
 
   # All parameters, in the appropriate order.  The key_attributes come first, then
   # the provider, then the properties, and finally the params and metaparams
   # in the order they were specified in the files.
   def self.allattrs
     key_attributes | (parameters & [:provider]) | properties.collect { |property| property.name } | parameters | metaparams
   end
 
   # Retrieve an attribute alias, if there is one.
   def self.attr_alias(param)
     @attr_aliases[symbolize(param)]
   end
 
   # Create an alias to an existing attribute.  This will cause the aliased
   # attribute to be valid when setting and retrieving values on the instance.
   def self.set_attr_alias(hash)
     hash.each do |new, old|
       @attr_aliases[symbolize(new)] = symbolize(old)
     end
   end
 
   # Find the class associated with any given attribute.
   def self.attrclass(name)
     @attrclasses ||= {}
 
     # We cache the value, since this method gets called such a huge number
     # of times (as in, hundreds of thousands in a given run).
     unless @attrclasses.include?(name)
       @attrclasses[name] = case self.attrtype(name)
       when :property; @validproperties[name]
       when :meta; @@metaparamhash[name]
       when :param; @paramhash[name]
       end
     end
     @attrclasses[name]
   end
 
   # What type of parameter are we dealing with? Cache the results, because
   # this method gets called so many times.
   def self.attrtype(attr)
     @attrtypes ||= {}
     unless @attrtypes.include?(attr)
       @attrtypes[attr] = case
         when @validproperties.include?(attr); :property
         when @paramhash.include?(attr); :param
         when @@metaparamhash.include?(attr); :meta
         end
     end
 
     @attrtypes[attr]
   end
 
   def self.eachmetaparam
     @@metaparams.each { |p| yield p.name }
   end
 
   # Create the 'ensure' class.  This is a separate method so other types
   # can easily call it and create their own 'ensure' values.
   def self.ensurable(&block)
     if block_given?
       self.newproperty(:ensure, :parent => Puppet::Property::Ensure, &block)
     else
       self.newproperty(:ensure, :parent => Puppet::Property::Ensure) do
         self.defaultvalues
       end
     end
   end
 
   # Should we add the 'ensure' property to this class?
   def self.ensurable?
     # If the class has all three of these methods defined, then it's
     # ensurable.
     ens = [:exists?, :create, :destroy].inject { |set, method|
       set &&= self.public_method_defined?(method)
     }
 
     ens
   end
 
   # Deal with any options passed into parameters.
   def self.handle_param_options(name, options)
     # If it's a boolean parameter, create a method to test the value easily
     if options[:boolean]
       define_method(name.to_s + "?") do
         val = self[name]
         if val == :true or val == true
           return true
         end
       end
     end
   end
 
   # Is the parameter in question a meta-parameter?
   def self.metaparam?(param)
     @@metaparamhash.include?(symbolize(param))
   end
 
   # Find the metaparameter class associated with a given metaparameter name.
   def self.metaparamclass(name)
     @@metaparamhash[symbolize(name)]
   end
 
   def self.metaparams
     @@metaparams.collect { |param| param.name }
   end
 
   def self.metaparamdoc(metaparam)
     @@metaparamhash[metaparam].doc
   end
 
   # Create a new metaparam.  Requires a block and a name, stores it in the
   # @parameters array, and does some basic checking on it.
   def self.newmetaparam(name, options = {}, &block)
     @@metaparams ||= []
     @@metaparamhash ||= {}
     name = symbolize(name)
 
 
       param = genclass(
         name,
       :parent => options[:parent] || Puppet::Parameter,
       :prefix => "MetaParam",
       :hash => @@metaparamhash,
       :array => @@metaparams,
       :attributes => options[:attributes],
 
       &block
     )
 
     # Grr.
     param.required_features = options[:required_features] if options[:required_features]
 
     handle_param_options(name, options)
 
     param.metaparam = true
 
     param
   end
 
   def self.key_attribute_parameters
     @key_attribute_parameters ||= (
       params = @parameters.find_all { |param|
         param.isnamevar? or param.name == :name
       }
     )
   end
 
   def self.key_attributes
     key_attribute_parameters.collect { |p| p.name }
   end
 
   def self.title_patterns
     case key_attributes.length
     when 0; []
     when 1;
       identity = lambda {|x| x}
       [ [ /(.*)/m, [ [key_attributes.first, identity ] ] ] ]
     else
       raise Puppet::DevError,"you must specify title patterns when there are two or more key attributes"
     end
   end
 
   def uniqueness_key
     to_resource.uniqueness_key
   end
 
   # Create a new parameter.  Requires a block and a name, stores it in the
   # @parameters array, and does some basic checking on it.
   def self.newparam(name, options = {}, &block)
     options[:attributes] ||= {}
 
       param = genclass(
         name,
       :parent => options[:parent] || Puppet::Parameter,
       :attributes => options[:attributes],
       :block => block,
       :prefix => "Parameter",
       :array => @parameters,
 
       :hash => @paramhash
     )
 
     handle_param_options(name, options)
 
     # Grr.
     param.required_features = options[:required_features] if options[:required_features]
 
     param.isnamevar if options[:namevar]
 
     param
   end
 
   def self.newstate(name, options = {}, &block)
     Puppet.warning "newstate() has been deprecrated; use newproperty(#{name})"
     newproperty(name, options, &block)
   end
 
   # Create a new property. The first parameter must be the name of the property;
   # this is how users will refer to the property when creating new instances.
   # The second parameter is a hash of options; the options are:
   # * <tt>:parent</tt>: The parent class for the property.  Defaults to Puppet::Property.
   # * <tt>:retrieve</tt>: The method to call on the provider or @parent object (if
   #   the provider is not set) to retrieve the current value.
   def self.newproperty(name, options = {}, &block)
     name = symbolize(name)
 
     # This is here for types that might still have the old method of defining
     # a parent class.
     unless options.is_a? Hash
       raise Puppet::DevError,
         "Options must be a hash, not #{options.inspect}"
     end
 
     raise Puppet::DevError, "Class #{self.name} already has a property named #{name}" if @validproperties.include?(name)
 
     if parent = options[:parent]
       options.delete(:parent)
     else
       parent = Puppet::Property
     end
 
     # We have to create our own, new block here because we want to define
     # an initial :retrieve method, if told to, and then eval the passed
     # block if available.
     prop = genclass(name, :parent => parent, :hash => @validproperties, :attributes => options) do
       # If they've passed a retrieve method, then override the retrieve
       # method on the class.
       if options[:retrieve]
         define_method(:retrieve) do
           provider.send(options[:retrieve])
         end
       end
 
       class_eval(&block) if block
     end
 
     # If it's the 'ensure' property, always put it first.
     if name == :ensure
       @properties.unshift prop
     else
       @properties << prop
     end
 
     prop
   end
 
   def self.paramdoc(param)
     @paramhash[param].doc
   end
 
   # Return the parameter names
   def self.parameters
     return [] unless defined?(@parameters)
     @parameters.collect { |klass| klass.name }
   end
 
   # Find the parameter class associated with a given parameter name.
   def self.paramclass(name)
     @paramhash[name]
   end
 
   # Return the property class associated with a name
   def self.propertybyname(name)
     @validproperties[name]
   end
 
   def self.validattr?(name)
     name = symbolize(name)
     return true if name == :name
     @validattrs ||= {}
 
     unless @validattrs.include?(name)
       @validattrs[name] = !!(self.validproperty?(name) or self.validparameter?(name) or self.metaparam?(name))
     end
 
     @validattrs[name]
   end
 
   # does the name reflect a valid property?
   def self.validproperty?(name)
     name = symbolize(name)
     @validproperties.include?(name) && @validproperties[name]
   end
 
   # Return the list of validproperties
   def self.validproperties
     return {} unless defined?(@parameters)
 
     @validproperties.keys
   end
 
   # does the name reflect a valid parameter?
   def self.validparameter?(name)
     raise Puppet::DevError, "Class #{self} has not defined parameters" unless defined?(@parameters)
     !!(@paramhash.include?(name) or @@metaparamhash.include?(name))
   end
 
   # This is a forward-compatibility method - it's the validity interface we'll use in Puppet::Resource.
   def self.valid_parameter?(name)
     validattr?(name)
   end
 
   # Return either the attribute alias or the attribute.
   def attr_alias(name)
     name = symbolize(name)
     if synonym = self.class.attr_alias(name)
       return synonym
     else
       return name
     end
   end
 
   # Are we deleting this resource?
   def deleting?
     obj = @parameters[:ensure] and obj.should == :absent
   end
 
   # Create a new property if it is valid but doesn't exist
   # Returns: true if a new parameter was added, false otherwise
   def add_property_parameter(prop_name)
     if self.class.validproperty?(prop_name) && !@parameters[prop_name]
       self.newattr(prop_name)
       return true
     end
     false
   end
 
   #
   # The name_var is the key_attribute in the case that there is only one.
   #
   def name_var
     key_attributes = self.class.key_attributes
     (key_attributes.length == 1) && key_attributes.first
   end
 
   # abstract accessing parameters and properties, and normalize
   # access to always be symbols, not strings
   # This returns a value, not an object.  It returns the 'is'
   # value, but you can also specifically return 'is' and 'should'
   # values using 'object.is(:property)' or 'object.should(:property)'.
   def [](name)
     name = attr_alias(name)
 
     fail("Invalid parameter #{name}(#{name.inspect})") unless self.class.validattr?(name)
 
     if name == :name
       name = name_var
     end
 
     if obj = @parameters[name]
       # Note that if this is a property, then the value is the "should" value,
       # not the current value.
       obj.value
     else
       return nil
     end
   end
 
   # Abstract setting parameters and properties, and normalize
   # access to always be symbols, not strings.  This sets the 'should'
   # value on properties, and otherwise just sets the appropriate parameter.
   def []=(name,value)
     name = attr_alias(name)
 
     fail("Invalid parameter #{name}") unless self.class.validattr?(name)
 
     if name == :name
       name = name_var
     end
     raise Puppet::Error.new("Got nil value for #{name}") if value.nil?
 
     property = self.newattr(name)
 
     begin
       # make sure the parameter doesn't have any errors
       property.value = value
     rescue => detail
       error = Puppet::Error.new("Parameter #{name} failed: #{detail}")
       error.set_backtrace(detail.backtrace)
       raise error
     end
 
     nil
   end
 
   # remove a property from the object; useful in testing or in cleanup
   # when an error has been encountered
   def delete(attr)
     attr = symbolize(attr)
     if @parameters.has_key?(attr)
       @parameters.delete(attr)
     else
       raise Puppet::DevError.new("Undefined attribute '#{attr}' in #{self}")
     end
   end
 
   # iterate across the existing properties
   def eachproperty
     # properties is a private method
     properties.each { |property|
       yield property
     }
   end
 
   # Create a transaction event.  Called by Transaction or by
   # a property.
   def event(options = {})
     Puppet::Transaction::Event.new({:resource => self, :file => file, :line => line, :tags => tags, :version => version}.merge(options))
   end
 
   # Let the catalog determine whether a given cached value is
   # still valid or has expired.
   def expirer
     catalog
   end
 
   # retrieve the 'should' value for a specified property
   def should(name)
     name = attr_alias(name)
     (prop = @parameters[name] and prop.is_a?(Puppet::Property)) ? prop.should : nil
   end
 
   # Create the actual attribute instance.  Requires either the attribute
   # name or class as the first argument, then an optional hash of
   # attributes to set during initialization.
   def newattr(name)
     if name.is_a?(Class)
       klass = name
       name = klass.name
     end
 
     unless klass = self.class.attrclass(name)
       raise Puppet::Error, "Resource type #{self.class.name} does not support parameter #{name}"
     end
 
     return @parameters[name] if @parameters.include?(name)
 
     @parameters[name] = klass.new(:resource => self)
   end
 
   # return the value of a parameter
   def parameter(name)
     @parameters[name.to_sym]
   end
 
   def parameters
     @parameters.dup
   end
 
   # Is the named property defined?
   def propertydefined?(name)
     name = name.intern unless name.is_a? Symbol
     @parameters.include?(name)
   end
 
   # Return an actual property instance by name; to return the value, use 'resource[param]'
   # LAK:NOTE(20081028) Since the 'parameter' method is now a superset of this method,
   # this one should probably go away at some point.
   def property(name)
     (obj = @parameters[symbolize(name)] and obj.is_a?(Puppet::Property)) ? obj : nil
   end
 
   # For any parameters or properties that have defaults and have not yet been
   # set, set them now.  This method can be handed a list of attributes,
   # and if so it will only set defaults for those attributes.
   def set_default(attr)
     return unless klass = self.class.attrclass(attr)
     return unless klass.method_defined?(:default)
     return if @parameters.include?(klass.name)
 
     return unless parameter = newattr(klass.name)
 
     if value = parameter.default and ! value.nil?
       parameter.value = value
     else
       @parameters.delete(parameter.name)
     end
   end
 
   # Convert our object to a hash.  This just includes properties.
   def to_hash
     rethash = {}
 
     @parameters.each do |name, obj|
       rethash[name] = obj.value
     end
 
     rethash
   end
 
   def type
     self.class.name
   end
 
   # Return a specific value for an attribute.
   def value(name)
     name = attr_alias(name)
 
     (obj = @parameters[name] and obj.respond_to?(:value)) ? obj.value : nil
   end
 
   def version
     return 0 unless catalog
     catalog.version
   end
 
   # Return all of the property objects, in the order specified in the
   # class.
   def properties
     self.class.properties.collect { |prop| @parameters[prop.name] }.compact
   end
 
   # Is this type's name isomorphic with the object?  That is, if the
   # name conflicts, does it necessarily mean that the objects conflict?
   # Defaults to true.
   def self.isomorphic?
     if defined?(@isomorphic)
       return @isomorphic
     else
       return true
     end
   end
 
   def isomorphic?
     self.class.isomorphic?
   end
 
   # is the instance a managed instance?  A 'yes' here means that
   # the instance was created from the language, vs. being created
   # in order resolve other questions, such as finding a package
   # in a list
   def managed?
     # Once an object is managed, it always stays managed; but an object
     # that is listed as unmanaged might become managed later in the process,
     # so we have to check that every time
     if @managed
       return @managed
     else
       @managed = false
       properties.each { |property|
         s = property.should
         if s and ! property.class.unmanaged
           @managed = true
           break
         end
       }
       return @managed
     end
   end
 
   ###############################
   # Code related to the container behaviour.
 
   # this is a retarded hack method to get around the difference between
   # component children and file children
   def self.depthfirst?
     @depthfirst
   end
 
   def depthfirst?
     self.class.depthfirst?
   end
 
   # Remove an object.  The argument determines whether the object's
   # subscriptions get eliminated, too.
   def remove(rmdeps = true)
     # This is hackish (mmm, cut and paste), but it works for now, and it's
     # better than warnings.
     @parameters.each do |name, obj|
       obj.remove
     end
     @parameters.clear
 
     @parent = nil
 
     # Remove the reference to the provider.
     if self.provider
       @provider.clear
       @provider = nil
     end
   end
 
   ###############################
   # Code related to evaluating the resources.
 
   # Flush the provider, if it supports it.  This is called by the
   # transaction.
   def flush
     self.provider.flush if self.provider and self.provider.respond_to?(:flush)
   end
 
   # if all contained objects are in sync, then we're in sync
   # FIXME I don't think this is used on the type instances any more,
   # it's really only used for testing
   def insync?(is)
     insync = true
 
     if property = @parameters[:ensure]
       unless is.include? property
         raise Puppet::DevError,
           "The is value is not in the is array for '#{property.name}'"
       end
       ensureis = is[property]
       if property.insync?(ensureis) and property.should == :absent
         return true
       end
     end
 
     properties.each { |property|
       unless is.include? property
         raise Puppet::DevError,
           "The is value is not in the is array for '#{property.name}'"
       end
 
       propis = is[property]
       unless property.insync?(propis)
         property.debug("Not in sync: #{propis.inspect} vs #{property.should.inspect}")
         insync = false
       #else
       #    property.debug("In sync")
       end
     }
 
     #self.debug("#{self} sync status is #{insync}")
     insync
   end
 
   # retrieve the current value of all contained properties
   def retrieve
     fail "Provider #{provider.class.name} is not functional on this host" if self.provider.is_a?(Puppet::Provider) and ! provider.class.suitable?
 
     result = Puppet::Resource.new(type, title)
 
     # Provide the name, so we know we'll always refer to a real thing
     result[:name] = self[:name] unless self[:name] == title
 
     if ensure_prop = property(:ensure) or (self.class.validattr?(:ensure) and ensure_prop = newattr(:ensure))
       result[:ensure] = ensure_state = ensure_prop.retrieve
     else
       ensure_state = nil
     end
 
     properties.each do |property|
       next if property.name == :ensure
       if ensure_state == :absent
         result[property] = :absent
       else
         result[property] = property.retrieve
       end
     end
 
     result
   end
 
   def retrieve_resource
     resource = retrieve
     resource = Resource.new(type, title, :parameters => resource) if resource.is_a? Hash
     resource
   end
 
   # Get a hash of the current properties.  Returns a hash with
   # the actual property instance as the key and the current value
   # as the, um, value.
   def currentpropvalues
     # It's important to use the 'properties' method here, as it follows the order
     # in which they're defined in the class.  It also guarantees that 'ensure'
     # is the first property, which is important for skipping 'retrieve' on
     # all the properties if the resource is absent.
     ensure_state = false
     return properties.inject({}) do | prophash, property|
       if property.name == :ensure
         ensure_state = property.retrieve
         prophash[property] = ensure_state
       else
         if ensure_state == :absent
           prophash[property] = :absent
         else
           prophash[property] = property.retrieve
         end
       end
       prophash
     end
   end
 
   # Are we running in noop mode?
   def noop?
     # If we're not a host_config, we're almost certainly part of
     # Settings, and we want to ignore 'noop'
     return false if catalog and ! catalog.host_config?
 
     if defined?(@noop)
       @noop
     else
       Puppet[:noop]
     end
   end
 
   def noop
     noop?
   end
 
   ###############################
   # Code related to managing resource instances.
   require 'puppet/transportable'
 
   # retrieve a named instance of the current type
   def self.[](name)
     raise "Global resource access is deprecated"
     @objects[name] || @aliases[name]
   end
 
   # add an instance by name to the class list of instances
   def self.[]=(name,object)
     raise "Global resource storage is deprecated"
     newobj = nil
     if object.is_a?(Puppet::Type)
       newobj = object
     else
       raise Puppet::DevError, "must pass a Puppet::Type object"
     end
 
     if exobj = @objects[name] and self.isomorphic?
       msg = "Object '#{newobj.class.name}[#{name}]' already exists"
 
       msg += ("in file #{object.file} at line #{object.line}") if exobj.file and exobj.line
       msg += ("and cannot be redefined in file #{object.file} at line #{object.line}") if object.file and object.line
       error = Puppet::Error.new(msg)
       raise error
     else
       #Puppet.info("adding %s of type %s to class list" %
       #    [name,object.class])
       @objects[name] = newobj
     end
   end
 
   # Create an alias.  We keep these in a separate hash so that we don't encounter
   # the objects multiple times when iterating over them.
   def self.alias(name, obj)
     raise "Global resource aliasing is deprecated"
     if @objects.include?(name)
       unless @objects[name] == obj
         raise Puppet::Error.new(
           "Cannot create alias #{name}: object already exists"
         )
       end
     end
 
     if @aliases.include?(name)
       unless @aliases[name] == obj
         raise Puppet::Error.new(
           "Object #{@aliases[name].name} already has alias #{name}"
         )
       end
     end
 
     @aliases[name] = obj
   end
 
   # remove all of the instances of a single type
   def self.clear
     raise "Global resource removal is deprecated"
     if defined?(@objects)
       @objects.each do |name, obj|
         obj.remove(true)
       end
       @objects.clear
     end
     @aliases.clear if defined?(@aliases)
   end
 
   # Force users to call this, so that we can merge objects if
   # necessary.
   def self.create(args)
     # LAK:DEP Deprecation notice added 12/17/2008
     Puppet.warning "Puppet::Type.create is deprecated; use Puppet::Type.new"
     new(args)
   end
 
   # remove a specified object
   def self.delete(resource)
     raise "Global resource removal is deprecated"
     return unless defined?(@objects)
     @objects.delete(resource.title) if @objects.include?(resource.title)
     @aliases.delete(resource.title) if @aliases.include?(resource.title)
     if @aliases.has_value?(resource)
       names = []
       @aliases.each do |name, otherres|
         if otherres == resource
           names << name
         end
       end
       names.each { |name| @aliases.delete(name) }
     end
   end
 
   # iterate across each of the type's instances
   def self.each
     raise "Global resource iteration is deprecated"
     return unless defined?(@objects)
     @objects.each { |name,instance|
       yield instance
     }
   end
 
   # does the type have an object with the given name?
   def self.has_key?(name)
     raise "Global resource access is deprecated"
     @objects.has_key?(name)
   end
 
   # Retrieve all known instances.  Either requires providers or must be overridden.
   def self.instances
     raise Puppet::DevError, "#{self.name} has no providers and has not overridden 'instances'" if provider_hash.empty?
 
     # Put the default provider first, then the rest of the suitable providers.
     provider_instances = {}
     providers_by_source.collect do |provider|
       provider.instances.collect do |instance|
         # We always want to use the "first" provider instance we find, unless the resource
         # is already managed and has a different provider set
         if other = provider_instances[instance.name]
           Puppet.warning "%s %s found in both %s and %s; skipping the %s version" %
             [self.name.to_s.capitalize, instance.name, other.class.name, instance.class.name, instance.class.name]
           next
         end
         provider_instances[instance.name] = instance
 
         new(:name => instance.name, :provider => instance, :audit => :all)
       end
     end.flatten.compact
   end
 
   # Return a list of one suitable provider per source, with the default provider first.
   def self.providers_by_source
     # Put the default provider first, then the rest of the suitable providers.
     sources = []
     [defaultprovider, suitableprovider].flatten.uniq.collect do |provider|
       next if sources.include?(provider.source)
 
       sources << provider.source
       provider
     end.compact
   end
 
   # Convert a simple hash into a Resource instance.
   def self.hash2resource(hash)
     hash = hash.inject({}) { |result, ary| result[ary[0].to_sym] = ary[1]; result }
 
     title = hash.delete(:title)
     title ||= hash[:name]
     title ||= hash[key_attributes.first] if key_attributes.length == 1
 
     raise Puppet::Error, "Title or name must be provided" unless title
 
     # Now create our resource.
     resource = Puppet::Resource.new(self.name, title)
     [:catalog].each do |attribute|
       if value = hash[attribute]
         hash.delete(attribute)
         resource.send(attribute.to_s + "=", value)
       end
     end
 
     hash.each do |param, value|
       resource[param] = value
     end
     resource
   end
 
   # Create the path for logging and such.
   def pathbuilder
     if p = parent
       [p.pathbuilder, self.ref].flatten
     else
       [self.ref]
     end
   end
 
   ###############################
   # Add all of the meta parameters.
   newmetaparam(:noop) do
     desc "Boolean flag indicating whether work should actually
       be done."
 
     newvalues(:true, :false)
     munge do |value|
       case value
       when true, :true, "true"; @resource.noop = true
       when false, :false, "false"; @resource.noop = false
       end
     end
   end
 
   newmetaparam(:schedule) do
     desc "On what schedule the object should be managed.  You must create a
       schedule object, and then reference the name of that object to use
-      that for your schedule::
+      that for your schedule:
 
-        schedule { daily:
-          period => daily,
-          range => \"2-4\"
-        }
+          schedule { daily:
+            period => daily,
+            range => \"2-4\"
+          }
 
-        exec { \"/usr/bin/apt-get update\":
-          schedule => daily
-        }
+          exec { \"/usr/bin/apt-get update\":
+            schedule => daily
+          }
 
       The creation of the schedule object does not need to appear in the
       configuration before objects that use it."
   end
 
   newmetaparam(:audit) do
     desc "Audit specified attributes of resources over time, and report if any have changed.
       This attribute can be used to track changes to any resource over time, and can
       provide an audit trail of every change that happens on any given machine.
 
       Note that you cannot both audit and manage an attribute - managing it guarantees
       the value, and any changes already get logged."
 
     validate do |list|
       list = Array(list)
       unless list == [:all]
         list.each do |param|
           next if @resource.class.validattr?(param)
           fail "Cannot audit #{param}: not a valid attribute for #{resource}"
         end
       end
     end
 
     munge do |args|
       properties_to_audit(args).each do |param|
         next unless resource.class.validproperty?(param)
         resource.newattr(param)
       end
     end
 
     def all_properties
       resource.class.properties.find_all do |property|
         resource.provider.nil? or resource.provider.class.supports_parameter?(property)
       end.collect do |property|
         property.name
       end
     end
 
     def properties_to_audit(list)
       if list == :all
         list = all_properties if list == :all
       else
         list = Array(list).collect { |p| p.to_sym }
       end
     end
   end
 
   newmetaparam(:check) do
     desc "Audit specified attributes of resources over time, and report if any have changed.
       This parameter has been deprecated in favor of 'audit'."
 
     munge do |args|
       resource.warning "'check' attribute is deprecated; use 'audit' instead"
       resource[:audit] = args
     end
   end
 
   newmetaparam(:loglevel) do
     desc "Sets the level that information will be logged.
       The log levels have the biggest impact when logs are sent to
       syslog (which is currently the default)."
     defaultto :notice
 
     newvalues(*Puppet::Util::Log.levels)
     newvalues(:verbose)
 
     munge do |loglevel|
       val = super(loglevel)
       if val == :verbose
         val = :info
       end
       val
     end
   end
 
   newmetaparam(:alias) do
     desc "Creates an alias for the object.  Puppet uses this internally when you
-      provide a symbolic name::
-
-        file { sshdconfig:
-          path => $operatingsystem ? {
-            solaris => \"/usr/local/etc/ssh/sshd_config\",
-            default => \"/etc/ssh/sshd_config\"
-          },
-          source => \"...\"
-        }
+      provide a symbolic name:
+
+          file { sshdconfig:
+            path => $operatingsystem ? {
+              solaris => \"/usr/local/etc/ssh/sshd_config\",
+              default => \"/etc/ssh/sshd_config\"
+            },
+            source => \"...\"
+          }
 
-        service { sshd:
-          subscribe => file[sshdconfig]
-        }
+          service { sshd:
+            subscribe => file[sshdconfig]
+          }
 
-      When you use this feature, the parser sets ``sshdconfig`` as the name,
+      When you use this feature, the parser sets `sshdconfig` as the name,
       and the library sets that as an alias for the file so the dependency
-      lookup for ``sshd`` works.  You can use this parameter yourself,
+      lookup for `sshd` works.  You can use this parameter yourself,
       but note that only the library can use these aliases; for instance,
-      the following code will not work::
+      the following code will not work:
 
-        file { \"/etc/ssh/sshd_config\":
-          owner => root,
-          group => root,
-          alias => sshdconfig
-        }
+          file { \"/etc/ssh/sshd_config\":
+            owner => root,
+            group => root,
+            alias => sshdconfig
+          }
 
-        file { sshdconfig:
-          mode => 644
-        }
+          file { sshdconfig:
+            mode => 644
+          }
 
       There's no way here for the Puppet parser to know that these two stanzas
       should be affecting the same file.
 
-      See the `LanguageTutorial language tutorial`:trac: for more information.
+      See the [Language Tutorial](http://docs.puppetlabs.com/guides/language_tutorial.html) for more information.
 
       "
 
     munge do |aliases|
       aliases = [aliases] unless aliases.is_a?(Array)
 
       raise(ArgumentError, "Cannot add aliases without a catalog") unless @resource.catalog
 
       aliases.each do |other|
         if obj = @resource.catalog.resource(@resource.class.name, other)
           unless obj.object_id == @resource.object_id
             self.fail("#{@resource.title} can not create alias #{other}: object already exists")
           end
           next
         end
 
         # Newschool, add it to the catalog.
         @resource.catalog.alias(@resource, other)
       end
     end
   end
 
   newmetaparam(:tag) do
     desc "Add the specified tags to the associated resource.  While all resources
       are automatically tagged with as much information as possible
       (e.g., each class and definition containing the resource), it can
       be useful to add your own tags to a given resource.
 
       Tags are currently useful for things like applying a subset of a
-      host's configuration::
+      host's configuration:
 
-        puppet agent --test --tags mytag
+          puppet agent --test --tags mytag
 
       This way, when you're testing a configuration you can run just the
       portion you're testing."
 
     munge do |tags|
       tags = [tags] unless tags.is_a? Array
 
       tags.each do |tag|
         @resource.tag(tag)
       end
     end
   end
 
   class RelationshipMetaparam < Puppet::Parameter
     class << self
       attr_accessor :direction, :events, :callback, :subclasses
     end
 
     @subclasses = []
 
     def self.inherited(sub)
       @subclasses << sub
     end
 
     def munge(references)
       references = [references] unless references.is_a?(Array)
       references.collect do |ref|
         if ref.is_a?(Puppet::Resource)
           ref
         else
           Puppet::Resource.new(ref)
         end
       end
     end
 
     def validate_relationship
       @value.each do |ref|
         unless @resource.catalog.resource(ref.to_s)
           description = self.class.direction == :in ? "dependency" : "dependent"
           fail "Could not find #{description} #{ref} for #{resource.ref}"
         end
       end
     end
 
     # Create edges from each of our relationships.    :in
     # relationships are specified by the event-receivers, and :out
     # relationships are specified by the event generator.  This
     # way 'source' and 'target' are consistent terms in both edges
     # and events -- that is, an event targets edges whose source matches
     # the event's source.  The direction of the relationship determines
     # which resource is applied first and which resource is considered
     # to be the event generator.
     def to_edges
       @value.collect do |reference|
         reference.catalog = resource.catalog
 
         # Either of the two retrieval attempts could have returned
         # nil.
         unless related_resource = reference.resolve
           self.fail "Could not retrieve dependency '#{reference}' of #{@resource.ref}"
         end
 
         # Are we requiring them, or vice versa?  See the method docs
         # for futher info on this.
         if self.class.direction == :in
           source = related_resource
           target = @resource
         else
           source = @resource
           target = related_resource
         end
 
         if method = self.class.callback
           subargs = {
             :event => self.class.events,
             :callback => method
           }
           self.debug("subscribes to #{related_resource.ref}")
         else
           # If there's no callback, there's no point in even adding
           # a label.
           subargs = nil
           self.debug("requires #{related_resource.ref}")
         end
 
         rel = Puppet::Relationship.new(source, target, subargs)
       end
     end
   end
 
   def self.relationship_params
     RelationshipMetaparam.subclasses
   end
 
 
   # Note that the order in which the relationships params is defined
   # matters.  The labelled params (notify and subcribe) must be later,
   # so that if both params are used, those ones win.  It's a hackish
   # solution, but it works.
 
   newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :NONE}) do
     desc "One or more objects that this object depends on.
       This is used purely for guaranteeing that changes to required objects
-      happen before the dependent object.  For instance::
+      happen before the dependent object.  For instance:
 
-        # Create the destination directory before you copy things down
-        file { \"/usr/local/scripts\":
-          ensure => directory
-        }
+          # Create the destination directory before you copy things down
+          file { \"/usr/local/scripts\":
+            ensure => directory
+          }
 
-        file { \"/usr/local/scripts/myscript\":
-          source => \"puppet://server/module/myscript\",
-          mode => 755,
-          require => File[\"/usr/local/scripts\"]
-        }
+          file { \"/usr/local/scripts/myscript\":
+            source => \"puppet://server/module/myscript\",
+            mode => 755,
+            require => File[\"/usr/local/scripts\"]
+          }
 
       Multiple dependencies can be specified by providing a comma-seperated list
-      of resources, enclosed in square brackets::
+      of resources, enclosed in square brackets:
 
-        require => [ File[\"/usr/local\"], File[\"/usr/local/scripts\"] ]
+          require => [ File[\"/usr/local\"], File[\"/usr/local/scripts\"] ]
 
       Note that Puppet will autorequire everything that it can, and
       there are hooks in place so that it's easy for resources to add new
       ways to autorequire objects, so if you think Puppet could be
       smarter here, let us know.
 
       In fact, the above code was redundant -- Puppet will autorequire
       any parent directories that are being managed; it will
       automatically realize that the parent directory should be created
       before the script is pulled down.
 
       Currently, exec resources will autorequire their CWD (if it is
       specified) plus any fully qualified paths that appear in the
-      command.   For instance, if you had an ``exec`` command that ran
-      the ``myscript`` mentioned above, the above code that pulls the
+      command.   For instance, if you had an `exec` command that ran
+      the `myscript` mentioned above, the above code that pulls the
       file down would be automatically listed as a requirement to the
-      ``exec`` code, so that you would always be running againts the
+      `exec` code, so that you would always be running againts the
       most recent version.
       "
   end
 
   newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :ALL_EVENTS, :callback => :refresh}) do
     desc "One or more objects that this object depends on.  Changes in the
       subscribed to objects result in the dependent objects being
-      refreshed (e.g., a service will get restarted).  For instance::
-
-        class nagios {
-          file { \"/etc/nagios/nagios.conf\":
-            source => \"puppet://server/module/nagios.conf\",
-            alias => nagconf # just to make things easier for me
+      refreshed (e.g., a service will get restarted).  For instance:
+
+          class nagios {
+            file { \"/etc/nagios/nagios.conf\":
+              source => \"puppet://server/module/nagios.conf\",
+              alias => nagconf # just to make things easier for me
+            }
+            service { nagios:
+              ensure => running,
+              subscribe => File[nagconf]
+            }
           }
-          service { nagios:
-            ensure => running,
-            subscribe => File[nagconf]
-          }
-        }
 
-      Currently the ``exec``, ``mount`` and ``service`` type support
+      Currently the `exec`, `mount` and `service` type support
       refreshing.
       "
   end
 
   newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :NONE}) do
     desc %{This parameter is the opposite of **require** -- it guarantees
       that the specified object is applied later than the specifying
-      object::
+      object:
 
-        file { "/var/nagios/configuration":
-          source  => "...",
-          recurse => true,
-          before => Exec["nagios-rebuid"]
-        }
+          file { "/var/nagios/configuration":
+            source  => "...",
+            recurse => true,
+            before => Exec["nagios-rebuid"]
+          }
 
-        exec { "nagios-rebuild":
-          command => "/usr/bin/make",
-          cwd => "/var/nagios/configuration"
-        }
+          exec { "nagios-rebuild":
+            command => "/usr/bin/make",
+            cwd => "/var/nagios/configuration"
+          }
 
       This will make sure all of the files are up to date before the
       make command is run.}
   end
 
   newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do
     desc %{This parameter is the opposite of **subscribe** -- it sends events
-      to the specified object::
+      to the specified object:
 
-        file { "/etc/sshd_config":
-          source => "....",
-          notify => Service[sshd]
-        }
+          file { "/etc/sshd_config":
+            source => "....",
+            notify => Service[sshd]
+          }
 
-        service { sshd:
-          ensure => running
-        }
+          service { sshd:
+            ensure => running
+          }
 
       This will restart the sshd service if the sshd config file changes.}
   end
 
   newmetaparam(:stage) do
     desc %{Which run stage a given resource should reside in.  This just creates
       a dependency on or from the named milestone.  For instance, saying that
       this is in the 'bootstrap' stage creates a dependency on the 'bootstrap'
       milestone.
 
       By default, all classes get directly added to the
       'main' stage.  You can create new stages as resources:
 
-        stage { [pre, post]: }
+          stage { [pre, post]: }
 
       To order stages, use standard relationships:
 
-        stage { pre: before => Stage[main] }
+          stage { pre: before => Stage[main] }
 
       Or use the new relationship syntax:
 
-        Stage[pre] -> Stage[main] -> Stage[post]
+          Stage[pre] -> Stage[main] -> Stage[post]
 
       Then use the new class parameters to specify a stage:
 
-        class { foo: stage => pre }
+          class { foo: stage => pre }
 
       Stages can only be set on classes, not individual resources.  This will
-      fail::
+      fail:
 
-        file { '/foo': stage => pre, ensure => file }
+          file { '/foo': stage => pre, ensure => file }
     }
   end
 
   ###############################
   # All of the provider plumbing for the resource types.
   require 'puppet/provider'
   require 'puppet/util/provider_features'
 
   # Add the feature handling module.
   extend Puppet::Util::ProviderFeatures
 
   attr_reader :provider
 
   # the Type class attribute accessors
   class << self
     attr_accessor :providerloader
     attr_writer :defaultprovider
   end
 
   # Find the default provider.
   def self.defaultprovider
     unless @defaultprovider
       suitable = suitableprovider
 
       # Find which providers are a default for this system.
       defaults = suitable.find_all { |provider| provider.default? }
 
       # If we don't have any default we use suitable providers
       defaults = suitable if defaults.empty?
       max = defaults.collect { |provider| provider.specificity }.max
       defaults = defaults.find_all { |provider| provider.specificity == max }
 
       retval = nil
       if defaults.length > 1
         Puppet.warning(
           "Found multiple default providers for #{self.name}: #{defaults.collect { |i| i.name.to_s }.join(", ")}; using #{defaults[0].name}"
         )
         retval = defaults.shift
       elsif defaults.length == 1
         retval = defaults.shift
       else
         raise Puppet::DevError, "Could not find a default provider for #{self.name}"
       end
 
       @defaultprovider = retval
     end
 
     @defaultprovider
   end
 
   def self.provider_hash_by_type(type)
     @provider_hashes ||= {}
     @provider_hashes[type] ||= {}
   end
 
   def self.provider_hash
     Puppet::Type.provider_hash_by_type(self.name)
   end
 
   # Retrieve a provider by name.
   def self.provider(name)
     name = Puppet::Util.symbolize(name)
 
     # If we don't have it yet, try loading it.
     @providerloader.load(name) unless provider_hash.has_key?(name)
     provider_hash[name]
   end
 
   # Just list all of the providers.
   def self.providers
     provider_hash.keys
   end
 
   def self.validprovider?(name)
     name = Puppet::Util.symbolize(name)
 
     (provider_hash.has_key?(name) && provider_hash[name].suitable?)
   end
 
   # Create a new provider of a type.  This method must be called
   # directly on the type that it's implementing.
   def self.provide(name, options = {}, &block)
     name = Puppet::Util.symbolize(name)
 
     if obj = provider_hash[name]
       Puppet.debug "Reloading #{name} #{self.name} provider"
       unprovide(name)
     end
 
     parent = if pname = options[:parent]
       options.delete(:parent)
       if pname.is_a? Class
         pname
       else
         if provider = self.provider(pname)
           provider
         else
           raise Puppet::DevError,
             "Could not find parent provider #{pname} of #{name}"
         end
       end
     else
       Puppet::Provider
     end
 
     options[:resource_type] ||= self
 
     self.providify
 
 
       provider = genclass(
         name,
       :parent => parent,
       :hash => provider_hash,
       :prefix => "Provider",
       :block => block,
       :include => feature_module,
       :extend => feature_module,
 
       :attributes => options
     )
 
     provider
   end
 
   # Make sure we have a :provider parameter defined.  Only gets called if there
   # are providers.
   def self.providify
     return if @paramhash.has_key? :provider
 
     newparam(:provider) do
       desc "The specific backend for #{self.name.to_s} to use. You will
         seldom need to specify this -- Puppet will usually discover the
         appropriate provider for your platform."
 
       # This is so we can refer back to the type to get a list of
       # providers for documentation.
       class << self
         attr_accessor :parenttype
       end
 
       # We need to add documentation for each provider.
       def self.doc
         @doc + "  Available providers are:\n\n" + parenttype.providers.sort { |a,b|
           a.to_s <=> b.to_s
         }.collect { |i|
           "* **#{i}**: #{parenttype().provider(i).doc}"
         }.join("\n")
       end
 
       defaultto {
         @resource.class.defaultprovider.name
       }
 
       validate do |provider_class|
         provider_class = provider_class[0] if provider_class.is_a? Array
         provider_class = provider_class.class.name if provider_class.is_a?(Puppet::Provider)
 
         unless provider = @resource.class.provider(provider_class)
           raise ArgumentError, "Invalid #{@resource.class.name} provider '#{provider_class}'"
         end
       end
 
       munge do |provider|
         provider = provider[0] if provider.is_a? Array
         provider = provider.intern if provider.is_a? String
         @resource.provider = provider
 
         if provider.is_a?(Puppet::Provider)
           provider.class.name
         else
           provider
         end
       end
     end.parenttype = self
   end
 
   def self.unprovide(name)
     if provider_hash.has_key? name
 
       rmclass(
         name,
         :hash => provider_hash,
 
         :prefix => "Provider"
       )
       if @defaultprovider and @defaultprovider.name == name
         @defaultprovider = nil
       end
     end
   end
 
   # Return an array of all of the suitable providers.
   def self.suitableprovider
     providerloader.loadall if provider_hash.empty?
     provider_hash.find_all { |name, provider|
       provider.suitable?
     }.collect { |name, provider|
       provider
     }.reject { |p| p.name == :fake } # For testing
   end
 
   def provider=(name)
     if name.is_a?(Puppet::Provider)
       @provider = name
       @provider.resource = self
     elsif klass = self.class.provider(name)
       @provider = klass.new(self)
     else
       raise ArgumentError, "Could not find #{name} provider of #{self.class.name}"
     end
   end
 
   ###############################
   # All of the relationship code.
 
   # Specify a block for generating a list of objects to autorequire.  This
   # makes it so that you don't have to manually specify things that you clearly
   # require.
   def self.autorequire(name, &block)
     @autorequires ||= {}
     @autorequires[name] = block
   end
 
   # Yield each of those autorequires in turn, yo.
   def self.eachautorequire
     @autorequires ||= {}
     @autorequires.each { |type, block|
       yield(type, block)
     }
   end
 
   # Figure out of there are any objects we can automatically add as
   # dependencies.
   def autorequire(rel_catalog = nil)
     rel_catalog ||= catalog
     raise(Puppet::DevError, "You cannot add relationships without a catalog") unless rel_catalog
 
     reqs = []
     self.class.eachautorequire { |type, block|
       # Ignore any types we can't find, although that would be a bit odd.
       next unless typeobj = Puppet::Type.type(type)
 
       # Retrieve the list of names from the block.
       next unless list = self.instance_eval(&block)
       list = [list] unless list.is_a?(Array)
 
       # Collect the current prereqs
       list.each { |dep|
         obj = nil
         # Support them passing objects directly, to save some effort.
         unless dep.is_a? Puppet::Type
           # Skip autorequires that we aren't managing
           unless dep = rel_catalog.resource(type, dep)
             next
           end
         end
 
         reqs << Puppet::Relationship.new(dep, self)
       }
     }
 
     reqs
   end
 
   # Build the dependencies associated with an individual object.
   def builddepends
     # Handle the requires
     self.class.relationship_params.collect do |klass|
       if param = @parameters[klass.name]
         param.to_edges
       end
     end.flatten.reject { |r| r.nil? }
   end
 
   # Define the initial list of tags.
   def tags=(list)
     tag(self.class.name)
     tag(*list)
   end
 
   # Types (which map to resources in the languages) are entirely composed of
   # attribute value pairs.  Generally, Puppet calls any of these things an
   # 'attribute', but these attributes always take one of three specific
   # forms:  parameters, metaparams, or properties.
 
   # In naming methods, I have tried to consistently name the method so
   # that it is clear whether it operates on all attributes (thus has 'attr' in
   # the method name, or whether it operates on a specific type of attributes.
   attr_writer :title
   attr_writer :noop
 
   include Enumerable
 
   # class methods dealing with Type management
 
   public
 
   # the Type class attribute accessors
   class << self
     attr_reader :name
     attr_accessor :self_refresh
     include Enumerable, Puppet::Util::ClassGen
     include Puppet::MetaType::Manager
 
     include Puppet::Util
     include Puppet::Util::Logging
   end
 
   # all of the variables that must be initialized for each subclass
   def self.initvars
     # all of the instances of this class
     @objects = Hash.new
     @aliases = Hash.new
 
     @defaults = {}
 
     @parameters ||= []
 
     @validproperties = {}
     @properties = []
     @parameters = []
     @paramhash = {}
 
     @attr_aliases = {}
 
     @paramdoc = Hash.new { |hash,key|
       key = key.intern if key.is_a?(String)
       if hash.include?(key)
         hash[key]
       else
         "Param Documentation for #{key} not found"
       end
     }
 
     @doc ||= ""
 
   end
 
   def self.to_s
     if defined?(@name)
       "Puppet::Type::#{@name.to_s.capitalize}"
     else
       super
     end
   end
 
   # Create a block to validate that our object is set up entirely.  This will
   # be run before the object is operated on.
   def self.validate(&block)
     define_method(:validate, &block)
     #@validate = block
   end
 
   # The catalog that this resource is stored in.
   attr_accessor :catalog
 
   # is the resource exported
   attr_accessor :exported
 
   # is the resource virtual (it should not :-))
   attr_accessor :virtual
 
   # create a log at specified level
   def log(msg)
 
     Puppet::Util::Log.create(
 
       :level => @parameters[:loglevel].value,
       :message => msg,
 
       :source => self
     )
   end
 
 
   # instance methods related to instance intrinsics
   # e.g., initialize and name
 
   public
 
   attr_reader :original_parameters
 
   # initialize the type instance
   def initialize(resource)
     raise Puppet::DevError, "Got TransObject instead of Resource or hash" if resource.is_a?(Puppet::TransObject)
     resource = self.class.hash2resource(resource) unless resource.is_a?(Puppet::Resource)
 
     # The list of parameter/property instances.
     @parameters = {}
 
     # Set the title first, so any failures print correctly.
     if resource.type.to_s.downcase.to_sym == self.class.name
       self.title = resource.title
     else
       # This should only ever happen for components
       self.title = resource.ref
     end
 
     [:file, :line, :catalog, :exported, :virtual].each do |getter|
       setter = getter.to_s + "="
       if val = resource.send(getter)
         self.send(setter, val)
       end
     end
 
     @tags = resource.tags
 
     @original_parameters = resource.to_hash
 
     set_name(@original_parameters)
 
     set_default(:provider)
 
     set_parameters(@original_parameters)
 
     self.validate if self.respond_to?(:validate)
   end
 
   private
 
   # Set our resource's name.
   def set_name(hash)
     self[name_var] = hash.delete(name_var) if name_var
   end
 
   # Set all of the parameters from a hash, in the appropriate order.
   def set_parameters(hash)
     # Use the order provided by allattrs, but add in any
     # extra attributes from the resource so we get failures
     # on invalid attributes.
     no_values = []
     (self.class.allattrs + hash.keys).uniq.each do |attr|
       begin
         # Set any defaults immediately.  This is mostly done so
         # that the default provider is available for any other
         # property validation.
         if hash.has_key?(attr)
           self[attr] = hash[attr]
         else
           no_values << attr
         end
       rescue ArgumentError, Puppet::Error, TypeError
         raise
       rescue => detail
         error = Puppet::DevError.new( "Could not set #{attr} on #{self.class.name}: #{detail}")
         error.set_backtrace(detail.backtrace)
         raise error
       end
     end
     no_values.each do |attr|
       set_default(attr)
     end
   end
 
   public
 
   # Set up all of our autorequires.
   def finish
     # Make sure all of our relationships are valid.  Again, must be done
     # when the entire catalog is instantiated.
     self.class.relationship_params.collect do |klass|
       if param = @parameters[klass.name]
         param.validate_relationship
       end
     end.flatten.reject { |r| r.nil? }
   end
 
   # For now, leave the 'name' method functioning like it used to.  Once 'title'
   # works everywhere, I'll switch it.
   def name
     self[:name]
   end
 
   # Look up our parent in the catalog, if we have one.
   def parent
     return nil unless catalog
 
     unless defined?(@parent)
       if parents = catalog.adjacent(self, :direction => :in)
         # We should never have more than one parent, so let's just ignore
         # it if we happen to.
         @parent = parents.shift
       else
         @parent = nil
       end
     end
     @parent
   end
 
   # Return the "type[name]" style reference.
   def ref
     "#{self.class.name.to_s.capitalize}[#{self.title}]"
   end
 
   def self_refresh?
     self.class.self_refresh
   end
 
   # Mark that we're purging.
   def purging
     @purging = true
   end
 
   # Is this resource being purged?  Used by transactions to forbid
   # deletion when there are dependencies.
   def purging?
     if defined?(@purging)
       @purging
     else
       false
     end
   end
 
   # Retrieve the title of an object.  If no title was set separately,
   # then use the object's name.
   def title
     unless @title
       if self.class.validparameter?(name_var)
         @title = self[:name]
       elsif self.class.validproperty?(name_var)
         @title = self.should(name_var)
       else
         self.devfail "Could not find namevar #{name_var} for #{self.class.name}"
       end
     end
 
     @title
   end
 
   # convert to a string
   def to_s
     self.ref
   end
 
   # Convert to a transportable object
   def to_trans(ret = true)
     trans = TransObject.new(self.title, self.class.name)
 
     values = retrieve_resource
     values.each do |name, value|
       name = name.name if name.respond_to? :name
       trans[name] = value
     end
 
     @parameters.each do |name, param|
       # Avoid adding each instance name twice
       next if param.class.isnamevar? and param.value == self.title
 
       # We've already got property values
       next if param.is_a?(Puppet::Property)
       trans[name] = param.value
     end
 
     trans.tags = self.tags
 
     # FIXME I'm currently ignoring 'parent' and 'path'
 
     trans
   end
 
   def to_resource
     # this 'type instance' versus 'resource' distinction seems artificial
     # I'd like to see it collapsed someday ~JW
     self.to_trans.to_resource
   end
 
   def virtual?;  !!@virtual;  end
   def exported?; !!@exported; end
 end
 end
 
 require 'puppet/provider'
 
 # Always load these types.
 require 'puppet/type/component'
diff --git a/lib/puppet/type/augeas.rb b/lib/puppet/type/augeas.rb
index 7fcfdd7a3..d29bda648 100644
--- a/lib/puppet/type/augeas.rb
+++ b/lib/puppet/type/augeas.rb
@@ -1,183 +1,182 @@
 #--
 #  Copyright (C) 2008 Red Hat Inc.
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public
 #  License as published by the Free Software Foundation; either
 #  version 2 of the License, or (at your option) any later version.
 #
 #  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 #
 # Author: Bryan Kearney <bkearney@redhat.com>
 
 Puppet::Type.newtype(:augeas) do
   include Puppet::Util
 
   feature :parse_commands, "Parse the command string"
   feature :need_to_run?, "If the command should run"
   feature :execute_changes, "Actually make the changes"
 
   @doc = "Apply the changes (single or array of changes) to the filesystem
     via the augeas tool.
 
     Requires:
-      - augeas to be installed (http://www.augeas.net)
-      - ruby-augeas bindings
 
-    Sample usage with a string::
+    - augeas to be installed (http://www.augeas.net)
+    - ruby-augeas bindings
 
-      augeas{\"test1\" :
-        context => \"/files/etc/sysconfig/firstboot\",
-        changes => \"set RUN_FIRSTBOOT YES\",
-        onlyif  => \"match other_value size > 0\",
-      }
+    Sample usage with a string:
 
-    Sample usage with an array and custom lenses::
+        augeas{\"test1\" :
+          context => \"/files/etc/sysconfig/firstboot\",
+          changes => \"set RUN_FIRSTBOOT YES\",
+          onlyif  => \"match other_value size > 0\",
+        }
 
-      augeas{\"jboss_conf\":
-        context => \"/files\",
-        changes => [
-          \"set /etc/jbossas/jbossas.conf/JBOSS_IP $ipaddress\",
-          \"set /etc/jbossas/jbossas.conf/JAVA_HOME /usr\"
-        ],
-        load_path => \"$/usr/share/jbossas/lenses\",
-      }
+    Sample usage with an array and custom lenses:
+
+        augeas{\"jboss_conf\":
+          context => \"/files\",
+          changes => [
+            \"set /etc/jbossas/jbossas.conf/JBOSS_IP $ipaddress\",
+            \"set /etc/jbossas/jbossas.conf/JAVA_HOME /usr\"
+          ],
+          load_path => \"$/usr/share/jbossas/lenses\",
+        }
 
     "
 
   newparam (:name) do
     desc "The name of this task. Used for uniqueness"
     isnamevar
   end
 
   newparam (:context) do
     desc "Optional context path. This value is prepended to the paths of all changes if the path is relative. If INCL is set, defaults to '/files' + INCL, otherwise the empty string"
     defaultto ""
     munge do |value|
       if value.empty? and resource[:incl]
         "/files" + resource[:incl]
       else
         value
       end
     end
   end
 
   newparam (:onlyif) do
     desc "Optional augeas command and comparisons to control the execution of this type.
-      Supported onlyif syntax::
-
-        get [AUGEAS_PATH] [COMPARATOR] [STRING]
-        match [MATCH_PATH] size [COMPARATOR] [INT]
-        match [MATCH_PATH] include [STRING]
-        match [MATCH_PATH] not_include [STRING]
-        match [MATCH_PATH] == [AN_ARRAY]
-        match [MATCH_PATH] != [AN_ARRAY]
-
-      where::
-
-        AUGEAS_PATH is a valid path scoped by the context
-        MATCH_PATH is a valid match synatx scoped by the context
-        COMPARATOR is in the set [> >= != == <= <]
-        STRING is a string
-        INT is a number
-        AN_ARRAY is in the form ['a string', 'another']"
+      Supported onlyif syntax:
+
+          get [AUGEAS_PATH] [COMPARATOR] [STRING]
+          match [MATCH_PATH] size [COMPARATOR] [INT]
+          match [MATCH_PATH] include [STRING]
+          match [MATCH_PATH] not_include [STRING]
+          match [MATCH_PATH] == [AN_ARRAY]
+          match [MATCH_PATH] != [AN_ARRAY]
+
+      where:
+
+          AUGEAS_PATH is a valid path scoped by the context
+          MATCH_PATH is a valid match synatx scoped by the context
+          COMPARATOR is in the set [> >= != == <= <]
+          STRING is a string
+          INT is a number
+          AN_ARRAY is in the form ['a string', 'another']"
     defaultto ""
   end
 
 
   newparam(:changes) do
     desc "The changes which should be applied to the filesystem. This
     can be either a string which contains a command or an array of commands.
-    Commands supported are::
+    Commands supported are:
 
-      set [PATH] [VALUE]     Sets the value VALUE at loction PATH
-      rm [PATH]              Removes the node at location PATH
-      remove [PATH]          Synonym for rm
-      clear [PATH]           Keeps the node at PATH, but removes the value.
-      ins [LABEL] [WHERE] [PATH]
-        Inserts an empty node LABEL either [WHERE={before|after}] PATH.
-      insert [LABEL] [WHERE] [PATH]
-        Synonym for ins
+        set [PATH] [VALUE]     Sets the value VALUE at loction PATH
+        rm [PATH]              Removes the node at location PATH
+        remove [PATH]          Synonym for rm
+        clear [PATH]           Keeps the node at PATH, but removes the value.
+        ins [LABEL] [WHERE] [PATH]    Inserts an empty node LABEL either [WHERE={before|after}] PATH.
+        insert [LABEL] [WHERE] [PATH] Synonym for ins
 
     If the parameter 'context' is set that value is prepended to PATH"
   end
 
 
   newparam(:root) do
     desc "A file system path; all files loaded by Augeas are loaded underneath ROOT"
     defaultto "/"
   end
 
   newparam(:load_path) do
     desc "Optional colon separated list of directories; these directories are searched for schema definitions"
     defaultto ""
   end
 
   newparam(:force) do
     desc "Optional command to force the augeas type to execute even if it thinks changes
     will not be made. This does not overide the only setting. If onlyif is set, then the
     foce setting will not override that result"
 
     defaultto false
   end
 
   newparam(:type_check) do
     desc "Set to true if augeas should perform typechecking. Optional, defaults to false"
     newvalues(:true, :false)
 
     defaultto :false
   end
 
   newparam(:lens) do
-    desc "Use a specific lens, e.g. 'Hosts.lns'. When this parameter is set, you must also set the incl parameter to indicate which file to load. Only that file will be loaded, which greatly speeds up execution of the type"
+    desc "Use a specific lens, e.g. `Hosts.lns`. When this parameter is set, you must also set the incl parameter to indicate which file to load. Only that file will be loaded, which greatly speeds up execution of the type"
   end
 
   newparam(:incl) do
-    desc "Load only a specific file, e.g. '/etc/hosts'.  When this parameter is set, you must also set the lens parameter to indicate which lens to use."
+    desc "Load only a specific file, e.g. `/etc/hosts`.  When this parameter is set, you must also set the lens parameter to indicate which lens to use."
   end
 
   validate do
     has_lens = !self[:lens].nil?
     has_incl = !self[:incl].nil?
     self.fail "You must specify both the lens and incl parameters, or neither" if has_lens != has_incl
   end
 
   # This is the acutal meat of the code. It forces
   # augeas to be run and fails or not based on the augeas return
   # code.
   newproperty(:returns) do |property|
     include Puppet::Util
     desc "The expected return code from the augeas command. Should not be set"
 
     defaultto 0
 
     # Make output a bit prettier
     def change_to_s(currentvalue, newvalue)
       "executed successfully"
     end
 
     # if the onlyif resource is provided, then the value is parsed.
     # a return value of 0 will stop exection because it matches the
     # default value.
     def retrieve
       if @resource.provider.need_to_run?()
         :need_to_run
       else
         0
       end
     end
 
     # Actually execute the command.
     def sync
       @resource.provider.execute_changes
     end
   end
 
 end
diff --git a/lib/puppet/type/computer.rb b/lib/puppet/type/computer.rb
index 86a30be27..89a0692bf 100644
--- a/lib/puppet/type/computer.rb
+++ b/lib/puppet/type/computer.rb
@@ -1,62 +1,62 @@
 Puppet::Type.newtype(:computer) do
 
   @doc = "Computer object management using DirectoryService
     on OS X.
 
     Note that these are distinctly different kinds of objects to 'hosts',
     as they require a MAC address and can have all sorts of policy attached to
     them.
 
     This provider only manages Computer objects in the local directory service
     domain, not in remote directories.
 
-    If you wish to manage /etc/hosts on Mac OS X, then simply use the host
+    If you wish to manage `/etc/hosts` file on Mac OS X, then simply use the host
     type as per other platforms.
 
     This type primarily exists to create localhost Computer objects that MCX
     policy can then be attached to."
 
   # ensurable
 
   # We autorequire the computer object in case it is being managed at the
   # file level by Puppet.
 
   autorequire(:file) do
     if self[:name]
       "/var/db/dslocal/nodes/Default/computers/#{self[:name]}.plist"
     else
       nil
     end
   end
 
   newproperty(:ensure, :parent => Puppet::Property::Ensure) do
     desc "Control the existences of this computer record. Set this attribute to
-      ``present`` to ensure the computer record exists.  Set it to ``absent``
+      `present` to ensure the computer record exists.  Set it to `absent`
       to delete any computer records with this name"
     newvalue(:present) do
       provider.create
     end
 
     newvalue(:absent) do
       provider.delete
     end
   end
 
   newparam(:name) do
     desc "The authoritative 'short' name of the computer record."
     isnamevar
   end
 
   newparam(:realname) do
     desc "The 'long' name of the computer record."
   end
 
   newproperty(:en_address) do
     desc "The MAC address of the primary network interface. Must match en0."
   end
 
   newproperty(:ip_address) do
     desc "The IP Address of the Computer object."
   end
 
 end
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index b3f5e608d..9d827df78 100755
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -1,414 +1,414 @@
 require 'etc'
 require 'facter'
 require 'puppet/util/filetype'
 
 Puppet::Type.newtype(:cron) do
   @doc = "Installs and manages cron jobs.  All fields except the command
     and the user are optional, although specifying no periodic
     fields would result in the command being executed every
     minute.  While the name of the cron job is not part of the actual
     job, it is used by Puppet to store and retrieve it.
 
     If you specify a cron job that matches an existing job in every way
     except name, then the jobs will be considered equivalent and the
     new name will be permanently associated with that job.  Once this
     association is made and synced to disk, you can then manage the job
     normally (e.g., change the schedule of the job).
 
-    Example::
-
-      cron { logrotate:
-        command => \"/usr/sbin/logrotate\",
-        user => root,
-        hour => 2,
-        minute => 0
-      }
-
-    Note that all cron values can be specified as an array of values::
-
-      cron { logrotate:
-        command => \"/usr/sbin/logrotate\",
-        user => root,
-        hour => [2, 4]
-      }
-
-    Or using ranges, or the step syntax ``*/2`` (although there's no guarantee that
-    your ``cron`` daemon supports it)::
-
-      cron { logrotate:
-        command => \"/usr/sbin/logrotate\",
-        user => root,
-        hour => ['2-4'],
-        minute => '*/10'
-      }
+    Example:
+
+        cron { logrotate:
+          command => \"/usr/sbin/logrotate\",
+          user => root,
+          hour => 2,
+          minute => 0
+        }
+
+    Note that all cron values can be specified as an array of values:
+
+        cron { logrotate:
+          command => \"/usr/sbin/logrotate\",
+          user => root,
+          hour => [2, 4]
+        }
+
+    Or using ranges, or the step syntax `*/2` (although there's no guarantee that
+    your `cron` daemon supports it):
+
+        cron { logrotate:
+          command => \"/usr/sbin/logrotate\",
+          user => root,
+          hour => ['2-4'],
+          minute => '*/10'
+        }
     "
   ensurable
 
   # A base class for all of the Cron parameters, since they all have
   # similar argument checking going on.
   class CronParam < Puppet::Property
     class << self
       attr_accessor :boundaries, :default
     end
 
     # We have to override the parent method, because we consume the entire
     # "should" array
     def insync?(is)
       if @should
         self.is_to_s(is) == self.should_to_s
       else
         true
       end
     end
 
     # A method used to do parameter input handling.  Converts integers
     # in string form to actual integers, and returns the value if it's
     # an integer or false if it's just a normal string.
     def numfix(num)
       if num =~ /^\d+$/
         return num.to_i
       elsif num.is_a?(Integer)
         return num
       else
         return false
       end
     end
 
     # Verify that a number is within the specified limits.  Return the
     # number if it is, or false if it is not.
     def limitcheck(num, lower, upper)
       (num >= lower and num <= upper) && num
     end
 
     # Verify that a value falls within the specified array.  Does case
     # insensitive matching, and supports matching either the entire word
     # or the first three letters of the word.
     def alphacheck(value, ary)
       tmp = value.downcase
 
       # If they specified a shortened version of the name, then see
       # if we can lengthen it (e.g., mon => monday).
       if tmp.length == 3
         ary.each_with_index { |name, index|
           if name =~ /#{tmp}/i
             return index
           end
         }
       else
         return ary.index(tmp) if ary.include?(tmp)
       end
 
       false
     end
 
     def should_to_s(newvalue = @should)
       if newvalue
         newvalue = [newvalue] unless newvalue.is_a?(Array)
         if self.name == :command or newvalue[0].is_a? Symbol
           newvalue[0]
         else
           newvalue.join(",")
         end
       else
         nil
       end
     end
 
     def is_to_s(currentvalue = @is)
       if currentvalue
         return currentvalue unless currentvalue.is_a?(Array)
 
         if self.name == :command or currentvalue[0].is_a? Symbol
           currentvalue[0]
         else
           currentvalue.join(",")
         end
       else
         nil
       end
     end
 
     def should
       if @should and @should[0] == :absent
         :absent
       else
         @should
       end
     end
 
     def should=(ary)
       super
       @should.flatten!
     end
 
     # The method that does all of the actual parameter value
     # checking; called by all of the +param<name>=+ methods.
     # Requires the value, type, and bounds, and optionally supports
     # a boolean of whether to do alpha checking, and if so requires
     # the ary against which to do the checking.
     munge do |value|
       # Support 'absent' as a value, so that they can remove
       # a value
       if value == "absent" or value == :absent
         return :absent
       end
 
       # Allow the */2 syntax
       if value =~ /^\*\/[0-9]+$/
         return value
       end
 
       # Allow ranges
       if value =~ /^[0-9]+-[0-9]+$/
         return value
       end
 
       # Allow ranges + */2
       if value =~ /^[0-9]+-[0-9]+\/[0-9]+$/
         return value
       end
 
       if value == "*"
         return value
       end
 
       return value unless self.class.boundaries
       lower, upper = self.class.boundaries
       retval = nil
       if num = numfix(value)
         retval = limitcheck(num, lower, upper)
       elsif respond_to?(:alpha)
         # If it has an alpha method defined, then we check
         # to see if our value is in that list and if so we turn
         # it into a number
         retval = alphacheck(value, alpha)
       end
 
       if retval
         return retval.to_s
       else
         self.fail "#{value} is not a valid #{self.class.name}"
       end
     end
   end
 
   # Somewhat uniquely, this property does not actually change anything -- it
   # just calls +@resource.sync+, which writes out the whole cron tab for
   # the user in question.  There is no real way to change individual cron
   # jobs without rewriting the entire cron file.
   #
   # Note that this means that managing many cron jobs for a given user
   # could currently result in multiple write sessions for that user.
   newproperty(:command, :parent => CronParam) do
     desc "The command to execute in the cron job.  The environment
       provided to the command varies by local system rules, and it is
       best to always provide a fully qualified command.  The user's
       profile is not sourced when the command is run, so if the
       user's environment is desired it should be sourced manually.
 
-      All cron parameters support ``absent`` as a value; this will
+      All cron parameters support `absent` as a value; this will
       remove any existing values for that field."
 
     def retrieve
       return_value = super
       return_value = return_value[0] if return_value && return_value.is_a?(Array)
 
       return_value
     end
 
     def should
       if @should
         if @should.is_a? Array
           @should[0]
         else
           devfail "command is not an array"
         end
       else
         nil
       end
     end
   end
 
   newproperty(:special) do
     desc "Special schedules only supported on FreeBSD."
 
     def specials
       %w{reboot yearly annually monthly weekly daily midnight hourly}
     end
 
     validate do |value|
       raise ArgumentError, "Invalid special schedule #{value.inspect}" unless specials.include?(value)
     end
   end
 
   newproperty(:minute, :parent => CronParam) do
     self.boundaries = [0, 59]
     desc "The minute at which to run the cron job.
       Optional; if specified, must be between 0 and 59, inclusive."
   end
 
   newproperty(:hour, :parent => CronParam) do
     self.boundaries = [0, 23]
     desc "The hour at which to run the cron job. Optional;
       if specified, must be between 0 and 23, inclusive."
   end
 
   newproperty(:weekday, :parent => CronParam) do
     def alpha
       %w{sunday monday tuesday wednesday thursday friday saturday}
     end
     self.boundaries = [0, 7]
     desc "The weekday on which to run the command.
       Optional; if specified, must be between 0 and 7, inclusive, with
       0 (or 7) being Sunday, or must be the name of the day (e.g., Tuesday)."
   end
 
   newproperty(:month, :parent => CronParam) do
     def alpha
       %w{january february march april may june july
         august september october november december}
     end
     self.boundaries = [1, 12]
     desc "The month of the year.  Optional; if specified
       must be between 1 and 12 or the month name (e.g., December)."
   end
 
   newproperty(:monthday, :parent => CronParam) do
     self.boundaries = [1, 31]
     desc "The day of the month on which to run the
       command.  Optional; if specified, must be between 1 and 31."
   end
 
   newproperty(:environment) do
     desc "Any environment settings associated with this cron job.  They
       will be stored between the header and the job in the crontab.  There
       can be no guarantees that other, earlier settings will not also
       affect a given cron job.
 
 
       Also, Puppet cannot automatically determine whether an existing,
       unmanaged environment setting is associated with a given cron
       job.  If you already have cron jobs with environment settings,
       then Puppet will keep those settings in the same place in the file,
       but will not associate them with a specific job.
 
       Settings should be specified exactly as they should appear in
-      the crontab, e.g., ``PATH=/bin:/usr/bin:/usr/sbin``."
+      the crontab, e.g., `PATH=/bin:/usr/bin:/usr/sbin`."
 
     validate do |value|
       unless value =~ /^\s*(\w+)\s*=\s*(.*)\s*$/ or value == :absent or value == "absent"
         raise ArgumentError, "Invalid environment setting #{value.inspect}"
       end
     end
 
     def insync?(is)
       if is.is_a? Array
         return is.sort == @should.sort
       else
         return is == @should
       end
     end
 
     def is_to_s(newvalue)
       if newvalue
         if newvalue.is_a?(Array)
           newvalue.join(",")
         else
           newvalue
         end
       else
         nil
       end
     end
 
     def should
       @should
     end
 
     def should_to_s(newvalue = @should)
       if newvalue
         newvalue.join(",")
       else
         nil
       end
     end
   end
 
   newparam(:name) do
     desc "The symbolic name of the cron job.  This name
       is used for human reference only and is generated automatically
       for cron jobs found on the system.  This generally won't
       matter, as Puppet will do its best to match existing cron jobs
       against specified jobs (and Puppet adds a comment to cron jobs it adds), but it is at least possible that converting from
       unmanaged jobs to managed jobs might require manual
       intervention."
 
     isnamevar
   end
 
   newproperty(:user) do
     desc "The user to run the command as.  This user must
       be allowed to run cron jobs, which is not currently checked by
       Puppet.
 
       The user defaults to whomever Puppet is running as."
 
     defaultto { Etc.getpwuid(Process.uid).name || "root" }
   end
 
   newproperty(:target) do
     desc "Where the cron job should be stored.  For crontab-style
       entries this is the same as the user and defaults that way.
       Other providers default accordingly."
 
     defaultto {
       if provider.is_a?(@resource.class.provider(:crontab))
         if val = @resource.should(:user)
           val
         else
           raise ArgumentError,
             "You must provide a user with crontab entries"
         end
       elsif provider.class.ancestors.include?(Puppet::Provider::ParsedFile)
         provider.class.default_target
       else
         nil
       end
     }
   end
 
   # We have to reorder things so that :provide is before :target
 
   attr_accessor :uid
 
   def value(name)
     name = symbolize(name)
     ret = nil
     if obj = @parameters[name]
       ret = obj.should
 
       ret ||= obj.retrieve
 
       if ret == :absent
         ret = nil
       end
     end
 
     unless ret
       case name
       when :command
         devfail "No command, somehow"
       when :special
         # nothing
       else
         #ret = (self.class.validproperty?(name).default || "*").to_s
         ret = "*"
       end
     end
 
     ret
   end
 end
 
 
 
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index bfeaaad34..dd57ec231 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -1,686 +1,685 @@
 module Puppet
   newtype(:exec) do
     include Puppet::Util::Execution
     require 'timeout'
 
     @doc = "Executes external commands.  It is critical that all commands
       executed using this mechanism can be run multiple times without
       harm, i.e., they are *idempotent*.  One useful way to create idempotent
-      commands is to use the checks like ``creates`` to avoid running the
+      commands is to use the checks like `creates` to avoid running the
       command unless some condition is met.
 
-      Note also that you can restrict an ``exec`` to only run when it receives
-      events by using the ``refreshonly`` parameter; this is a useful way to
+      Note also that you can restrict an `exec` to only run when it receives
+      events by using the `refreshonly` parameter; this is a useful way to
       have your configuration respond to events with arbitrary commands.
 
-      It is worth noting that ``exec`` is special, in that it is not
-      currently considered an error to have multiple ``exec`` instances
+      It is worth noting that `exec` is special, in that it is not
+      currently considered an error to have multiple `exec` instances
       with the same name.  This was done purely because it had to be this
       way in order to get certain functionality, but it complicates things.
-      In particular, you will not be able to use ``exec`` instances that
+      In particular, you will not be able to use `exec` instances that
       share their commands with other instances as a dependency, since
       Puppet has no way of knowing which instance you mean.
 
-      For example::
+      For example:
 
-        # defined in the production class
-        exec { \"make\":
-          cwd => \"/prod/build/dir\",
-          path => \"/usr/bin:/usr/sbin:/bin\"
-        }
+          # defined in the production class
+          exec { \"make\":
+            cwd => \"/prod/build/dir\",
+            path => \"/usr/bin:/usr/sbin:/bin\"
+          }
 
-        . etc. .
+          . etc. .
 
-        # defined in the test class
-        exec { \"make\":
-          cwd => \"/test/build/dir\",
-          path => \"/usr/bin:/usr/sbin:/bin\"
-        }
+          # defined in the test class
+          exec { \"make\":
+            cwd => \"/test/build/dir\",
+            path => \"/usr/bin:/usr/sbin:/bin\"
+          }
 
       Any other type would throw an error, complaining that you had
       the same instance being managed in multiple places, but these are
-      obviously different images, so ``exec`` had to be treated specially.
+      obviously different images, so `exec` had to be treated specially.
 
       It is recommended to avoid duplicate names whenever possible.
 
-      Note that if an ``exec`` receives an event from another resource,
-      it will get executed again (or execute the command specified in ``refresh``, if there is one).
+      Note that if an `exec` receives an event from another resource,
+      it will get executed again (or execute the command specified in `refresh`, if there is one).
 
-      There is a strong tendency to use ``exec`` to do whatever work Puppet
+      There is a strong tendency to use `exec` to do whatever work Puppet
       can't already do; while this is obviously acceptable (and unavoidable)
-      in the short term, it is highly recommended to migrate work from ``exec``
+      in the short term, it is highly recommended to migrate work from `exec`
       to native Puppet types as quickly as possible.  If you find that
-      you are doing a lot of work with ``exec``, please at least notify
+      you are doing a lot of work with `exec`, please at least notify
       us at Puppet Labs what you are doing, and hopefully we can work with
       you to get a native resource type for the work you are doing."
 
     require 'open3'
 
     # Create a new check mechanism.  It's basically just a parameter that
     # provides one extra 'check' method.
     def self.newcheck(name, &block)
       @checks ||= {}
 
       check = newparam(name, &block)
       @checks[name] = check
     end
 
     def self.checks
       @checks.keys
     end
 
     newproperty(:returns, :array_matching => :all, :event => :executed_command) do |property|
       include Puppet::Util::Execution
       munge do |value|
         value.to_s
       end
 
       def event_name
         :executed_command
       end
 
       defaultto "0"
 
       attr_reader :output
       desc "The expected return code(s).  An error will be returned if the
         executed command returns something else.  Defaults to 0. Can be
         specified as an array of acceptable return codes or a single value."
 
       # Make output a bit prettier
       def change_to_s(currentvalue, newvalue)
         "executed successfully"
       end
 
       # First verify that all of our checks pass.
       def retrieve
         # Default to somethinng
 
         if @resource.check
           return :notrun
         else
           return self.should
         end
       end
 
       # Actually execute the command.
       def sync
         olddir = nil
 
         # We need a dir to change to, even if it's just the cwd
         dir = self.resource[:cwd] || Dir.pwd
 
         event = :executed_command
         tries = self.resource[:tries]
         try_sleep = self.resource[:try_sleep]
 
         begin
           tries.times do |try|
             # Only add debug messages for tries > 1 to reduce log spam.
             debug("Exec try #{try+1}/#{tries}") if tries > 1
             @output, @status = @resource.run(self.resource[:command])
             break if self.should.include?(@status.exitstatus.to_s)
             if try_sleep > 0 and tries > 1
               debug("Sleeping for #{try_sleep} seconds between tries")
               sleep try_sleep
             end
           end
         rescue Timeout::Error
           self.fail "Command exceeded timeout" % value.inspect
         end
 
         if log = @resource[:logoutput]
           case log
           when :true
             log = @resource[:loglevel]
           when :on_failure
             unless self.should.include?(@status.exitstatus.to_s)
               log = @resource[:loglevel]
             else
               log = :false
             end
           end
           unless log == :false
             @output.split(/\n/).each { |line|
               self.send(log, line)
             }
           end
         end
 
         unless self.should.include?(@status.exitstatus.to_s)
           self.fail("#{self.resource[:command]} returned #{@status.exitstatus} instead of one of [#{self.should.join(",")}]")
         end
 
         event
       end
     end
 
     newparam(:command) do
       isnamevar
       desc "The actual command to execute.  Must either be fully qualified
         or a search path for the command must be provided.  If the command
         succeeds, any output produced will be logged at the instance's
-        normal log level (usually ``notice``), but if the command fails
+        normal log level (usually `notice`), but if the command fails
         (meaning its return code does not match the specified code) then
-        any output is logged at the ``err`` log level."
+        any output is logged at the `err` log level."
     end
 
     newparam(:path) do
       desc "The search path used for command execution.
         Commands must be fully qualified if no path is specified.  Paths
         can be specified as an array or as a colon-separated list."
 
       # Support both arrays and colon-separated fields.
       def value=(*values)
         @value = values.flatten.collect { |val|
           if val =~ /;/ # recognize semi-colon separated paths
             val.split(";")
           elsif val =~ /^\w:[^:]*$/ # heuristic to avoid splitting a driveletter away
             val
           else
             val.split(":")
           end
         }.flatten
       end
     end
 
     newparam(:user) do
       desc "The user to run the command as.  Note that if you
         use this then any error output is not currently captured.  This
         is because of a bug within Ruby.  If you are using Puppet to
         create this user, the exec will automatically require the user,
         as long as it is specified by name."
 
       # Most validation is handled by the SUIDManager class.
       validate do |user|
         self.fail "Only root can execute commands as other users" unless Puppet.features.root?
       end
     end
 
     newparam(:group) do
       desc "The group to run the command as.  This seems to work quite
         haphazardly on different platforms -- it is a platform issue
         not a Ruby or Puppet one, since the same variety exists when
         running commnands as different users in the shell."
       # Validation is handled by the SUIDManager class.
     end
 
     newparam(:cwd) do
       desc "The directory from which to run the command.  If
         this directory does not exist, the command will fail."
 
       validate do |dir|
         unless dir =~ /^#{File::SEPARATOR}/
           self.fail("CWD must be a fully qualified path")
         end
       end
 
       munge do |dir|
         dir = dir[0] if dir.is_a?(Array)
 
         dir
       end
     end
 
     newparam(:logoutput) do
       desc "Whether to log output.  Defaults to logging output at the
-        loglevel for the ``exec`` resource. Use *on_failure* to only
+        loglevel for the `exec` resource. Use *on_failure* to only
         log the output when the command reports an error.  Values are
         **true**, *false*, *on_failure*, and any legal log level."
 
       newvalues(:true, :false, :on_failure)
     end
 
     newparam(:refresh) do
       desc "How to refresh this command.  By default, the exec is just
         called again when it receives an event from another resource,
         but this parameter allows you to define a different command
         for refreshing."
 
       validate do |command|
         @resource.validatecmd(command)
       end
     end
 
     newparam(:env) do
       desc "This parameter is deprecated. Use 'environment' instead."
 
       munge do |value|
         warning "'env' is deprecated on exec; use 'environment' instead."
         resource[:environment] = value
       end
     end
 
     newparam(:environment) do
       desc "Any additional environment variables you want to set for a
         command.  Note that if you use this to set PATH, it will override
-        the ``path`` attribute.  Multiple environment variables should be
+        the `path` attribute.  Multiple environment variables should be
         specified as an array."
 
       validate do |values|
         values = [values] unless values.is_a? Array
         values.each do |value|
           unless value =~ /\w+=/
             raise ArgumentError, "Invalid environment setting '#{value}'"
           end
         end
       end
     end
 
     newparam(:timeout) do
       desc "The maximum time the command should take.  If the command takes
         longer than the timeout, the command is considered to have failed
         and will be stopped.  Use any negative number to disable the timeout.
         The time is specified in seconds."
 
       munge do |value|
         value = value.shift if value.is_a?(Array)
         if value.is_a?(String)
           unless value =~ /^[-\d.]+$/
             raise ArgumentError, "The timeout must be a number."
           end
           Float(value)
         else
           value
         end
       end
 
       defaultto 300
     end
 
     newparam(:tries) do
       desc "The number of times execution of the command should be tried.
         Defaults to '1'. This many attempts will be made to execute
         the command until an acceptable return code is returned.
         Note that the timeout paramater applies to each try rather than
         to the complete set of tries."
 
       munge do |value|
         if value.is_a?(String)
           unless value =~ /^[\d]+$/
             raise ArgumentError, "Tries must be an integer"
           end
           value = Integer(value)
         end
         raise ArgumentError, "Tries must be an integer >= 1" if value < 1
         value
       end
 
       defaultto 1
     end
 
     newparam(:try_sleep) do
       desc "The time to sleep in seconds between 'tries'."
 
       munge do |value|
         if value.is_a?(String)
           unless value =~ /^[-\d.]+$/
             raise ArgumentError, "try_sleep must be a number"
           end
           value = Float(value)
         end
         raise ArgumentError, "try_sleep cannot be a negative number" if value < 0
         value
       end
 
       defaultto 0
     end
 
 
     newcheck(:refreshonly) do
       desc "The command should only be run as a
         refresh mechanism for when a dependent object is changed.  It only
         makes sense to use this option when this command depends on some
-        other object; it is useful for triggering an action::
-
-          # Pull down the main aliases file
-          file { \"/etc/aliases\":
-            source => \"puppet://server/module/aliases\"
-          }
-
-          # Rebuild the database, but only when the file changes
-          exec { newaliases:
-            path => [\"/usr/bin\", \"/usr/sbin\"],
-            subscribe => File[\"/etc/aliases\"],
-            refreshonly => true
-          }
+        other object; it is useful for triggering an action:
+
+            # Pull down the main aliases file
+            file { \"/etc/aliases\":
+              source => \"puppet://server/module/aliases\"
+            }  
+
+            # Rebuild the database, but only when the file changes
+            exec { newaliases:
+              path => [\"/usr/bin\", \"/usr/sbin\"],
+              subscribe => File[\"/etc/aliases\"],
+              refreshonly => true
+            }
 
-        Note that only ``subscribe`` and ``notify`` can trigger actions, not ``require``,
-        so it only makes sense to use ``refreshonly`` with ``subscribe`` or ``notify``."
+        Note that only `subscribe` and `notify` can trigger actions, not `require`,
+        so it only makes sense to use `refreshonly` with `subscribe` or `notify`."
 
       newvalues(:true, :false)
 
       # We always fail this test, because we're only supposed to run
       # on refresh.
       def check(value)
         # We have to invert the values.
         if value == :true
           false
         else
           true
         end
       end
     end
 
     newcheck(:creates) do
       desc "A file that this command creates.  If this
         parameter is provided, then the command will only be run
-        if the specified file does not exist::
+        if the specified file does not exist:
 
-          exec { \"tar xf /my/tar/file.tar\":
-            cwd => \"/var/tmp\",
-            creates => \"/var/tmp/myfile\",
-            path => [\"/usr/bin\", \"/usr/sbin\"]
-          }
+            exec { \"tar xf /my/tar/file.tar\":
+              cwd => \"/var/tmp\",
+              creates => \"/var/tmp/myfile\",
+              path => [\"/usr/bin\", \"/usr/sbin\"]
+            }
 
         "
 
       # FIXME if they try to set this and fail, then we should probably
       # fail the entire exec, right?
       validate do |files|
         files = [files] unless files.is_a? Array
 
         files.each do |file|
           self.fail("'creates' must be set to a fully qualified path") unless file
 
           unless file =~ %r{^#{File::SEPARATOR}}
             self.fail "'creates' files must be fully qualified."
           end
         end
       end
 
       # If the file exists, return false (i.e., don't run the command),
       # else return true
       def check(value)
         ! FileTest.exists?(value)
       end
     end
 
     newcheck(:unless) do
-      desc "If this parameter is set, then this ``exec`` will run unless
-        the command returns 0.  For example::
+      desc "If this parameter is set, then this `exec` will run unless
+        the command returns 0.  For example:
 
-          exec { \"/bin/echo root >> /usr/lib/cron/cron.allow\":
-            path => \"/usr/bin:/usr/sbin:/bin\",
-            unless => \"grep root /usr/lib/cron/cron.allow 2>/dev/null\"
-          }
+            exec { \"/bin/echo root >> /usr/lib/cron/cron.allow\":
+              path => \"/usr/bin:/usr/sbin:/bin\",
+              unless => \"grep root /usr/lib/cron/cron.allow 2>/dev/null\"
+            }
 
-        This would add ``root`` to the cron.allow file (on Solaris) unless
-        ``grep`` determines it's already there.
+        This would add `root` to the cron.allow file (on Solaris) unless
+        `grep` determines it's already there.
 
         Note that this command follows the same rules as the main command,
         which is to say that it must be fully qualified if the path is not set.
         "
 
       validate do |cmds|
         cmds = [cmds] unless cmds.is_a? Array
 
         cmds.each do |cmd|
           @resource.validatecmd(cmd)
         end
       end
 
       # Return true if the command does not return 0.
       def check(value)
         begin
           output, status = @resource.run(value, true)
         rescue Timeout::Error
           err "Check #{value.inspect} exceeded timeout"
           return false
         end
 
         status.exitstatus != 0
       end
     end
 
     newcheck(:onlyif) do
-      desc "If this parameter is set, then this ``exec`` will only run if
-        the command returns 0.  For example::
+      desc "If this parameter is set, then this `exec` will only run if
+        the command returns 0.  For example:
 
-          exec { \"logrotate\":
-            path => \"/usr/bin:/usr/sbin:/bin\",
-            onlyif => \"test `du /var/log/messages | cut -f1` -gt 100000\"
-          }
+            exec { \"logrotate\":
+              path => \"/usr/bin:/usr/sbin:/bin\",
+              onlyif => \"test `du /var/log/messages | cut -f1` -gt 100000\"
+            }
 
-        This would run ``logrotate`` only if that test returned true.
+        This would run `logrotate` only if that test returned true.
 
         Note that this command follows the same rules as the main command,
         which is to say that it must be fully qualified if the path is not set.
 
-        Also note that onlyif can take an array as its value, eg::
+        Also note that onlyif can take an array as its value, e.g.:
 
-          onlyif => [\"test -f /tmp/file1\", \"test -f /tmp/file2\"]
+            onlyif => [\"test -f /tmp/file1\", \"test -f /tmp/file2\"]
 
         This will only run the exec if /all/ conditions in the array return true.
         "
 
       validate do |cmds|
         cmds = [cmds] unless cmds.is_a? Array
 
         cmds.each do |cmd|
           @resource.validatecmd(cmd)
         end
       end
 
       # Return true if the command returns 0.
       def check(value)
         begin
           output, status = @resource.run(value, true)
         rescue Timeout::Error
           err "Check #{value.inspect} exceeded timeout"
           return false
         end
 
         status.exitstatus == 0
       end
     end
 
     # Exec names are not isomorphic with the objects.
     @isomorphic = false
 
     validate do
       validatecmd(self[:command])
     end
 
     # FIXME exec should autorequire any exec that 'creates' our cwd
     autorequire(:file) do
       reqs = []
 
       # Stick the cwd in there if we have it
       reqs << self[:cwd] if self[:cwd]
 
       self[:command].scan(/^(#{File::SEPARATOR}\S+)/) { |str|
         reqs << str
       }
 
       self[:command].scan(/^"([^"]+)"/) { |str|
         reqs << str
       }
 
       [:onlyif, :unless].each { |param|
         next unless tmp = self[param]
 
         tmp = [tmp] unless tmp.is_a? Array
 
         tmp.each do |line|
           # And search the command line for files, adding any we
           # find.  This will also catch the command itself if it's
           # fully qualified.  It might not be a bad idea to add
           # unqualified files, but, well, that's a bit more annoying
           # to do.
           reqs += line.scan(%r{(#{File::SEPARATOR}\S+)})
         end
       }
 
       # For some reason, the += isn't causing a flattening
       reqs.flatten!
 
       reqs
     end
 
     autorequire(:user) do
       # Autorequire users if they are specified by name
       if user = self[:user] and user !~ /^\d+$/
         user
       end
     end
 
     def self.instances
       []
     end
 
     # Verify that we pass all of the checks.  The argument determines whether
     # we skip the :refreshonly check, which is necessary because we now check
     # within refresh
     def check(refreshing = false)
       self.class.checks.each { |check|
         next if refreshing and check == :refreshonly
         if @parameters.include?(check)
           val = @parameters[check].value
           val = [val] unless val.is_a? Array
           val.each do |value|
             return false unless @parameters[check].check(value)
           end
         end
       }
 
       true
     end
 
     # Verify that we have the executable
     def checkexe(cmd)
       exe = extractexe(cmd)
 
       if self[:path]
         if Puppet.features.posix? and !File.exists?(exe)
           withenv :PATH => self[:path].join(File::PATH_SEPARATOR) do
             path = %x{which #{exe}}.chomp
             if path == ""
               raise ArgumentError,
                 "Could not find command '#{exe}'"
             else
               exe = path
             end
           end
         elsif Puppet.features.microsoft_windows? and !File.exists?(exe)
           self[:path].each do |path|
             [".exe", ".ps1", ".bat", ".com", ""].each do |extension|
               file = File.join(path, exe+extension)
               return if File.exists?(file)
             end
           end
         end
       end
 
       raise ArgumentError, "Could not find executable '#{exe}'" unless FileTest.exists?(exe)
       unless FileTest.executable?(exe)
         raise ArgumentError,
           "'#{exe}' is not executable"
       end
     end
 
     def output
       if self.property(:returns).nil?
         return nil
       else
         return self.property(:returns).output
       end
     end
 
     # Run the command, or optionally run a separately-specified command.
     def refresh
       if self.check(true)
         if cmd = self[:refresh]
           self.run(cmd)
         else
           self.property(:returns).sync
         end
       end
     end
 
     # Run a command.
     def run(command, check = false)
       output = nil
       status = nil
 
       dir = nil
 
       checkexe(command)
 
       if dir = self[:cwd]
         unless File.directory?(dir)
           if check
             dir = nil
           else
             self.fail "Working directory '#{dir}' does not exist"
           end
         end
       end
 
       dir ||= Dir.pwd
 
       if check
         debug "Executing check '#{command}'"
       else
         debug "Executing '#{command}'"
       end
       begin
         # Do our chdir
         Dir.chdir(dir) do
           environment = {}
 
           environment[:PATH] = self[:path].join(":") if self[:path]
 
           if envlist = self[:environment]
             envlist = [envlist] unless envlist.is_a? Array
             envlist.each do |setting|
               if setting =~ /^(\w+)=((.|\n)+)$/
                 name = $1
                 value = $2
                 if environment.include? name
                   warning(
                   "Overriding environment setting '#{name}' with '#{value}'"
                   )
                 end
                 environment[name] = value
               else
                 warning "Cannot understand environment setting #{setting.inspect}"
               end
             end
           end
 
           withenv environment do
             Timeout::timeout(self[:timeout]) do
               output, status = Puppet::Util::SUIDManager.run_and_capture(
                 [command], self[:user], self[:group]
               )
             end
             # The shell returns 127 if the command is missing.
             if status.exitstatus == 127
               raise ArgumentError, output
             end
           end
         end
       rescue Errno::ENOENT => detail
         self.fail detail.to_s
       end
 
       return output, status
     end
 
     def validatecmd(cmd)
       exe = extractexe(cmd)
       # if we're not fully qualified, require a path
       self.fail "'#{cmd}' is both unqualifed and specified no search path" if File.expand_path(exe) != exe and self[:path].nil?
     end
 
     def extractexe(cmd)
       # easy case: command was quoted
       if cmd =~ /^"([^"]+)"/
         $1
       else
         cmd.split(/ /)[0]
       end
     end
   end
 end
-
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 71f2756bc..f35a26408 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -1,798 +1,798 @@
 require 'digest/md5'
 require 'cgi'
 require 'etc'
 require 'uri'
 require 'fileutils'
 require 'puppet/network/handler'
 require 'puppet/util/diff'
 require 'puppet/util/checksums'
 require 'puppet/network/client'
 require 'puppet/util/backups'
 
 Puppet::Type.newtype(:file) do
   include Puppet::Util::MethodHelper
   include Puppet::Util::Checksums
   include Puppet::Util::Backups
   @doc = "Manages local files, including setting ownership and
     permissions, creation of both files and directories, and
     retrieving entire files from remote servers.  As Puppet matures, it
-    expected that the ``file`` resource will be used less and less to
+    expected that the `file` resource will be used less and less to
     manage content, and instead native resources will be used to do so.
 
     If you find that you are often copying files in from a central
     location, rather than using native resources, please contact
     Puppet Labs and we can hopefully work with you to develop a
     native resource to support what you are doing."
 
   def self.title_patterns
     [ [ /^(.*?)\/*\Z/m, [ [ :path, lambda{|x| x} ] ] ] ]
   end
 
   newparam(:path) do
     desc "The path to the file to manage.  Must be fully qualified."
     isnamevar
 
     validate do |value|
       # accept various path syntaxes: lone slash, posix, win32, unc
       unless (Puppet.features.posix? and (value =~ /^\/$/ or value =~ /^\/[^\/]/)) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/))
         fail Puppet::Error, "File paths must be fully qualified, not '#{value}'"
       end
     end
 
     # convert the current path in an index into the collection and the last
     # path name. The aim is to use less storage for all common paths in a hierarchy
     munge do |value|
       path, name = File.split(value.gsub(/\/+/,'/'))
       { :index => Puppet::FileCollection.collection.index(path), :name => name }
     end
 
     # and the reverse
     unmunge do |value|
       basedir = Puppet::FileCollection.collection.path(value[:index])
       # a lone slash as :name indicates a root dir on windows
       if value[:name] == '/'
         basedir
       else
         File.join( basedir, value[:name] )
       end
     end
   end
 
   newparam(:backup) do
     desc "Whether files should be backed up before
       being replaced.  The preferred method of backing files up is via
-      a ``filebucket``, which stores files by their MD5 sums and allows
+      a `filebucket`, which stores files by their MD5 sums and allows
       easy retrieval without littering directories with backups.  You
       can specify a local filebucket or a network-accessible
-      server-based filebucket by setting ``backup => bucket-name``.
-      Alternatively, if you specify any value that begins with a ``.``
-      (e.g., ``.puppet-bak``), then Puppet will use copy the file in
+      server-based filebucket by setting `backup => bucket-name`.
+      Alternatively, if you specify any value that begins with a `.`
+      (e.g., `.puppet-bak`), then Puppet will use copy the file in
       the same directory with that value as the extension of the
-      backup. Setting ``backup => false`` disables all backups of the
+      backup. Setting `backup => false` disables all backups of the
       file in question.
 
-      Puppet automatically creates a local filebucket named ``puppet`` and
+      Puppet automatically creates a local filebucket named `puppet` and
       defaults to backing up there.  To use a server-based filebucket,
-      you must specify one in your configuration::
+      you must specify one in your configuration
 
-        filebucket { main:
-          server => puppet
-        }
+            filebucket { main:
+              server => puppet
+            }
 
-      The ``puppet master`` daemon creates a filebucket by default,
+      The `puppet master` daemon creates a filebucket by default,
       so you can usually back up to your main server with this
       configuration.  Once you've described the bucket in your
-      configuration, you can use it in any file::
+      configuration, you can use it in any file
 
-        file { \"/my/file\":
-          source => \"/path/in/nfs/or/something\",
-          backup => main
-        }
+            file { \"/my/file\":
+              source => \"/path/in/nfs/or/something\",
+              backup => main
+            }
 
       This will back the file up to the central server.
 
       At this point, the benefits of using a filebucket are that you do not
       have backup files lying around on each of your machines, a given
       version of a file is only backed up once, and you can restore
       any given file manually, no matter how old.  Eventually,
       transactional support will be able to automatically restore
       filebucketed files.
       "
 
     defaultto "puppet"
 
     munge do |value|
       # I don't really know how this is happening.
       value = value.shift if value.is_a?(Array)
 
       case value
       when false, "false", :false
         false
       when true, "true", ".puppet-bak", :true
         ".puppet-bak"
       when String
         value
       else
         self.fail "Invalid backup type #{value.inspect}"
       end
     end
   end
 
   newparam(:recurse) do
     desc "Whether and how deeply to do recursive
       management."
 
     newvalues(:true, :false, :inf, :remote, /^[0-9]+$/)
 
     # Replace the validation so that we allow numbers in
     # addition to string representations of them.
     validate { |arg| }
     munge do |value|
       newval = super(value)
       case newval
       when :true, :inf; true
       when :false; false
       when :remote; :remote
       when Integer, Fixnum, Bignum
         self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
 
         # recurse == 0 means no recursion
         return false if value == 0
 
         resource[:recurselimit] = value
         true
       when /^\d+$/
         self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
         value = Integer(value)
 
         # recurse == 0 means no recursion
         return false if value == 0
 
         resource[:recurselimit] = value
         true
       else
         self.fail "Invalid recurse value #{value.inspect}"
       end
     end
   end
 
   newparam(:recurselimit) do
     desc "How deeply to do recursive management."
 
     newvalues(/^[0-9]+$/)
 
     munge do |value|
       newval = super(value)
       case newval
       when Integer, Fixnum, Bignum; value
       when /^\d+$/; Integer(value)
       else
         self.fail "Invalid recurselimit value #{value.inspect}"
       end
     end
   end
 
   newparam(:replace, :boolean => true) do
     desc "Whether or not to replace a file that is
       sourced but exists.  This is useful for using file sources
       purely for initialization."
     newvalues(:true, :false)
     aliasvalue(:yes, :true)
     aliasvalue(:no, :false)
     defaultto :true
   end
 
   newparam(:force, :boolean => true) do
     desc "Force the file operation.  Currently only used when replacing
       directories with links."
     newvalues(:true, :false)
     defaultto false
   end
 
   newparam(:ignore) do
     desc "A parameter which omits action on files matching
       specified patterns during recursion.  Uses Ruby's builtin globbing
-      engine, so shell metacharacters are fully supported, e.g. ``[a-z]*``.
+      engine, so shell metacharacters are fully supported, e.g. `[a-z]*`.
       Matches that would descend into the directory structure are ignored,
-      e.g., ``*/*``."
+      e.g., `*/*`."
 
     validate do |value|
       unless value.is_a?(Array) or value.is_a?(String) or value == false
         self.devfail "Ignore must be a string or an Array"
       end
     end
   end
 
   newparam(:links) do
     desc "How to handle links during file actions.  During file copying,
-      ``follow`` will copy the target file instead of the link, ``manage``
-      will copy the link itself, and ``ignore`` will just pass it by.
-      When not copying, ``manage`` and ``ignore`` behave equivalently
-      (because you cannot really ignore links entirely during local recursion), and ``follow`` will manage the file to which the
+      `follow` will copy the target file instead of the link, `manage`
+      will copy the link itself, and `ignore` will just pass it by.
+      When not copying, `manage` and `ignore` behave equivalently
+      (because you cannot really ignore links entirely during local recursion), and `follow` will manage the file to which the
       link points."
 
     newvalues(:follow, :manage)
 
     defaultto :manage
   end
 
   newparam(:purge, :boolean => true) do
     desc "Whether unmanaged files should be purged.  If you have a filebucket
       configured the purged files will be uploaded, but if you do not,
       this will destroy data.  Only use this option for generated
       files unless you really know what you are doing.  This option only
       makes sense when recursively managing directories.
 
-      Note that when using ``purge`` with ``source``, Puppet will purge any files
+      Note that when using `purge` with `source`, Puppet will purge any files
       that are not on the remote system."
 
     defaultto :false
 
     newvalues(:true, :false)
   end
 
   newparam(:sourceselect) do
     desc "Whether to copy all valid sources, or just the first one.  This parameter
       is only used in recursive copies; by default, the first valid source is the
-      only one used as a recursive source, but if this parameter is set to ``all``,
+      only one used as a recursive source, but if this parameter is set to `all`,
       then all valid sources will have all of their contents copied to the local host,
       and for sources that have the same file, the source earlier in the list will
       be used."
 
     defaultto :first
 
     newvalues(:first, :all)
   end
 
   # Autorequire any parent directories.
   autorequire(:file) do
     basedir = File.dirname(self[:path])
     if basedir != self[:path]
       basedir
     else
       nil
     end
   end
 
   # Autorequire the owner and group of the file.
   {:user => :owner, :group => :group}.each do |type, property|
     autorequire(type) do
       if @parameters.include?(property)
         # The user/group property automatically converts to IDs
         next unless should = @parameters[property].shouldorig
         val = should[0]
         if val.is_a?(Integer) or val =~ /^\d+$/
           nil
         else
           val
         end
       end
     end
   end
 
   CREATORS = [:content, :source, :target]
 
   validate do
     count = 0
     CREATORS.each do |param|
       count += 1 if self.should(param)
     end
     count += 1 if @parameters.include?(:source)
     self.fail "You cannot specify more than one of #{CREATORS.collect { |p| p.to_s}.join(", ")}" if count > 1
 
     self.fail "You cannot specify a remote recursion without a source" if !self[:source] and self[:recurse] == :remote
 
     self.warning "Possible error: recurselimit is set but not recurse, no recursion will happen" if !self[:recurse] and self[:recurselimit]
   end
 
   def self.[](path)
     return nil unless path
     super(path.gsub(/\/+/, '/').sub(/\/$/, ''))
   end
 
   # List files, but only one level deep.
   def self.instances(base = "/")
     return [] unless FileTest.directory?(base)
 
     files = []
     Dir.entries(base).reject { |e|
       e == "." or e == ".."
     }.each do |name|
       path = File.join(base, name)
       if obj = self[path]
         obj[:audit] = :all
         files << obj
       else
         files << self.new(
           :name => path, :audit => :all
         )
       end
     end
     files
   end
 
   @depthfirst = false
 
   # Determine the user to write files as.
   def asuser
     if self.should(:owner) and ! self.should(:owner).is_a?(Symbol)
       writeable = Puppet::Util::SUIDManager.asuser(self.should(:owner)) {
         FileTest.writable?(File.dirname(self[:path]))
       }
 
       # If the parent directory is writeable, then we execute
       # as the user in question.  Otherwise we'll rely on
       # the 'owner' property to do things.
       asuser = self.should(:owner) if writeable
     end
 
     asuser
   end
 
   def bucket
     return @bucket if @bucket
 
     backup = self[:backup]
     return nil unless backup
     return nil if backup =~ /^\./
 
     unless catalog or backup == "puppet"
       fail "Can not find filebucket for backups without a catalog"
     end
 
     unless catalog and filebucket = catalog.resource(:filebucket, backup) or backup == "puppet"
       fail "Could not find filebucket #{backup} specified in backup"
     end
 
     return default_bucket unless filebucket
 
     @bucket = filebucket.bucket
 
     @bucket
   end
 
   def default_bucket
     Puppet::Type.type(:filebucket).mkdefaultbucket.bucket
   end
 
   # Does the file currently exist?  Just checks for whether
   # we have a stat
   def exist?
     stat ? true : false
   end
 
   # We have to do some extra finishing, to retrieve our bucket if
   # there is one.
   def finish
     # Look up our bucket, if there is one
     bucket
     super
   end
 
   # Create any children via recursion or whatever.
   def eval_generate
     return [] unless self.recurse?
 
     recurse
     #recurse.reject do |resource|
     #    catalog.resource(:file, resource[:path])
     #end.each do |child|
     #    catalog.add_resource child
     #    catalog.relationship_graph.add_edge self, child
     #end
   end
 
   def flush
     # We want to make sure we retrieve metadata anew on each transaction.
     @parameters.each do |name, param|
       param.flush if param.respond_to?(:flush)
     end
     @stat = nil
   end
 
   def initialize(hash)
     # Used for caching clients
     @clients = {}
 
     super
 
     # If they've specified a source, we get our 'should' values
     # from it.
     unless self[:ensure]
       if self[:target]
         self[:ensure] = :symlink
       elsif self[:content]
         self[:ensure] = :file
       end
     end
 
     @stat = nil
   end
 
   # Configure discovered resources to be purged.
   def mark_children_for_purging(children)
     children.each do |name, child|
       next if child[:source]
       child[:ensure] = :absent
     end
   end
 
   # Create a new file or directory object as a child to the current
   # object.
   def newchild(path)
     full_path = File.join(self[:path], path)
 
     # Add some new values to our original arguments -- these are the ones
     # set at initialization.  We specifically want to exclude any param
     # values set by the :source property or any default values.
     # LAK:NOTE This is kind of silly, because the whole point here is that
     # the values set at initialization should live as long as the resource
     # but values set by default or by :source should only live for the transaction
     # or so.  Unfortunately, we don't have a straightforward way to manage
     # the different lifetimes of this data, so we kludge it like this.
     # The right-side hash wins in the merge.
     options = @original_parameters.merge(:path => full_path).reject { |param, value| value.nil? }
 
     # These should never be passed to our children.
     [:parent, :ensure, :recurse, :recurselimit, :target, :alias, :source].each do |param|
       options.delete(param) if options.include?(param)
     end
 
     self.class.new(options)
   end
 
   # Files handle paths specially, because they just lengthen their
   # path names, rather than including the full parent's title each
   # time.
   def pathbuilder
     # We specifically need to call the method here, so it looks
     # up our parent in the catalog graph.
     if parent = parent()
       # We only need to behave specially when our parent is also
       # a file
       if parent.is_a?(self.class)
         # Remove the parent file name
         list = parent.pathbuilder
         list.pop # remove the parent's path info
         return list << self.ref
       else
         return super
       end
     else
       return [self.ref]
     end
   end
 
   # Should we be purging?
   def purge?
     @parameters.include?(:purge) and (self[:purge] == :true or self[:purge] == "true")
   end
 
   # Recursively generate a list of file resources, which will
   # be used to copy remote files, manage local files, and/or make links
   # to map to another directory.
   def recurse
     children = {}
     children = recurse_local if self[:recurse] != :remote
 
     if self[:target]
       recurse_link(children)
     elsif self[:source]
       recurse_remote(children)
     end
 
     # If we're purging resources, then delete any resource that isn't on the
     # remote system.
     mark_children_for_purging(children) if self.purge?
 
     result = children.values.sort { |a, b| a[:path] <=> b[:path] }
     remove_less_specific_files(result)
   end
 
   # This is to fix bug #2296, where two files recurse over the same
   # set of files.  It's a rare case, and when it does happen you're
   # not likely to have many actual conflicts, which is good, because
   # this is a pretty inefficient implementation.
   def remove_less_specific_files(files)
     mypath = self[:path].split(File::Separator)
     other_paths = catalog.vertices.
       select  { |r| r.is_a?(self.class) and r[:path] != self[:path] }.
       collect { |r| r[:path].split(File::Separator) }.
       select  { |p| p[0,mypath.length]  == mypath }
 
     return files if other_paths.empty?
 
     files.reject { |file|
       path = file[:path].split(File::Separator)
       other_paths.any? { |p| path[0,p.length] == p }
       }
   end
 
   # A simple method for determining whether we should be recursing.
   def recurse?
     return false unless @parameters.include?(:recurse)
 
     val = @parameters[:recurse].value
 
     !!(val and (val == true or val == :remote))
   end
 
   # Recurse the target of the link.
   def recurse_link(children)
     perform_recursion(self[:target]).each do |meta|
       if meta.relative_path == "."
         self[:ensure] = :directory
         next
       end
 
       children[meta.relative_path] ||= newchild(meta.relative_path)
       if meta.ftype == "directory"
         children[meta.relative_path][:ensure] = :directory
       else
         children[meta.relative_path][:ensure] = :link
         children[meta.relative_path][:target] = meta.full_path
       end
     end
     children
   end
 
   # Recurse the file itself, returning a Metadata instance for every found file.
   def recurse_local
     result = perform_recursion(self[:path])
     return {} unless result
     result.inject({}) do |hash, meta|
       next hash if meta.relative_path == "."
 
       hash[meta.relative_path] = newchild(meta.relative_path)
       hash
     end
   end
 
   # Recurse against our remote file.
   def recurse_remote(children)
     sourceselect = self[:sourceselect]
 
     total = self[:source].collect do |source|
       next unless result = perform_recursion(source)
       return if top = result.find { |r| r.relative_path == "." } and top.ftype != "directory"
       result.each { |data| data.source = "#{source}/#{data.relative_path}" }
       break result if result and ! result.empty? and sourceselect == :first
       result
     end.flatten
 
     # This only happens if we have sourceselect == :all
     unless sourceselect == :first
       found = []
       total.reject! do |data|
         result = found.include?(data.relative_path)
         found << data.relative_path unless found.include?(data.relative_path)
         result
       end
     end
 
     total.each do |meta|
       if meta.relative_path == "."
         parameter(:source).metadata = meta
         next
       end
       children[meta.relative_path] ||= newchild(meta.relative_path)
       children[meta.relative_path][:source] = meta.source
       children[meta.relative_path][:checksum] = :md5 if meta.ftype == "file"
 
       children[meta.relative_path].parameter(:source).metadata = meta
     end
 
     children
   end
 
   def perform_recursion(path)
 
     Puppet::FileServing::Metadata.search(
 
       path,
       :links => self[:links],
       :recurse => (self[:recurse] == :remote ? true : self[:recurse]),
 
       :recurselimit => self[:recurselimit],
       :ignore => self[:ignore],
       :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none
     )
   end
 
   # Remove any existing data.  This is only used when dealing with
   # links or directories.
   def remove_existing(should)
     return unless s = stat
 
     self.fail "Could not back up; will not replace" unless perform_backup
 
     unless should.to_s == "link"
       return if s.ftype.to_s == should.to_s
     end
 
     case s.ftype
     when "directory"
       if self[:force] == :true
         debug "Removing existing directory for replacement with #{should}"
         FileUtils.rmtree(self[:path])
       else
         notice "Not removing directory; use 'force' to override"
       end
     when "link", "file"
       debug "Removing existing #{s.ftype} for replacement with #{should}"
       File.unlink(self[:path])
     else
       self.fail "Could not back up files of type #{s.ftype}"
     end
     expire
   end
 
   def retrieve
     if source = parameter(:source)
       source.copy_source_values
     end
     super
   end
 
   # Set the checksum, from another property.  There are multiple
   # properties that modify the contents of a file, and they need the
   # ability to make sure that the checksum value is in sync.
   def setchecksum(sum = nil)
     if @parameters.include? :checksum
       if sum
         @parameters[:checksum].checksum = sum
       else
         # If they didn't pass in a sum, then tell checksum to
         # figure it out.
         currentvalue = @parameters[:checksum].retrieve
         @parameters[:checksum].checksum = currentvalue
       end
     end
   end
 
   # Should this thing be a normal file?  This is a relatively complex
   # way of determining whether we're trying to create a normal file,
   # and it's here so that the logic isn't visible in the content property.
   def should_be_file?
     return true if self[:ensure] == :file
 
     # I.e., it's set to something like "directory"
     return false if e = self[:ensure] and e != :present
 
     # The user doesn't really care, apparently
     if self[:ensure] == :present
       return true unless s = stat
       return(s.ftype == "file" ? true : false)
     end
 
     # If we've gotten here, then :ensure isn't set
     return true if self[:content]
     return true if stat and stat.ftype == "file"
     false
   end
 
   # Stat our file.  Depending on the value of the 'links' attribute, we
   # use either 'stat' or 'lstat', and we expect the properties to use the
   # resulting stat object accordingly (mostly by testing the 'ftype'
   # value).
   cached_attr(:stat) do
     method = :stat
 
     # Files are the only types that support links
     if (self.class.name == :file and self[:links] != :follow) or self.class.name == :tidy
       method = :lstat
     end
     path = self[:path]
 
     begin
       File.send(method, self[:path])
     rescue Errno::ENOENT => error
       return nil
     rescue Errno::EACCES => error
       warning "Could not stat; permission denied"
       return nil
     end
   end
 
   # We have to hack this just a little bit, because otherwise we'll get
   # an error when the target and the contents are created as properties on
   # the far side.
   def to_trans(retrieve = true)
     obj = super
     obj.delete(:target) if obj[:target] == :notlink
     obj
   end
 
   # Write out the file.  Requires the property name for logging.
   # Write will be done by the content property, along with checksum computation
   def write(property)
     remove_existing(:file)
 
     use_temporary_file = write_temporary_file?
     if use_temporary_file
       path = "#{self[:path]}.puppettmp_#{rand(10000)}"
       path = "#{self[:path]}.puppettmp_#{rand(10000)}" while File.exists?(path) or File.symlink?(path)
     else
       path = self[:path]
     end
 
     mode = self.should(:mode) # might be nil
     umask = mode ? 000 : 022
 
     content_checksum = Puppet::Util.withumask(umask) { File.open(path, 'w', mode) { |f| write_content(f) } }
 
     # And put our new file in place
     if use_temporary_file # This is only not true when our file is empty.
       begin
         fail_if_checksum_is_wrong(path, content_checksum) if validate_checksum?
         File.rename(path, self[:path])
       rescue => detail
         fail "Could not rename temporary file #{path} to #{self[:path]}: #{detail}"
       ensure
         # Make sure the created file gets removed
         File.unlink(path) if FileTest.exists?(path)
       end
     end
 
     # make sure all of the modes are actually correct
     property_fix
 
   end
 
   private
 
   # Should we validate the checksum of the file we're writing?
   def validate_checksum?
     self[:checksum] !~ /time/
   end
 
   # Make sure the file we wrote out is what we think it is.
   def fail_if_checksum_is_wrong(path, content_checksum)
     newsum = parameter(:checksum).sum_file(path)
     return if [:absent, nil, content_checksum].include?(newsum)
 
     self.fail "File written to disk did not match checksum; discarding changes (#{content_checksum} vs #{newsum})"
   end
 
   # write the current content. Note that if there is no content property
   # simply opening the file with 'w' as done in write is enough to truncate
   # or write an empty length file.
   def write_content(file)
     (content = property(:content)) && content.write(file)
   end
 
   private
 
   def write_temporary_file?
     # unfortunately we don't know the source file size before fetching it
     # so let's assume the file won't be empty
     (c = property(:content) and c.length) || (s = @parameters[:source] and 1)
   end
 
   # There are some cases where all of the work does not get done on
   # file creation/modification, so we have to do some extra checking.
   def property_fix
     properties.each do |thing|
       next unless [:mode, :owner, :group, :seluser, :selrole, :seltype, :selrange].include?(thing.name)
 
       # Make sure we get a new stat objct
       expire
       currentvalue = thing.retrieve
       thing.sync unless thing.insync?(currentvalue)
     end
   end
 end
 
 # We put all of the properties in separate files, because there are so many
 # of them.  The order these are loaded is important, because it determines
 # the order they are in the property lit.
 require 'puppet/type/file/checksum'
 require 'puppet/type/file/content'     # can create the file
 require 'puppet/type/file/source'      # can create the file
 require 'puppet/type/file/target'      # creates a different type of file
 require 'puppet/type/file/ensure'      # can create the file
 require 'puppet/type/file/owner'
 require 'puppet/type/file/group'
 require 'puppet/type/file/mode'
 require 'puppet/type/file/type'
 require 'puppet/type/file/selcontext'  # SELinux file context
diff --git a/lib/puppet/type/file/ensure.rb b/lib/puppet/type/file/ensure.rb
index c74a1d47a..967e06aee 100755
--- a/lib/puppet/type/file/ensure.rb
+++ b/lib/puppet/type/file/ensure.rb
@@ -1,170 +1,170 @@
 module Puppet
   Puppet::Type.type(:file).ensurable do
     require 'etc'
     desc "Whether to create files that don't currently exist.
       Possible values are *absent*, *present*, *file*, and *directory*.
-      Specifying ``present`` will match any form of file existence, and
+      Specifying `present` will match any form of file existence, and
       if the file is missing will create an empty file. Specifying
-      ``absent`` will delete the file (and directory if recurse => true).
+      `absent` will delete the file (and directory if recurse => true).
 
       Anything other than those values will be considered to be a symlink.
-      For instance, the following text creates a link::
+      For instance, the following text creates a link:
 
-        # Useful on solaris
-        file { \"/etc/inetd.conf\":
-          ensure => \"/etc/inet/inetd.conf\"
-        }
+          # Useful on solaris
+          file { \"/etc/inetd.conf\":
+            ensure => \"/etc/inet/inetd.conf\"
+          }
 
-      You can make relative links::
+      You can make relative links:
 
-        # Useful on solaris
-        file { \"/etc/inetd.conf\":
-          ensure => \"inet/inetd.conf\"
-        }
+          # Useful on solaris
+          file { \"/etc/inetd.conf\":
+            ensure => \"inet/inetd.conf\"
+          }
 
       If you need to make a relative link to a file named the same
-      as one of the valid values, you must prefix it with ``./`` or
+      as one of the valid values, you must prefix it with `./` or
       something similar.
 
       You can also make recursive symlinks, which will create a
       directory structure that maps to the target directory,
       with directories corresponding to each directory
       and links corresponding to each file."
 
     # Most 'ensure' properties have a default, but with files we, um, don't.
     nodefault
 
     newvalue(:absent) do
       File.unlink(@resource[:path])
     end
 
     aliasvalue(:false, :absent)
 
     newvalue(:file, :event => :file_created) do
       # Make sure we're not managing the content some other way
       if property = @resource.property(:content)
         property.sync
       else
         @resource.write(:ensure)
         mode = @resource.should(:mode)
       end
     end
 
     #aliasvalue(:present, :file)
     newvalue(:present, :event => :file_created) do
       # Make a file if they want something, but this will match almost
       # anything.
       set_file
     end
 
     newvalue(:directory, :event => :directory_created) do
       mode = @resource.should(:mode)
       parent = File.dirname(@resource[:path])
       unless FileTest.exists? parent
         raise Puppet::Error,
           "Cannot create #{@resource[:path]}; parent directory #{parent} does not exist"
       end
       if mode
         Puppet::Util.withumask(000) do
           Dir.mkdir(@resource[:path],mode)
         end
       else
         Dir.mkdir(@resource[:path])
       end
       @resource.send(:property_fix)
       return :directory_created
     end
 
 
     newvalue(:link, :event => :link_created) do
       fail "Cannot create a symlink without a target" unless property = resource.property(:target)
       property.retrieve
       property.mklink
     end
 
     # Symlinks.
     newvalue(/./) do
       # This code never gets executed.  We need the regex to support
       # specifying it, but the work is done in the 'symlink' code block.
     end
 
     munge do |value|
       value = super(value)
       value,resource[:target] = :link,value unless value.is_a? Symbol
       resource[:links] = :manage if value == :link and resource[:links] != :follow
       value
     end
 
     def change_to_s(currentvalue, newvalue)
       return super unless newvalue.to_s == "file"
 
       return super unless property = @resource.property(:content)
 
       # We know that content is out of sync if we're here, because
       # it's essentially equivalent to 'ensure' in the transaction.
       if source = @resource.parameter(:source)
         should = source.checksum
       else
         should = property.should
       end
       if should == :absent
         is = property.retrieve
       else
         is = :absent
       end
 
       property.change_to_s(is, should)
     end
 
     # Check that we can actually create anything
     def check
       basedir = File.dirname(@resource[:path])
 
       if ! FileTest.exists?(basedir)
         raise Puppet::Error,
           "Can not create #{@resource.title}; parent directory does not exist"
       elsif ! FileTest.directory?(basedir)
         raise Puppet::Error,
           "Can not create #{@resource.title}; #{dirname} is not a directory"
       end
     end
 
     # We have to treat :present specially, because it works with any
     # type of file.
     def insync?(currentvalue)
       unless currentvalue == :absent or resource.replace?
         return true
       end
 
       if self.should == :present
         return !(currentvalue.nil? or currentvalue == :absent)
       else
         return super(currentvalue)
       end
     end
 
     def retrieve
       if stat = @resource.stat(false)
         return stat.ftype.intern
       else
         if self.should == :false
           return :false
         else
           return :absent
         end
       end
     end
 
     def sync
       @resource.remove_existing(self.should)
       if self.should == :absent
         return :file_removed
       end
 
       event = super
 
       event
     end
   end
 end
 
diff --git a/lib/puppet/type/file/mode.rb b/lib/puppet/type/file/mode.rb
index 9abf56d26..1ce56c843 100755
--- a/lib/puppet/type/file/mode.rb
+++ b/lib/puppet/type/file/mode.rb
@@ -1,124 +1,124 @@
 # Manage file modes.  This state should support different formats
 # for specification (e.g., u+rwx, or -0011), but for now only supports
 # specifying the full mode.
 module Puppet
   Puppet::Type.type(:file).newproperty(:mode) do
     require 'etc'
     desc "Mode the file should be.  Currently relatively limited:
       you must specify the exact mode the file should be.
 
       Note that when you set the mode of a directory, Puppet always
       sets the search/traverse (1) bit anywhere the read (4) bit is set.
       This is almost always what you want: read allows you to list the
       entries in a directory, and search/traverse allows you to access
       (read/write/execute) those entries.)  Because of this feature, you
       can recursively make a directory and all of the files in it
-      world-readable by setting e.g.::
+      world-readable by setting e.g.:
 
-        file { '/some/dir':
-          mode => 644,
-          recurse => true,
-        }
+          file { '/some/dir':
+            mode => 644,
+            recurse => true,
+          }
 
-      In this case all of the files underneath ``/some/dir`` will have
+      In this case all of the files underneath `/some/dir` will have
       mode 644, and all of the directories will have mode 755."
 
     @event = :file_changed
 
     # Our modes are octal, so make sure they print correctly.  Other
     # valid values are symbols, basically
     def is_to_s(currentvalue)
       case currentvalue
       when Integer
         return "%o" % currentvalue
       when Symbol
         return currentvalue
       else
         raise Puppet::DevError, "Invalid current value for mode: #{currentvalue.inspect}"
       end
     end
 
     def should_to_s(newvalue = @should)
       case newvalue
       when Integer
         return "%o" % newvalue
       when Symbol
         return newvalue
       else
         raise Puppet::DevError, "Invalid 'should' value for mode: #{newvalue.inspect}"
       end
     end
 
     munge do |should|
       # this is pretty hackish, but i need to make sure the number is in
       # octal, yet the number can only be specified as a string right now
       value = should
       if value.is_a?(String)
         unless value =~ /^\d+$/
           raise Puppet::Error, "File modes can only be numbers, not #{value.inspect}"
         end
         # Make sure our number looks like octal.
         unless value =~ /^0/
           value = "0#{value}"
         end
         old = value
         begin
           value = Integer(value)
         rescue ArgumentError => detail
           raise Puppet::DevError, "Could not convert #{old.inspect} to integer"
         end
       end
 
       return value
     end
 
     # If we're a directory, we need to be executable for all cases
     # that are readable.  This should probably be selectable, but eh.
     def dirmask(value)
       if FileTest.directory?(@resource[:path])
         value |= 0100 if value & 0400 != 0
         value |= 010 if value & 040 != 0
         value |= 01 if value & 04 != 0
       end
 
       value
     end
 
     def insync?(currentvalue)
       if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow
         self.debug "Not managing symlink mode"
         return true
       else
         return super(currentvalue)
       end
     end
 
     def retrieve
       # If we're not following links and we're a link, then we just turn
       # off mode management entirely.
 
       if stat = @resource.stat(false)
         unless defined?(@fixed)
           @should &&= @should.collect { |s| self.dirmask(s) }
         end
         return stat.mode & 007777
       else
         return :absent
       end
     end
 
     def sync
       mode = self.should
 
       begin
         File.chmod(mode, @resource[:path])
       rescue => detail
         error = Puppet::Error.new("failed to chmod #{@resource[:path]}: #{detail.message}")
         error.set_backtrace detail.backtrace
         raise error
       end
       :file_changed
     end
   end
 end
 
diff --git a/lib/puppet/type/file/selcontext.rb b/lib/puppet/type/file/selcontext.rb
index edcfb83b2..a33c6a000 100644
--- a/lib/puppet/type/file/selcontext.rb
+++ b/lib/puppet/type/file/selcontext.rb
@@ -1,103 +1,103 @@
 # Manage SELinux context of files.
 #
 # This code actually manages three pieces of data in the context.
 #
 # [root@delenn files]# ls -dZ /
 # drwxr-xr-x  root root system_u:object_r:root_t         /
 #
 # The context of '/' here is 'system_u:object_r:root_t'.  This is
 # three seperate fields:
 #
 # system_u is the user context
 # object_r is the role context
 # root_t is the type context
 #
 # All three of these fields are returned in a single string by the
 # output of the stat command, but set individually with the chcon
 # command.  This allows the user to specify a subset of the three
 # values while leaving the others alone.
 #
 # See http://www.nsa.gov/selinux/ for complete docs on SELinux.
 
 module Puppet
   require 'puppet/util/selinux'
 
   class SELFileContext < Puppet::Property
     include Puppet::Util::SELinux
 
     def retrieve
       return :absent unless @resource.stat(false)
       context = self.get_selinux_current_context(@resource[:path])
       parse_selinux_context(name, context)
     end
 
     def retrieve_default_context(property)
       unless context = self.get_selinux_default_context(@resource[:path])
         return nil
       end
       property_default = self.parse_selinux_context(property, context)
       self.debug "Found #{property} default '#{property_default}' for #{@resource[:path]}" if not property_default.nil?
       property_default
     end
 
     def insync?(value)
       if not selinux_support?
         debug("SELinux bindings not found. Ignoring parameter.")
         return true
       end
       super
     end
 
     def sync
       self.set_selinux_context(@resource[:path], @should, name)
       :file_changed
     end
   end
 
   Puppet::Type.type(:file).newproperty(:seluser, :parent => Puppet::SELFileContext) do
     desc "What the SELinux user component of the context of the file should be.
-      Any valid SELinux user component is accepted.  For example ``user_u``.
+      Any valid SELinux user component is accepted.  For example `user_u`.
       If not specified it defaults to the value returned by matchpathcon for
       the file, if any exists.  Only valid on systems with SELinux support
       enabled."
 
     @event = :file_changed
     defaultto { self.retrieve_default_context(:seluser) }
   end
 
   Puppet::Type.type(:file).newproperty(:selrole, :parent => Puppet::SELFileContext) do
     desc "What the SELinux role component of the context of the file should be.
-      Any valid SELinux role component is accepted.  For example ``role_r``.
+      Any valid SELinux role component is accepted.  For example `role_r`.
       If not specified it defaults to the value returned by matchpathcon for
       the file, if any exists.  Only valid on systems with SELinux support
       enabled."
 
     @event = :file_changed
     defaultto { self.retrieve_default_context(:selrole) }
   end
 
   Puppet::Type.type(:file).newproperty(:seltype, :parent => Puppet::SELFileContext) do
     desc "What the SELinux type component of the context of the file should be.
-      Any valid SELinux type component is accepted.  For example ``tmp_t``.
+      Any valid SELinux type component is accepted.  For example `tmp_t`.
       If not specified it defaults to the value returned by matchpathcon for
       the file, if any exists.  Only valid on systems with SELinux support
       enabled."
 
     @event = :file_changed
     defaultto { self.retrieve_default_context(:seltype) }
   end
 
   Puppet::Type.type(:file).newproperty(:selrange, :parent => Puppet::SELFileContext) do
     desc "What the SELinux range component of the context of the file should be.
-      Any valid SELinux range component is accepted.  For example ``s0`` or
-      ``SystemHigh``.  If not specified it defaults to the value returned by
+      Any valid SELinux range component is accepted.  For example `s0` or
+      `SystemHigh`.  If not specified it defaults to the value returned by
       matchpathcon for the file, if any exists.  Only valid on systems with
       SELinux support enabled and that have support for MCS (Multi-Category
       Security)."
 
     @event = :file_changed
     defaultto { self.retrieve_default_context(:selrange) }
   end
 
 end
 
diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb
index 2eaf4a33f..0e7aac72d 100755
--- a/lib/puppet/type/file/source.rb
+++ b/lib/puppet/type/file/source.rb
@@ -1,187 +1,187 @@
 
 require 'puppet/file_serving/content'
 require 'puppet/file_serving/metadata'
 
 module Puppet
   # Copy files from a local or remote source.  This state *only* does any work
   # when the remote file is an actual file; in that case, this state copies
   # the file down.  If the remote file is a dir or a link or whatever, then
   # this state, during retrieval, modifies the appropriate other states
   # so that things get taken care of appropriately.
   Puppet::Type.type(:file).newparam(:source) do
     include Puppet::Util::Diff
 
     attr_accessor :source, :local
-    desc "Copy a file over the current file.  Uses ``checksum`` to
+    desc "Copy a file over the current file.  Uses `checksum` to
       determine when a file should be copied.  Valid values are either
       fully qualified paths to files, or URIs.  Currently supported URI
       types are *puppet* and *file*.
 
       This is one of the primary mechanisms for getting content into
       applications that Puppet does not directly support and is very
       useful for those configuration files that don't change much across
-      sytems.  For instance::
+      sytems.  For instance:
 
-        class sendmail {
-          file { \"/etc/mail/sendmail.cf\":
-            source => \"puppet://server/modules/module_name/sendmail.cf\"
+          class sendmail {
+            file { \"/etc/mail/sendmail.cf\":
+              source => \"puppet://server/modules/module_name/sendmail.cf\"
+            }
           }
-        }
 
-      You can also leave out the server name, in which case ``puppet agent``
-      will fill in the name of its configuration server and ``puppet apply``
+      You can also leave out the server name, in which case `puppet agent`
+      will fill in the name of its configuration server and `puppet apply`
       will use the local filesystem.  This makes it easy to use the same
       configuration in both local and centralized forms.
 
-      Currently, only the ``puppet`` scheme is supported for source
+      Currently, only the `puppet` scheme is supported for source
       URL's. Puppet will connect to the file server running on
-      ``server`` to retrieve the contents of the file. If the
-      ``server`` part is empty, the behavior of the command-line
-      interpreter (``puppet apply``) and the client demon (``puppet agent``) differs
-      slightly: ``apply`` will look such a file up on the module path
-      on the local host, whereas ``agent`` will connect to the
+      `server` to retrieve the contents of the file. If the
+      `server` part is empty, the behavior of the command-line
+      interpreter (`puppet apply`) and the client demon (`puppet agent`) differs
+      slightly: `apply` will look such a file up on the module path
+      on the local host, whereas `agent` will connect to the
       puppet server that it received the manifest from.
 
-      See the `FileServingConfiguration fileserver configuration documentation`:trac: for information on how to configure
+      See the [fileserver configuration documentation](http://projects.puppetlabs.com/projects/puppet/wiki/File_Serving_Configuration) for information on how to configure
       and use file services within Puppet.
 
       If you specify multiple file sources for a file, then the first
       source that exists will be used.  This allows you to specify
-      what amount to search paths for files::
-
-        file { \"/path/to/my/file\":
-          source => [
-            \"/modules/nfs/files/file.$host\",
-            \"/modules/nfs/files/file.$operatingsystem\",
-            \"/modules/nfs/files/file\"
-          ]
-        }
+      what amount to search paths for files:
+
+          file { \"/path/to/my/file\":
+            source => [
+              \"/modules/nfs/files/file.$host\",
+              \"/modules/nfs/files/file.$operatingsystem\",
+              \"/modules/nfs/files/file\"
+            ]
+          }
 
       This will use the first found file as the source.
 
-      You cannot currently copy links using this mechanism; set ``links``
-      to ``follow`` if any remote sources are links.
+      You cannot currently copy links using this mechanism; set `links`
+      to `follow` if any remote sources are links.
       "
 
     validate do |sources|
       sources = [sources] unless sources.is_a?(Array)
       sources.each do |source|
         begin
           uri = URI.parse(URI.escape(source))
         rescue => detail
           self.fail "Could not understand source #{source}: #{detail}"
         end
 
         self.fail "Cannot use URLs of type '#{uri.scheme}' as source for fileserving" unless uri.scheme.nil? or %w{file puppet}.include?(uri.scheme)
       end
     end
 
     munge do |sources|
       sources = [sources] unless sources.is_a?(Array)
       sources.collect { |source| source.sub(/\/$/, '') }
     end
 
     def change_to_s(currentvalue, newvalue)
       # newvalue = "{md5}#{@metadata.checksum}"
       if @resource.property(:ensure).retrieve == :absent
         return "creating from source #{metadata.source} with contents #{metadata.checksum}"
       else
         return "replacing from source #{metadata.source} with contents #{metadata.checksum}"
       end
     end
 
     def checksum
       metadata && metadata.checksum
     end
 
     # Copy the values from the source to the resource.  Yay.
     def copy_source_values
       devfail "Somehow got asked to copy source values without any metadata" unless metadata
 
       # Take each of the stats and set them as states on the local file
       # if a value has not already been provided.
       [:owner, :mode, :group, :checksum].each do |metadata_method|
         param_name = (metadata_method == :checksum) ? :content : metadata_method
         next if metadata_method == :owner and !Puppet.features.root?
         next if metadata_method == :checksum and metadata.ftype == "directory"
 
         if resource[param_name].nil? or resource[param_name] == :absent
           resource[param_name] = metadata.send(metadata_method)
         end
       end
 
       if resource[:ensure] == :absent
         # We know all we need to
       elsif metadata.ftype != "link"
         resource[:ensure] = metadata.ftype
       elsif @resource[:links] == :follow
         resource[:ensure] = :present
       else
         resource[:ensure] = "link"
         resource[:target] = metadata.destination
       end
     end
 
     def pinparams
       [:mode, :type, :owner, :group, :content]
     end
 
     def found?
       ! (metadata.nil? or metadata.ftype.nil?)
     end
 
     # Provide, and retrieve if necessary, the metadata for this file.  Fail
     # if we can't find data about this host, and fail if there are any
     # problems in our query.
     cached_attr(:metadata) do
       return nil unless value
       result = nil
       value.each do |source|
         begin
           if data = Puppet::FileServing::Metadata.find(source)
             result = data
             result.source = source
             break
           end
         rescue => detail
           fail detail, "Could not retrieve file metadata for #{source}: #{detail}"
         end
       end
       fail "Could not retrieve information from source(s) #{value.join(", ")}" unless result
       result
     end
 
     # Make sure we're also checking the checksum
     def value=(value)
       super
 
       checks = (pinparams + [:ensure])
       checks.delete(:checksum)
 
       resource[:audit] = checks
       resource[:checksum] = :md5 unless resource.property(:checksum)
     end
 
     def local?
       found? and uri and (uri.scheme || "file") == "file"
     end
 
     def full_path
       URI.unescape(uri.path) if found? and uri
     end
 
     def server
       (uri and uri.host) or Puppet.settings[:server]
     end
 
     def port
       (uri and uri.port) or Puppet.settings[:masterport]
     end
 
     private
 
     def uri
       @uri ||= URI.parse(URI.escape(metadata.source))
     end
   end
 end
diff --git a/lib/puppet/type/filebucket.rb b/lib/puppet/type/filebucket.rb
index 65ff88411..7fd2ef46b 100755
--- a/lib/puppet/type/filebucket.rb
+++ b/lib/puppet/type/filebucket.rb
@@ -1,95 +1,94 @@
 module Puppet
   require 'puppet/file_bucket/dipper'
 
   newtype(:filebucket) do
     @doc = "A repository for backing up files.  If no filebucket is
       defined, then files will be backed up in their current directory,
       but the filebucket can be either a host- or site-global repository
       for backing up.  It stores files and returns the MD5 sum, which
       can later be used to retrieve the file if restoration becomes
       necessary.  A filebucket does not do any work itself; instead,
       it can be specified as the value of *backup* in a **file** object.
 
       Currently, filebuckets are only useful for manual retrieval of
       accidentally removed files (e.g., you look in the log for the md5 sum and retrieve the file with that sum from the filebucket), but
       when transactions are fully supported filebuckets will be used to
       undo transactions.
 
       You will normally want to define a single filebucket for your
-      whole network and then use that as the default backup location::
+      whole network and then use that as the default backup location:
 
-        # Define the bucket
-        filebucket { main: server => puppet }
+          # Define the bucket
+          filebucket { main: server => puppet }
 
-        # Specify it as the default target
-        File { backup => main }
+          # Specify it as the default target
+          File { backup => main }
 
       Puppetmaster servers create a filebucket by default, so this will
       work in a default configuration."
 
     newparam(:name) do
       desc "The name of the filebucket."
       isnamevar
     end
 
     newparam(:server) do
       desc "The server providing the remote filebucket.  If this is not
         specified then *path* is checked. If it is set, then the
         bucket is local.  Otherwise the puppetmaster server specified
         in the config or at the commandline is used."
       defaultto { Puppet[:server] }
     end
 
     newparam(:port) do
       desc "The port on which the remote server is listening.
         Defaults to the normal Puppet port, %s." % Puppet[:masterport]
 
       defaultto { Puppet[:masterport] }
     end
 
     newparam(:path) do
       desc "The path to the local filebucket.  If this is
         unset, then the bucket is remote.  The parameter *server* must
         can be specified to set the remote server."
 
       defaultto { Puppet[:clientbucketdir] }
     end
 
     # Create a default filebucket.
     def self.mkdefaultbucket
       new(:name => "puppet", :path => Puppet[:clientbucketdir])
     end
 
     def bucket
       mkbucket unless defined?(@bucket)
       @bucket
     end
 
     private
 
     def mkbucket
       # Default is a local filebucket, if no server is given.
       # If the default path has been removed, too, then
       # the puppetmaster is used as default server
 
       type = "local"
       args = {}
       if self[:path]
         args[:Path] = self[:path]
       else
         args[:Server] = self[:server]
         args[:Port] = self[:port]
       end
 
       begin
         @bucket = Puppet::FileBucket::Dipper.new(args)
       rescue => detail
         puts detail.backtrace if Puppet[:trace]
         self.fail("Could not create #{type} filebucket: #{detail}")
       end
 
       @bucket.name = self.name
     end
   end
 end
-
diff --git a/lib/puppet/type/group.rb b/lib/puppet/type/group.rb
index 9f26d2243..cde1cfd65 100755
--- a/lib/puppet/type/group.rb
+++ b/lib/puppet/type/group.rb
@@ -1,100 +1,99 @@
 
 require 'etc'
 require 'facter'
 
 module Puppet
   newtype(:group) do
     @doc = "Manage groups. On most platforms this can only create groups.
       Group membership must be managed on individual users.
 
       On some platforms such as OS X, group membership is managed as an
       attribute of the group, not the user record. Providers must have
       the feature 'manages_members' to manage the 'members' property of
       a group record."
 
     feature :manages_members,
       "For directories where membership is an attribute of groups not users."
 
     ensurable do
       desc "Create or remove the group."
 
       newvalue(:present) do
         provider.create
       end
 
       newvalue(:absent) do
         provider.delete
       end
     end
 
     newproperty(:gid) do
       desc "The group ID.  Must be specified numerically.  If not
         specified, a number will be picked, which can result in ID
         differences across systems and thus is not recommended.  The
         GID is picked according to local system standards."
 
       def retrieve
         provider.gid
       end
 
       def sync
         if self.should == :absent
           raise Puppet::DevError, "GID cannot be deleted"
         else
           provider.gid = self.should
         end
       end
 
       munge do |gid|
         case gid
         when String
           if gid =~ /^[-0-9]+$/
             gid = Integer(gid)
           else
             self.fail "Invalid GID #{gid}"
           end
         when Symbol
           unless gid == :absent
             self.devfail "Invalid GID #{gid}"
           end
         end
 
         return gid
       end
     end
 
     newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
       desc "The members of the group. For directory services where group
       membership is stored in the group objects, not the users."
 
       def change_to_s(currentvalue, newvalue)
         currentvalue = currentvalue.join(",") if currentvalue != :absent
         newvalue = newvalue.join(",")
         super(currentvalue, newvalue)
       end
     end
 
     newparam(:auth_membership) do
       desc "whether the provider is authoritative for group membership."
       defaultto true
     end
 
     newparam(:name) do
       desc "The group name.  While naming limitations vary by
         system, it is advisable to keep the name to the degenerate
         limitations, which is a maximum of 8 characters beginning with
         a letter."
       isnamevar
     end
 
     newparam(:allowdupe, :boolean => true) do
       desc "Whether to allow duplicate GIDs.  This option does not work on
-        FreeBSD (contract to the ``pw`` man page)."
+        FreeBSD (contract to the `pw` man page)."
 
       newvalues(:true, :false)
 
       defaultto false
     end
   end
 end
-
diff --git a/lib/puppet/type/host.rb b/lib/puppet/type/host.rb
index 929542d7c..8ab750459 100755
--- a/lib/puppet/type/host.rb
+++ b/lib/puppet/type/host.rb
@@ -1,101 +1,98 @@
 module Puppet
   newtype(:host) do
     ensurable
 
     newproperty(:ip) do
       desc "The host's IP address, IPv4 or IPv6."
 
     validate do |value|
       unless value =~ /((([0-9a-fA-F]+:){7}[0-9a-fA-F]+)|(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?::(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?)|((25[0-5]|2[0-4][\d]|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3})/
       raise Puppet::Error, "Invalid IP address"
       end
     end
 
     end
 
     newproperty(:host_aliases) do
-      desc 'Any aliases the host might have.  Multiple values must be
-        specified as an array.  Note that this property is not the same as
-        the "alias" metaparam; use this property to add aliases to a host
-        on disk, and "alias" to aliases for use in your Puppet scripts.'
+      desc "Any aliases the host might have.  Multiple values must be
+        specified as an array."
 
       def insync?(is)
         is == @should
       end
 
       def is_to_s(currentvalue = @is)
         currentvalue = [currentvalue] unless currentvalue.is_a? Array
         currentvalue.join(" ")
       end
 
       def retrieve
         is = super
         case is
         when String
           is = is.split(/\s*,\s*/)
         when Symbol
           is = [is]
         when Array
           # nothing
         else
           raise Puppet::DevError, "Invalid @is type #{is.class}"
         end
         is
       end
 
       # We actually want to return the whole array here, not just the first
       # value.
       def should
         if defined?(@should)
           if @should == [:absent]
             return :absent
           else
             return @should
           end
         else
           return nil
         end
       end
 
       def should_to_s(newvalue = @should)
         newvalue.join(" ")
       end
 
       validate do |value|
         raise Puppet::Error, "Host aliases cannot include whitespace" if value =~ /\s/
       end
     end
 
     newproperty(:target) do
       desc "The file in which to store service information.  Only used by
         those providers that write to disk."
 
       defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
         @resource.class.defaultprovider.default_target
         else
           nil
         end
       }
     end
 
     newparam(:name) do
       desc "The host name."
 
       isnamevar
 
       validate do |value|
         # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         x = value.split('.').each do |hostpart|
           unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/
             raise Puppet::Error, "Invalid host name"
           end
         end
       end
     end
 
     @doc = "Installs and manages host entries.  For most systems, these
-      entries will just be in ``/etc/hosts``, but some systems (notably OS X)
+      entries will just be in `/etc/hosts`, but some systems (notably OS X)
       will have different solutions."
   end
 end
-
diff --git a/lib/puppet/type/k5login.rb b/lib/puppet/type/k5login.rb
index 850e37733..a343e9e5c 100644
--- a/lib/puppet/type/k5login.rb
+++ b/lib/puppet/type/k5login.rb
@@ -1,87 +1,87 @@
 # $Id: k5login.rb 2468 2007-08-07 23:30:20Z digant $
 #
 # Plug-in type for handling k5login files
 
 Puppet::Type.newtype(:k5login) do
-  @doc = "Manage the .k5login file for a user.  Specify the full path to
-    the .k5login file as the name and an array of principals as the
+  @doc = "Manage the `.k5login` file for a user.  Specify the full path to
+    the `.k5login` file as the name and an array of principals as the
     property principals."
 
   ensurable
 
   # Principals that should exist in the file
   newproperty(:principals, :array_matching => :all) do
-    desc "The principals present in the .k5login file."
+    desc "The principals present in the `.k5login` file."
   end
 
   # The path/name of the k5login file
   newparam(:path) do
     isnamevar
     desc "The path to the file to manage.  Must be fully qualified."
 
     validate do |value|
       unless value =~ /^#{File::SEPARATOR}/
         raise Puppet::Error, "File paths must be fully qualified"
       end
     end
   end
 
   # To manage the mode of the file
   newproperty(:mode) do
     desc "Manage the k5login file's mode"
     defaultto { "644" }
   end
 
   provide(:k5login) do
     desc "The k5login provider is the only provider for the k5login
       type."
 
     # Does this file exist?
     def exists?
       File.exists?(@resource[:name])
     end
 
     # create the file
     def create
       write(@resource.should(:principals))
       should_mode = @resource.should(:mode)
       unless self.mode == should_mode
         self.mode = should_mode
       end
     end
 
     # remove the file
     def destroy
       File.unlink(@resource[:name])
     end
 
     # Return the principals
     def principals(dummy_argument=:work_arround_for_ruby_GC_bug)
       if File.exists?(@resource[:name])
         File.readlines(@resource[:name]).collect { |line| line.chomp }
       else
         :absent
       end
     end
 
     # Write the principals out to the k5login file
     def principals=(value)
       write(value)
     end
 
     # Return the mode as an octal string, not as an integer
     def mode
       "%o" % (File.stat(@resource[:name]).mode & 007777)
     end
 
     # Set the file mode, converting from a string to an integer.
     def mode=(value)
       File.chmod(Integer("0#{value}"), @resource[:name])
     end
 
     private
     def write(value)
       File.open(@resource[:name], "w") { |f| f.puts value.join("\n") }
     end
   end
 end
diff --git a/lib/puppet/type/macauthorization.rb b/lib/puppet/type/macauthorization.rb
index 9b17c279d..ef6fbb6c1 100644
--- a/lib/puppet/type/macauthorization.rb
+++ b/lib/puppet/type/macauthorization.rb
@@ -1,164 +1,163 @@
 Puppet::Type.newtype(:macauthorization) do
 
   @doc = "Manage the Mac OS X authorization database.
-    See:
-    http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html for more information."
+    See the [Apple developer site](http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html) for more information."
 
   ensurable
 
   autorequire(:file) do
     ["/etc/authorization"]
   end
 
   def munge_boolean(value)
     case value
     when true, "true", :true
       :true
     when false, "false", :false
       :false
     else
       fail("munge_boolean only takes booleans")
     end
   end
 
   def munge_integer(value)
       Integer(value)
   rescue ArgumentError
       fail("munge_integer only takes integers")
   end
 
   newparam(:name) do
     desc "The name of the right or rule to be managed.
     Corresponds to 'key' in Authorization Services. The key is the name
     of a rule. A key uses the same naming conventions as a right. The
     Security Server uses a rule’s key to match the rule with a right.
     Wildcard keys end with a ‘.’. The generic rule has an empty key value.
     Any rights that do not match a specific rule use the generic rule."
 
     isnamevar
   end
 
   newproperty(:auth_type) do
     desc "type - can be a 'right' or a 'rule'. 'comment' has not yet been
     implemented."
 
     newvalue(:right)
     newvalue(:rule)
     # newvalue(:comment)  # not yet implemented.
   end
 
   newproperty(:allow_root, :boolean => true) do
     desc "Corresponds to 'allow-root' in the authorization store, renamed
     due to hyphens being problematic. Specifies whether a right should be
     allowed automatically if the requesting process is running with
     uid == 0.  AuthorizationServices defaults this attribute to false if
     not specified"
 
     newvalue(:true)
     newvalue(:false)
 
     munge do |value|
       @resource.munge_boolean(value)
     end
   end
 
   newproperty(:authenticate_user, :boolean => true) do
     desc "Corresponds to 'authenticate-user' in the authorization store,
     renamed due to hyphens being problematic."
 
     newvalue(:true)
     newvalue(:false)
 
     munge do |value|
       @resource.munge_boolean(value)
     end
   end
 
   newproperty(:auth_class) do
     desc "Corresponds to 'class' in the authorization store, renamed due
     to 'class' being a reserved word."
 
     newvalue(:user)
     newvalue(:'evaluate-mechanisms')
     newvalue(:allow)
     newvalue(:deny)
     newvalue(:rule)
   end
 
   newproperty(:comment) do
     desc "The 'comment' attribute for authorization resources."
   end
 
   newproperty(:group) do
     desc "The user must authenticate as a member of this group. This
     attribute can be set to any one group."
   end
 
   newproperty(:k_of_n) do
     desc "k-of-n describes how large a subset of rule mechanisms must
     succeed for successful authentication. If there are 'n' mechanisms,
     then 'k' (the integer value of this parameter) mechanisms must succeed.
     The most common setting for this parameter is '1'. If k-of-n is not
     set, then 'n-of-n' mechanisms must succeed."
 
     munge do |value|
       @resource.munge_integer(value)
     end
   end
 
   newproperty(:mechanisms, :array_matching => :all) do
     desc "an array of suitable mechanisms."
   end
 
   newproperty(:rule, :array_matching => :all) do
     desc "The rule(s) that this right refers to."
   end
 
   newproperty(:session_owner, :boolean => true) do
     desc "Corresponds to 'session-owner' in the authorization store,
     renamed due to hyphens being problematic.  Whether the session owner
     automatically matches this rule or right."
 
     newvalue(:true)
     newvalue(:false)
 
     munge do |value|
       @resource.munge_boolean(value)
     end
   end
 
   newproperty(:shared, :boolean => true) do
     desc "If this is set to true, then the Security Server marks the
     credentials used to gain this right as shared. The Security Server
     may use any shared credentials to authorize this right. For maximum
     security, set sharing to false so credentials stored by the Security
     Server for one application may not be used by another application."
 
     newvalue(:true)
     newvalue(:false)
 
     munge do |value|
       @resource.munge_boolean(value)
     end
   end
 
   newproperty(:timeout) do
     desc "The credential used by this rule expires in the specified
     number of seconds. For maximum security where the user must
     authenticate every time, set the timeout to 0. For minimum security,
     remove the timeout attribute so the user authenticates only once per
     session."
 
     munge do |value|
       @resource.munge_integer(value)
     end
   end
 
   newproperty(:tries) do
     desc "The number of tries allowed."
     munge do |value|
       @resource.munge_integer(value)
     end
   end
 
 end
diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb
index 5534fdf25..ce7ca790b 100755
--- a/lib/puppet/type/mailalias.rb
+++ b/lib/puppet/type/mailalias.rb
@@ -1,49 +1,48 @@
 module Puppet
   newtype(:mailalias) do
     @doc = "Creates an email alias in the local alias database."
 
     ensurable
 
     newparam(:name, :namevar => true) do
       desc "The alias name."
     end
 
     newproperty(:recipient, :array_matching => :all) do
       desc "Where email should be sent.  Multiple values
         should be specified as an array."
 
       def is_to_s(value)
         if value.include?(:absent)
           super
         else
           value.join(",")
         end
       end
 
       def should
         @should
       end
 
       def should_to_s(value)
         if value.include?(:absent)
           super
         else
           value.join(",")
         end
       end
     end
 
     newproperty(:target) do
       desc "The file in which to store the aliases.  Only used by
         those providers that write to disk."
 
       defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
           @resource.class.defaultprovider.default_target
         else
           nil
         end
       }
     end
   end
 end
-
diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb
index 7ac0e4e4f..732fbf09f 100755
--- a/lib/puppet/type/maillist.rb
+++ b/lib/puppet/type/maillist.rb
@@ -1,63 +1,62 @@
 module Puppet
   newtype(:maillist) do
     @doc = "Manage email lists.  This resource type currently can only create
       and remove lists, it cannot reconfigure them."
 
     ensurable do
       defaultvalues
 
       newvalue(:purged) do
         provider.purge
       end
 
       def change_to_s(current_value, newvalue)
         return "Purged #{resource}" if newvalue == :purged
         super
       end
 
       def insync?(is)
         return true if is == :absent && should == :purged
         super
       end
     end
 
     newparam(:name, :namevar => true) do
       desc "The name of the email list."
     end
 
     newparam(:description) do
       desc "The description of the mailing list."
     end
 
     newparam(:password) do
       desc "The admin password."
     end
 
     newparam(:webserver) do
       desc "The name of the host providing web archives and the administrative interface."
     end
 
     newparam(:mailserver) do
       desc "The name of the host handling email for the list."
     end
 
     newparam(:admin) do
       desc "The email address of the administrator."
     end
 
     def generate
       if provider.respond_to?(:aliases)
         should = self.should(:ensure) || :present
         if should == :purged
           should = :absent
         end
         atype = Puppet::Type.type(:mailalias)
 
         provider.aliases.
           reject  { |name,recipient| catalog.resource(:mailalias, name) }.
           collect { |name,recipient| atype.new(:name => name, :recipient => recipient, :ensure => should) }
       end
     end
   end
 end
-
diff --git a/lib/puppet/type/mcx.rb b/lib/puppet/type/mcx.rb
index e56b11938..4f0a6c3c5 100644
--- a/lib/puppet/type/mcx.rb
+++ b/lib/puppet/type/mcx.rb
@@ -1,115 +1,115 @@
 #--
 # Copyright (C) 2008 Jeffrey J McCune.
 
 # This program and entire repository is free software; you can
 # redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Author: Jeff McCune <mccune.jeff@gmail.com>
 
 Puppet::Type.newtype(:mcx) do
 
   @doc = "MCX object management using DirectoryService on OS X.
 
-Original Author: Jeff McCune <mccune.jeff@gmail.com>
-
 The default provider of this type merely manages the XML plist as
 reported by the dscl -mcxexport command.  This is similar to the
 content property of the file type in Puppet.
 
 The recommended method of using this type is to use Work Group Manager
 to manage users and groups on the local computer, record the resulting
 puppet manifest using the command 'ralsh mcx' then deploying this
 to other machines.
 "
   feature :manages_content, \
     "The provider can manage MCXSettings as a string.",
     :methods => [:content, :content=]
 
   ensurable do
     desc "Create or remove the MCX setting."
 
     newvalue(:present) do
       provider.create
     end
 
     newvalue(:absent) do
       provider.destroy
     end
 
   end
 
   newparam(:name) do
     desc "The name of the resource being managed.
-    The default naming convention follows Directory Service paths::
+    The default naming convention follows Directory Service paths:
 
-      /Computers/localhost
-      /Groups/admin
-      /Users/localadmin
+        /Computers/localhost
+        /Groups/admin
+        /Users/localadmin
 
-    The ds_type and ds_name type parameters are not necessary if the
+    The `ds_type` and `ds_name` type parameters are not necessary if the
     default naming convention is followed."
     isnamevar
   end
 
   newparam(:ds_type) do
 
     desc "The DirectoryService type this MCX setting attaches to."
 
     newvalues(:user, :group, :computer, :computerlist)
 
   end
 
   newparam(:ds_name) do
     desc "The name to attach the MCX Setting to.
     e.g. 'localhost' when ds_type => computer. This setting is not
     required, as it may be parsed so long as the resource name is
     parseable.  e.g. /Groups/admin where 'group' is the dstype."
   end
 
   newproperty(:content, :required_features => :manages_content) do
     desc "The XML Plist.  The value of MCXSettings in DirectoryService.
     This is the standard output from the system command:
-    dscl localhost -mcxexport /Local/Default/<ds_type>/ds_name
-    Note that ds_type is capitalized and plural in the dscl command."
+        
+        dscl localhost -mcxexport /Local/Default/<ds_type>/ds_name
+    
+    Note that `ds_type` is capitalized and plural in the dscl command."
   end
 
   # JJM Yes, this is not DRY at all.  Because of the code blocks
   # autorequire must be done this way.  I think.
 
   def setup_autorequire(type)
     # value returns a Symbol
     name = value(:name)
     ds_type = value(:ds_type)
     ds_name = value(:ds_name)
     if ds_type == type
       rval = [ ds_name.to_s ]
     else
       rval = [ ]
     end
     rval
   end
 
   autorequire(:user) do
     setup_autorequire(:user)
   end
 
   autorequire(:group) do
     setup_autorequire(:group)
   end
 
   autorequire(:computer) do
     setup_autorequire(:computer)
   end
 
 end
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index 6ee5dd174..d048c90f1 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -1,225 +1,224 @@
 module Puppet
   # We want the mount to refresh when it changes.
   newtype(:mount, :self_refresh => true) do
     @doc = "Manages mounted filesystems, including putting mount
       information into the mount table. The actual behavior depends
       on the value of the 'ensure' parameter.
 
-      Note that if a ``mount`` receives an event from another resource,
-      it will try to remount the filesystems if ``ensure`` is set to ``mounted``."
+      Note that if a `mount` receives an event from another resource,
+      it will try to remount the filesystems if `ensure` is set to `mounted`."
 
     feature :refreshable, "The provider can remount the filesystem.",
       :methods => [:remount]
 
     # Use the normal parent class, because we actually want to
     # call code when sync is called.
     newproperty(:ensure) do
       desc "Control what to do with this mount. Set this attribute to
-        ``umounted`` to make sure the filesystem is in the filesystem table
-        but not mounted (if the filesystem is currently mounted, it will be unmounted).  Set it to ``absent`` to unmount (if necessary) and remove
-        the filesystem from the fstab.  Set to ``mounted`` to add it to the
-        fstab and mount it. Set to ``present`` to add to fstab but not change
+        `umounted` to make sure the filesystem is in the filesystem table
+        but not mounted (if the filesystem is currently mounted, it will be unmounted).  Set it to `absent` to unmount (if necessary) and remove
+        the filesystem from the fstab.  Set to `mounted` to add it to the
+        fstab and mount it. Set to `present` to add to fstab but not change
         mount/unmount status"
 
       newvalue(:defined) do
         provider.create
         return :mount_created
       end
 
       aliasvalue :present, :defined
 
       newvalue(:unmounted) do
         if provider.mounted?
           syncothers
           provider.unmount
           return :mount_unmounted
         else
           provider.create
           return :mount_created
         end
       end
 
       newvalue(:absent, :event => :mount_deleted) do
         provider.unmount if provider.mounted?
 
         provider.destroy
       end
 
       newvalue(:mounted, :event => :mount_mounted) do
         # Create the mount point if it does not already exist.
         current_value = self.retrieve
         provider.create if current_value.nil? or current_value == :absent
 
         syncothers
 
         # The fs can be already mounted if it was absent but mounted
         provider.mount unless provider.mounted?
       end
 
       def insync?(is)
         if should == :defined and is != :absent
           true
         else
           super
         end
       end
 
       def retrieve
         # We need to special case :mounted; if we're absent, we still
         # want
         curval = super()
         if curval == :absent
           return :absent
         elsif provider.mounted?
           return :mounted
         else
           return :unmounted
         end
       end
 
       def syncothers
         # We have to flush any changes to disk.
         currentvalues = @resource.retrieve_resource
 
         # Determine if there are any out-of-sync properties.
         oos = @resource.send(:properties).find_all do |prop|
           unless currentvalues.include?(prop)
             raise Puppet::DevError, "Parent has property %s but it doesn't appear in the current values", [prop.name]
           end
           if prop.name == :ensure
             false
           else
             ! prop.insync?(currentvalues[prop])
           end
         end.each { |prop| prop.sync }.length
         @resource.flush if oos > 0
       end
     end
 
     newproperty(:device) do
       desc "The device providing the mount.  This can be whatever
         device is supporting by the mount, including network
         devices or devices specified by UUID rather than device
         path, depending on the operating system."
     end
 
     # Solaris specifies two devices, not just one.
     newproperty(:blockdevice) do
       desc "The device to fsck.  This is property is only valid
         on Solaris, and in most cases will default to the correct
         value."
 
       # Default to the device but with "dsk" replaced with "rdsk".
       defaultto do
         if Facter["operatingsystem"].value == "Solaris"
           device = @resource.value(:device)
           if device =~ %r{/dsk/}
             device.sub(%r{/dsk/}, "/rdsk/")
           else
             nil
           end
         else
           nil
         end
       end
     end
 
     newproperty(:fstype) do
       desc "The mount type.  Valid values depend on the
         operating system.  This is a required option."
     end
 
     newproperty(:options) do
       desc "Mount options for the mounts, as they would
         appear in the fstab."
     end
 
     newproperty(:pass) do
       desc "The pass in which the mount is checked."
 
       defaultto {
         0 if @resource.managed?
       }
     end
 
     newproperty(:atboot) do
       desc "Whether to mount the mount at boot.  Not all platforms
         support this."
     end
 
     newproperty(:dump) do
       desc "Whether to dump the mount.  Not all platform support this.
-        Valid values are ``1`` or ``0``. or ``2`` on FreeBSD, Default is ``0``."
+        Valid values are `1` or `0`. or `2` on FreeBSD, Default is `0`."
 
       if Facter["operatingsystem"].value == "FreeBSD"
         newvalue(%r{(0|1|2)})
       else
         newvalue(%r{(0|1)})
       end
 
       newvalue(%r{(0|1)})
 
       defaultto {
         0 if @resource.managed?
       }
     end
 
     newproperty(:target) do
       desc "The file in which to store the mount table.  Only used by
         those providers that write to disk."
 
       defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
           @resource.class.defaultprovider.default_target
         else
           nil
         end
       }
     end
 
     newparam(:name) do
       desc "The mount path for the mount."
 
       isnamevar
     end
 
     newparam(:path) do
-      desc "The deprecated name for the mount point.  Please use ``name`` now."
+      desc "The deprecated name for the mount point.  Please use `name` now."
 
       def value=(value)
         warning "'path' is deprecated for mounts.  Please use 'name'."
         @resource[:name] = value
         super
       end
     end
 
     newparam(:remounts) do
-      desc "Whether the mount can be remounted  ``mount -o remount``.  If
+      desc "Whether the mount can be remounted  `mount -o remount`.  If
         this is false, then the filesystem will be unmounted and remounted
         manually, which is prone to failure."
 
       newvalues(:true, :false)
       defaultto do
         case Facter.value(:operatingsystem)
         when "FreeBSD", "Darwin"
           false
         else
           true
         end
       end
     end
 
     def refresh
       # Only remount if we're supposed to be mounted.
       provider.remount if self.should(:fstype) != "swap" and provider.mounted?
     end
 
     def value(name)
       name = symbolize(name)
       ret = nil
       if property = @parameters[name]
         return property.value
       end
     end
   end
 end
-
diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb
index 97935e270..a6ec1dc8b 100644
--- a/lib/puppet/type/notify.rb
+++ b/lib/puppet/type/notify.rb
@@ -1,45 +1,44 @@
 #
 # Simple module for logging messages on the client-side
 #
 
 module Puppet
   newtype(:notify) do
     @doc = "Sends an arbitrary message to the agent run-time log."
 
     newproperty(:message) do
       desc "The message to be sent to the log."
       def sync
         case @resource["withpath"]
         when :true
           send(@resource[:loglevel], self.should)
         else
           Puppet.send(@resource[:loglevel], self.should)
         end
         return
       end
 
       def retrieve
         :absent
       end
 
       def insync?(is)
         false
       end
 
       defaultto { @resource[:name] }
     end
 
     newparam(:withpath) do
       desc "Whether to not to show the full object path."
       defaultto :false
 
       newvalues(:true, :false)
     end
 
     newparam(:name) do
       desc "An arbitrary tag for your own reference; the name of the message."
       isnamevar
     end
   end
 end
-
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
index f25464db5..51a866332 100644
--- a/lib/puppet/type/package.rb
+++ b/lib/puppet/type/package.rb
@@ -1,323 +1,321 @@
 # Define the different packaging systems.  Each package system is implemented
 # in a module, which then gets used to individually extend each package object.
 # This allows packages to exist on the same machine using different packaging
 # systems.
 
 module Puppet
   newtype(:package) do
     @doc = "Manage packages.  There is a basic dichotomy in package
       support right now:  Some package types (e.g., yum and apt) can
       retrieve their own package files, while others (e.g., rpm and sun) cannot.  For those package formats that cannot retrieve
-      their own files, you can use the ``source`` parameter to point to
+      their own files, you can use the `source` parameter to point to
       the correct file.
 
       Puppet will automatically guess the packaging format that you are
       using based on the platform you are on, but you can override it
-      using the ``provider`` parameter; each provider defines what it
+      using the `provider` parameter; each provider defines what it
       requires in order to function, and you must meet those requirements
       to use a given provider."
 
     feature :installable, "The provider can install packages.",
       :methods => [:install]
     feature :uninstallable, "The provider can uninstall packages.",
       :methods => [:uninstall]
     feature :upgradeable, "The provider can upgrade to the latest version of a
-        package.  This feature is used by specifying ``latest`` as the
+        package.  This feature is used by specifying `latest` as the
         desired value for the package.",
       :methods => [:update, :latest]
     feature :purgeable, "The provider can purge packages.  This generally means
         that all traces of the package are removed, including
         existing configuration files.  This feature is thus destructive
         and should be used with the utmost care.",
       :methods => [:purge]
     feature :versionable, "The provider is capable of interrogating the
         package database for installed version(s), and can select
         which out of a set of available versions of a package to
         install if asked."
     feature :holdable, "The provider is capable of placing packages on hold
         such that they are not automatically upgraded as a result of
         other package dependencies unless explicit action is taken by
         a user or another package. Held is considered a superset of
         installed.",
       :methods => [:hold]
 
     ensurable do
       desc "What state the package should be in.
         *latest* only makes sense for those packaging formats that can
         retrieve new packages on their own and will throw an error on
         those that cannot.  For those packaging systems that allow you
         to specify package versions, specify them here.  Similarly,
         *purged* is only useful for packaging systems that support
         the notion of managing configuration files separately from
         'normal' system files."
 
       attr_accessor :latest
 
       newvalue(:present, :event => :package_installed) do
         provider.install
       end
 
       newvalue(:absent, :event => :package_removed) do
         provider.uninstall
       end
 
       newvalue(:purged, :event => :package_purged, :required_features => :purgeable) do
         provider.purge
       end
 
       newvalue(:held, :event => :package_held, :required_features => :holdable) do
         provider.hold
       end
 
       # Alias the 'present' value.
       aliasvalue(:installed, :present)
 
       newvalue(:latest, :required_features => :upgradeable) do
         # Because yum always exits with a 0 exit code, there's a retrieve
         # in the "install" method.  So, check the current state now,
         # to compare against later.
         current = self.retrieve
         begin
           provider.update
         rescue => detail
           self.fail "Could not update: #{detail}"
         end
 
         if current == :absent
           :package_installed
         else
           :package_changed
         end
       end
 
       newvalue(/./, :required_features => :versionable) do
         begin
           provider.install
         rescue => detail
           self.fail "Could not update: #{detail}"
         end
 
         if self.retrieve == :absent
           :package_installed
         else
           :package_changed
         end
       end
 
-
       defaultto :installed
 
       # Override the parent method, because we've got all kinds of
       # funky definitions of 'in sync'.
       def insync?(is)
         @should ||= []
 
         @latest ||= nil
         @lateststamp ||= (Time.now.to_i - 1000)
         # Iterate across all of the should values, and see how they
         # turn out.
 
         @should.each { |should|
           case should
           when :present
             return true unless [:absent, :purged, :held].include?(is)
           when :latest
             # Short-circuit packages that are not present
             return false if is == :absent or is == :purged
 
             # Don't run 'latest' more than about every 5 minutes
             if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5
               #self.debug "Skipping latest check"
             else
               begin
                 @latest = provider.latest
                 @lateststamp = Time.now.to_i
               rescue => detail
                 error = Puppet::Error.new("Could not get latest version: #{detail}")
                 error.set_backtrace(detail.backtrace)
                 raise error
               end
             end
 
             case is
             when @latest
               return true
             when :present
               # This will only happen on retarded packaging systems
               # that can't query versions.
               return true
             else
               self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
             end
           when :absent
             return true if is == :absent or is == :purged
           when :purged
             return true if is == :purged
           when is
             return true
           end
         }
 
         false
       end
 
       # This retrieves the current state. LAK: I think this method is unused.
       def retrieve
         provider.properties[:ensure]
       end
 
       # Provide a bit more information when logging upgrades.
       def should_to_s(newvalue = @should)
         if @latest
           @latest.to_s
         else
           super(newvalue)
         end
       end
     end
 
     newparam(:name) do
       desc "The package name.  This is the name that the packaging
       system uses internally, which is sometimes (especially on Solaris)
       a name that is basically useless to humans.  If you want to
       abstract package installation, then you can use aliases to provide
-      a common name to packages::
-
-        # In the 'openssl' class
-        $ssl = $operatingsystem ? {
-          solaris => SMCossl,
-          default => openssl
-        }
-
-        # It is not an error to set an alias to the same value as the
-        # object name.
-        package { $ssl:
-          ensure => installed,
-          alias => openssl
-        }
-
-        . etc. .
-
-        $ssh = $operatingsystem ? {
-          solaris => SMCossh,
-          default => openssh
-        }
-
-        # Use the alias to specify a dependency, rather than
-        # having another selector to figure it out again.
-        package { $ssh:
-          ensure => installed,
-          alias => openssh,
-          require => Package[openssl]
-        }
+      a common name to packages:
+
+          # In the 'openssl' class
+          $ssl = $operatingsystem ? {
+            solaris => SMCossl,
+            default => openssl
+          }
+
+          # It is not an error to set an alias to the same value as the
+          # object name.
+          package { $ssl:
+            ensure => installed,
+            alias => openssl
+          }
+
+          . etc. .
+
+          $ssh = $operatingsystem ? {
+            solaris => SMCossh,
+            default => openssh
+          }
+
+          # Use the alias to specify a dependency, rather than
+          # having another selector to figure it out again.
+          package { $ssh:
+            ensure => installed,
+            alias => openssh,
+            require => Package[openssl]
+          }
 
       "
       isnamevar
     end
 
     newparam(:source) do
       desc "Where to find the actual package.  This must be a local file
         (or on a network file system) or a URL that your specific
         packaging type understands; Puppet will not retrieve files for you."
     end
     newparam(:instance) do
       desc "A read-only parameter set by the package."
     end
     newparam(:status) do
       desc "A read-only parameter set by the package."
     end
 
     newparam(:type) do
-      desc "Deprecated form of ``provider``."
+      desc "Deprecated form of `provider`."
 
       munge do |value|
         warning "'type' is deprecated; use 'provider' instead"
         @resource[:provider] = value
 
         @resource[:provider]
       end
     end
 
     newparam(:adminfile) do
       desc "A file containing package defaults for installing packages.
         This is currently only used on Solaris.  The value will be
         validated according to system rules, which in the case of
         Solaris means that it should either be a fully qualified path
-        or it should be in /var/sadm/install/admin."
+        or it should be in `/var/sadm/install/admin`."
     end
 
     newparam(:responsefile) do
       desc "A file containing any necessary answers to questions asked by
         the package.  This is currently used on Solaris and Debian.  The
         value will be validated according to system rules, but it should
         generally be a fully qualified path."
     end
 
     newparam(:configfiles) do
       desc "Whether configfiles should be kept or replaced.  Most packages
         types do not support this parameter."
 
       defaultto :keep
 
       newvalues(:keep, :replace)
     end
 
     newparam(:category) do
       desc "A read-only parameter set by the package."
     end
     newparam(:platform) do
       desc "A read-only parameter set by the package."
     end
     newparam(:root) do
       desc "A read-only parameter set by the package."
     end
     newparam(:vendor) do
       desc "A read-only parameter set by the package."
     end
     newparam(:description) do
       desc "A read-only parameter set by the package."
     end
 
     newparam(:allowcdrom) do
       desc "Tells apt to allow cdrom sources in the sources.list file.
         Normally apt will bail if you try this."
 
       newvalues(:true, :false)
     end
 
     newparam(:flavor) do
       desc "Newer versions of OpenBSD support 'flavors', which are
         further specifications for which type of package you want."
     end
 
     autorequire(:file) do
       autos = []
       [:responsefile, :adminfile].each { |param|
         if val = self[param]
           autos << val
         end
       }
 
       if source = self[:source]
         if source =~ /^#{File::SEPARATOR}/
           autos << source
         end
       end
       autos
     end
 
     # This only exists for testing.
     def clear
       if obj = @parameters[:ensure]
         obj.latest = nil
       end
     end
 
     # The 'query' method returns a hash of info if the package
     # exists and returns nil if it does not.
     def exists?
       @provider.get(:ensure) != :absent
     end
   end
 end
-
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index 34382e067..ae41b883b 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -1,135 +1,131 @@
-#  Created by Luke Kanies on 2006-12-12.
-#  Copyright (c) 2006. All rights reserved.
-
 require 'puppet'
 
 Puppet::Type.newtype(:resources) do
   @doc = "This is a metatype that can manage other resource types.  Any
     metaparams specified here will be passed on to any generated resources,
-    so you can purge umanaged resources but set ``noop`` to true so the
+    so you can purge umanaged resources but set `noop` to true so the
     purging is only logged and does not actually happen."
 
 
   newparam(:name) do
     desc "The name of the type to be managed."
 
     validate do |name|
       raise ArgumentError, "Could not find resource type '#{name}'" unless Puppet::Type.type(name)
     end
 
     munge { |v| v.to_s }
   end
 
   newparam(:purge, :boolean => true) do
     desc "Purge unmanaged resources.  This will delete any resource
       that is not specified in your configuration
       and is not required by any specified resources."
 
     newvalues(:true, :false)
 
     validate do |value|
       if [:true, true, "true"].include?(value)
         unless @resource.resource_type.respond_to?(:instances)
           raise ArgumentError, "Purging resources of type #{@resource[:name]} is not supported, since they cannot be queried from the system"
         end
         raise ArgumentError, "Purging is only supported on types that accept 'ensure'" unless @resource.resource_type.validproperty?(:ensure)
       end
     end
   end
 
   newparam(:unless_system_user) do
     desc "This keeps system users from being purged.  By default, it
       does not purge users whose UIDs are less than or equal to 500, but you can specify
       a different UID as the inclusive limit."
 
     newvalues(:true, :false, /^\d+$/)
 
     munge do |value|
       case value
       when /^\d+/
         Integer(value)
       when :true, true
         500
       when :false, false
         false
       when Integer; value
       else
         raise ArgumentError, "Invalid value #{value.inspect}"
       end
     end
 
     defaultto {
       if @resource[:name] == "user"
         500
       else
         nil
       end
     }
   end
 
   def check(resource)
     @checkmethod ||= "#{self[:name]}_check"
     @hascheck ||= respond_to?(@checkmethod)
     if @hascheck
       return send(@checkmethod, resource)
     else
       return true
     end
   end
 
   def able_to_ensure_absent?(resource)
       resource[:ensure] = :absent
   rescue ArgumentError, Puppet::Error => detail
       err "The 'ensure' attribute on #{self[:name]} resources does not accept 'absent' as a value"
       false
   end
 
   # Generate any new resources we need to manage.  This is pretty hackish
   # right now, because it only supports purging.
   def generate
     return [] unless self.purge?
     resource_type.instances.
       reject { |r| catalog.resource_refs.include? r.ref }.
       select { |r| check(r) }.
       select { |r| r.class.validproperty?(:ensure) }.
       select { |r| able_to_ensure_absent?(r) }.
       each { |resource|
         @parameters.each do |name, param|
           resource[name] = param.value if param.metaparam?
         end
 
         # Mark that we're purging, so transactions can handle relationships
         # correctly
         resource.purging
       }
   end
 
   def resource_type
     unless defined?(@resource_type)
       unless type = Puppet::Type.type(self[:name])
         raise Puppet::DevError, "Could not find resource type"
       end
       @resource_type = type
     end
     @resource_type
   end
 
   # Make sure we don't purge users below a certain uid, if the check
   # is enabled.
   def user_check(resource)
     return true unless self[:name] == "user"
     return true unless self[:unless_system_user]
 
     resource[:audit] = :uid
     current_values = resource.retrieve_resource
 
     return false if system_users.include?(resource[:name])
 
     current_values[resource.property(:uid)] > self[:unless_system_user]
   end
 
   def system_users
     %w{root nobody bin noaccess daemon sys}
   end
 end
-
diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb
index bedf1e536..ff3fba8eb 100755
--- a/lib/puppet/type/schedule.rb
+++ b/lib/puppet/type/schedule.rb
@@ -1,352 +1,349 @@
 module Puppet
   newtype(:schedule) do
     @doc = "Defined schedules for Puppet.  The important thing to understand
       about how schedules are currently implemented in Puppet is that they
       can only be used to stop a resource from being applied, they never
       guarantee that it is applied.
 
       Every time Puppet applies its configuration, it will collect the
       list of resources whose schedule does not eliminate them from
       running right then, but there is currently no system in place to
       guarantee that a given resource runs at a given time.  If you
       specify a very  restrictive schedule and Puppet happens to run at a
       time within that schedule, then the resources will get applied;
       otherwise, that work may never get done.
 
       Thus, it behooves you to use wider scheduling (e.g., over a couple of
       hours) combined with periods and repetitions.  For instance, if you
       wanted to restrict certain resources to only running once, between
       the hours of two and 4 AM, then you would use this schedule::
 
         schedule { maint:
           range => \"2 - 4\",
           period => daily,
           repeat => 1
         }
 
       With this schedule, the first time that Puppet runs between 2 and 4 AM,
       all resources with this schedule will get applied, but they won't
       get applied again between 2 and 4 because they will have already
       run once that day, and they won't get applied outside that schedule
       because they will be outside the scheduled range.
 
       Puppet automatically creates a schedule for each valid period with the
       same name as that period (e.g., hourly and daily).  Additionally,
       a schedule named *puppet* is created and used as the default,
       with the following attributes::
 
         schedule { puppet:
           period => hourly,
           repeat => 2
         }
 
       This will cause resources to be applied every 30 minutes by default.
       "
 
     newparam(:name) do
       desc "The name of the schedule.  This name is used to retrieve the
         schedule when assigning it to an object::
 
           schedule { daily:
             period => daily,
             range => [2, 4]
           }
 
           exec { \"/usr/bin/apt-get update\":
             schedule => daily
           }
 
         "
       isnamevar
     end
 
     newparam(:range) do
       desc "The earliest and latest that a resource can be applied.  This
         is always a range within a 24 hour period, and hours must be
         specified in numbers between 0 and 23, inclusive.  Minutes and
         seconds can be provided, using the normal colon as a separator.
         For instance::
 
           schedule { maintenance:
             range => \"1:30 - 4:30\"
           }
 
         This is mostly useful for restricting certain resources to being
         applied in maintenance windows or during off-peak hours."
 
       # This is lame; properties all use arrays as values, but parameters don't.
       # That's going to hurt eventually.
       validate do |values|
         values = [values] unless values.is_a?(Array)
         values.each { |value|
           unless  value.is_a?(String) and
               value =~ /\d+(:\d+){0,2}\s*-\s*\d+(:\d+){0,2}/
             self.fail "Invalid range value '#{value}'"
           end
         }
       end
 
       munge do |values|
         values = [values] unless values.is_a?(Array)
         ret = []
 
         values.each { |value|
           range = []
           # Split each range value into a hour, minute, second triad
           value.split(/\s*-\s*/).each { |val|
             # Add the values as an array.
             range << val.split(":").collect { |n| n.to_i }
           }
 
           self.fail "Invalid range #{value}" if range.length != 2
 
           # Make sure the hours are valid
           [range[0][0], range[1][0]].each do |n|
             raise ArgumentError, "Invalid hour '#{n}'" if n < 0 or n > 23
           end
 
           [range[0][1], range[1][1]].each do |n|
             raise ArgumentError, "Invalid minute '#{n}'" if n and (n < 0 or n > 59)
           end
           if range[0][0] > range[1][0]
             self.fail(("Invalid range #{value}; ") +
               "ranges cannot span days."
             )
           end
           ret << range
         }
 
         # Now our array of arrays
         ret
       end
 
       def match?(previous, now)
         # The lowest-level array is of the hour, minute, second triad
         # then it's an array of two of those, to present the limits
         # then it's array of those ranges
         @value = [@value] unless @value[0][0].is_a?(Array)
 
         @value.each do |value|
           limits = value.collect do |range|
             ary = [now.year, now.month, now.day, range[0]]
             if range[1]
               ary << range[1]
             else
               ary << now.min
             end
 
             if range[2]
               ary << range[2]
             else
               ary << now.sec
             end
 
             time = Time.local(*ary)
 
             unless time.hour == range[0]
               self.devfail(
                 "Incorrectly converted time: #{time}: #{time.hour} vs #{range[0]}"
               )
             end
 
             time
           end
 
           unless limits[0] < limits[1]
             self.info(
             "Assuming upper limit should be that time the next day"
             )
 
             ary = limits[1].to_a
             ary[3] += 1
             limits[1] = Time.local(*ary)
 
             #self.devfail("Lower limit is above higher limit: %s" %
             #    limits.inspect
             #)
           end
 
           #self.info limits.inspect
           #self.notice now
           return now.between?(*limits)
         end
 
         # Else, return false, since our current time isn't between
         # any valid times
         false
       end
     end
 
     newparam(:periodmatch) do
       desc "Whether periods should be matched by number (e.g., the two times
         are in the same hour) or by distance (e.g., the two times are
         60 minutes apart)."
 
       newvalues(:number, :distance)
 
       defaultto :distance
     end
 
     newparam(:period) do
       desc "The period of repetition for a resource.  Choose from among
         a fixed list of *hourly*, *daily*, *weekly*, and *monthly*.
         The default is for a resource to get applied every time that
         Puppet runs, whatever that period is.
 
         Note that the period defines how often a given resource will get
         applied but not when; if you would like to restrict the hours
         that a given resource can be applied (e.g., only at night during
-        a maintenance window) then use the ``range`` attribute.
+        a maintenance window) then use the `range` attribute.
 
         If the provided periods are not sufficient, you can provide a
         value to the *repeat* attribute, which will cause Puppet to
         schedule the affected resources evenly in the period the
-        specified number of times.  Take this schedule::
+        specified number of times.  Take this schedule:
 
-          schedule { veryoften:
-            period => hourly,
-            repeat => 6
-          }
+            schedule { veryoften:
+              period => hourly,
+              repeat => 6
+            }
 
         This can cause Puppet to apply that resource up to every 10 minutes.
 
         At the moment, Puppet cannot guarantee that level of
         repetition; that is, it can run up to every 10 minutes, but
         internal factors might prevent it from actually running that
         often (e.g., long-running Puppet runs will squash conflictingly scheduled runs).
 
-        See the ``periodmatch`` attribute for tuning whether to match
+        See the `periodmatch` attribute for tuning whether to match
         times by their distance apart or by their specific value."
 
       newvalues(:hourly, :daily, :weekly, :monthly, :never)
 
       @@scale = {
         :hourly => 3600,
         :daily => 86400,
         :weekly => 604800,
         :monthly => 2592000
       }
       @@methods = {
         :hourly => :hour,
         :daily => :day,
         :monthly => :month,
         :weekly => proc do |prev, now|
           # Run the resource if the previous day was after this weekday (e.g., prev is wed, current is tue)
           # or if it's been more than a week since we ran
           prev.wday > now.wday or (now - prev) > (24 * 3600 * 7)
         end
       }
 
       def match?(previous, now)
         return false if value == :never
 
         value = self.value
         case @resource[:periodmatch]
         when :number
           method = @@methods[value]
           if method.is_a?(Proc)
             return method.call(previous, now)
           else
             # We negate it, because if they're equal we don't run
             return now.send(method) != previous.send(method)
           end
         when :distance
           scale = @@scale[value]
 
           # If the number of seconds between the two times is greater
           # than the unit of time, we match.  We divide the scale
           # by the repeat, so that we'll repeat that often within
           # the scale.
           diff = (now.to_i - previous.to_i)
           comparison = (scale / @resource[:repeat])
 
           return (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
         end
       end
     end
 
     newparam(:repeat) do
       desc "How often the application gets repeated in a given period.
         Defaults to 1. Must be an integer."
 
       defaultto 1
 
       validate do |value|
         unless value.is_a?(Integer) or value =~ /^\d+$/
           raise Puppet::Error,
             "Repeat must be a number"
         end
 
         # This implicitly assumes that 'periodmatch' is distance -- that
         # is, if there's no value, we assume it's a valid value.
         return unless @resource[:periodmatch]
 
         if value != 1 and @resource[:periodmatch] != :distance
           raise Puppet::Error,
             "Repeat must be 1 unless periodmatch is 'distance', not '#{@resource[:periodmatch]}'"
         end
       end
 
       munge do |value|
         value = Integer(value) unless value.is_a?(Integer)
 
         value
       end
 
       def match?(previous, now)
         true
       end
     end
 
     def self.instances
       []
     end
 
     def self.mkdefaultschedules
       result = []
       Puppet.debug "Creating default schedules"
 
             result << self.new(
-                
+
         :name => "puppet",
         :period => :hourly,
-        
+
         :repeat => "2"
       )
 
       # And then one for every period
       @parameters.find { |p| p.name == :period }.value_collection.values.each { |value|
 
               result << self.new(
-                
           :name => value.to_s,
-        
           :period => value
         )
       }
 
       result
     end
 
     def match?(previous = nil, now = nil)
 
       # If we've got a value, then convert it to a Time instance
       previous &&= Time.at(previous)
 
       now ||= Time.now
 
       # Pull them in order
       self.class.allattrs.each { |param|
         if @parameters.include?(param) and
           @parameters[param].respond_to?(:match?)
           return false unless @parameters[param].match?(previous, now)
         end
       }
 
       # If we haven't returned false, then return true; in other words,
       # any provided schedules need to all match
       true
     end
   end
 end
-
diff --git a/lib/puppet/type/selboolean.rb b/lib/puppet/type/selboolean.rb
index cf873e987..204b89056 100644
--- a/lib/puppet/type/selboolean.rb
+++ b/lib/puppet/type/selboolean.rb
@@ -1,31 +1,26 @@
-#
-# Simple module for manageing SELinux booleans
-#
-
 module Puppet
   newtype(:selboolean) do
     @doc = "Manages SELinux booleans on systems with SELinux support.  The supported booleans
-      are any of the ones found in /selinux/booleans/."
+      are any of the ones found in `/selinux/booleans/`."
 
     newparam(:name) do
       desc "The name of the SELinux boolean to be managed."
       isnamevar
     end
 
     newproperty(:value) do
       desc "Whether the the SELinux boolean should be enabled or disabled."
       newvalue(:on)
       newvalue(:off)
     end
 
     newparam(:persistent) do
       desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
-        The default is ``false``."
+        The default is `false`."
 
       defaultto :false
       newvalues(:true, :false)
     end
 
   end
 end
-
diff --git a/lib/puppet/type/selmodule.rb b/lib/puppet/type/selmodule.rb
index 240d6e6d1..60be8a855 100644
--- a/lib/puppet/type/selmodule.rb
+++ b/lib/puppet/type/selmodule.rb
@@ -1,54 +1,53 @@
 #
 # Simple module for manageing SELinux policy modules
 #
 
 Puppet::Type.newtype(:selmodule) do
   @doc = "Manages loading and unloading of SELinux policy modules
     on the system.  Requires SELinux support.  See man semodule(8)
     for more information on SELinux policy modules."
 
   ensurable
 
   newparam(:name) do
     desc "The name of the SELinux policy to be managed.  You should not
       include the customary trailing .pp extension."
     isnamevar
   end
 
   newparam(:selmoduledir) do
 
     desc "The directory to look for the compiled pp module file in.
-      Currently defaults to /usr/share/selinux/targeted.  If selmodulepath
+      Currently defaults to `/usr/share/selinux/targeted`.  If selmodulepath
       is not specified the module will be looked for in this directory in a
       in a file called NAME.pp, where NAME is the value of the name parameter."
 
     defaultto "/usr/share/selinux/targeted"
   end
 
   newparam(:selmodulepath) do
 
     desc "The full path to the compiled .pp policy module.  You only need to use
       this if the module file is not in the directory pointed at by selmoduledir."
 
   end
 
   newproperty(:syncversion) do
 
-    desc "If set to ``true``, the policy will be reloaded if the
+    desc "If set to `true`, the policy will be reloaded if the
     version found in the on-disk file differs from the loaded
-    version.  If set to ``false`` (the default) the the only check
+    version.  If set to `false` (the default) the the only check
     that will be made is if the policy is loaded at all or not."
 
     newvalue(:true)
     newvalue(:false)
   end
 
   autorequire(:file) do
     if self[:selmodulepath]
       [self[:selmodulepath]]
     else
       ["#{self[:selmoduledir]}/#{self[:name]}.pp"]
     end
   end
 end
-
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 8f5c6ee37..c00f02789 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -1,185 +1,185 @@
 # This is our main way of managing processes right now.
 #
 # a service is distinct from a process in that services
 # can only be managed through the interface of an init script
 # which is why they have a search path for initscripts and such
 
 module Puppet
 
   newtype(:service) do
     @doc = "Manage running services.  Service support unfortunately varies
       widely by platform -- some platforms have very little if any
       concept of a running service, and some have a very codified and
       powerful concept.  Puppet's service support will generally be able
       to make up for any inherent shortcomings (e.g., if there is no
       'status' command, then Puppet will look in the process table for a
       command matching the service name), but the more information you
       can provide the better behaviour you will get.  Or, you can just
       use a platform that has very good service support.
 
-      Note that if a ``service`` receives an event from another resource,
+      Note that if a `service` receives an event from another resource,
       the service will get restarted. The actual command to restart the
       service depends on the platform. You can provide a special command
-      for restarting with the ``restart`` attribute."
+      for restarting with the `restart` attribute."
 
     feature :refreshable, "The provider can restart the service.",
       :methods => [:restart]
 
     feature :enableable, "The provider can enable and disable the service",
       :methods => [:disable, :enable, :enabled?]
 
     feature :controllable, "The provider uses a control variable."
 
     newproperty(:enable, :required_features => :enableable) do
       desc "Whether a service should be enabled to start at boot.
         This property behaves quite differently depending on the platform;
         wherever possible, it relies on local tools to enable or disable
         a given service."
 
       newvalue(:true, :event => :service_enabled) do
         provider.enable
       end
 
       newvalue(:false, :event => :service_disabled) do
         provider.disable
       end
 
       def retrieve
         provider.enabled?
       end
     end
 
     # Handle whether the service should actually be running right now.
     newproperty(:ensure) do
       desc "Whether a service should be running."
 
       newvalue(:stopped, :event => :service_stopped) do
         provider.stop
       end
 
       newvalue(:running, :event => :service_started) do
         provider.start
       end
 
       aliasvalue(:false, :stopped)
       aliasvalue(:true, :running)
 
       def retrieve
         provider.status
       end
 
       def sync
         event = super()
 
         if property = @resource.property(:enable)
           val = property.retrieve
           property.sync unless property.insync?(val)
         end
 
         event
       end
     end
 
     newparam(:binary) do
       desc "The path to the daemon.  This is only used for
         systems that do not support init scripts.  This binary will be
-        used to start the service if no ``start`` parameter is
+        used to start the service if no `start` parameter is
         provided."
     end
 
     newparam(:hasstatus) do
       desc "Declare the the service's init script has a
         functional status command.  Based on testing, it was found
         that a large number of init scripts on different platforms do
         not support any kind of status command; thus, you must specify
         manually whether the service you are running has such a
         command (or you can specify a specific command using the
-        ``status`` parameter).
+        `status` parameter).
 
         If you do not specify anything, then the service name will be
         looked for in the process table."
 
       newvalues(:true, :false)
     end
     newparam(:name) do
       desc "The name of the service to run.  This name is used to find
         the service in whatever service subsystem it is in."
       isnamevar
     end
 
     newparam(:path) do
       desc "The search path for finding init scripts.  Multiple values should
         be separated by colons or provided as an array."
 
       munge do |value|
         value = [value] unless value.is_a?(Array)
         # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         # It affects stand-alone blocks, too.
         paths = value.flatten.collect { |p| x = p.split(":") }.flatten
       end
 
       defaultto { provider.class.defpath if provider.class.respond_to?(:defpath) }
     end
     newparam(:pattern) do
       desc "The pattern to search for in the process table.
         This is used for stopping services on platforms that do not
         support init scripts, and is also used for determining service
         status on those service whose init scripts do not include a status
         command.
 
         If this is left unspecified and is needed to check the status
         of a service, then the service name will be used instead.
 
         The pattern can be a simple string or any legal Ruby pattern."
 
       defaultto { @resource[:binary] || @resource[:name] }
     end
     newparam(:restart) do
       desc "Specify a *restart* command manually.  If left
         unspecified, the service will be stopped and then started."
     end
     newparam(:start) do
       desc "Specify a *start* command manually.  Most service subsystems
-        support a ``start`` command, so this will not need to be
+        support a `start` command, so this will not need to be
         specified."
     end
     newparam(:status) do
       desc "Specify a *status* command manually.  If left
         unspecified, the status method will be determined
         automatically, usually by looking for the service in the
         process table."
     end
 
     newparam(:stop) do
       desc "Specify a *stop* command manually."
     end
 
     newparam(:control) do
       desc "The control variable used to manage services (originally for HP-UX).
-        Defaults to the upcased service name plus ``START`` replacing dots with
-        underscores, for those providers that support the ``controllable`` feature."
+        Defaults to the upcased service name plus `START` replacing dots with
+        underscores, for those providers that support the `controllable` feature."
       defaultto { resource.name.gsub(".","_").upcase + "_START" if resource.provider.controllable? }
     end
 
     newparam :hasrestart do
-      desc "Specify that an init script has a ``restart`` option.  Otherwise,
-        the init script's ``stop`` and ``start`` methods are used."
+      desc "Specify that an init script has a `restart` option.  Otherwise,
+        the init script's `stop` and `start` methods are used."
       newvalues(:true, :false)
     end
 
     newparam(:manifest) do
       desc "Specify a command to config a service, or a path to a manifest to do so."
     end
 
     # Basically just a synonym for restarting.  Used to respond
     # to events.
     def refresh
       # Only restart if we're actually running
       if (@parameters[:ensure] || newattr(:ensure)).retrieve == :running
         provider.restart
       else
         debug "Skipping restart; service is not running"
       end
     end
   end
 end
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb
index 2bfa87b0f..e3320140e 100644
--- a/lib/puppet/type/ssh_authorized_key.rb
+++ b/lib/puppet/type/ssh_authorized_key.rb
@@ -1,99 +1,98 @@
 module Puppet
   newtype(:ssh_authorized_key) do
     @doc = "Manages SSH authorized keys. Currently only type 2 keys are
     supported."
 
     ensurable
 
     newparam(:name) do
       desc "The SSH key comment. This attribute is currently used as a
       system-wide primary key and therefore has to be unique."
 
       isnamevar
     end
 
     newproperty(:type) do
       desc "The encryption type used: ssh-dss or ssh-rsa."
 
       newvalue("ssh-dss")
       newvalue("ssh-rsa")
 
       aliasvalue(:dsa, "ssh-dss")
       aliasvalue(:rsa, "ssh-rsa")
     end
 
     newproperty(:key) do
       desc "The key itself; generally a long string of hex digits."
     end
 
     newproperty(:user) do
       desc "The user account in which the SSH key should be installed.
       The resource will automatically depend on this user."
     end
 
     newproperty(:target) do
       desc "The absolute filename in which to store the SSH key. This
       property is optional and should only be used in cases where keys
-      are stored in a non-standard location (ie not in
-      ~user/.ssh/authorized_keys)."
+      are stored in a non-standard location (i.e.` not in
+      `~user/.ssh/authorized_keys`)."
 
       defaultto :absent
 
       def should
         return super if defined?(@should) and @should[0] != :absent
 
         return nil unless user = resource[:user]
 
         begin
           return File.expand_path("~#{user}/.ssh/authorized_keys")
         rescue
           Puppet.debug "The required user is not yet present on the system"
           return nil
         end
       end
 
       def insync?(is)
         is == should
       end
     end
 
     newproperty(:options, :array_matching => :all) do
       desc "Key options, see sshd(8) for possible values. Multiple values
         should be specified as an array."
 
       defaultto do :absent end
 
       def is_to_s(value)
         if value == :absent or value.include?(:absent)
           super
         else
           value.join(",")
         end
       end
 
       def should_to_s(value)
         if value == :absent or value.include?(:absent)
           super
         else
           value.join(",")
         end
       end
     end
 
     autorequire(:user) do
       should(:user) if should(:user)
     end
 
     validate do
       # Go ahead if target attribute is defined
       return if @parameters[:target].shouldorig[0] != :absent
 
       # Go ahead if user attribute is defined
       return if @parameters.include?(:user)
 
       # If neither target nor user is defined, this is an error
       raise Puppet::Error, "Attribute 'user' or 'target' is mandatory"
     end
   end
 end
-
diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb
index e1adc7173..b7a1b8a8d 100755
--- a/lib/puppet/type/sshkey.rb
+++ b/lib/puppet/type/sshkey.rb
@@ -1,70 +1,67 @@
 module Puppet
   newtype(:sshkey) do
     @doc = "Installs and manages ssh host keys.  At this point, this type
-      only knows how to install keys into /etc/ssh/ssh_known_hosts, and
-      it cannot manage user authorized keys yet."
+      only knows how to install keys into `/etc/ssh/ssh_known_hosts`.  See 
+      the `ssh_authorized_key` type to manage authorized keys."
 
     ensurable
 
     newproperty(:type) do
       desc "The encryption type used.  Probably ssh-dss or ssh-rsa."
 
       newvalue("ssh-dss")
       newvalue("ssh-rsa")
       aliasvalue(:dsa, "ssh-dss")
       aliasvalue(:rsa, "ssh-rsa")
     end
 
     newproperty(:key) do
       desc "The key itself; generally a long string of hex digits."
     end
 
     # FIXME This should automagically check for aliases to the hosts, just
     # to see if we can automatically glean any aliases.
     newproperty(:host_aliases) do
       desc 'Any aliases the host might have.  Multiple values must be
-        specified as an array.  Note that this property is not the same as
-        the "alias" metaparam; use this property to add aliases to a host
-        on disk, and "alias" to aliases for use in your Puppet scripts.'
+        specified as an array.'
 
       attr_accessor :meta
 
       def insync?(is)
         is == @should
       end
       # We actually want to return the whole array here, not just the first
       # value.
       def should
         defined?(@should) ? @should : nil
       end
 
       validate do |value|
         if value =~ /\s/
           raise Puppet::Error, "Aliases cannot include whitespace"
         end
         if value =~ /,/
           raise Puppet::Error, "Aliases cannot include whitespace"
         end
       end
     end
 
     newparam(:name) do
       desc "The host name that the key is associated with."
 
       isnamevar
     end
 
     newproperty(:target) do
       desc "The file in which to store the ssh key.  Only used by
-        the ``parsed`` provider."
+        the `parsed` provider."
 
       defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
         @resource.class.defaultprovider.default_target
         else
           nil
         end
       }
     end
   end
 end
-
diff --git a/lib/puppet/type/stage.rb b/lib/puppet/type/stage.rb
index d22cd7b70..0736dc4b9 100644
--- a/lib/puppet/type/stage.rb
+++ b/lib/puppet/type/stage.rb
@@ -1,18 +1,19 @@
 Puppet::Type.newtype(:stage) do
   desc "A resource type for specifying run stages.  The actual stage should
-  be specified on resources::
-    class { foo: stage => pre }
+  be specified on resources:
+      
+      class { foo: stage => pre }
 
-  And you must manually control stage order::
+  And you must manually control stage order:
 
-    stage { pre: before => Stage[main] }
+      stage { pre: before => Stage[main] }
 
   You automatically get a 'main' stage created, and by default all resources
   get inserted into that stage.
 
   You can only set stages on class resources, not normal builtin resources."
 
   newparam :name do
     desc "The name of the stage. This will be used as the 'stage' for each resource."
   end
 end
diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index a6605211e..64a7a1a88 100755
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -1,330 +1,330 @@
 Puppet::Type.newtype(:tidy) do
   require 'puppet/file_serving/fileset'
 
   @doc = "Remove unwanted files based on specific criteria.  Multiple
     criteria are OR'd together, so a file that is too large but is not
     old enough will still get tidied.
 
-    If you don't specify either 'age' or 'size', then all files will
+    If you don't specify either `age` or `size`, then all files will
     be removed.
 
     This resource type works by generating a file resource for every file
     that should be deleted and then letting that resource perform the
     actual deletion.
     "
 
   newparam(:path) do
     desc "The path to the file or directory to manage.  Must be fully
       qualified."
     isnamevar
   end
 
   newparam(:recurse) do
     desc "If target is a directory, recursively descend
       into the directory looking for files to tidy."
 
     newvalues(:true, :false, :inf, /^[0-9]+$/)
 
     # Replace the validation so that we allow numbers in
     # addition to string representations of them.
     validate { |arg| }
     munge do |value|
       newval = super(value)
       case newval
       when :true, :inf; true
       when :false; false
       when Integer, Fixnum, Bignum; value
       when /^\d+$/; Integer(value)
       else
         raise ArgumentError, "Invalid recurse value #{value.inspect}"
       end
     end
   end
 
   newparam(:matches) do
     desc "One or more (shell type) file glob patterns, which restrict
       the list of files to be tidied to those whose basenames match
       at least one of the patterns specified. Multiple patterns can
       be specified using an array.
 
-      Example::
+      Example:
 
           tidy { \"/tmp\":
             age => \"1w\",
             recurse => 1,
             matches => [ \"[0-9]pub*.tmp\", \"*.temp\", \"tmpfile?\" ]
           }
 
-      This removes files from \/tmp if they are one week old or older,
+      This removes files from `/tmp` if they are one week old or older,
       are not in a subdirectory and match one of the shell globs given.
 
       Note that the patterns are matched against the basename of each
       file -- that is, your glob patterns should not have any '/'
       characters in them, since you are only specifying against the last
       bit of the file.
 
       Finally, note that you must now specify a non-zero/non-false value
       for recurse if matches is used, as matches only apply to files found
       by recursion (there's no reason to use static patterns match against
       a statically determined path).  Requiering explicit recursion clears
       up a common source of confusion."
 
     # Make sure we convert to an array.
     munge do |value|
       fail "Tidy can't use matches with recurse 0, false, or undef" if "#{@resource[:recurse]}" =~ /^(0|false|)$/
       [value].flatten
     end
 
     # Does a given path match our glob patterns, if any?  Return true
     # if no patterns have been provided.
     def tidy?(path, stat)
       basename = File.basename(path)
       flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
       return(value.find {|pattern| File.fnmatch(pattern, basename, flags) } ? true : false)
     end
   end
 
   newparam(:backup) do
     desc "Whether tidied files should be backed up.  Any values are passed
       directly to the file resources used for actual file deletion, so use
       its backup documentation to determine valid values."
   end
 
   newparam(:age) do
     desc "Tidy files whose age is equal to or greater than
       the specified time.  You can choose seconds, minutes,
       hours, days, or weeks by specifying the first letter of any
       of those words (e.g., '1w').
 
       Specifying 0 will remove all files."
 
     @@ageconvertors = {
       :s => 1,
       :m => 60
     }
 
     @@ageconvertors[:h] = @@ageconvertors[:m] * 60
     @@ageconvertors[:d] = @@ageconvertors[:h] * 24
     @@ageconvertors[:w] = @@ageconvertors[:d] * 7
 
     def convert(unit, multi)
       if num = @@ageconvertors[unit]
         return num * multi
       else
         self.fail "Invalid age unit '#{unit}'"
       end
     end
 
     def tidy?(path, stat)
       # If the file's older than we allow, we should get rid of it.
       (Time.now.to_i - stat.send(resource[:type]).to_i) > value
     end
 
     munge do |age|
       unit = multi = nil
       case age
       when /^([0-9]+)(\w)\w*$/
         multi = Integer($1)
         unit = $2.downcase.intern
       when /^([0-9]+)$/
         multi = Integer($1)
         unit = :d
       else
         self.fail "Invalid tidy age #{age}"
       end
 
       convert(unit, multi)
     end
   end
 
   newparam(:size) do
     desc "Tidy files whose size is equal to or greater than
       the specified size.  Unqualified values are in kilobytes, but
       *b*, *k*, and *m* can be appended to specify *bytes*, *kilobytes*,
       and *megabytes*, respectively.  Only the first character is
       significant, so the full word can also be used."
 
     @@sizeconvertors = {
       :b => 0,
       :k => 1,
       :m => 2,
       :g => 3
     }
 
     def convert(unit, multi)
       if num = @@sizeconvertors[unit]
         result = multi
         num.times do result *= 1024 end
         return result
       else
         self.fail "Invalid size unit '#{unit}'"
       end
     end
 
     def tidy?(path, stat)
       stat.size >= value
     end
 
     munge do |size|
       case size
       when /^([0-9]+)(\w)\w*$/
         multi = Integer($1)
         unit = $2.downcase.intern
       when /^([0-9]+)$/
         multi = Integer($1)
         unit = :k
       else
         self.fail "Invalid tidy size #{age}"
       end
 
       convert(unit, multi)
     end
   end
 
   newparam(:type) do
     desc "Set the mechanism for determining age."
 
     newvalues(:atime, :mtime, :ctime)
 
     defaultto :atime
   end
 
   newparam(:rmdirs, :boolean => true) do
     desc "Tidy directories in addition to files; that is, remove
       directories whose age is older than the specified criteria.
       This will only remove empty directories, so all contained
       files must also be tidied before a directory gets removed."
 
     newvalues :true, :false
   end
 
   # Erase PFile's validate method
   validate do
   end
 
   def self.instances
     []
   end
 
   @depthfirst = true
 
   def initialize(hash)
     super
 
     # only allow backing up into filebuckets
     self[:backup] = false unless self[:backup].is_a? Puppet::FileBucket::Dipper
   end
 
   # Make a file resource to remove a given file.
   def mkfile(path)
     # Force deletion, so directories actually get deleted.
     Puppet::Type.type(:file).new :path => path, :backup => self[:backup], :ensure => :absent, :force => true
   end
 
   def retrieve
     # Our ensure property knows how to retrieve everything for us.
     if obj = @parameters[:ensure]
       return obj.retrieve
     else
       return {}
     end
   end
 
   # Hack things a bit so we only ever check the ensure property.
   def properties
     []
   end
 
   def eval_generate
     []
   end
 
   def generate
     return [] unless stat(self[:path])
 
     case self[:recurse]
     when Integer, Fixnum, Bignum, /^\d+$/
       parameter = { :recurse => true, :recurselimit => self[:recurse] }
     when true, :true, :inf
       parameter = { :recurse => true }
     end
 
     if parameter
       files = Puppet::FileServing::Fileset.new(self[:path], parameter).files.collect do |f|
         f == "." ? self[:path] : File.join(self[:path], f)
       end
     else
       files = [self[:path]]
     end
     result = files.find_all { |path| tidy?(path) }.collect { |path| mkfile(path) }.each { |file| notice "Tidying #{file.ref}" }.sort { |a,b| b[:path] <=> a[:path] }
 
     # No need to worry about relationships if we don't have rmdirs; there won't be
     # any directories.
     return result unless rmdirs?
 
     # Now make sure that all directories require the files they contain, if all are available,
     # so that a directory is emptied before we try to remove it.
     files_by_name = result.inject({}) { |hash, file| hash[file[:path]] = file; hash }
 
     files_by_name.keys.sort { |a,b| b <=> b }.each do |path|
       dir = File.dirname(path)
       next unless resource = files_by_name[dir]
       if resource[:require]
         resource[:require] << Puppet::Resource.new(:file, path)
       else
         resource[:require] = [Puppet::Resource.new(:file, path)]
       end
     end
 
     result
   end
 
   # Does a given path match our glob patterns, if any?  Return true
   # if no patterns have been provided.
   def matches?(path)
     return true unless self[:matches]
 
     basename = File.basename(path)
     flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
     if self[:matches].find {|pattern| File.fnmatch(pattern, basename, flags) }
       return true
     else
       debug "No specified patterns match #{path}, not tidying"
       return false
     end
   end
 
   # Should we remove the specified file?
   def tidy?(path)
     return false unless stat = self.stat(path)
 
     return false if stat.ftype == "directory" and ! rmdirs?
 
     # The 'matches' parameter isn't OR'ed with the other tests --
     # it's just used to reduce the list of files we can match.
     return false if param = parameter(:matches) and ! param.tidy?(path, stat)
 
     tested = false
     [:age, :size].each do |name|
       next unless param = parameter(name)
       tested = true
       return true if param.tidy?(path, stat)
     end
 
     # If they don't specify either, then the file should always be removed.
     return true unless tested
     false
   end
 
   def stat(path)
     begin
       File.lstat(path)
     rescue Errno::ENOENT => error
       info "File does not exist"
       return nil
     rescue Errno::EACCES => error
       warning "Could not stat; permission denied"
       return nil
     end
   end
 end
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index c7ac796a3..007b760bc 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -1,384 +1,383 @@
 require 'etc'
 require 'facter'
 require 'puppet/property/list'
 require 'puppet/property/ordered_list'
 require 'puppet/property/keyvalue'
 
 module Puppet
   newtype(:user) do
     @doc = "Manage users.  This type is mostly built to manage system
       users, so it is lacking some features useful for managing normal
       users.
 
       This resource type uses the prescribed native tools for creating
       groups and generally uses POSIX APIs for retrieving information
-      about them.  It does not directly modify /etc/passwd or anything."
+      about them.  It does not directly modify `/etc/passwd` or anything."
 
     feature :allows_duplicates,
       "The provider supports duplicate users with the same UID."
 
     feature :manages_homedir,
       "The provider can create and remove home directories."
 
     feature :manages_passwords,
       "The provider can modify user passwords, by accepting a password
       hash."
 
     feature :manages_solaris_rbac,
       "The provider can manage roles and normal users"
 
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
       end
 
       newvalue(:absent, :event => :user_removed) do
         provider.delete
       end
 
       newvalue(:role, :event => :role_created, :required_features => :manages_solaris_rbac) do
         provider.create_role
       end
 
       desc "The basic state that the object should be in."
 
       # If they're talking about the thing at all, they generally want to
       # say it should exist.
       defaultto do
         if @resource.managed?
           :present
         else
           nil
         end
       end
 
       def retrieve
         if provider.exists?
           if provider.respond_to?(:is_role?) and provider.is_role?
             return :role
           else
             return :present
           end
         else
           return :absent
         end
       end
     end
 
     newproperty(:uid) do
       desc "The user ID.  Must be specified numerically.  For new users
         being created, if no user ID is specified then one will be
         chosen automatically, which will likely result in the same user
         having different IDs on different systems, which is not
         recommended.  This is especially noteworthy if you use Puppet
         to manage the same user on both Darwin and other platforms,
         since Puppet does the ID generation for you on Darwin, but the
         tools do so on other platforms."
 
       munge do |value|
         case value
         when String
           if value =~ /^[-0-9]+$/
             value = Integer(value)
           end
         end
 
         return value
       end
     end
 
     newproperty(:gid) do
       desc "The user's primary group.  Can be specified numerically or
         by name."
 
       munge do |value|
         if value.is_a?(String) and value =~ /^[-0-9]+$/
           Integer(value)
         else
           value
         end
       end
 
       def insync?(is)
         return true unless self.should
 
         # We know the 'is' is a number, so we need to convert the 'should' to a number,
         # too.
         @should.each do |value|
           return true if number = Puppet::Util.gid(value) and is == number
         end
 
         false
       end
 
       def sync
         found = false
         @should.each do |value|
           if number = Puppet::Util.gid(value)
             provider.gid = number
             found = true
             break
           end
         end
 
         fail "Could not find group(s) #{@should.join(",")}" unless found
 
         # Use the default event.
       end
     end
 
     newproperty(:comment) do
       desc "A description of the user.  Generally is a user's full name."
     end
 
     newproperty(:home) do
       desc "The home directory of the user.  The directory must be created
         separately and is not currently checked for existence."
     end
 
     newproperty(:shell) do
       desc "The user's login shell.  The shell must exist and be
         executable."
     end
 
     newproperty(:password, :required_features => :manages_passwords) do
       desc "The user's password, in whatever encrypted format the local machine requires. Be sure to enclose any value that includes a dollar sign ($) in single quotes (\')."
 
       validate do |value|
         raise ArgumentError, "Passwords cannot include ':'" if value.is_a?(String) and value.include?(":")
       end
 
       def change_to_s(currentvalue, newvalue)
         if currentvalue == :absent
           return "created password"
         else
           return "changed password"
         end
       end
     end
 
 
     newproperty(:groups, :parent => Puppet::Property::List) do
       desc "The groups of which the user is a member.  The primary
         group should not be listed.  Multiple groups should be
         specified as an array."
 
       validate do |value|
         if value =~ /^\d+$/
           raise ArgumentError, "Group names must be provided, not numbers"
         end
         raise ArgumentError, "Group names must be provided as an array, not a comma-separated list" if value.include?(",")
       end
     end
 
     newparam(:name) do
       desc "User name.  While limitations are determined for
         each operating system, it is generally a good idea to keep to
         the degenerate 8 characters, beginning with a letter."
       isnamevar
     end
 
     newparam(:membership) do
       desc "Whether specified groups should be treated as the only groups
         of which the user is a member or whether they should merely
         be treated as the minimum membership list."
 
       newvalues(:inclusive, :minimum)
 
       defaultto :minimum
     end
 
     newparam(:allowdupe, :boolean => true) do
       desc "Whether to allow duplicate UIDs."
 
       newvalues(:true, :false)
 
       defaultto false
     end
 
     newparam(:managehome, :boolean => true) do
       desc "Whether to manage the home directory when managing the user."
 
       newvalues(:true, :false)
 
       defaultto false
 
       validate do |val|
         if val.to_s == "true"
           raise ArgumentError, "User provider #{provider.class.name} can not manage home directories" unless provider.class.manages_homedir?
         end
       end
     end
 
     # Autorequire the group, if it's around
     autorequire(:group) do
       autos = []
 
       if obj = @parameters[:gid] and groups = obj.shouldorig
         groups = groups.collect { |group|
           if group =~ /^\d+$/
             Integer(group)
           else
             group
           end
         }
         groups.each { |group|
           case group
           when Integer
             if resource = catalog.resources.find { |r| r.is_a?(Puppet::Type.type(:group)) and r.should(:gid) == group }
               autos << resource
             end
           else
             autos << group
           end
         }
       end
 
       if obj = @parameters[:groups] and groups = obj.should
         autos += groups.split(",")
       end
 
       autos
     end
 
     # Provide an external hook.  Yay breaking out of APIs.
     def exists?
       provider.exists?
     end
 
     def retrieve
       absent = false
       properties.inject({}) { |prophash, property|
         current_value = :absent
 
         if absent
           prophash[property] = :absent
         else
           current_value = property.retrieve
           prophash[property] = current_value
         end
 
         if property.name == :ensure and current_value == :absent
           absent = true
         end
         prophash
       }
     end
 
     newproperty(:roles, :parent => Puppet::Property::List, :required_features => :manages_solaris_rbac) do
       desc "The roles the user has.  Multiple roles should be
         specified as an array."
 
       def membership
         :role_membership
       end
 
       validate do |value|
         if value =~ /^\d+$/
           raise ArgumentError, "Role names must be provided, not numbers"
         end
         raise ArgumentError, "Role names must be provided as an array, not a comma-separated list" if value.include?(",")
       end
     end
 
     #autorequire the roles that the user has
     autorequire(:user) do
       reqs = []
 
       if roles_property = @parameters[:roles] and roles = roles_property.should
         reqs += roles.split(',')
       end
 
       reqs
     end
 
     newparam(:role_membership) do
       desc "Whether specified roles should be treated as the only roles
         of which the user is a member or whether they should merely
         be treated as the minimum membership list."
 
       newvalues(:inclusive, :minimum)
 
       defaultto :minimum
     end
 
     newproperty(:auths, :parent => Puppet::Property::List, :required_features => :manages_solaris_rbac) do
       desc "The auths the user has.  Multiple auths should be
         specified as an array."
 
       def membership
         :auth_membership
       end
 
       validate do |value|
         if value =~ /^\d+$/
           raise ArgumentError, "Auth names must be provided, not numbers"
         end
         raise ArgumentError, "Auth names must be provided as an array, not a comma-separated list" if value.include?(",")
       end
     end
 
     newparam(:auth_membership) do
       desc "Whether specified auths should be treated as the only auths
         of which the user is a member or whether they should merely
         be treated as the minimum membership list."
 
       newvalues(:inclusive, :minimum)
 
       defaultto :minimum
     end
 
     newproperty(:profiles, :parent => Puppet::Property::OrderedList, :required_features => :manages_solaris_rbac) do
       desc "The profiles the user has.  Multiple profiles should be
         specified as an array."
 
       def membership
         :profile_membership
       end
 
       validate do |value|
         if value =~ /^\d+$/
           raise ArgumentError, "Profile names must be provided, not numbers"
         end
         raise ArgumentError, "Profile names must be provided as an array, not a comma-separated list" if value.include?(",")
       end
     end
 
     newparam(:profile_membership) do
       desc "Whether specified roles should be treated as the only roles
         of which the user is a member or whether they should merely
         be treated as the minimum membership list."
 
       newvalues(:inclusive, :minimum)
 
       defaultto :minimum
     end
 
     newproperty(:keys, :parent => Puppet::Property::KeyValue, :required_features => :manages_solaris_rbac) do
       desc "Specify user attributes in an array of keyvalue pairs"
 
       def membership
         :key_membership
       end
 
       validate do |value|
         raise ArgumentError, "key value pairs must be seperated by an =" unless value.include?("=")
       end
     end
 
     newparam(:key_membership) do
       desc "Whether specified key value pairs should be treated as the only attributes
         of the user or whether they should merely
         be treated as the minimum list."
 
       newvalues(:inclusive, :minimum)
 
       defaultto :minimum
     end
 
     newproperty(:project, :required_features => :manages_solaris_rbac) do
       desc "The name of the project associated with a user"
     end
   end
 end
-
diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index 5d86b1c75..698c077f4 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -1,346 +1,347 @@
 # Description of yum repositories
 
 require 'puppet/util/inifile'
 
 module Puppet
   # A property for one entry in a .ini-style file
   class IniProperty < Puppet::Property
     def insync?(is)
       # A should property of :absent is the same as nil
       if is.nil? && (should.nil? || should == :absent)
         return true
       end
       super(is)
     end
 
     def sync
       if insync?(retrieve)
         result = nil
       else
         result = set(self.should)
         if should == :absent
           resource.section[inikey] = nil
         else
           resource.section[inikey] = should
         end
       end
       result
     end
 
     def retrieve
       resource.section[inikey]
     end
 
     def inikey
       name.to_s
     end
 
     # Set the key associated with this property to KEY, instead
     # of using the property's NAME
     def self.inikey(key)
       # Override the inikey instance method
       # Is there a way to do this without resorting to strings ?
       # Using a block fails because the block can't access
       # the variable 'key' in the outer scope
       self.class_eval("def inikey ; \"#{key.to_s}\" ; end")
     end
 
   end
 
   # Doc string for properties that can be made 'absent'
   ABSENT_DOC="Set this to 'absent' to remove it from the file completely"
 
   newtype(:yumrepo) do
     @doc = "The client-side description of a yum repository. Repository
-      configurations are found by parsing /etc/yum.conf and
-      the files indicated by reposdir in that file (see yum.conf(5) for details)
+      configurations are found by parsing `/etc/yum.conf` and
+      the files indicated by the `reposdir` option in that file 
+      (see yum.conf(5) for details)
 
       Most parameters are identical to the ones documented
       in yum.conf(5)
 
       Continuation lines that yum supports for example for the
       baseurl are not supported. No attempt is made to access
       files included with the **include** directive"
 
     class << self
       attr_accessor :filetype
       # The writer is only used for testing, there should be no need
       # to change yumconf or inifile in any other context
       attr_accessor :yumconf
       attr_writer :inifile
     end
 
     self.filetype = Puppet::Util::FileType.filetype(:flat)
 
     @inifile = nil
 
     @yumconf = "/etc/yum.conf"
 
     # Where to put files for brand new sections
     @defaultrepodir = nil
 
     def self.instances
       l = []
       check = validproperties
       clear
       inifile.each_section do |s|
         next if s.name == "main"
         obj = new(:name => s.name, :audit => check)
         current_values = obj.retrieve
         obj.eachproperty do |property|
           if current_values[property].nil?
             obj.delete(property.name)
           else
             property.should = current_values[property]
           end
         end
         obj.delete(:audit)
         l << obj
       end
       l
     end
 
     # Return the Puppet::Util::IniConfig::File for the whole yum config
     def self.inifile
       if @inifile.nil?
         @inifile = read
         main = @inifile['main']
         raise Puppet::Error, "File #{yumconf} does not contain a main section" if main.nil?
         reposdir = main['reposdir']
         reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
         reposdir.gsub!(/[\n,]/, " ")
         reposdir.split.each do |dir|
           Dir::glob("#{dir}/*.repo").each do |file|
             @inifile.read(file) if File.file?(file)
           end
         end
         reposdir.split.each do |dir|
           if File::directory?(dir) && File::writable?(dir)
             @defaultrepodir = dir
             break
           end
         end
       end
       @inifile
     end
 
     # Parse the yum config files. Only exposed for the tests
     # Non-test code should use self.inifile to get at the
     # underlying file
     def self.read
       result = Puppet::Util::IniConfig::File.new
       result.read(yumconf)
       main = result['main']
       raise Puppet::Error, "File #{yumconf} does not contain a main section" if main.nil?
       reposdir = main['reposdir']
       reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
       reposdir.gsub!(/[\n,]/, " ")
       reposdir.split.each do |dir|
         Dir::glob("#{dir}/*.repo").each do |file|
           result.read(file) if File.file?(file)
         end
       end
       if @defaultrepodir.nil?
         reposdir.split.each do |dir|
           if File::directory?(dir) && File::writable?(dir)
             @defaultrepodir = dir
             break
           end
         end
       end
       result
     end
 
     # Return the Puppet::Util::IniConfig::Section with name NAME
     # from the yum config
     def self.section(name)
       result = inifile[name]
       if result.nil?
         # Brand new section
         path = yumconf
         path = File::join(@defaultrepodir, "#{name}.repo") unless @defaultrepodir.nil?
         Puppet::info "create new repo #{name} in file #{path}"
         result = inifile.add_section(name, path)
       end
       result
     end
 
     # Store all modifications back to disk
     def self.store
       inifile.store
       unless Puppet[:noop]
         target_mode = 0644 # FIXME: should be configurable
         inifile.each_file do |file|
           current_mode = File.stat(file).mode & 0777
           unless current_mode == target_mode
             Puppet::info "changing mode of #{file} from %03o to %03o" % [current_mode, target_mode]
             File.chmod(target_mode, file)
           end
         end
       end
     end
 
     # This is only used during testing.
     def self.clear
       @inifile = nil
       @yumconf = "/etc/yum.conf"
       @defaultrepodir = nil
     end
 
     # Return the Puppet::Util::IniConfig::Section for this yumrepo resource
     def section
       self.class.section(self[:name])
     end
 
     # Store modifications to this yumrepo resource back to disk
     def flush
       self.class.store
     end
 
     newparam(:name) do
       desc "The name of the repository.  This corresponds to the
         repositoryid parameter in yum.conf(5)."
       isnamevar
     end
 
     newproperty(:descr, :parent => Puppet::IniProperty) do
       desc "A human readable description of the repository.
         This corresponds to the name parameter in yum.conf(5).
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
       inikey "name"
     end
 
     newproperty(:mirrorlist, :parent => Puppet::IniProperty) do
       desc "The URL that holds the list of mirrors for this repository.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       # Should really check that it's a valid URL
       newvalue(/.*/) { }
     end
 
     newproperty(:baseurl, :parent => Puppet::IniProperty) do
       desc "The URL for this repository.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       # Should really check that it's a valid URL
       newvalue(/.*/) { }
     end
 
     newproperty(:enabled, :parent => Puppet::IniProperty) do
       desc "Whether this repository is enabled or disabled. Possible
         values are '0', and '1'.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{(0|1)}) { }
     end
 
     newproperty(:gpgcheck, :parent => Puppet::IniProperty) do
       desc "Whether to check the GPG signature on packages installed
         from this repository. Possible values are '0', and '1'.
         \n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{(0|1)}) { }
     end
 
     newproperty(:gpgkey, :parent => Puppet::IniProperty) do
       desc "The URL for the GPG key with which packages from this
         repository are signed.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       # Should really check that it's a valid URL
       newvalue(/.*/) { }
     end
 
     newproperty(:include, :parent => Puppet::IniProperty) do
       desc "A URL from which to include the config.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       # Should really check that it's a valid URL
       newvalue(/.*/) { }
     end
 
     newproperty(:exclude, :parent => Puppet::IniProperty) do
       desc "List of shell globs. Matching packages will never be
         considered in updates or installs for this repo.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
 
     newproperty(:includepkgs, :parent => Puppet::IniProperty) do
       desc "List of shell globs. If this is set, only packages
         matching one of the globs will be considered for
         update or install.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
 
     newproperty(:enablegroups, :parent => Puppet::IniProperty) do
       desc "Determines whether yum will allow the use of
         package groups for this  repository. Possible
         values are '0', and '1'.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{(0|1)}) { }
     end
 
     newproperty(:failovermethod, :parent => Puppet::IniProperty) do
       desc "Either 'roundrobin' or 'priority'.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{roundrobin|priority}) { }
     end
 
     newproperty(:keepalive, :parent => Puppet::IniProperty) do
       desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1
         keepalive  should  be  used with this repository.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{(0|1)}) { }
     end
 
     newproperty(:timeout, :parent => Puppet::IniProperty) do
       desc "Number of seconds to wait for a connection before timing
         out.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{[0-9]+}) { }
     end
 
     newproperty(:metadata_expire, :parent => Puppet::IniProperty) do
       desc "Number of seconds after which the metadata will expire.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{[0-9]+}) { }
     end
 
     newproperty(:protect, :parent => Puppet::IniProperty) do
       desc "Enable or disable protection for this repository. Requires
         that the protectbase plugin is installed and enabled.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{(0|1)}) { }
     end
 
     newproperty(:priority, :parent => Puppet::IniProperty) do
       desc "Priority of this repository from 1-99. Requires that
         the priorities plugin is installed and enabled.
         #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{[1-9][0-9]?}) { }
     end
 
     newproperty(:proxy, :parent => Puppet::IniProperty) do
       desc "URL to the proxy server for this repository.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       # Should really check that it's a valid URL
       newvalue(/.*/) { }
     end
 
     newproperty(:proxy_username, :parent => Puppet::IniProperty) do
       desc "Username for this proxy.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
 
     newproperty(:proxy_password, :parent => Puppet::IniProperty) do
       desc "Password for this proxy.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
   end
 end
diff --git a/lib/puppet/type/zfs.rb b/lib/puppet/type/zfs.rb
index e1a972ddf..1757931f8 100755
--- a/lib/puppet/type/zfs.rb
+++ b/lib/puppet/type/zfs.rb
@@ -1,51 +1,50 @@
 module Puppet
   newtype(:zfs) do
     @doc = "Manage zfs. Create destroy and set properties on zfs instances."
 
     ensurable
 
     newparam(:name) do
       desc "The full name for this filesystem. (including the zpool)"
     end
 
     newproperty(:mountpoint) do
       desc "The mountpoint property."
     end
 
     newproperty(:compression) do
       desc "The compression property."
     end
 
     newproperty(:copies) do
       desc "The copies property."
     end
 
     newproperty(:quota) do
       desc "The quota property."
     end
 
     newproperty(:reservation) do
       desc "The reservation property."
     end
 
     newproperty(:sharenfs) do
       desc "The sharenfs property."
     end
 
     newproperty(:snapdir) do
-      desc "The sharenfs property."
+      desc "The snapdir property."
     end
 
     autorequire(:zpool) do
       #strip the zpool off the zfs name and autorequire it
       [@parameters[:name].value.split('/')[0]]
     end
 
     autorequire(:zfs) do
       #slice and dice, we want all the zfs before this one
       names = @parameters[:name].value.split('/')
       names.slice(1..-2).inject([]) { |a,v| a << "#{a.last}/#{v}" }.collect { |fs| names[0] + fs }
     end
   end
 end
-
diff --git a/lib/puppet/type/zone.rb b/lib/puppet/type/zone.rb
index d523c469a..408d6f5dd 100644
--- a/lib/puppet/type/zone.rb
+++ b/lib/puppet/type/zone.rb
@@ -1,444 +1,444 @@
 Puppet::Type.newtype(:zone) do
   @doc = "Solaris zones."
 
   # These properties modify the zone configuration, and they need to provide
   # the text separately from syncing it, so all config statements can be rolled
   # into a single creation statement.
   class ZoneConfigProperty < Puppet::Property
     # Perform the config operation.
     def sync
       provider.setconfig self.configtext
     end
   end
 
   # Those properties that can have multiple instances.
   class ZoneMultiConfigProperty < ZoneConfigProperty
     def configtext
       list = @should
 
       current_value = self.retrieve
 
       unless current_value.is_a? Symbol
         if current_value.is_a? Array
           list += current_value
         else
           list << current_value if current_value
         end
       end
 
       # Some hackery so we can test whether current_value is an array or a symbol
       if current_value.is_a? Array
         tmpis = current_value
       else
         if current_value
           tmpis = [current_value]
         else
           tmpis = []
         end
       end
 
       rms = []
       adds = []
 
       # Collect the modifications to make
       list.sort.uniq.collect do |obj|
         # Skip objectories that are configured and should be
         next if tmpis.include?(obj) and @should.include?(obj)
 
         if tmpis.include?(obj)
           rms << obj
         else
           adds << obj
         end
       end
 
 
       # And then perform all of the removals before any of the adds.
       (rms.collect { |o| rm(o) } + adds.collect { |o| add(o) }).join("\n")
     end
 
     # We want all specified directories to be included.
     def insync?(current_value)
       if current_value.is_a? Array and @should.is_a? Array
         current_value.sort == @should.sort
       else
         current_value == @should
       end
     end
   end
 
   ensurable do
     desc "The running state of the zone.  The valid states directly reflect
-      the states that ``zoneadm`` provides.  The states are linear,
-      in that a zone must be ``configured`` then ``installed``, and
-      only then can be ``running``.  Note also that ``halt`` is currently
+      the states that `zoneadm` provides.  The states are linear,
+      in that a zone must be `configured` then `installed`, and
+      only then can be `running`.  Note also that `halt` is currently
       used to stop zones."
 
     @states = {}
     @parametervalues = []
 
     def self.alias_state(values)
       @state_aliases ||= {}
       values.each do |nick, name|
         @state_aliases[nick] = name
       end
     end
 
     def self.newvalue(name, hash)
       @parametervalues = [] if @parametervalues.is_a? Hash
 
       @parametervalues << name
 
       @states[name] = hash
       hash[:name] = name
     end
 
     def self.state_name(name)
       if other = @state_aliases[name]
         other
       else
         name
       end
     end
 
     newvalue :absent, :down => :destroy
     newvalue :configured, :up => :configure, :down => :uninstall
     newvalue :installed, :up => :install, :down => :stop
     newvalue :running, :up => :start
 
     alias_state :incomplete => :installed, :ready => :installed, :shutting_down => :running
 
     defaultto :running
 
     def self.state_index(value)
       @parametervalues.index(state_name(value))
     end
 
     # Return all of the states between two listed values, exclusive
     # of the first item.
     def self.state_sequence(first, second)
       findex = sindex = nil
       unless findex = @parametervalues.index(state_name(first))
         raise ArgumentError, "'#{first}' is not a valid zone state"
       end
       unless sindex = @parametervalues.index(state_name(second))
         raise ArgumentError, "'#{first}' is not a valid zone state"
       end
       list = nil
 
       # Apparently ranges are unidirectional, so we have to reverse
       # the range op twice.
       if findex > sindex
         list = @parametervalues[sindex..findex].collect do |name|
           @states[name]
         end.reverse
       else
         list = @parametervalues[findex..sindex].collect do |name|
           @states[name]
         end
       end
 
       # The first result is the current state, so don't return it.
       list[1..-1]
     end
 
     def retrieve
       provider.properties[:ensure]
     end
 
     def sync
       method = nil
       if up?
         direction = :up
       else
         direction = :down
       end
 
       # We need to get the state we're currently in and just call
       # everything between it and us.
       self.class.state_sequence(self.retrieve, self.should).each do |state|
         if method = state[direction]
           warned = false
           while provider.processing?
             unless warned
               info "Waiting for zone to finish processing"
               warned = true
             end
             sleep 1
           end
           provider.send(method)
         else
           raise Puppet::DevError, "Cannot move #{direction} from #{st[:name]}"
         end
       end
 
       ("zone_#{self.should}").intern
     end
 
     # Are we moving up the property tree?
     def up?
       current_value = self.retrieve
       self.class.state_index(current_value) < self.class.state_index(self.should)
     end
   end
 
   newparam(:name) do
     desc "The name of the zone."
 
     isnamevar
   end
 
   newparam(:id) do
     desc "The numerical ID of the zone.  This number is autogenerated
       and cannot be changed."
   end
 
   newparam(:clone) do
     desc "Instead of installing the zone, clone it from another zone.
       If the zone root resides on a zfs file system, a snapshot will be
       used to create the clone, is it redisides on ufs, a copy of the zone
       will be used. The zone you clone from must not be running."
   end
 
   newproperty(:ip, :parent => ZoneMultiConfigProperty) do
     require 'ipaddr'
 
     desc "The IP address of the zone.  IP addresses must be specified
       with the interface, separated by a colon, e.g.: bge0:192.168.0.1.
       For multiple interfaces, specify them in an array."
 
     # Add an interface.
     def add(str)
       interface, ip, defrouter = ipsplit(str)
       cmd = "add net\n"
       cmd += "set physical=#{interface}\n" if interface
       cmd += "set address=#{ip}\n" if ip
       cmd += "set defrouter=#{defrouter}\n" if defrouter
       #if @resource[:iptype] == :shared
       cmd += "end\n"
     end
 
     # Convert a string into the component interface, address and defrouter
     def ipsplit(str)
       interface, address, defrouter = str.split(':')
       return interface, address, defrouter
     end
 
     # Remove an interface.
     def rm(str)
       interface, ip, defrouter = ipsplit(str)
       # Reality seems to disagree with the documentation here; the docs
       # specify that braces are required, but they're apparently only
       # required if you're specifying multiple values.
       if ip
         "remove net address=#{ip}"
       elsif interface
         "remove net interface=#{interface}"
       else
         raise ArgumentError, "can not remove network based on default router"
       end
     end
   end
 
   newproperty(:iptype, :parent => ZoneConfigProperty) do
     desc "The IP stack type of the zone. Can either be 'shared' or 'exclusive'."
 
     defaultto :shared
 
     newvalue :shared
     newvalue :exclusive
 
     def configtext
       "set ip-type=#{self.should}"
     end
   end
 
   newproperty(:autoboot, :parent => ZoneConfigProperty) do
     desc "Whether the zone should automatically boot."
 
     defaultto true
 
     newvalue(:true) {}
     newvalue(:false) {}
 
     def configtext
       "set autoboot=#{self.should}"
     end
   end
 
   newproperty(:pool, :parent => ZoneConfigProperty) do
     desc "The resource pool for this zone."
 
     def configtext
       "set pool=#{self.should}"
     end
   end
 
   newproperty(:shares, :parent => ZoneConfigProperty) do
     desc "Number of FSS CPU shares allocated to the zone."
 
     def configtext
       "add rctl\nset name=zone.cpu-shares\nadd value (priv=privileged,limit=#{self.should},action=none)\nend"
     end
   end
 
   newproperty(:inherit, :parent => ZoneMultiConfigProperty) do
     desc "The list of directories that the zone inherits from the global
       zone.  All directories must be fully qualified."
 
     validate do |value|
       unless value =~ /^\//
         raise ArgumentError, "Inherited filesystems must be fully qualified"
       end
     end
 
     # Add a directory to our list of inherited directories.
     def add(dir)
       "add inherit-pkg-dir\nset dir=#{dir}\nend"
     end
 
     def rm(dir)
       # Reality seems to disagree with the documentation here; the docs
       # specify that braces are required, but they're apparently only
       # required if you're specifying multiple values.
       "remove inherit-pkg-dir dir=#{dir}"
     end
 
     def should
       @should
     end
   end
 
   # Specify the sysidcfg file.  This is pretty hackish, because it's
   # only used to boot the zone the very first time.
   newparam(:sysidcfg) do
     desc %{The text to go into the sysidcfg file when the zone is first
-      booted.  The best way is to use a template::
-
-        # $templatedir/sysidcfg
-        system_locale=en_US
-        timezone=GMT
-        terminal=xterms
-        security_policy=NONE
-        root_password=&lt;%= password %>
-        timeserver=localhost
-        name_service=DNS {domain_name=&lt;%= domain %> name_server=&lt;%= nameserver %>}
-        network_interface=primary {hostname=&lt;%= realhostname %>
-          ip_address=&lt;%= ip %>
-          netmask=&lt;%= netmask %>
-          protocol_ipv6=no
-          default_route=&lt;%= defaultroute %>}
-        nfs4_domain=dynamic
-
-      And then call that::
-
-        zone { myzone:
-          ip => "bge0:192.168.0.23",
-          sysidcfg => template(sysidcfg),
-          path => "/opt/zones/myzone",
-          realhostname => "fully.qualified.domain.name"
-        }
+      booted.  The best way is to use a template:
+
+          # $templatedir/sysidcfg
+          system_locale=en_US
+          timezone=GMT
+          terminal=xterms
+          security_policy=NONE
+          root_password=<%= password %>
+          timeserver=localhost
+          name_service=DNS {domain_name=<%= domain %> name_server=<%= nameserver %>}
+          network_interface=primary {hostname=<%= realhostname %>
+            ip_address=<%= ip %>
+            netmask=<%= netmask %>
+            protocol_ipv6=no
+            default_route=<%= defaultroute %>}
+          nfs4_domain=dynamic
+
+      And then call that:
+
+          zone { myzone:
+            ip => "bge0:192.168.0.23",
+            sysidcfg => template(sysidcfg),
+            path => "/opt/zones/myzone",
+            realhostname => "fully.qualified.domain.name"
+          }
 
       The sysidcfg only matters on the first booting of the zone,
       so Puppet only checks for it at that time.}
   end
 
   newparam(:path) do
     desc "The root of the zone's filesystem.  Must be a fully qualified
       file name.  If you include '%s' in the path, then it will be
       replaced with the zone's name.  At this point, you cannot use
       Puppet to move a zone."
 
     validate do |value|
       unless value =~ /^\//
         raise ArgumentError, "The zone base must be fully qualified"
       end
     end
 
     munge do |value|
       if value =~ /%s/
         value % @resource[:name]
       else
         value
       end
     end
   end
 
   newparam(:create_args) do
     desc "Arguments to the zonecfg create command.  This can be used to create branded zones."
   end
 
   newparam(:install_args) do
     desc "Arguments to the zoneadm install command.  This can be used to create branded zones."
   end
 
   newparam(:realhostname) do
     desc "The actual hostname of the zone."
   end
 
   # If Puppet is also managing the base dir or its parent dir, list them
   # both as prerequisites.
   autorequire(:file) do
     if @parameters.include? :path
       [@parameters[:path].value, File.dirname(@parameters[:path].value)]
     else
       nil
     end
   end
 
   def validate_ip(ip, name)
       IPAddr.new(ip) if ip
   rescue ArgumentError
       self.fail "'#{ip}' is an invalid #{name}"
   end
 
   validate do
     value = self[:ip]
     interface, address, defrouter = value.split(':')
     if self[:iptype] == :shared
       if (interface && address && defrouter.nil?) ||
         (interface && address && defrouter)
         validate_ip(address, "IP address")
         validate_ip(defrouter, "default router")
       else
         self.fail "ip must contain interface name and ip address separated by a \":\""
       end
     else
       self.fail "only interface may be specified when using exclusive IP stack: #{value}" unless interface && address.nil? && defrouter.nil?
     end
 
     self.fail "zone path is required" unless self[:path]
   end
 
   def retrieve
     provider.flush
     if hash = provider.properties and hash[:ensure] != :absent
       result = setstatus(hash)
       result
     else
       # Return all properties as absent.
       return properties.inject({}) do | prophash, property|
         prophash[property] = :absent
         prophash
       end
     end
   end
 
   # Take the results of a listing and set everything appropriately.
   def setstatus(hash)
     prophash = {}
     hash.each do |param, value|
       next if param == :name
       case self.class.attrtype(param)
       when :property
         # Only try to provide values for the properties we're managing
         if prop = self.property(param)
           prophash[prop] = value
         end
       else
         self[param] = value
       end
     end
     prophash
   end
 end
diff --git a/lib/puppet/type/zpool.rb b/lib/puppet/type/zpool.rb
index 80e635504..49cce552a 100755
--- a/lib/puppet/type/zpool.rb
+++ b/lib/puppet/type/zpool.rb
@@ -1,87 +1,92 @@
 module Puppet
   class Property
 
     class VDev < Property
 
       def flatten_and_sort(array)
         array.collect { |a| a.split(' ') }.flatten.sort
       end
 
       def insync?(is)
         return true unless self.should
 
         return @should == [:absent] if is == :absent
 
         flatten_and_sort(is) == flatten_and_sort(@should)
       end
     end
 
     class MultiVDev < VDev
       def insync?(is)
         return true unless self.should
 
         return @should == [:absent] if is == :absent
 
         return false unless is.length == @should.length
 
         is.each_with_index { |list, i| return false unless flatten_and_sort(list) == flatten_and_sort(@should[i]) }
 
         #if we made it this far we are in sync
         true
       end
     end
   end
 
   newtype(:zpool) do
     @doc = "Manage zpools. Create and delete zpools. The provider WILL NOT SYNC, only report differences.
 
       Supports vdevs with mirrors, raidz, logs and spares."
 
     ensurable
 
     newproperty(:disk, :array_matching => :all, :parent => Puppet::Property::VDev) do
       desc "The disk(s) for this pool. Can be an array or space separated string"
     end
 
     newproperty(:mirror, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string.
-        mirror => [\"disk1 disk2\", \"disk3 disk4\"]"
+      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string:
+
+    mirror => [\"disk1 disk2\", \"disk3 disk4\"]
+
+      "
 
       validate do |value|
         raise ArgumentError, "mirror names must be provided as string separated, not a comma-separated list" if value.include?(",")
       end
     end
 
     newproperty(:raidz, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to raid for this pool. Should be an array of space separated strings.
-        raidz => [\"disk1 disk2\", \"disk3 disk4\"]"
+      desc "List of all the devices to raid for this pool. Should be an array of space separated strings:
+      
+          raidz => [\"disk1 disk2\", \"disk3 disk4\"]
+
+      "
 
       validate do |value|
         raise ArgumentError, "raid names must be provided as string separated, not a comma-separated list" if value.include?(",")
       end
     end
 
     newproperty(:spare, :array_matching => :all, :parent => Puppet::Property::VDev) do
       desc "Spare disk(s) for this pool."
     end
 
     newproperty(:log, :array_matching => :all, :parent => Puppet::Property::VDev) do
       desc "Log disks for this pool. (doesn't support mirroring yet)"
     end
 
     newparam(:pool) do
       desc "The name for this pool."
       isnamevar
     end
 
     newparam(:raid_parity) do
       desc "Determines parity when using raidz property."
     end
 
     validate do
       has_should = [:disk, :mirror, :raidz].select { |prop| self.should(prop) }
       self.fail "You cannot specify #{has_should.join(" and ")} on this type (only one)" if has_should.length > 1
     end
   end
 end
-
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb
index c293ac14a..f0dd0a5c5 100644
--- a/lib/puppet/util/autoload.rb
+++ b/lib/puppet/util/autoload.rb
@@ -1,144 +1,156 @@
 require 'puppet/util/warnings'
 require 'puppet/util/cacher'
 
 # Autoload paths, either based on names or all at once.
 class Puppet::Util::Autoload
   require 'puppet/util/autoload/file_cache'
 
   include Puppet::Util
   include Puppet::Util::Warnings
   include Puppet::Util::Cacher
   include Puppet::Util::Autoload::FileCache
 
   @autoloaders = {}
   @loaded = []
 
   class << self
     attr_reader :autoloaders
     private :autoloaders
   end
 
   # Send [], []=, and :clear to the @autloaders hash
   Puppet::Util.classproxy self, :autoloaders, "[]", "[]="
 
   # List all loaded files.
   def self.list_loaded
     @loaded.sort { |a,b| a[0] <=> b[0] }.collect do |path, hash|
       "#{path}: #{hash[:file]}"
     end
   end
 
   # Has a given path been loaded?  This is used for testing whether a
   # changed file should be loaded or just ignored.  This is only
   # used in network/client/master, when downloading plugins, to
   # see if a given plugin is currently loaded and thus should be
   # reloaded.
   def self.loaded?(path)
     path = path.to_s.sub(/\.rb$/, '')
     @loaded.include?(path)
   end
 
   # Save the fact that a given path has been loaded.  This is so
   # we can load downloaded plugins if they've already been loaded
   # into memory.
   def self.loaded(file)
     $" << file + ".rb" unless $".include?(file)
     @loaded << file unless @loaded.include?(file)
   end
 
   attr_accessor :object, :path, :objwarn, :wrap
 
   def initialize(obj, path, options = {})
     @path = path.to_s
     raise ArgumentError, "Autoload paths cannot be fully qualified" if @path !~ /^\w/
     @object = obj
 
     self.class[obj] = self
 
     options.each do |opt, value|
       opt = opt.intern if opt.is_a? String
       begin
         self.send(opt.to_s + "=", value)
       rescue NoMethodError
         raise ArgumentError, "#{opt} is not a valid option"
       end
     end
 
     @wrap = true unless defined?(@wrap)
   end
 
   # Load a single plugin by name.  We use 'load' here so we can reload a
   # given plugin.
   def load(name,env=nil)
     path = name.to_s + ".rb"
 
     searchpath(env).each do |dir|
       file = File.join(dir, path)
       next unless file_exist?(file)
       begin
         Kernel.load file, @wrap
         name = symbolize(name)
         loaded name, file
         return true
       rescue SystemExit,NoMemoryError
         raise
       rescue Exception => detail
         puts detail.backtrace if Puppet[:trace]
         raise Puppet::Error, "Could not autoload #{name}: #{detail}"
       end
     end
     false
   end
 
   # Mark the named object as loaded.  Note that this supports unqualified
   # queries, while we store the result as a qualified query in the class.
   def loaded(name, file)
     self.class.loaded(File.join(@path, name.to_s))
   end
 
   # Indicate whether the specfied plugin has been loaded.
   def loaded?(name)
     self.class.loaded?(File.join(@path, name.to_s))
   end
 
   # Load all instances that we can.  This uses require, rather than load,
   # so that already-loaded files don't get reloaded unnecessarily.
   def loadall
     # Load every instance of everything we can find.
     searchpath.each do |dir|
       Dir.glob("#{dir}/*.rb").each do |file|
         name = File.basename(file).sub(".rb", '').intern
         next if loaded?(name)
         begin
           Kernel.require file
           loaded(name, file)
         rescue SystemExit,NoMemoryError
           raise
         rescue Exception => detail
           puts detail.backtrace if Puppet[:trace]
           raise Puppet::Error, "Could not autoload #{file}: #{detail}"
         end
       end
     end
   end
 
   # The list of directories to search through for loadable plugins.
   def searchpath(env=nil)
     search_directories(env).collect { |d| File.join(d, @path) }.find_all { |d| FileTest.directory?(d) }
   end
 
   def module_directories(env=nil)
     # We have to require this late in the process because otherwise we might have
     # load order issues.
     require 'puppet/node/environment'
-    Puppet::Node::Environment.new(env).modulepath.collect do |dir|
-      Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f| File.join(dir, f) }
-    end.flatten.collect { |d| [File.join(d, "plugins"), File.join(d, "lib")] }.flatten.find_all do |d|
-      FileTest.directory?(d)
-    end
+
+    real_env = Puppet::Node::Environment.new(env)
+
+    # We're using a per-thread cache of said module directories, so that
+    # we don't scan the filesystem each time we try to load something with
+    # this autoload instance. But since we don't want to cache for the eternity
+    # this env_module_directories gets reset after the compilation on the master.
+    # This is also reset after an agent ran.
+    # One of the side effect of this change is that this module directories list will be
+    # shared among all autoload that we have running at a time. But that won't be an issue
+    # as by definition those directories are shared by all autoload.
+    Thread.current[:env_module_directories] ||= {}
+    Thread.current[:env_module_directories][real_env] ||= real_env.modulepath.collect do |dir|
+        Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f| File.join(dir, f) }
+      end.flatten.collect { |d| [File.join(d, "plugins"), File.join(d, "lib")] }.flatten.find_all do |d|
+        FileTest.directory?(d)
+      end
   end
 
   def search_directories(env=nil)
     [module_directories(env), Puppet[:libdir].split(File::PATH_SEPARATOR), $LOAD_PATH].flatten
   end
 end
diff --git a/lib/puppet/util/command_line/puppetdoc b/lib/puppet/util/command_line/puppetdoc
index d9bbbec33..0fa1830d6 100755
--- a/lib/puppet/util/command_line/puppetdoc
+++ b/lib/puppet/util/command_line/puppetdoc
@@ -1,67 +1,67 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Generate a reference for all Puppet types.  Largely meant for internal Reductive
 # Labs use.
 #
 # = Usage
 #
-#   puppet doc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|markdown|trac|rdoc>]
+#   puppet doc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|rdoc>]
 #              [-r|--reference <[type]|configuration|..>] [--charset CHARSET] [manifest-file]
 #
 # = Description
 #
-# If mode is not 'rdoc', then this command generates a restructured-text document describing all installed
+# If mode is not 'rdoc', then this command generates a Markdown document describing all installed
 # Puppet types or all allowable arguments to puppet executables.  It is largely
 # meant for internal use and is used to generate the reference document
-# available on the Reductive Labs web site.
+# available on the Puppet Labs web site.
 #
 # In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
 # are in 'manifestdir' and 'modulepath' configuration directives.
 # The generated documentation directory is doc by default but can be changed with the 'outputdir' option.
 #
 # If the command is started with 'manifest-file' command-line arguments, puppet doc generate a single
 # manifest documentation that is output on stdout.
 #
 # = Options
 #
 # all::
 #   Output the docs for all of the reference types. In 'rdoc' modes, this also outputs documentation for all resources
 #
 # help::
 #   Print this help message
 #
 # outputdir::
 #   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
 #
 # mode::
-#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
+#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf' and 'rdoc'. The 'pdf' mode creates PDF formatted files in the /tmp directory. The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppet doc --list+.
 #
 # charset::
 #   Used only in 'rdoc' mode. It sets the charset used in the html files produced.
 #
 # = Example
 #
 #   $ puppet doc -r type > /tmp/type_reference.rst
 # or
 #   $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
 # or
 #   $ puppet doc /etc/puppet/manifests/site.pp
 # or
-#   $ puppet doc -m markdown -r configuration
+#   $ puppet doc -m pdf -r configuration
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
 # Copyright (c) 2005-2007 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:doc].run
diff --git a/lib/puppet/util/command_line/puppetrun b/lib/puppet/util/command_line/puppetrun
index ee95c47eb..27cd775b9 100755
--- a/lib/puppet/util/command_line/puppetrun
+++ b/lib/puppet/util/command_line/puppetrun
@@ -1,128 +1,126 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Trigger a puppet agent run on a set of hosts.
 #
 # = Usage
 #
 #   puppet kick [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground]
 #       [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules]
 #       [-t|--tag <tag>] [--test] [-p|--ping] <host> [<host> [...]]
 #
 # = Description
 #
 # This script can be used to connect to a set of machines running +puppet agent+
 # and trigger them to run their configurations.  The most common usage would
 # be to specify a class of hosts and a set of tags, and +puppet kick+ would
 # look up in LDAP all of the hosts matching that class, then connect to
 # each host and trigger a run of all of the objects with the specified tags.
 #
 # If you are not storing your host configurations in LDAP, you can specify
 # hosts manually.
 #
 # You will most likely have to run +puppet kick+ as root to get access to
 # the SSL certificates.
 #
 # +puppet kick+ reads +puppet master+'s configuration file, so that it can copy
 # things like LDAP settings.
 #
 # = Usage Notes
 #
 # +puppet kick+ is useless unless +puppet agent+ is listening.  See its documentation
 # for more information, but the gist is that you must enable +listen+ on the
 # +puppet agent+ daemon, either using +--listen+ on the command line or adding
 # 'listen: true' in its config file.  In addition, you need to set the daemons
 # up to specifically allow connections by creating the +namespaceauth+ file,
 # normally at '/etc/puppet/namespaceauth.conf'.  This file specifies who has
 # access to each namespace; if you create the file you must add every namespace
 # you want any Puppet daemon to allow -- it is currently global to all Puppet
 # daemons.
 #
 # An example file looks like this::
 #
 #     [fileserver]
 #         allow *.madstop.com
 #
 #     [puppetmaster]
 #         allow *.madstop.com
 #
 #     [puppetrunner]
 #         allow culain.madstop.com
 #
 # This is what you would install on your Puppet master; non-master hosts could
 # leave off the 'fileserver' and 'puppetmaster' namespaces.
 #
-# Expect more documentation on this eventually.
-#
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://reductivelabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet master with
 # '--genconfig'.
 #
 #
 # all::
 #   Connect to all available hosts.  Requires LDAP support at this point.
 #
 # class::
 #   Specify a class of machines to which to connect.  This only works if you
 #   have LDAP configured, at the moment.
 #
 # debug::
 #   Enable full debugging.
 #
 # foreground::
 #   Run each configuration in the foreground; that is, when connecting to a host,
 #   do not return until the host has finished its run.  The default is false.
 #
 # help::
 #   Print this help message
 #
 # host::
 #   A specific host to which to connect.  This flag can be specified more
 #   than once.
 #
 # ignoreschedules::
 #   Whether the client should ignore schedules when running its configuration.
 #   This can be used to force the client to perform work it would not normally
 #   perform so soon.  The default is false.
 #
 # parallel::
 #   How parallel to make the connections.  Parallelization is provided by forking
 #   for each client to which to connect.  The default is 1, meaning serial execution.
 #
 # tag::
 #   Specify a tag for selecting the objects to apply. Does not work with the
 #   --test option.
 #
 #
 # test::
 #   Print the hosts you would connect to but do not actually connect. This
 #   option requires LDAP support at this point.
 #
 # ping::
 #
 #   Do a ICMP echo against the target host. Skip hosts that don't respond to ping.
 #
 # = Example
 #
 #   sudo puppet kick -p 10 -t remotefile -t webserver host1 host2
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:kick].run
diff --git a/lib/puppet/util/command_line/ralsh b/lib/puppet/util/command_line/ralsh
index 68ad92d84..83338fcbc 100755
--- a/lib/puppet/util/command_line/ralsh
+++ b/lib/puppet/util/command_line/ralsh
@@ -1,89 +1,89 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Use the Puppet RAL to directly interact with the system.
 #
 # = Usage
 #
 #   puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit]
 #                   [-H|--host <host>] [-p|--param <param>] [-t|--types]
 #                   type <name>
 #
 # = Description
 #
 # This command provides simple facilities for converting current system state
 # into Puppet code, along with some ability to use Puppet to affect the current
 # state.
 #
 # By default, you must at least provide a type to list, which case puppet resource
 # will tell you everything it knows about all instances of that type.  You can
 # optionally specify an instance name, and puppet resource will only describe that single
 # instance.
 #
 # You can also add +--edit+ as an argument, and puppet resource will write its output
 # to a file, open that file in an editor, and then apply the file as a Puppet
 # transaction.  You can easily use this to use Puppet to make simple changes to
 # a system.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
 #
 # edit:
 #   Write the results of the query to a file, open the file in an editor,
 #   and read the file back in as an executable Puppet manifest.
 #
 # host:
 #   When specified, connect to the resource server on the named host
 #   and retrieve the list of resouces of the type specified.
 #
 # help:
 #   Print this help message.
 #
 # param:
 #   Add more parameters to be outputted from queries.
 #
 # types:
 #   List all available types.
 #
-# verbose::
+# verbose:
 #   Print extra information.
 #
 # = Example
 #
-# This example uses ``puppet resource`` to return Puppet configuration for the user ``luke``::
-#
-#    $ puppet resource user luke
-#    user { 'luke':
-#      home => '/home/luke',
-#      uid => '100',
-#      ensure => 'present',
-#      comment => 'Luke Kanies,,,',
-#      gid => '1000',
-#      shell => '/bin/bash',
-#      groups => ['sysadmin','audio','video','puppet']
-#    }
+# This example uses `puppet resource` to return Puppet configuration for the user `luke`:
+#
+#      $ puppet resource user luke
+#      user { 'luke':
+#        home => '/home/luke',
+#        uid => '100',
+#        ensure => 'present',
+#        comment => 'Luke Kanies,,,',
+#        gid => '1000',
+#        shell => '/bin/bash',
+#        groups => ['sysadmin','audio','video','puppet']
+#      }
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
 # Copyright (c) 2005-2007 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:resource].run
diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
index efd054d85..4344d67ab 100644
--- a/lib/puppet/util/docs.rb
+++ b/lib/puppet/util/docs.rb
@@ -1,114 +1,107 @@
 # Some simple methods for helping manage automatic documentation generation.
 module Puppet::Util::Docs
   # Specify the actual doc string.
   def desc(str)
     @doc = str
   end
 
   # Add a new autodoc block.  We have to define these as class methods,
   # rather than just sticking them in a hash, because otherwise they're
   # too difficult to do inheritance with.
   def dochook(name, &block)
     method = "dochook_#{name}"
 
     meta_def method, &block
   end
 
   attr_writer :doc
 
   # Generate the full doc string.
   def doc
     extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.collect { |m|
       self.send(m)
     }.join("  ")
 
     if @doc
       @doc + extra
     else
       extra
     end
   end
 
   # Build a table
   def doctable(headers, data)
     str = "\n\n"
 
     lengths = []
     # Figure out the longest field for all columns
     data.each do |name, values|
       [name, values].flatten.each_with_index do |value, i|
         lengths[i] ||= 0
         lengths[i] = value.to_s.length if value.to_s.length > lengths[i]
       end
     end
 
     # The headers could also be longest
     headers.each_with_index do |value, i|
       lengths[i] = value.to_s.length if value.to_s.length > lengths[i]
     end
 
-    # Add the top header row
-    str += lengths.collect { |num| "=" * num }.join(" ") + "\n"
+    # Add the header names
+    str += headers.zip(lengths).collect { |value, num| pad(value, num) }.join(" | ") + " |" + "\n"
 
-    # And the header names
-    str += headers.zip(lengths).collect { |value, num| pad(value, num) }.join(" ") + "\n"
-
-    # And the second header row
-    str += lengths.collect { |num| "=" * num }.join(" ") + "\n"
+    # And the header row
+    str += lengths.collect { |num| "-" * num }.join(" | ") + " |" + "\n"
 
     # Now each data row
     data.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, rows|
       str += [name, rows].flatten.zip(lengths).collect do |value, length|
         pad(value, length)
-      end.join(" ") + "\n"
+      end.join(" | ") + " |" + "\n"
     end
 
-    # And the bottom line row
-    str += lengths.collect { |num| "=" * num }.join(" ") + "\n"
-
     str + "\n"
   end
 
   attr_reader :nodoc
   def nodoc?
     nodoc
   end
 
   # Pad a field with spaces
   def pad(value, length)
     value.to_s + (" " * (length - value.to_s.length))
   end
 
   # Handle the inline indentation in the docs.
   def scrub(text)
     # Stupid markdown
     #text = text.gsub("<%=", "&lt;%=")
     # For text with no carriage returns, there's nothing to do.
     return text if text !~ /\n/
     indent = nil
 
     # If we can match an indentation, then just remove that same level of
     # indent from every line.  However, ignore any indentation on the
     # first line, since that can be inconsistent.
     text = text.lstrip
     text.gsub!(/^([\t]+)/) { |s| " "*8*s.length; } # Expand leading tabs
     # Find first non-empty line after the first line:
     line2start = (text =~ /(\n?\s*\n)/)
     line2start += $1.length
     if (text[line2start..-1] =~ /^([ ]+)\S/) == 0
       indent = Regexp.quote($1)
       begin
         return text.gsub(/^#{indent}/,'')
       rescue => detail
         puts detail.backtrace
         puts detail
       end
     else
       return text
     end
 
   end
 
   module_function :scrub
 end
-
diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index 9664ff310..6b5af8350 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -1,50 +1,50 @@
 
 unless defined? JRUBY_VERSION
   Process.maxgroups = 1024
 end
 
 module RDoc
   def self.caller(skip=nil)
     in_gem_wrapper = false
     Kernel.caller.reject { |call|
       in_gem_wrapper ||= call =~ /#{Regexp.escape $0}:\d+:in `load'/
     }
   end
 end
 
 
 require "yaml"
 require "puppet/util/zaml.rb"
 
 class Symbol
   def to_zaml(z)
     z.emit("!ruby/sym ")
     to_s.to_zaml(z)
   end
 end
 
 [Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
   cls.class_eval do
-    def to_yaml
+    def to_yaml(ignored=nil)
       ZAML.dump(self)
     end
   end
 }
 
 def YAML.dump(*args)
   ZAML.dump(*args)
 end
 
 #
 # Workaround for bug in MRI 1.8.7, see
 #     http://redmine.ruby-lang.org/issues/show/2708
 # for details
 #
 if RUBY_VERSION == '1.8.7'
   class NilClass
     def closed?
       true
     end
   end
 end
 
diff --git a/lib/puppet/util/nagios_maker.rb b/lib/puppet/util/nagios_maker.rb
index 59ed820f9..863fe24fa 100644
--- a/lib/puppet/util/nagios_maker.rb
+++ b/lib/puppet/util/nagios_maker.rb
@@ -1,61 +1,60 @@
 require 'puppet/external/nagios'
 require 'puppet/external/nagios/base'
 require 'puppet/provider/naginator'
 
 module Puppet::Util::NagiosMaker
   # Create a new nagios type, using all of the parameters
   # from the parser.
   def self.create_nagios_type(name)
     name = name.to_sym
     full_name = ("nagios_#{name}").to_sym
 
     raise(Puppet::DevError, "No nagios type for #{name}") unless nagtype = Nagios::Base.type(name)
 
     type = Puppet::Type.newtype(full_name) {}
 
     type.ensurable
 
     type.newparam(nagtype.namevar, :namevar => true) do
       desc "The name parameter for Nagios type #{nagtype.name}"
     end
 
     # We deduplicate the parameters because it makes sense to allow Naginator to have dupes.
     nagtype.parameters.uniq.each do |param|
       next if param == nagtype.namevar
 
       # We can't turn these parameter names into constants, so at least for now they aren't
       # supported.
       next if param.to_s =~ /^[0-9]/
 
       type.newproperty(param) do
         desc "Nagios configuration file parameter."
       end
     end
 
     type.newproperty(:target) do
       desc 'target'
 
       defaultto do
         resource.class.defaultprovider.default_target
       end
     end
 
     target = "/etc/nagios/#{full_name.to_s}.cfg"
     provider = type.provide(:naginator, :parent => Puppet::Provider::Naginator, :default_target => target) {}
     provider.nagios_type
 
     type.desc "The Nagios type #{name.to_s}.  This resource type is autogenerated using the
-      model developed in Naginator_, and all of the Nagios types are generated using the
+      model developed in Naginator, and all of the Nagios types are generated using the
       same code and the same library.
 
       This type generates Nagios configuration statements in Nagios-parseable configuration
-      files.  By default, the statements will be added to ``#{target}``, but
-      you can send them to a different file by setting their ``target`` attribute.
+      files.  By default, the statements will be added to `#{target}`, but
+      you can send them to a different file by setting their `target` attribute.
 
-      You can purge Nagios resources using the ``resources`` type, but *only*
+      You can purge Nagios resources using the `resources` type, but *only*
       in the default file locations.  This is an architectural limitation.
 
-      .. _naginator: http://projects.reductivelabs.com/projects/naginator
     "
   end
 end
diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb
index ac294d20d..30e8dcb39 100644
--- a/lib/puppet/util/provider_features.rb
+++ b/lib/puppet/util/provider_features.rb
@@ -1,169 +1,169 @@
 # Provides feature definitions.
 require 'puppet/util/methodhelper'
 require 'puppet/util/docs'
 require 'puppet/util'
 module Puppet::Util::ProviderFeatures
   include Puppet::Util::Docs
   # The class that models the features and handles checking whether the features
   # are present.
   class ProviderFeature
     include Puppet::Util
     include Puppet::Util::MethodHelper
     include Puppet::Util::Docs
     attr_accessor :name, :docs, :methods
 
     # Are all of the requirements met?
     def available?(obj)
       if self.methods
         return !!methods_available?(obj)
       else
         # In this case, the provider has to declare support for this
         # feature, and that's been checked before we ever get to the
         # method checks.
         return false
       end
     end
 
     def initialize(name, docs, hash)
       self.name = symbolize(name)
       self.docs = docs
       hash = symbolize_options(hash)
       set_options(hash)
     end
 
     private
 
     # Are all of the required methods available?
     def methods_available?(obj)
       methods.each do |m|
         if obj.is_a?(Class)
           return false unless obj.public_method_defined?(m)
         else
           return false unless obj.respond_to?(m)
         end
       end
       true
     end
   end
 
   # Define one or more features.  At a minimum, features require a name
   # and docs, and at this point they should also specify a list of methods
   # required to determine if the feature is present.
   def feature(name, docs, hash = {})
     @features ||= {}
     raise(Puppet::DevError, "Feature #{name} is already defined") if @features.include?(name)
     begin
       obj = ProviderFeature.new(name, docs, hash)
       @features[obj.name] = obj
     rescue ArgumentError => detail
       error = ArgumentError.new(
         "Could not create feature #{name}: #{detail}"
       )
       error.set_backtrace(detail.backtrace)
       raise error
     end
   end
 
   # Return a hash of all feature documentation.
   def featuredocs
     str = ""
     @features ||= {}
     return nil if @features.empty?
     names = @features.keys.sort { |a,b| a.to_s <=> b.to_s }
     names.each do |name|
       doc = @features[name].docs.gsub(/\n\s+/, " ")
-      str += "- **#{name}**: #{doc}\n"
+      str += "- *#{name}*: #{doc}\n"
     end
 
     if providers.length > 0
       headers = ["Provider", names].flatten
       data = {}
       providers.each do |provname|
         data[provname] = []
         prov = provider(provname)
         names.each do |name|
           if prov.feature?(name)
-            data[provname] << "**X**"
+            data[provname] << "*X*"
           else
             data[provname] << ""
           end
         end
       end
       str += doctable(headers, data)
     end
     str
   end
 
   # Return a list of features.
   def features
     @features ||= {}
     @features.keys
   end
 
   # Generate a module that sets up the boolean methods to test for given
   # features.
   def feature_module
     unless defined?(@feature_module)
       @features ||= {}
       @feature_module = ::Module.new
       const_set("FeatureModule", @feature_module)
       features = @features
       # Create a feature? method that can be passed a feature name and
       # determine if the feature is present.
       @feature_module.send(:define_method, :feature?) do |name|
         method = name.to_s + "?"
         return !!(respond_to?(method) and send(method))
       end
 
       # Create a method that will list all functional features.
       @feature_module.send(:define_method, :features) do
         return false unless defined?(features)
         features.keys.find_all { |n| feature?(n) }.sort { |a,b|
           a.to_s <=> b.to_s
         }
       end
 
       # Create a method that will determine if a provided list of
       # features are satisfied by the curred provider.
       @feature_module.send(:define_method, :satisfies?) do |*needed|
         ret = true
         needed.flatten.each do |feature|
           unless feature?(feature)
             ret = false
             break
           end
         end
         ret
       end
 
       # Create a boolean method for each feature so you can test them
       # individually as you might need.
       @features.each do |name, feature|
         method = name.to_s + "?"
         @feature_module.send(:define_method, method) do
           (is_a?(Class) ?  declared_feature?(name) : self.class.declared_feature?(name)) or feature.available?(self)
         end
       end
 
       # Allow the provider to declare that it has a given feature.
       @feature_module.send(:define_method, :has_features) do |*names|
         @declared_features ||= []
         names.each do |name|
           name = symbolize(name)
           @declared_features << name
         end
       end
       # Aaah, grammatical correctness
       @feature_module.send(:alias_method, :has_feature, :has_features)
     end
     @feature_module
   end
 
   # Return the actual provider feature instance.  Really only used for testing.
   def provider_feature(name)
     return nil unless defined?(@features)
 
     @features[name]
   end
 end
 
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index 62bab643e..4f2058e69 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -1,207 +1,158 @@
 require 'puppet/util/instance_loader'
 require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
   include Puppet::Util
   include Puppet::Util::Docs
 
   extend Puppet::Util::InstanceLoader
 
   instance_load(:reference, 'puppet/reference')
 
   def self.footer
     "\n\n----------------\n\n*This page autogenerated on #{Time.now}*\n"
   end
 
   def self.modes
-    %w{pdf trac text markdown}
+    %w{pdf text}
   end
 
   def self.newreference(name, options = {}, &block)
     ref = self.new(name, options, &block)
     instance_hash(:reference)[symbolize(name)] = ref
 
     ref
   end
 
   def self.page(*sections)
     depth = 4
     # Use the minimum depth
     sections.each do |name|
       section = reference(name) or raise "Could not find section #{name}"
       depth = section.depth if section.depth < depth
     end
-    text = ".. contents:: :depth: 2\n\n"
+    text = "{:toc}\n\n"
   end
 
   def self.pdf(text)
     puts "creating pdf"
     Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
       f.puts text
     end
     rst2latex = %x{which rst2latex}
     if $CHILD_STATUS != 0 or rst2latex =~ /no /
       rst2latex = %x{which rst2latex.py}
     end
     if $CHILD_STATUS != 0 or rst2latex =~ /no /
       raise "Could not find rst2latex"
     end
     rst2latex.chomp!
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
     Puppet::Util.secure_open("/tmp/puppetdoc.tex","w") do |f|
       # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink
     end
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
       $stderr.puts "rst2latex failed"
       $stderr.puts output
       exit(1)
     end
     $stderr.puts output
 
     # Now convert to pdf
     Dir.chdir("/tmp") do
       %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
     end
 
   end
 
-  def self.markdown(name, text)
-    puts "Creating markdown for #{name} reference."
-    dir = "/tmp/#{Puppet::PUPPETVERSION}"
-    FileUtils.mkdir(dir) unless File.directory?(dir)
-    Puppet::Util.secure_open(dir + "/#{name}.rst", "w") do |f|
-      f.puts text
-    end
-    pandoc = %x{which pandoc}
-    if $CHILD_STATUS != 0 or pandoc =~ /no /
-      pandoc = %x{which pandoc}
-    end
-    if $CHILD_STATUS != 0 or pandoc =~ /no /
-      raise "Could not find pandoc"
-    end
-    pandoc.chomp!
-    cmd = %{#{pandoc} -s -r rst -w markdown #{dir}/#{name}.rst -o #{dir}/#{name}.mdwn}
-    output = %x{#{cmd}}
-    unless $CHILD_STATUS == 0
-      $stderr.puts "Pandoc failed to create #{name} reference."
-      $stderr.puts output
-      exit(1)
-    end
-
-    File.unlink(dir + "/#{name}.rst")
-  end
-
   def self.references
     instance_loader(:reference).loadall
     loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
   end
 
   HEADER_LEVELS = [nil, "=", "-", "+", "'", "~"]
 
   attr_accessor :page, :depth, :header, :title, :dynamic
   attr_writer :doc
 
   def doc
     if defined?(@doc)
       return "#{@name} - #{@doc}"
     else
       return @title
     end
   end
 
   def dynamic?
     self.dynamic
   end
 
   def h(name, level)
     "#{name}\n#{HEADER_LEVELS[level] * name.to_s.length}\n\n"
   end
 
   def initialize(name, options = {}, &block)
     @name = name
     options.each do |option, value|
       send(option.to_s + "=", value)
     end
 
     meta_def(:generate, &block)
 
     # Now handle the defaults
     @title ||= "#{@name.to_s.capitalize} Reference"
     @page ||= @title.gsub(/\s+/, '')
     @depth ||= 2
     @header ||= ""
   end
 
   # Indent every line in the chunk except those which begin with '..'.
   def indent(text, tab)
     text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
   end
 
   def option(name, value)
     ":#{name.to_s.capitalize}: #{value}\n"
   end
 
   def paramwrap(name, text, options = {})
     options[:level] ||= 5
     #str = "#{name} : "
     str = h(name, options[:level])
     str += "- **namevar**\n\n" if options[:namevar]
     str += text
     #str += text.gsub(/\n/, "\n    ")
 
     str += "\n\n"
   end
 
   # Remove all trac links.
   def strip_trac(text)
     text.gsub(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
   end
 
   def text
     puts output
   end
 
   def to_rest(withcontents = true)
     # First the header
     text = h(@title, 1)
     text += "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n"
-    text +=  ".. contents:: :depth: #{@depth}\n\n" if withcontents
+    text +=  "{:toc}\n\n" if withcontents
 
     text += @header
 
     text += generate
 
     text += self.class.footer if withcontents
 
     text
   end
 
   def to_text(withcontents = true)
     strip_trac(to_rest(withcontents))
   end
-
-  def to_trac(with_contents = true)
-    "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
-  end
-
-  def trac
-    Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
-      f.puts self.to_trac
-    end
-
-    puts "Writing #{@name} reference to trac as #{@page}"
-    cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page
-    output = %x{#{cmd}}
-    unless $CHILD_STATUS == 0
-      $stderr.puts "trac-admin failed"
-      $stderr.puts output
-      exit(1)
-    end
-    unless output =~ /^\s+/
-      $stderr.puts output
-    end
-  end
 end
-
diff --git a/spec/integration/indirector/bucket_file/rest_spec.rb b/spec/integration/indirector/bucket_file/rest_spec.rb
index 4d90a8c59..dc10faa67 100644
--- a/spec/integration/indirector/bucket_file/rest_spec.rb
+++ b/spec/integration/indirector/bucket_file/rest_spec.rb
@@ -1,68 +1,69 @@
 #!/usr/bin/env ruby
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
 require 'puppet/file_bucket/file'
 require 'puppet/network/server'
 require 'puppet/network/http/webrick/rest'
 
 describe "Filebucket REST Terminus" do
   before do
     Puppet[:masterport] = 34343
     Puppet[:server] = "localhost"
 
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet::Util::Cacher.expire
 
     Puppet[:servertype] = 'webrick'
     Puppet[:server] = '127.0.0.1'
     Puppet[:certname] = '127.0.0.1'
 
     # Generate the certificate with a local CA
     Puppet::SSL::Host.ca_location = :local
     ca = Puppet::SSL::CertificateAuthority.new
     ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
     ca.generate("foo.madstop.com") unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
     @host = Puppet::SSL::Host.new(Puppet[:certname])
 
     @params = { :port => 34343, :handlers => [ :file_bucket_file ] }
     @server = Puppet::Network::Server.new(@params)
     @server.listen
 
     @old_terminus = Puppet::FileBucket::File.indirection.terminus_class
     Puppet::FileBucket::File.terminus_class = :rest
 
     # LAK:NOTE We need to have a fake model here so that our indirected methods get
     # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
     # return.
     @file_bucket_file = stub_everything 'file_bucket_file'
     @mock_model = stub('faked model', :name => "file_bucket_file", :convert_from => @file_bucket_file)
     Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
     Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization)
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
     @server.unlisten
     Puppet::FileBucket::File.terminus_class = @old_terminus
   end
 
   it "should be able save a file to the remote filebucket" do
     @file_bucket_file.expects(:save)
 
     file_bucket_file = Puppet::FileBucket::File.new("pouet")
     file_bucket_file.save
   end
 end
diff --git a/spec/integration/indirector/certificate/rest_spec.rb b/spec/integration/indirector/certificate/rest_spec.rb
index 356a7d316..58aa96c48 100755
--- a/spec/integration/indirector/certificate/rest_spec.rb
+++ b/spec/integration/indirector/certificate/rest_spec.rb
@@ -1,68 +1,69 @@
 #!/usr/bin/env ruby
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
 require 'puppet/ssl/certificate'
 require 'puppet/network/server'
 require 'puppet/network/http/webrick/rest'
 
 describe "Certificate REST Terminus" do
   before do
     Puppet[:masterport] = 34343
     Puppet[:server] = "localhost"
 
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet::Util::Cacher.expire
 
     Puppet[:servertype] = 'webrick'
     Puppet[:server] = '127.0.0.1'
     Puppet[:certname] = '127.0.0.1'
 
     # Generate the certificate with a local CA
     Puppet::SSL::Host.ca_location = :local
     ca = Puppet::SSL::CertificateAuthority.new
     ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
     ca.generate("foo.madstop.com") unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
     @host = Puppet::SSL::Host.new(Puppet[:certname])
 
     @params = { :port => 34343, :handlers => [ :certificate ] }
     @server = Puppet::Network::Server.new(@params)
     @server.listen
 
     # Then switch to a remote CA, so that we go through REST.
     Puppet::SSL::Host.ca_location = :remote
 
     # LAK:NOTE We need to have a fake model here so that our indirected methods get
     # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
     # return.
     @mock_model = stub('faked model', :name => "certificate")
     Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
     Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization).returns(true)
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
     @server.unlisten
   end
 
   it "should be able to retrieve a remote certificate" do
     @mock_model.expects(:find).returns @host.certificate
     result = Puppet::SSL::Certificate.find('bar')
 
     # There's no good '==' method on certs.
     result.content.to_s.should == @host.certificate.content.to_s
     result.name.should == "bar"
   end
 end
diff --git a/spec/integration/indirector/certificate_request/rest_spec.rb b/spec/integration/indirector/certificate_request/rest_spec.rb
index 2c98ef66c..c718b78ab 100755
--- a/spec/integration/indirector/certificate_request/rest_spec.rb
+++ b/spec/integration/indirector/certificate_request/rest_spec.rb
@@ -1,88 +1,89 @@
 #!/usr/bin/env ruby
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
 require 'puppet/ssl/certificate_request'
 require 'puppet/network/server'
 require 'puppet/network/http/webrick/rest'
 
 describe "Certificate Request REST Terminus" do
   before do
     Puppet::Util::Cacher.expire
 
     Puppet[:masterport] = 34343
     Puppet[:server] = "localhost"
 
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet[:servertype] = 'webrick'
     Puppet[:server] = '127.0.0.1'
     Puppet[:certname] = '127.0.0.1'
 
     # Generate the certificate with a local CA
     Puppet::SSL::Host.ca_location = :local
     ca = Puppet::SSL::CertificateAuthority.new
     ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
     # Create the CSR and write it to disk
     @host = Puppet::SSL::Host.new("foo.madstop.com")
     @host.generate_certificate_request
 
     # Now remove the cached csr
     Puppet::SSL::Host.ca_location = :none
     Puppet::SSL::Host.destroy("foo.madstop.com")
 
     @params = { :port => 34343, :handlers => [ :certificate_request ] }
     @server = Puppet::Network::Server.new(@params)
     @server.listen
 
     # Then switch to a remote CA, so that we go through REST.
     Puppet::SSL::Host.ca_location = :remote
 
     # LAK:NOTE We need to have a fake model here so that our indirected methods get
     # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
     # return.
     @mock_model = stub('faked model', :name => "certificate request")
     Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
     Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization).returns(true)
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
     @server.unlisten
   end
 
   it "should be able to save a certificate request to the CA" do
     key = Puppet::SSL::Key.new("bar.madstop.com")
     key.generate
 
     csr = Puppet::SSL::CertificateRequest.new("bar.madstop.com")
     csr.generate(key.content)
 
     server_csr = mock 'csr'
     server_csr.expects(:save)
     @mock_model.expects(:convert_from).with("s", csr.content.to_s).returns server_csr
 
     csr.save
   end
 
   it "should be able to retrieve a remote certificate request" do
     # We're finding the cached value :/
     @mock_model.expects(:find).returns @host.certificate_request
     result = Puppet::SSL::CertificateRequest.find('foo.madstop.com')
 
     # There's no good '==' method on certs.
     result.content.to_s.should == @host.certificate_request.content.to_s
     result.name.should == @host.certificate_request.name
   end
 end
diff --git a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
index 62a2f808e..86f2b0150 100755
--- a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
+++ b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb
@@ -1,76 +1,77 @@
 #!/usr/bin/env ruby
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
 require 'puppet/ssl/certificate'
 require 'puppet/network/server'
 require 'puppet/network/http/webrick/rest'
 
 describe "Certificate REST Terminus" do
   before do
     Puppet[:masterport] = 34343
     Puppet[:server] = "localhost"
 
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet::Util::Cacher.expire
 
     Puppet[:servertype] = 'webrick'
     Puppet[:server] = '127.0.0.1'
     Puppet[:certname] = '127.0.0.1'
 
     # Generate the certificate with a local CA
     Puppet::SSL::Host.ca_location = :local
     ca = Puppet::SSL::CertificateAuthority.new
     ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
     @params = { :port => 34343, :handlers => [ :certificate_revocation_list ] }
     @server = Puppet::Network::Server.new(@params)
     @server.listen
 
     # And make sure we've generated the CRL
     @crl = ca.crl
 
     # Now remove the cached crl
     Puppet::SSL::Host.ca_location = :none
     Puppet::SSL::CertificateRevocationList.destroy(Puppet::SSL::CA_NAME)
 
     # This is necessary so that we create the SSL store before we start
     # using REST.  This is necessary to prevent an infinite loop,
     # which only occurs during testing.
     Puppet::Network::HttpPool.ssl_host.ssl_store
 
     # Then switch to a remote CA, so that we go through REST.
     Puppet::SSL::Host.ca_location = :remote
 
     # LAK:NOTE We need to have a fake model here so that our indirected methods get
     # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
     # return.
     @mock_model = stub('faked model', :name => "certificate")
     Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
     Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization).returns(true)
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
     @server.unlisten
   end
 
   it "should be able to retrieve a remote CRL" do
     @mock_model.expects(:find).returns @crl
     result = Puppet::SSL::CertificateRevocationList.find('bar')
 
     # There's no good '==' method on certs.
     result.content.to_s.should == @crl.content.to_s
   end
 end
diff --git a/spec/integration/indirector/report/rest_spec.rb b/spec/integration/indirector/report/rest_spec.rb
index 089f8fd3f..fdc218975 100644
--- a/spec/integration/indirector/report/rest_spec.rb
+++ b/spec/integration/indirector/report/rest_spec.rb
@@ -1,96 +1,97 @@
 #!/usr/bin/env ruby
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
 require 'puppet/transaction/report'
 require 'puppet/network/server'
 require 'puppet/network/http/webrick/rest'
 
 describe "Report REST Terminus" do
   before do
     Puppet[:masterport] = 34343
     Puppet[:server] = "localhost"
 
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet::Util::Cacher.expire
 
     Puppet[:servertype] = 'webrick'
     Puppet[:server] = '127.0.0.1'
     Puppet[:certname] = '127.0.0.1'
 
     # Generate the certificate with a local CA
     Puppet::SSL::Host.ca_location = :local
     ca = Puppet::SSL::CertificateAuthority.new
     ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
     ca.generate("foo.madstop.com") unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
     @host = Puppet::SSL::Host.new(Puppet[:certname])
 
     @params = { :port => 34343, :handlers => [ :report ] }
     @server = Puppet::Network::Server.new(@params)
     @server.listen
 
     # Let's use REST for our reports :-)
     @old_terminus = Puppet::Transaction::Report.indirection.terminus_class
     Puppet::Transaction::Report.terminus_class = :rest
 
     # LAK:NOTE We need to have a fake model here so that our indirected methods get
     # passed through REST; otherwise we'd be stubbing 'save', which would cause an immediate
     # return.
     @report = stub_everything 'report'
     @mock_model = stub_everything 'faked model', :name => "report", :convert_from => @report
     Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
     Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization)
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
     @server.unlisten
     Puppet::Transaction::Report.terminus_class = @old_terminus
   end
 
   it "should be able to send a report to the server" do
     @report.expects(:save)
 
     report = Puppet::Transaction::Report.new
 
     resourcemetrics = {
       :total => 12,
       :out_of_sync => 20,
       :applied => 45,
       :skipped => 1,
       :restarted => 23,
       :failed_restarts => 1,
       :scheduled => 10
     }
     report.add_metric(:resources, resourcemetrics)
 
     timemetrics = {
       :resource1 => 10,
       :resource2 => 50,
       :resource3 => 40,
       :resource4 => 20,
     }
     report.add_metric(:times, timemetrics)
 
 
           report.add_metric(
         :changes,
         
       :total => 20
     )
 
     report.save
   end
 end
diff --git a/spec/integration/indirector/rest_spec.rb b/spec/integration/indirector/rest_spec.rb
index e9048392a..14e9e9593 100755
--- a/spec/integration/indirector/rest_spec.rb
+++ b/spec/integration/indirector/rest_spec.rb
@@ -1,524 +1,525 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'puppet/network/server'
 require 'puppet/indirector'
 require 'puppet/indirector/rest'
 
 # a fake class that will be indirected via REST
 class Puppet::TestIndirectedFoo
   extend Puppet::Indirector
   indirects :test_indirected_foo, :terminus_setting => :test_indirected_foo_terminus
 
   attr_reader :value
   attr_accessor :name
 
   def initialize(value = 0)
     @value = value
   end
 
   def self.from_yaml(yaml)
     YAML.load(yaml)
   end
 
   def name
     "bob"
   end
 end
 
 # empty Terminus class -- this would normally have to be in a directory findable by the autoloader, but we short-circuit that below
 class Puppet::TestIndirectedFoo::Rest < Puppet::Indirector::REST
 end
 
 
 describe Puppet::Indirector::REST do
   before do
     # Get a safe temporary file
     @tmpfile = Tempfile.new("webrick_integration_testing")
     @dir = @tmpfile.path + "_dir"
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 
     Puppet::SSL::Host.ca_location = :local
 
     Puppet::TestIndirectedFoo.terminus_class = :rest
   end
 
   after do
     Puppet::Network::HttpPool.expire
     Puppet::SSL::Host.ca_location = :none
     Puppet.settings.clear
   end
 
   describe "when using webrick" do
     before :each do
       Puppet::Util::Cacher.expire
 
       Puppet[:servertype] = 'webrick'
       Puppet[:server] = '127.0.0.1'
       Puppet[:certname] = '127.0.0.1'
 
       ca = Puppet::SSL::CertificateAuthority.new
       ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
 
       @params = { :port => 34343, :handlers => [ :test_indirected_foo ], :xmlrpc_handlers => [ :status ] }
       @server = Puppet::Network::Server.new(@params)
       @server.listen
 
       # LAK:NOTE We need to have a fake model here so that our indirected methods get
       # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
       # return.
       @mock_model = stub('faked model', :name => "foo")
       Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
       # do not trigger the authorization layer
       Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization).returns(true)
     end
 
     describe "when finding a model instance over REST" do
       describe "when a matching model instance can be found" do
         before :each do
           @model_instance = Puppet::TestIndirectedFoo.new(23)
           @mock_model.stubs(:find).returns @model_instance
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error
         end
 
         it 'should return an instance of the model class' do
           Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo
         end
 
         it "should pass options all the way through" do
           @mock_model.expects(:find).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instance
           Puppet::TestIndirectedFoo.find('bar', :one => "two", :three => "four")
         end
 
         it 'should return the instance of the model class associated with the provided lookup key' do
           Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value
         end
 
         it 'should set an expiration on model instance' do
           Puppet::TestIndirectedFoo.find('bar').expiration.should_not be_nil
         end
 
         it "should use a supported format" do
           Puppet::TestIndirectedFoo.expects(:supported_formats).returns ["marshal"]
           text = Marshal.dump(@model_instance)
           @model_instance.expects(:render).with(Puppet::Network::FormatHandler.format("marshal")).returns text
           Puppet::TestIndirectedFoo.find('bar')
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model = stub('faked model', :name => "foo", :find => nil)
           Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
         end
 
         it "should return nil" do
           Puppet::TestIndirectedFoo.find('bar').should be_nil
         end
       end
 
       describe "when an exception is encountered in looking up a model instance" do
         before :each do
           @mock_model = stub('faked model', :name => "foo")
           @mock_model.stubs(:find).raises(RuntimeError)
           Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when searching for model instances over REST" do
       describe "when matching model instances can be found" do
         before :each do
           @model_instances = [ Puppet::TestIndirectedFoo.new(23), Puppet::TestIndirectedFoo.new(24) ]
           @mock_model.stubs(:search).returns @model_instances
 
           # Force yaml, because otherwise our mocks can't work correctly
           Puppet::TestIndirectedFoo.stubs(:supported_formats).returns %w{yaml}
 
           @mock_model.stubs(:render_multiple).returns @model_instances.to_yaml
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.search('bar') }.should_not raise_error
         end
 
         it 'should return all matching results' do
           Puppet::TestIndirectedFoo.search('bar').length.should == @model_instances.length
         end
 
         it "should pass options all the way through" do
           @mock_model.expects(:search).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instances
           Puppet::TestIndirectedFoo.search("foo", :one => "two", :three => "four")
         end
 
         it 'should return model instances' do
           Puppet::TestIndirectedFoo.search('bar').each do |result|
             result.class.should == Puppet::TestIndirectedFoo
           end
         end
 
         it 'should return the instance of the model class associated with the provided lookup key' do
           Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value }
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model = stub('faked model', :name => "foo", :find => nil)
           Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
         end
 
         it "should return nil" do
           Puppet::TestIndirectedFoo.find('bar').should be_nil
         end
       end
 
       describe "when an exception is encountered in looking up a model instance" do
         before :each do
           @mock_model = stub('faked model')
           @mock_model.stubs(:find).raises(RuntimeError)
           Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when destroying a model instance over REST" do
       describe "when a matching model instance can be found" do
         before :each do
           @mock_model.stubs(:destroy).returns true
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should_not raise_error
         end
 
         it 'should return success' do
           Puppet::TestIndirectedFoo.destroy('bar').should == true
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model.stubs(:destroy).returns false
         end
 
         it "should return failure" do
           Puppet::TestIndirectedFoo.destroy('bar').should == false
         end
       end
 
       describe "when an exception is encountered in destroying a model instance" do
         before :each do
           @mock_model.stubs(:destroy).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when saving a model instance over REST" do
       before :each do
         @instance = Puppet::TestIndirectedFoo.new(42)
         @mock_model.stubs(:save_object).returns @instance
         @mock_model.stubs(:convert_from).returns @instance
         Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).returns(@instance)
       end
 
       describe "when a successful save can be performed" do
         before :each do
         end
 
         it "should not fail" do
           lambda { @instance.save }.should_not raise_error
         end
 
         it 'should return an instance of the model class' do
           @instance.save.class.should == Puppet::TestIndirectedFoo
         end
 
         it 'should return a matching instance of the model class' do
           @instance.save.value.should == @instance.value
         end
       end
 
       describe "when a save cannot be completed" do
         before :each do
           Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).returns(false)
         end
 
         it "should return failure" do
           @instance.save.should == false
         end
       end
 
       describe "when an exception is encountered in performing a save" do
         before :each do
           Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { @instance.save }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     after :each do
       @server.unlisten
     end
   end
 
   describe "when using mongrel" do
     confine "Mongrel is not available" => Puppet.features.mongrel?
 
     before :each do
       Puppet[:servertype] = 'mongrel'
       @params = { :port => 34343, :handlers => [ :test_indirected_foo ] }
 
       # Make sure we never get a cert, since mongrel can't speak ssl
       Puppet::SSL::Certificate.stubs(:find).returns nil
 
       # We stub ssl to be off, since mongrel can't speak ssl
       Net::HTTP.any_instance.stubs(:use_ssl?).returns false
 
       @server = Puppet::Network::Server.new(@params)
       @server.listen
 
       # LAK:NOTE We need to have a fake model here so that our indirected methods get
       # passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
       # return.
       @mock_model = stub('faked model', :name => "foo")
       Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
 
       # do not trigger the authorization layer
       Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:check_authorization).returns(true)
     end
 
     after do
       @server.unlisten
     end
 
     describe "when finding a model instance over REST" do
       describe "when a matching model instance can be found" do
         before :each do
           @model_instance = Puppet::TestIndirectedFoo.new(23)
           @mock_model.stubs(:find).returns @model_instance
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error
         end
 
         it 'should return an instance of the model class' do
           Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo
         end
 
         it "should pass options all the way through" do
           @mock_model.expects(:find).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instance
           Puppet::TestIndirectedFoo.find('bar', :one => "two", :three => "four")
         end
 
         it 'should return the instance of the model class associated with the provided lookup key' do
           Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value
         end
 
         it 'should set an expiration on model instance' do
           Puppet::TestIndirectedFoo.find('bar').expiration.should_not be_nil
         end
 
         it "should use a supported format" do
           Puppet::TestIndirectedFoo.expects(:supported_formats).returns ["marshal"]
           format = stub 'format'
           text = Marshal.dump(@model_instance)
           @model_instance.expects(:render).with(Puppet::Network::FormatHandler.format("marshal")).returns text
           Puppet::TestIndirectedFoo.find('bar')
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model.stubs(:find).returns nil
         end
 
         it "should return nil" do
           Puppet::TestIndirectedFoo.find('bar').should be_nil
         end
       end
 
       describe "when an exception is encountered in looking up a model instance" do
         before :each do
           @mock_model.stubs(:find).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when searching for model instances over REST" do
       describe "when matching model instances can be found" do
         before :each do
           @model_instances = [ Puppet::TestIndirectedFoo.new(23), Puppet::TestIndirectedFoo.new(24) ]
 
           # Force yaml, because otherwise our mocks can't work correctly
           Puppet::TestIndirectedFoo.stubs(:supported_formats).returns %w{yaml}
 
           @mock_model.stubs(:search).returns @model_instances
           @mock_model.stubs(:render_multiple).returns @model_instances.to_yaml
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.search('bar') }.should_not raise_error
         end
 
         it 'should return all matching results' do
           Puppet::TestIndirectedFoo.search('bar').length.should == @model_instances.length
         end
 
         it "should pass options all the way through" do
           @mock_model.expects(:search).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instances
           Puppet::TestIndirectedFoo.search('bar', :one => "two", :three => "four")
         end
 
         it 'should return model instances' do
           Puppet::TestIndirectedFoo.search('bar').each do |result|
             result.class.should == Puppet::TestIndirectedFoo
           end
         end
 
         it 'should return the instance of the model class associated with the provided lookup key' do
           Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value }
         end
 
         it 'should set an expiration on model instances' do
           Puppet::TestIndirectedFoo.search('bar').each do |result|
             result.expiration.should_not be_nil
           end
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model.stubs(:search).returns nil
           @mock_model.stubs(:render_multiple).returns nil.to_yaml
         end
 
         it "should return nil" do
           Puppet::TestIndirectedFoo.search('bar').should == []
         end
       end
 
       describe "when an exception is encountered in looking up a model instance" do
         before :each do
           @mock_model.stubs(:find).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when destroying a model instance over REST" do
       describe "when a matching model instance can be found" do
         before :each do
           @mock_model.stubs(:destroy).returns true
         end
 
         it "should not fail" do
           lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should_not raise_error
         end
 
         it 'should return success' do
           Puppet::TestIndirectedFoo.destroy('bar').should == true
         end
       end
 
       describe "when no matching model instance can be found" do
         before :each do
           @mock_model.stubs(:destroy).returns false
         end
 
         it "should return failure" do
           Puppet::TestIndirectedFoo.destroy('bar').should == false
         end
       end
 
       describe "when an exception is encountered in destroying a model instance" do
         before :each do
           @mock_model.stubs(:destroy).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError)
         end
       end
     end
 
     describe "when saving a model instance over REST" do
       before :each do
         @instance = Puppet::TestIndirectedFoo.new(42)
         @mock_model.stubs(:convert_from).returns @instance
 
         # LAK:NOTE This stub is necessary to prevent the REST call from calling
         # REST.save again, thus producing painful infinite recursion.
         Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).returns(@instance)
       end
 
       describe "when a successful save can be performed" do
         before :each do
         end
 
         it "should not fail" do
           lambda { @instance.save }.should_not raise_error
         end
 
         it 'should return an instance of the model class' do
           @instance.save.class.should == Puppet::TestIndirectedFoo
         end
 
         it 'should return a matching instance of the model class' do
           @instance.save.value.should == @instance.value
         end
       end
 
       describe "when a save cannot be completed" do
         before :each do
           Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).returns(false)
         end
 
         it "should return failure" do
           @instance.save.should == false
         end
       end
 
       describe "when an exception is encountered in performing a save" do
         before :each do
           Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).raises(RuntimeError)
         end
 
         it "should raise an exception" do
           lambda { @instance.save }.should raise_error(Net::HTTPError)
         end
       end
     end
   end
 end
diff --git a/spec/integration/network/server/webrick_spec.rb b/spec/integration/network/server/webrick_spec.rb
index 2809df780..2b14dfb37 100755
--- a/spec/integration/network/server/webrick_spec.rb
+++ b/spec/integration/network/server/webrick_spec.rb
@@ -1,85 +1,86 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/network/server'
 require 'puppet/ssl/certificate_authority'
 require 'socket'
 
 describe Puppet::Network::Server do
   describe "when using webrick" do
     before :each do
       Puppet[:servertype] = 'webrick'
       Puppet[:server] = '127.0.0.1'
       @params = { :port => 34343, :handlers => [ :node ], :xmlrpc_handlers => [ :status ] }
 
       # Get a safe temporary file
       @tmpfile = Tempfile.new("webrick_integration_testing")
       @dir = @tmpfile.path + "_dir"
 
       Puppet.settings[:confdir] = @dir
       Puppet.settings[:vardir] = @dir
+      Puppet.settings[:group] = Process.gid
 
       Puppet::SSL::Host.ca_location = :local
 
       ca = Puppet::SSL::CertificateAuthority.new
       ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname])
     end
 
     after do
       @tmpfile.delete
       Puppet.settings.clear
 
       system("rm -rf #{@dir}")
 
       Puppet::Util::Cacher.expire
     end
 
     describe "before listening" do
       it "should not be reachable at the specified address and port" do
         lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error
       end
     end
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
         @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
         @server.listen
         lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error
       end
 
       it "should default to '0.0.0.0' as its bind address" do
         Puppet.settings.clear
         Puppet[:servertype] = 'webrick'
         Puppet[:bindaddress].should == '0.0.0.0'
       end
 
       it "should use any specified bind address" do
         Puppet[:bindaddress] = "127.0.0.1"
         @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
         @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening
         @server.send(:http_server).expects(:listen).with { |args| args[:address] == "127.0.0.1" }
         @server.listen
       end
 
       it "should not allow multiple servers to listen on the same address and port" do
         @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
         @server.listen
         @server2 = Puppet::Network::Server.new(@params.merge(:port => 34343))
         lambda { @server2.listen }.should raise_error
       end
 
       after :each do
         @server.unlisten if @server && @server.listening?
       end
     end
 
     describe "after unlistening" do
       it "should not be reachable on the port and address assigned" do
         @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
         @server.listen
         @server.unlisten
         lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error(Errno::ECONNREFUSED)
       end
     end
   end
 end
diff --git a/spec/integration/parser/compiler_spec.rb b/spec/integration/parser/compiler_spec.rb
index 83bbf9500..9158ad1c2 100755
--- a/spec/integration/parser/compiler_spec.rb
+++ b/spec/integration/parser/compiler_spec.rb
@@ -1,29 +1,72 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Parser::Compiler do
   before :each do
     @node = Puppet::Node.new "testnode"
 
     @scope_resource = stub 'scope_resource', :builtin? => true, :finish => nil, :ref => 'Class[main]'
     @scope = stub 'scope', :resource => @scope_resource, :source => mock("source")
   end
 
   after do
     Puppet.settings.clear
   end
 
   it "should be able to determine the configuration version from a local version control repository" do
     # This should always work, because we should always be
     # in the puppet repo when we run this.
     version = %x{git rev-parse HEAD}.chomp
 
     Puppet.settings[:config_version] = 'git rev-parse HEAD'
 
     @parser = Puppet::Parser::Parser.new "development"
     @compiler = Puppet::Parser::Compiler.new(@node)
 
     @compiler.catalog.version.should == version
   end
+
+  describe "when resolving class references" do
+    it "should favor local scope, even if there's an included class in topscope" do
+      Puppet[:code] = <<-PP
+        class experiment {
+          class baz {
+          }
+          notify {"x" : require => Class[Baz] }
+        }
+        class baz {
+        }
+        include baz
+        include experiment
+        include experiment::baz
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      notify_resource = catalog.resource( "Notify[x]" )
+
+      notify_resource[:require].title.should == "Experiment::Baz"
+    end
+
+    it "should favor local scope, even if there's an unincluded class in topscope" do
+      Puppet[:code] = <<-PP
+        class experiment {
+          class baz {
+          }
+          notify {"x" : require => Class[Baz] }
+        }
+        class baz {
+        }
+        include experiment
+        include experiment::baz
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      notify_resource = catalog.resource( "Notify[x]" )
+
+      notify_resource[:require].title.should == "Experiment::Baz"
+    end
+  end
 end
diff --git a/spec/integration/ssl/certificate_authority_spec.rb b/spec/integration/ssl/certificate_authority_spec.rb
index be82b5fb7..fca17b405 100755
--- a/spec/integration/ssl/certificate_authority_spec.rb
+++ b/spec/integration/ssl/certificate_authority_spec.rb
@@ -1,135 +1,136 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2008-4-17.
 #  Copyright (c) 2008. All rights reserved.
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/ssl/certificate_authority'
 require 'tempfile'
 
 describe Puppet::SSL::CertificateAuthority do
   before do
     # Get a safe temporary file
     file = Tempfile.new("ca_integration_testing")
     @dir = file.path
     file.delete
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
     @ca = Puppet::SSL::CertificateAuthority.new
   end
 
   after {
     Puppet::SSL::Host.ca_location = :none
 
     system("rm -rf #{@dir}")
     Puppet.settings.clear
 
     Puppet::Util::Cacher.expire
 
     Puppet::SSL::CertificateAuthority.instance_variable_set("@instance", nil)
   }
 
   it "should create a CA host" do
     @ca.host.should be_ca
   end
 
   it "should be able to generate a certificate" do
     @ca.generate_ca_certificate
 
     @ca.host.certificate.should be_instance_of(Puppet::SSL::Certificate)
   end
 
   it "should be able to generate a new host certificate" do
     @ca.generate("newhost")
 
     Puppet::SSL::Certificate.find("newhost").should be_instance_of(Puppet::SSL::Certificate)
   end
 
   it "should be able to revoke a host certificate" do
     @ca.generate("newhost")
 
     @ca.revoke("newhost")
 
     lambda { @ca.verify("newhost") }.should raise_error
   end
 
   it "should have a CRL" do
     @ca.generate_ca_certificate
     @ca.crl.should_not be_nil
   end
 
   it "should be able to read in a previously created CRL" do
     @ca.generate_ca_certificate
 
     # Create it to start with.
     @ca.crl
 
     Puppet::SSL::CertificateAuthority.new.crl.should_not be_nil
   end
 
   describe "when signing certificates" do
     before do
       @host = Puppet::SSL::Host.new("luke.madstop.com")
 
       # We have to provide the key, since when we're in :ca_only mode, we can only interact
       # with the CA key.
       key = Puppet::SSL::Key.new(@host.name)
       key.generate
 
       @host.key = key
       @host.generate_certificate_request
 
       path = File.join(Puppet[:requestdir], "luke.madstop.com.pem")
     end
 
     it "should be able to sign certificates" do
       @ca.sign("luke.madstop.com")
     end
 
     it "should save the signed certificate" do
       @ca.sign("luke.madstop.com")
 
       Puppet::SSL::Certificate.find("luke.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
     end
 
     it "should be able to sign multiple certificates" do
       @other = Puppet::SSL::Host.new("other.madstop.com")
       okey = Puppet::SSL::Key.new(@other.name)
       okey.generate
       @other.key = okey
       @other.generate_certificate_request
 
       @ca.sign("luke.madstop.com")
       @ca.sign("other.madstop.com")
 
       Puppet::SSL::Certificate.find("other.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
       Puppet::SSL::Certificate.find("luke.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
     end
 
     it "should save the signed certificate to the :signeddir" do
       @ca.sign("luke.madstop.com")
 
       client_cert = File.join(Puppet[:signeddir], "luke.madstop.com.pem")
       File.read(client_cert).should == Puppet::SSL::Certificate.find("luke.madstop.com").content.to_s
     end
 
     it "should save valid certificates" do
       @ca.sign("luke.madstop.com")
 
       ssl = %x{which openssl}
 
       unless ssl
         pending "No ssl available"
       else
         ca_cert = Puppet[:cacert]
         client_cert = File.join(Puppet[:signeddir], "luke.madstop.com.pem")
         output = %x{openssl verify -CAfile #{ca_cert} #{client_cert}}
         $CHILD_STATUS.should == 0
       end
     end
   end
 end
diff --git a/spec/integration/ssl/certificate_request_spec.rb b/spec/integration/ssl/certificate_request_spec.rb
index 365ecce38..8426b9dc5 100755
--- a/spec/integration/ssl/certificate_request_spec.rb
+++ b/spec/integration/ssl/certificate_request_spec.rb
@@ -1,61 +1,62 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2008-4-17.
 #  Copyright (c) 2008. All rights reserved.
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/ssl/certificate_request'
 require 'tempfile'
 
 describe Puppet::SSL::CertificateRequest do
   before do
     # Get a safe temporary file
     file = Tempfile.new("csr_integration_testing")
     @dir = file.path
     file.delete
 
     Dir.mkdir(@dir)
 
     Puppet.settings.clear
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :none
 
     @csr = Puppet::SSL::CertificateRequest.new("luke.madstop.com")
 
     @key = OpenSSL::PKey::RSA.new(512)
   end
 
   after do
     system("rm -rf #{@dir}")
     Puppet.settings.clear
 
     # This is necessary so the terminus instances don't lie around.
     Puppet::Util::Cacher.expire
   end
 
   it "should be able to generate CSRs" do
     @csr.generate(@key)
   end
 
   it "should be able to save CSRs" do
     @csr.save
   end
 
   it "should be able to find saved certificate requests via the Indirector" do
     @csr.generate(@key)
     @csr.save
 
     Puppet::SSL::CertificateRequest.find("luke.madstop.com").should be_instance_of(Puppet::SSL::CertificateRequest)
   end
 
   it "should save the completely CSR when saving" do
     @csr.generate(@key)
     @csr.save
 
     Puppet::SSL::CertificateRequest.find("luke.madstop.com").content.to_s.should == @csr.content.to_s
   end
 end
diff --git a/spec/integration/ssl/certificate_revocation_list_spec.rb b/spec/integration/ssl/certificate_revocation_list_spec.rb
index 127654ce3..44eee363d 100755
--- a/spec/integration/ssl/certificate_revocation_list_spec.rb
+++ b/spec/integration/ssl/certificate_revocation_list_spec.rb
@@ -1,42 +1,43 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2008-5-5.
 #  Copyright (c) 2008. All rights reserved.
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/ssl/certificate_revocation_list'
 require 'tempfile'
 
 describe Puppet::SSL::CertificateRevocationList do
   before do
     # Get a safe temporary file
     file = Tempfile.new("ca_integration_testing")
     @dir = file.path
     file.delete
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
   end
 
   after {
     Puppet::SSL::Host.ca_location = :none
 
     system("rm -rf #{@dir}")
     Puppet.settings.clear
 
     # This is necessary so the terminus instances don't lie around.
     Puppet::Util::Cacher.expire
   }
 
   it "should be able to read in written out CRLs with no revoked certificates" do
     ca = Puppet::SSL::CertificateAuthority.new
 
     raise "CRL not created" unless FileTest.exist?(Puppet[:hostcrl])
 
     crl = Puppet::SSL::CertificateRevocationList.new("crl_int_testing")
     crl.read(Puppet[:hostcrl])
   end
 end
diff --git a/spec/integration/ssl/host_spec.rb b/spec/integration/ssl/host_spec.rb
index 9b4152e83..05862dfc4 100755
--- a/spec/integration/ssl/host_spec.rb
+++ b/spec/integration/ssl/host_spec.rb
@@ -1,90 +1,91 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2008-4-17.
 #  Copyright (c) 2008. All rights reserved.
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/ssl/host'
 require 'tempfile'
 
 describe Puppet::SSL::Host do
   before do
     # Get a safe temporary file
     file = Tempfile.new("host_integration_testing")
     @dir = file.path
     file.delete
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
 
     @host = Puppet::SSL::Host.new("luke.madstop.com")
     @ca = Puppet::SSL::CertificateAuthority.new
   end
 
   after {
     Puppet::SSL::Host.ca_location = :none
 
     system("rm -rf #{@dir}")
     Puppet.settings.clear
     Puppet::Util::Cacher.expire
   }
 
   it "should be considered a CA host if its name is equal to 'ca'" do
     Puppet::SSL::Host.new(Puppet::SSL::CA_NAME).should be_ca
   end
 
   describe "when managing its key" do
     it "should be able to generate and save a key" do
       @host.generate_key
     end
 
     it "should save the key such that the Indirector can find it" do
       @host.generate_key
 
       Puppet::SSL::Key.find(@host.name).content.to_s.should == @host.key.to_s
     end
 
     it "should save the private key into the :privatekeydir" do
       @host.generate_key
       File.read(File.join(Puppet.settings[:privatekeydir], "luke.madstop.com.pem")).should == @host.key.to_s
     end
   end
 
   describe "when managing its certificate request" do
     it "should be able to generate and save a certificate request" do
       @host.generate_certificate_request
     end
 
     it "should save the certificate request such that the Indirector can find it" do
       @host.generate_certificate_request
 
       Puppet::SSL::CertificateRequest.find(@host.name).content.to_s.should == @host.certificate_request.to_s
     end
 
     it "should save the private certificate request into the :privatekeydir" do
       @host.generate_certificate_request
       File.read(File.join(Puppet.settings[:requestdir], "luke.madstop.com.pem")).should == @host.certificate_request.to_s
     end
   end
 
   describe "when the CA host" do
     it "should never store its key in the :privatekeydir" do
       Puppet.settings.use(:main, :ssl, :ca)
       @ca = Puppet::SSL::Host.new(Puppet::SSL::Host.ca_name)
       @ca.generate_key
 
       FileTest.should_not be_exist(File.join(Puppet[:privatekeydir], "ca.pem"))
     end
   end
 
   it "should pass the verification of its own SSL store" do
     @host.generate
     @ca = Puppet::SSL::CertificateAuthority.new
     @ca.sign(@host.name)
 
     @host.ssl_store.verify(@host.certificate.content).should be_true
   end
 end
diff --git a/spec/unit/indirector/node/ldap_spec.rb b/spec/unit/indirector/node/ldap_spec.rb
index f9c5efa07..042e7bd54 100755
--- a/spec/unit/indirector/node/ldap_spec.rb
+++ b/spec/unit/indirector/node/ldap_spec.rb
@@ -1,456 +1,454 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/node/ldap'
 
 describe Puppet::Node::Ldap do
-  before do
-    Puppet::Node::Facts.stubs(:terminus_class).returns :yaml
-  end
-
   describe "when searching for a single node" do
     before :each do
       @searcher = Puppet::Node::Ldap.new
 
       @name = "mynode.domain.com"
       @node = stub 'node', :name => @name, :name= => nil
       @node.stub_everything
 
       Puppet::Node.stubs(:new).returns(@node)
 
       @request = stub 'request', :key => @name
     end
 
     it "should convert the hostname into a search filter" do
-      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {"environment" => 'production'}
+      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {}
       @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(cn=#{@name}))").yields entry
-      @searcher.name2hash(@name, 'production', 'parent')
+      @searcher.name2hash(@name)
     end
 
     it "should convert any found entry into a hash" do
-      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {"environment" => 'production'}
+      entry = stub 'entry', :dn => 'cn=mynode.domain.com,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {}
       @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(cn=#{@name}))").yields entry
-      myhash = {"myhash" => true, :environment => 'production'}
+      myhash = {"myhash" => true}
       @searcher.expects(:entry2hash).with(entry).returns myhash
-      @searcher.name2hash(@name, 'production', 'parent').should == myhash
+      @searcher.name2hash(@name).should == myhash
     end
 
     # This heavily tests our entry2hash method, so we don't have to stub out the stupid entry information any more.
     describe "when an ldap entry is found" do
       before do
         @entry = stub 'entry', :dn => 'cn=mynode,ou=hosts,dc=madstop,dc=com', :vals => %w{}, :to_hash => {}
         @searcher.stubs(:ldapsearch).yields @entry
       end
 
       it "should convert the entry to a hash" do
         @searcher.entry2hash(@entry).should be_instance_of(Hash)
       end
 
       it "should add the entry's common name to the hash if fqdn if false" do
         @searcher.entry2hash(@entry,fqdn = false)[:name].should == "mynode"
       end
 
       it "should add the entry's fqdn name to the hash if fqdn if true" do
         @searcher.entry2hash(@entry,fqdn = true)[:name].should == "mynode.madstop.com"
       end
 
       it "should add all of the entry's classes to the hash" do
         @entry.stubs(:vals).with("puppetclass").returns %w{one two}
         @searcher.entry2hash(@entry)[:classes].should == %w{one two}
       end
 
       it "should deduplicate class values" do
         @entry.stubs(:to_hash).returns({})
         @searcher.stubs(:class_attributes).returns(%w{one two})
         @entry.stubs(:vals).with("one").returns(%w{a b})
         @entry.stubs(:vals).with("two").returns(%w{b c})
         @searcher.entry2hash(@entry)[:classes].should == %w{a b c}
       end
 
       it "should add the entry's environment to the hash" do
         @entry.stubs(:to_hash).returns("environment" => %w{production})
         @searcher.entry2hash(@entry)[:environment].should == "production"
       end
 
       it "should add all stacked parameters as parameters in the hash" do
         @entry.stubs(:vals).with("puppetvar").returns(%w{one=two three=four})
         result = @searcher.entry2hash(@entry)
         result[:parameters]["one"].should == "two"
         result[:parameters]["three"].should == "four"
       end
 
       it "should not add the stacked parameter as a normal parameter" do
         @entry.stubs(:vals).with("puppetvar").returns(%w{one=two three=four})
         @entry.stubs(:to_hash).returns("puppetvar" => %w{one=two three=four})
         @searcher.entry2hash(@entry)[:parameters]["puppetvar"].should be_nil
       end
 
       it "should add all other attributes as parameters in the hash" do
         @entry.stubs(:to_hash).returns("foo" => %w{one two})
         @searcher.entry2hash(@entry)[:parameters]["foo"].should == %w{one two}
       end
 
       it "should return single-value parameters as strings, not arrays" do
         @entry.stubs(:to_hash).returns("foo" => %w{one})
         @searcher.entry2hash(@entry)[:parameters]["foo"].should == "one"
       end
 
       it "should convert 'true' values to the boolean 'true'" do
         @entry.stubs(:to_hash).returns({"one" => ["true"]})
         @searcher.entry2hash(@entry)[:parameters]["one"].should == true
       end
 
       it "should convert 'false' values to the boolean 'false'" do
         @entry.stubs(:to_hash).returns({"one" => ["false"]})
         @searcher.entry2hash(@entry)[:parameters]["one"].should == false
       end
 
       it "should convert 'true' values to the boolean 'true' inside an array" do
         @entry.stubs(:to_hash).returns({"one" => ["true", "other"]})
         @searcher.entry2hash(@entry)[:parameters]["one"].should == [true, "other"]
       end
 
       it "should convert 'false' values to the boolean 'false' inside an array" do
         @entry.stubs(:to_hash).returns({"one" => ["false", "other"]})
         @searcher.entry2hash(@entry)[:parameters]["one"].should == [false, "other"]
       end
 
       it "should add the parent's name if present" do
         @entry.stubs(:vals).with("parentnode").returns(%w{foo})
         @searcher.entry2hash(@entry)[:parent].should == "foo"
       end
 
       it "should fail if more than one parent is specified" do
         @entry.stubs(:vals).with("parentnode").returns(%w{foo})
         @searcher.entry2hash(@entry)[:parent].should == "foo"
       end
     end
 
     it "should search first for the provided key" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns({})
       @searcher.find(@request)
     end
 
     it "should search for the short version of the provided key if the key looks like a hostname and no results are found for the key itself" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns(nil)
+      @searcher.expects(:name2hash).with("mynode").returns({})
       @searcher.find(@request)
     end
 
     it "should search for default information if no information can be found for the key" do
-      @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns(nil)
-      @searcher.expects(:name2hash).with("default", 'production', 'child').returns({})
+      @searcher.expects(:name2hash).with("mynode.domain.com").returns(nil)
+      @searcher.expects(:name2hash).with("mynode").returns(nil)
+      @searcher.expects(:name2hash).with("default").returns({})
       @searcher.find(@request)
     end
 
     it "should return nil if no results are found in ldap" do
       @searcher.stubs(:name2hash).returns nil
       @searcher.find(@request).should be_nil
     end
 
     it "should return a node object if results are found in ldap" do
       @searcher.stubs(:name2hash).returns({})
       @searcher.find(@request).should equal(@node)
     end
 
     describe "and node information is found in LDAP" do
       before do
         @result = {}
         @searcher.stubs(:name2hash).returns @result
       end
 
       it "should create the node with the correct name, even if it was found by a different name" do
-        @searcher.expects(:name2hash).with("mynode.domain.com", 'production', 'child').returns nil
-        @searcher.expects(:name2hash).with("mynode", 'production', 'child').returns @result
+        @searcher.expects(:name2hash).with("mynode.domain.com").returns nil
+        @searcher.expects(:name2hash).with("mynode").returns @result
 
         Puppet::Node.expects(:new).with("mynode.domain.com").returns @node
         @searcher.find(@request)
       end
 
       it "should add any classes from ldap" do
         @result[:classes] = %w{a b c d}
         @node.expects(:classes=).with(%w{a b c d})
         @searcher.find(@request)
       end
 
       it "should add all entry attributes as node parameters" do
         @result[:parameters] = {"one" => "two", "three" => "four"}
         @node.expects(:parameters=).with("one" => "two", "three" => "four")
         @searcher.find(@request)
       end
 
       it "should set the node's environment to the environment of the results" do
         @result[:environment] = "test"
         @node.expects(:environment=).with("test")
         @searcher.find(@request)
       end
 
       it "should retain false parameter values" do
         @result[:parameters] = {}
         @result[:parameters]["one"] = false
         @node.expects(:parameters=).with("one" => false)
         @searcher.find(@request)
       end
 
       it "should merge the node's facts after the parameters from ldap are assigned" do
         # Make sure we've got data to start with, so the parameters are actually set.
         @result[:parameters] = {}
         @result[:parameters]["one"] = "yay"
 
         # A hackish way to enforce order.
         set = false
         @node.expects(:parameters=).with { |*args| set = true }
         @node.expects(:fact_merge).with { |*args| raise "Facts were merged before parameters were set" unless set; true }
 
         @searcher.find(@request)
       end
 
       describe "and a parent node is specified" do
         before do
           @entry = {:classes => [], :parameters => {}}
           @parent = {:classes => [], :parameters => {}}
           @parent_parent = {:classes => [], :parameters => {}}
 
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == @name}.returns(@entry)
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == 'parent'}.returns(@parent)
-          @searcher.stubs(:name2hash).with{|name, env, mode| name == 'parent_parent'}.returns(@parent_parent)
+          @searcher.stubs(:name2hash).with(@name).returns(@entry)
+          @searcher.stubs(:name2hash).with('parent').returns(@parent)
+          @searcher.stubs(:name2hash).with('parent_parent').returns(@parent_parent)
 
           @searcher.stubs(:parent_attribute).returns(:parent)
         end
 
         it "should search for the parent node" do
           @entry[:parent] = "parent"
+          @searcher.expects(:name2hash).with(@name).returns @entry
+          @searcher.expects(:name2hash).with('parent').returns @parent
 
           @searcher.find(@request)
         end
 
         it "should fail if the parent cannot be found" do
           @entry[:parent] = "parent"
 
-          @searcher.expects(:name2hash).with('parent', 'production', 'parent').returns nil
+          @searcher.expects(:name2hash).with('parent').returns nil
 
           proc { @searcher.find(@request) }.should raise_error(Puppet::Error)
         end
 
         it "should add any parent classes to the node's classes" do
           @entry[:parent] = "parent"
           @entry[:classes] = %w{a b}
 
           @parent[:classes] = %w{c d}
 
           @node.expects(:classes=).with(%w{a b c d})
           @searcher.find(@request)
         end
 
         it "should add any parent parameters to the node's parameters" do
           @entry[:parent] = "parent"
           @entry[:parameters]["one"] = "two"
 
           @parent[:parameters]["three"] = "four"
 
           @node.expects(:parameters=).with("one" => "two", "three" => "four")
           @searcher.find(@request)
         end
 
         it "should prefer node parameters over parent parameters" do
           @entry[:parent] = "parent"
           @entry[:parameters]["one"] = "two"
 
           @parent[:parameters]["one"] = "three"
 
           @node.expects(:parameters=).with("one" => "two")
           @searcher.find(@request)
         end
 
         it "should use the parent's environment if the node has none" do
           @entry[:parent] = "parent"
 
           @parent[:environment] = "parent"
 
           @node.stubs(:parameters=)
           @node.expects(:environment=).with("parent")
           @searcher.find(@request)
         end
 
         it "should prefer the node's environment to the parent's" do
           @entry[:parent] = "parent"
           @entry[:environment] = "child"
 
           @parent[:environment] = "parent"
 
           @node.stubs(:parameters=)
           @node.expects(:environment=).with("child")
           @searcher.find(@request)
         end
 
         it "should recursively look up parent information" do
           @entry[:parent] = "parent"
           @entry[:parameters]["one"] = "two"
 
           @parent[:parent] = "parent_parent"
           @parent[:parameters]["three"] = "four"
 
           @parent_parent[:parameters]["five"] = "six"
 
           @node.expects(:parameters=).with("one" => "two", "three" => "four", "five" => "six")
           @searcher.find(@request)
         end
 
         it "should not allow loops in parent declarations" do
           @entry[:parent] = "parent"
           @parent[:parent] = @name
           proc { @searcher.find(@request) }.should raise_error(ArgumentError)
         end
       end
     end
   end
 
   describe "when searching for multiple nodes" do
     before :each do
       @searcher = Puppet::Node::Ldap.new
       @options = {}
       @request = stub 'request', :key => "foo", :options => @options
 
       Puppet::Node::Facts.stubs(:terminus_class).returns :yaml
     end
 
     it "should find all nodes if no arguments are provided" do
       @searcher.expects(:ldapsearch).with("(objectclass=puppetClient)")
       # LAK:NOTE The search method requires an essentially bogus key.  It's
       # an API problem that I don't really know how to fix.
       @searcher.search @request
     end
 
     describe "and a class is specified" do
       it "should find all nodes that are members of that class" do
         @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(puppetclass=one))")
 
         @options[:class] = "one"
         @searcher.search @request
       end
     end
 
     describe "multiple classes are specified" do
       it "should find all nodes that are members of all classes" do
         @searcher.expects(:ldapsearch).with("(&(objectclass=puppetClient)(puppetclass=one)(puppetclass=two))")
         @options[:class] = %w{one two}
         @searcher.search @request
       end
     end
 
     it "should process each found entry" do
       # .yields can't be used to yield multiple values :/
       @searcher.expects(:ldapsearch).yields("one")
       @searcher.expects(:entry2hash).with("one",nil).returns(:name => "foo")
       @searcher.search @request
     end
 
     it "should return a node for each processed entry with the name from the entry" do
       @searcher.expects(:ldapsearch).yields("whatever")
       @searcher.expects(:entry2hash).with("whatever",nil).returns(:name => "foo")
       result = @searcher.search(@request)
       result[0].should be_instance_of(Puppet::Node)
       result[0].name.should == "foo"
     end
 
     it "should merge each node's facts" do
       node = mock 'node'
       Puppet::Node.expects(:new).with("foo").returns node
       node.expects(:fact_merge)
       @searcher.stubs(:ldapsearch).yields("one")
       @searcher.stubs(:entry2hash).with("one",nil).returns(:name => "foo")
       @searcher.search(@request)
     end
 
     it "should pass the request's fqdn option to entry2hash" do
       node = mock 'node'
       @options[:fqdn] = :hello
       Puppet::Node.stubs(:new).with("foo").returns node
       node.stubs(:fact_merge)
       @searcher.stubs(:ldapsearch).yields("one")
       @searcher.expects(:entry2hash).with("one",:hello).returns(:name => "foo")
       @searcher.search(@request)
     end
   end
 end
 
 describe Puppet::Node::Ldap, " when developing the search query" do
   before do
     @searcher = Puppet::Node::Ldap.new
   end
 
   it "should return the value of the :ldapclassattrs split on commas as the class attributes" do
     Puppet.stubs(:[]).with(:ldapclassattrs).returns("one,two")
     @searcher.class_attributes.should == %w{one two}
   end
 
   it "should return nil as the parent attribute if the :ldapparentattr is set to an empty string" do
     Puppet.stubs(:[]).with(:ldapparentattr).returns("")
     @searcher.parent_attribute.should be_nil
   end
 
   it "should return the value of the :ldapparentattr as the parent attribute" do
     Puppet.stubs(:[]).with(:ldapparentattr).returns("pere")
     @searcher.parent_attribute.should == "pere"
   end
 
   it "should use the value of the :ldapstring as the search filter" do
     Puppet.stubs(:[]).with(:ldapstring).returns("mystring")
     @searcher.search_filter("testing").should == "mystring"
   end
 
   it "should replace '%s' with the node name in the search filter if it is present" do
     Puppet.stubs(:[]).with(:ldapstring).returns("my%sstring")
     @searcher.search_filter("testing").should == "mytestingstring"
   end
 
   it "should not modify the global :ldapstring when replacing '%s' in the search filter" do
     filter = mock 'filter'
     filter.expects(:include?).with("%s").returns(true)
     filter.expects(:gsub).with("%s", "testing").returns("mynewstring")
     Puppet.stubs(:[]).with(:ldapstring).returns(filter)
     @searcher.search_filter("testing").should == "mynewstring"
   end
 end
 
 describe Puppet::Node::Ldap, " when deciding attributes to search for" do
   before do
     @searcher = Puppet::Node::Ldap.new
   end
 
   it "should use 'nil' if the :ldapattrs setting is 'all'" do
     Puppet.stubs(:[]).with(:ldapattrs).returns("all")
     @searcher.search_attributes.should be_nil
   end
 
   it "should split the value of :ldapattrs on commas and use the result as the attribute list" do
     Puppet.stubs(:[]).with(:ldapattrs).returns("one,two")
     @searcher.stubs(:class_attributes).returns([])
     @searcher.stubs(:parent_attribute).returns(nil)
     @searcher.search_attributes.should == %w{one two}
   end
 
   it "should add the class attributes to the search attributes if not returning all attributes" do
     Puppet.stubs(:[]).with(:ldapattrs).returns("one,two")
     @searcher.stubs(:class_attributes).returns(%w{three four})
     @searcher.stubs(:parent_attribute).returns(nil)
     # Sort them so i don't have to care about return order
     @searcher.search_attributes.sort.should == %w{one two three four}.sort
   end
 
   it "should add the parent attribute to the search attributes if not returning all attributes" do
     Puppet.stubs(:[]).with(:ldapattrs).returns("one,two")
     @searcher.stubs(:class_attributes).returns([])
     @searcher.stubs(:parent_attribute).returns("parent")
     @searcher.search_attributes.sort.should == %w{one two parent}.sort
   end
 
   it "should not add nil parent attributes to the search attributes" do
     Puppet.stubs(:[]).with(:ldapattrs).returns("one,two")
     @searcher.stubs(:class_attributes).returns([])
     @searcher.stubs(:parent_attribute).returns(nil)
     @searcher.search_attributes.should == %w{one two}
   end
 end
diff --git a/spec/unit/network/http/rack/rest_spec.rb b/spec/unit/network/http/rack/rest_spec.rb
index 9b3e1e59f..96cf84c37 100755
--- a/spec/unit/network/http/rack/rest_spec.rb
+++ b/spec/unit/network/http/rack/rest_spec.rb
@@ -1,249 +1,249 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../../spec_helper'
 require 'puppet/network/http/rack' if Puppet.features.rack?
 require 'puppet/network/http/rack/rest'
 
 describe "Puppet::Network::HTTP::RackREST" do
   confine "Rack is not available" => Puppet.features.rack?
 
   it "should include the Puppet::Network::HTTP::Handler module" do
     Puppet::Network::HTTP::RackREST.ancestors.should be_include(Puppet::Network::HTTP::Handler)
   end
 
   describe "when initializing" do
     it "should call the Handler's initialization hook with its provided arguments" do
       Puppet::Network::HTTP::RackREST.any_instance.expects(:initialize_for_puppet).with(:server => "my", :handler => "arguments")
       Puppet::Network::HTTP::RackREST.new(:server => "my", :handler => "arguments")
     end
   end
 
   describe "when serving a request" do
     before :all do
       @model_class = stub('indirected model class')
       Puppet::Indirector::Indirection.stubs(:model).with(:foo).returns(@model_class)
       @handler = Puppet::Network::HTTP::RackREST.new(:handler => :foo)
     end
 
     before :each do
       @response = Rack::Response.new
     end
 
     def mk_req(uri, opts = {})
       env = Rack::MockRequest.env_for(uri, opts)
       Rack::Request.new(env)
     end
 
     describe "and using the HTTP Handler interface" do
       it "should return the HTTP_ACCEPT parameter as the accept header" do
         req = mk_req('/', 'HTTP_ACCEPT' => 'myaccept')
         @handler.accept_header(req).should == "myaccept"
       end
 
       it "should return the CONTENT_TYPE parameter as the content type header" do
         req = mk_req('/', 'CONTENT_TYPE' => 'mycontent')
         @handler.content_type_header(req).should == "mycontent"
       end
 
       it "should use the REQUEST_METHOD as the http method" do
         req = mk_req('/', :method => 'MYMETHOD')
         @handler.http_method(req).should == "MYMETHOD"
       end
 
       it "should return the request path as the path" do
         req = mk_req('/foo/bar')
         @handler.path(req).should == "/foo/bar"
       end
 
       it "should return the request body as the body" do
         req = mk_req('/foo/bar', :input => 'mybody')
         @handler.body(req).should == "mybody"
       end
 
       it "should set the response's content-type header when setting the content type" do
         @header = mock 'header'
         @response.expects(:header).returns @header
         @header.expects(:[]=).with('Content-Type', "mytype")
 
         @handler.set_content_type(@response, "mytype")
       end
 
       it "should set the status and write the body when setting the response for a request" do
         @response.expects(:status=).with(400)
         @response.expects(:write).with("mybody")
 
         @handler.set_response(@response, "mybody", 400)
       end
 
       describe "when result is a File" do
         before :each do
           stat = stub 'stat', :size => 100
           @file = stub 'file', :stat => stat, :path => "/tmp/path"
           @file.stubs(:is_a?).with(File).returns(true)
         end
 
-        it "should set the Content-Length header" do
-          @response.expects(:[]=).with("Content-Length", 100)
+        it "should set the Content-Length header as a string" do
+          @response.expects(:[]=).with("Content-Length", '100')
 
           @handler.set_response(@response, @file, 200)
         end
 
         it "should return a RackFile adapter as body" do
           @response.expects(:body=).with { |val| val.is_a?(Puppet::Network::HTTP::RackREST::RackFile) }
 
           @handler.set_response(@response, @file, 200)
         end
       end
     end
 
     describe "and determining the request parameters" do
       it "should include the HTTP request parameters, with the keys as symbols" do
         req = mk_req('/?foo=baz&bar=xyzzy')
         result = @handler.params(req)
         result[:foo].should == "baz"
         result[:bar].should == "xyzzy"
       end
 
       it "should CGI-decode the HTTP parameters" do
         encoding = CGI.escape("foo bar")
         req = mk_req("/?foo=#{encoding}")
         result = @handler.params(req)
         result[:foo].should == "foo bar"
       end
 
       it "should convert the string 'true' to the boolean" do
         req = mk_req("/?foo=true")
         result = @handler.params(req)
         result[:foo].should be_true
       end
 
       it "should convert the string 'false' to the boolean" do
         req = mk_req("/?foo=false")
         result = @handler.params(req)
         result[:foo].should be_false
       end
 
       it "should convert integer arguments to Integers" do
         req = mk_req("/?foo=15")
         result = @handler.params(req)
         result[:foo].should == 15
       end
 
       it "should convert floating point arguments to Floats" do
         req = mk_req("/?foo=1.5")
         result = @handler.params(req)
         result[:foo].should == 1.5
       end
 
       it "should YAML-load and CGI-decode values that are YAML-encoded" do
         escaping = CGI.escape(YAML.dump(%w{one two}))
         req = mk_req("/?foo=#{escaping}")
         result = @handler.params(req)
         result[:foo].should == %w{one two}
       end
 
       it "should not allow the client to set the node via the query string" do
         req = mk_req("/?node=foo")
         @handler.params(req)[:node].should be_nil
       end
 
       it "should not allow the client to set the IP address via the query string" do
         req = mk_req("/?ip=foo")
         @handler.params(req)[:ip].should be_nil
       end
 
       it "should pass the client's ip address to model find" do
         req = mk_req("/", 'REMOTE_ADDR' => 'ipaddress')
         @handler.params(req)[:ip].should == "ipaddress"
       end
 
       it "should set 'authenticated' to false if no certificate is present" do
         req = mk_req('/')
         @handler.params(req)[:authenticated].should be_false
       end
     end
 
     describe "with pre-validated certificates" do
 
       it "should use the :ssl_client_header to determine the parameter when looking for the certificate" do
         Puppet.settings.stubs(:value).returns "eh"
         Puppet.settings.expects(:value).with(:ssl_client_header).returns "myheader"
         req = mk_req('/', "myheader" => "/CN=host.domain.com")
         @handler.params(req)
       end
 
       it "should retrieve the hostname by matching the certificate parameter" do
         Puppet.settings.stubs(:value).returns "eh"
         Puppet.settings.expects(:value).with(:ssl_client_header).returns "myheader"
         req = mk_req('/', "myheader" => "/CN=host.domain.com")
         @handler.params(req)[:node].should == "host.domain.com"
       end
 
       it "should use the :ssl_client_header to determine the parameter for checking whether the host certificate is valid" do
         Puppet.settings.stubs(:value).with(:ssl_client_header).returns "certheader"
         Puppet.settings.expects(:value).with(:ssl_client_verify_header).returns "myheader"
         req = mk_req('/', "myheader" => "SUCCESS", "certheader" => "/CN=host.domain.com")
         @handler.params(req)
       end
 
       it "should consider the host authenticated if the validity parameter contains 'SUCCESS'" do
         Puppet.settings.stubs(:value).with(:ssl_client_header).returns "certheader"
         Puppet.settings.stubs(:value).with(:ssl_client_verify_header).returns "myheader"
         req = mk_req('/', "myheader" => "SUCCESS", "certheader" => "/CN=host.domain.com")
         @handler.params(req)[:authenticated].should be_true
       end
 
       it "should consider the host unauthenticated if the validity parameter does not contain 'SUCCESS'" do
         Puppet.settings.stubs(:value).with(:ssl_client_header).returns "certheader"
         Puppet.settings.stubs(:value).with(:ssl_client_verify_header).returns "myheader"
         req = mk_req('/', "myheader" => "whatever", "certheader" => "/CN=host.domain.com")
         @handler.params(req)[:authenticated].should be_false
       end
 
       it "should consider the host unauthenticated if no certificate information is present" do
         Puppet.settings.stubs(:value).with(:ssl_client_header).returns "certheader"
         Puppet.settings.stubs(:value).with(:ssl_client_verify_header).returns "myheader"
         req = mk_req('/', "myheader" => nil, "certheader" => "/CN=host.domain.com")
         @handler.params(req)[:authenticated].should be_false
       end
 
       it "should resolve the node name with an ip address look-up if no certificate is present" do
         Puppet.settings.stubs(:value).returns "eh"
         Puppet.settings.expects(:value).with(:ssl_client_header).returns "myheader"
         req = mk_req('/', "myheader" => nil)
         @handler.expects(:resolve_node).returns("host.domain.com")
         @handler.params(req)[:node].should == "host.domain.com"
       end
     end
   end
 end
 
 describe Puppet::Network::HTTP::RackREST::RackFile do
   before(:each) do
     stat = stub 'stat', :size => 100
     @file = stub 'file', :stat => stat, :path => "/tmp/path"
     @rackfile = Puppet::Network::HTTP::RackREST::RackFile.new(@file)
   end
 
   it "should have an each method" do
     @rackfile.should be_respond_to(:each)
   end
 
   it "should yield file chunks by chunks" do
     @file.expects(:read).times(3).with(8192).returns("1", "2", nil)
     i = 1
     @rackfile.each do |chunk|
       chunk.to_i.should == i
       i += 1
     end
   end
 
   it "should have a close method" do
     @rackfile.should be_respond_to(:close)
   end
 
   it "should delegate close to File close" do
     @file.expects(:close)
     @rackfile.close
   end
-end
\ No newline at end of file
+end
diff --git a/spec/unit/node/facts_spec.rb b/spec/unit/node/facts_spec.rb
index a2f4ab9f0..394db7913 100755
--- a/spec/unit/node/facts_spec.rb
+++ b/spec/unit/node/facts_spec.rb
@@ -1,102 +1,113 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/node/facts'
 
 describe Puppet::Node::Facts, "when indirecting" do
   before do
     @facts = Puppet::Node::Facts.new("me")
   end
 
   it "should be able to convert all fact values to strings" do
     @facts.values["one"] = 1
     @facts.stringify
     @facts.values["one"].should == "1"
   end
 
   it "should add the node's certificate name as the 'clientcert' fact when adding local facts" do
     @facts.add_local_facts
     @facts.values["clientcert"].should == Puppet.settings[:certname]
   end
 
   it "should add the Puppet version as a 'clientversion' fact when adding local facts" do
     @facts.add_local_facts
     @facts.values["clientversion"].should == Puppet.version.to_s
   end
 
   it "should add the current environment as a fact if one is not set when adding local facts" do
     @facts.add_local_facts
     @facts.values["environment"].should == Puppet[:environment]
   end
 
   it "should not replace any existing environment fact when adding local facts" do
     @facts.values["environment"] = "foo"
     @facts.add_local_facts
     @facts.values["environment"].should == "foo"
   end
 
   it "should be able to downcase fact values" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns true
 
     @facts.values["one"] = "Two"
 
     @facts.downcase_if_necessary
     @facts.values["one"].should == "two"
   end
 
   it "should only try to downcase strings" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns true
 
     @facts.values["now"] = Time.now
 
     @facts.downcase_if_necessary
     @facts.values["now"].should be_instance_of(Time)
   end
 
   it "should not downcase facts if not configured to do so" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns false
 
     @facts.values["one"] = "Two"
     @facts.downcase_if_necessary
     @facts.values["one"].should == "Two"
   end
 
   describe "when indirecting" do
     before do
       @indirection = stub 'indirection', :request => mock('request'), :name => :facts
 
       # We have to clear the cache so that the facts ask for our indirection stub,
       # instead of anything that might be cached.
       Puppet::Util::Cacher.expire
 
       @facts = Puppet::Node::Facts.new("me", "one" => "two")
     end
 
     it "should redirect to the specified fact store for retrieval" do
       Puppet::Node::Facts.stubs(:indirection).returns(@indirection)
       @indirection.expects(:find)
       Puppet::Node::Facts.find(:my_facts)
     end
 
     it "should redirect to the specified fact store for storage" do
       Puppet::Node::Facts.stubs(:indirection).returns(@indirection)
       @indirection.expects(:save)
       @facts.save
     end
 
-    it "should default to the 'facter' terminus" do
-      Puppet::Node::Facts.indirection.terminus_class.should == :facter
+    describe "when the Puppet application is 'master'" do
+      it "should default to the 'yaml' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should == :yaml
+      end
     end
+
+    describe "when the Puppet application is not 'master'" do
+      it "should default to the 'facter' terminus" do
+        pending "Cannot test the behavior of defaults in defaults.rb"
+        # Puppet::Node::Facts.indirection.terminus_class.should == :facter
+      end
+    end
+
   end
 
   describe "when storing and retrieving" do
     it "should add metadata to the facts" do
       facts = Puppet::Node::Facts.new("me", "one" => "two", "three" => "four")
       facts.values[:_timestamp].should be_instance_of(Time)
     end
   end
 end
diff --git a/spec/unit/parameter/value_collection_spec.rb b/spec/unit/parameter/value_collection_spec.rb
index 78c2c5263..cb82d1517 100755
--- a/spec/unit/parameter/value_collection_spec.rb
+++ b/spec/unit/parameter/value_collection_spec.rb
@@ -1,167 +1,167 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/parameter'
 
 describe Puppet::Parameter::ValueCollection do
   before do
     @collection = Puppet::Parameter::ValueCollection.new
   end
 
   it "should have a method for defining new values" do
     @collection.should respond_to(:newvalues)
   end
 
   it "should have a method for adding individual values" do
     @collection.should respond_to(:newvalue)
   end
 
   it "should be able to retrieve individual values" do
     value = @collection.newvalue(:foo)
     @collection.value(:foo).should equal(value)
   end
 
   it "should be able to add an individual value with a block" do
     @collection.newvalue(:foo) { raise "testing" }
     @collection.value(:foo).block.should be_instance_of(Proc)
   end
 
   it "should be able to add values that are empty strings" do
     lambda { @collection.newvalue('') }.should_not raise_error
   end
 
   it "should be able to add values that are empty strings" do
     value = @collection.newvalue('')
     @collection.match?('').should equal(value)
   end
 
   it "should set :call to :none when adding a value with no block" do
     value = @collection.newvalue(:foo)
     value.call.should == :none
   end
 
   describe "when adding a value with a block" do
     it "should set the method name to 'set_' plus the value name" do
       value = @collection.newvalue(:myval) { raise "testing" }
       value.method.should == "set_myval"
     end
   end
 
   it "should be able to add an individual value with options" do
     value = @collection.newvalue(:foo, :call => :bar)
     value.call.should == :bar
   end
 
   it "should have a method for validating a value" do
     @collection.should respond_to(:validate)
   end
 
   it "should have a method for munging a value" do
     @collection.should respond_to(:munge)
   end
 
   it "should be able to generate documentation when it has both values and regexes" do
     @collection.newvalues :foo, "bar", %r{test}
     @collection.doc.should be_instance_of(String)
   end
 
   it "should correctly generate documentation for values" do
     @collection.newvalues :foo
-    @collection.doc.should be_include("Valid values are ``foo``")
+    @collection.doc.should be_include("Valid values are `foo`")
   end
 
   it "should correctly generate documentation for regexes" do
     @collection.newvalues %r{\w+}
-    @collection.doc.should be_include("Values can match ``/\\w+/``")
+    @collection.doc.should be_include("Values can match `/\\w+/`")
   end
 
   it "should be able to find the first matching value" do
     @collection.newvalues :foo, :bar
     @collection.match?("foo").should be_instance_of(Puppet::Parameter::Value)
   end
 
   it "should be able to match symbols" do
     @collection.newvalues :foo, :bar
     @collection.match?(:foo).should be_instance_of(Puppet::Parameter::Value)
   end
 
   it "should be able to match symbols when a regex is provided" do
     @collection.newvalues %r{.}
     @collection.match?(:foo).should be_instance_of(Puppet::Parameter::Value)
   end
 
   it "should be able to match values using regexes" do
     @collection.newvalues %r{.}
     @collection.match?("foo").should_not be_nil
   end
 
   it "should prefer value matches to regex matches" do
     @collection.newvalues %r{.}, :foo
     @collection.match?("foo").name.should == :foo
   end
 
   describe "when validating values" do
     it "should do nothing if no values or regexes have been defined" do
       @collection.validate("foo")
     end
 
     it "should fail if the value is not a defined value or alias and does not match a regex" do
       @collection.newvalues :foo
       lambda { @collection.validate("bar") }.should raise_error(ArgumentError)
     end
 
     it "should succeed if the value is one of the defined values" do
       @collection.newvalues :foo
       lambda { @collection.validate(:foo) }.should_not raise_error(ArgumentError)
     end
 
     it "should succeed if the value is one of the defined values even if the definition uses a symbol and the validation uses a string" do
       @collection.newvalues :foo
       lambda { @collection.validate("foo") }.should_not raise_error(ArgumentError)
     end
 
     it "should succeed if the value is one of the defined values even if the definition uses a string and the validation uses a symbol" do
       @collection.newvalues "foo"
       lambda { @collection.validate(:foo) }.should_not raise_error(ArgumentError)
     end
 
     it "should succeed if the value is one of the defined aliases" do
       @collection.newvalues :foo
       @collection.aliasvalue :bar, :foo
       lambda { @collection.validate("bar") }.should_not raise_error(ArgumentError)
     end
 
     it "should succeed if the value matches one of the regexes" do
       @collection.newvalues %r{\d}
       lambda { @collection.validate("10") }.should_not raise_error(ArgumentError)
     end
   end
 
   describe "when munging values" do
     it "should do nothing if no values or regexes have been defined" do
       @collection.munge("foo").should == "foo"
     end
 
     it "should return return any matching defined values" do
       @collection.newvalues :foo, :bar
       @collection.munge("foo").should == :foo
     end
 
     it "should return any matching aliases" do
       @collection.newvalues :foo
       @collection.aliasvalue :bar, :foo
       @collection.munge("bar").should == :foo
     end
 
     it "should return the value if it matches a regex" do
       @collection.newvalues %r{\w}
       @collection.munge("bar").should == "bar"
     end
 
     it "should return the value if no other option is matched" do
       @collection.newvalues :foo
       @collection.munge("bar").should == "bar"
     end
   end
 end
diff --git a/spec/unit/parser/ast/leaf_spec.rb b/spec/unit/parser/ast/leaf_spec.rb
index 5bdca67fa..eb71f0d37 100755
--- a/spec/unit/parser/ast/leaf_spec.rb
+++ b/spec/unit/parser/ast/leaf_spec.rb
@@ -1,362 +1,366 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::Leaf do
   before :each do
     @scope = stub 'scope'
     @value = stub 'value'
     @leaf = Puppet::Parser::AST::Leaf.new(:value => @value)
   end
 
   it "should have a evaluate_match method" do
     Puppet::Parser::AST::Leaf.new(:value => "value").should respond_to(:evaluate_match)
   end
 
   describe "when converting to string" do
     it "should transform its value to string" do
       value = stub 'value', :is_a? => true
       value.expects(:to_s)
       Puppet::Parser::AST::Leaf.new( :value => value ).to_s
     end
   end
 
   it "should have a match method" do
     @leaf.should respond_to(:match)
   end
 
   it "should delegate match to ==" do
     @value.expects(:==).with("value")
 
     @leaf.match("value")
   end
 end
 
 describe Puppet::Parser::AST::FlatString do
   describe "when converting to string" do
     it "should transform its value to a quoted string" do
       value = stub 'value', :is_a? => true, :to_s => "ab"
       Puppet::Parser::AST::FlatString.new( :value => value ).to_s.should == "\"ab\""
     end
   end
 end
 
 describe Puppet::Parser::AST::String do
   describe "when converting to string" do
     it "should transform its value to a quoted string" do
       value = stub 'value', :is_a? => true, :to_s => "ab"
       Puppet::Parser::AST::String.new( :value => value ).to_s.should == "\"ab\""
     end
+    it "should return a dup of its value" do
+      value = ""
+      Puppet::Parser::AST::String.new( :value => value ).evaluate(stub 'scope').should_not be_equal(value)
+    end
   end
 end
 
 describe Puppet::Parser::AST::Concat do
   describe "when evaluating" do
     before :each do
       @scope = stub_everything 'scope'
     end
     it "should interpolate variables and concatenate their values" do
       one = Puppet::Parser::AST::String.new(:value => "one")
       one.stubs(:evaluate).returns("one ")
       two = Puppet::Parser::AST::String.new(:value => "two")
       two.stubs(:evaluate).returns(" two ")
       three = Puppet::Parser::AST::String.new(:value => "three")
       three.stubs(:evaluate).returns(" three")
       var = Puppet::Parser::AST::Variable.new(:value => "myvar")
       var.stubs(:evaluate).returns("foo")
       array = Puppet::Parser::AST::Variable.new(:value => "array")
       array.stubs(:evaluate).returns(["bar","baz"])
       concat = Puppet::Parser::AST::Concat.new(:value => [one,var,two,array,three])
 
       concat.evaluate(@scope).should == 'one foo two barbaz three'
     end
 
     it "should transform undef variables to empty string" do
       var = Puppet::Parser::AST::Variable.new(:value => "myvar")
       var.stubs(:evaluate).returns(:undef)
       concat = Puppet::Parser::AST::Concat.new(:value => [var])
 
       concat.evaluate(@scope).should == ''
     end
   end
 end
 
 describe Puppet::Parser::AST::Undef do
   before :each do
     @scope = stub 'scope'
     @undef = Puppet::Parser::AST::Undef.new(:value => :undef)
   end
 
   it "should match undef with undef" do
     @undef.evaluate_match(:undef, @scope).should be_true
   end
 
   it "should not match undef with an empty string" do
     @undef.evaluate_match("", @scope).should be_false
   end
 end
 
 describe Puppet::Parser::AST::HashOrArrayAccess do
   before :each do
     @scope = stub 'scope'
   end
 
   describe "when evaluating" do
     it "should evaluate the variable part if necessary" do
       @scope.stubs(:lookupvar).with("a").returns(["b"])
 
       variable = stub 'variable', :evaluate => "a"
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => variable, :key => 0 )
 
       variable.expects(:safeevaluate).with(@scope).returns("a")
 
       access.evaluate(@scope).should == "b"
     end
 
     it "should evaluate the access key part if necessary" do
       @scope.stubs(:lookupvar).with("a").returns(["b"])
 
       index = stub 'index', :evaluate => 0
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => index )
 
       index.expects(:safeevaluate).with(@scope).returns(0)
 
       access.evaluate(@scope).should == "b"
     end
 
     it "should be able to return an array member" do
       @scope.stubs(:lookupvar).with("a").returns(["val1", "val2", "val3"])
 
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => 1 )
 
       access.evaluate(@scope).should == "val2"
     end
 
     it "should be able to return an hash value" do
       @scope.stubs(:lookupvar).with("a").returns({ "key1" => "val1", "key2" => "val2", "key3" => "val3" })
 
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" )
 
       access.evaluate(@scope).should == "val2"
     end
 
     it "should raise an error if the variable lookup didn't return an hash or an array" do
       @scope.stubs(:lookupvar).with("a").returns("I'm a string")
 
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" )
 
       lambda { access.evaluate(@scope) }.should raise_error
     end
 
     it "should raise an error if the variable wasn't in the scope" do
       @scope.stubs(:lookupvar).with("a").returns(nil)
 
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" )
 
       lambda { access.evaluate(@scope) }.should raise_error
     end
 
     it "should return a correct string representation" do
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key2" )
       access.to_s.should == '$a[key2]'
     end
 
     it "should work with recursive hash access" do
       @scope.stubs(:lookupvar).with("a").returns({ "key" => { "subkey" => "b" }})
 
       access1 = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key")
       access2 = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => access1, :key => "subkey")
 
       access2.evaluate(@scope).should == 'b'
     end
 
     it "should work with interleaved array and hash access" do
       @scope.stubs(:lookupvar).with("a").returns({ "key" => [ "a" , "b" ]})
 
       access1 = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key")
       access2 = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => access1, :key => 1)
 
       access2.evaluate(@scope).should == 'b'
     end
   end
 
   describe "when assigning" do
     it "should add a new key and value" do
       scope = Puppet::Parser::Scope.new
       scope.setvar("a", { 'a' => 'b' })
 
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "b")
       access.assign(scope, "c" )
 
       scope.lookupvar("a").should be_include("b")
     end
 
     it "should raise an error when trying to overwrite an hash value" do
       @scope.stubs(:lookupvar).with("a").returns({ "key" => [ "a" , "b" ]})
       access = Puppet::Parser::AST::HashOrArrayAccess.new(:variable => "a", :key => "key")
 
       lambda { access.assign(@scope, "test") }.should raise_error
     end
   end
 end
 
 describe Puppet::Parser::AST::Regex do
   before :each do
     @scope = stub 'scope'
   end
 
   describe "when initializing" do
     it "should create a Regexp with its content when value is not a Regexp" do
       Regexp.expects(:new).with("/ab/")
 
       Puppet::Parser::AST::Regex.new :value => "/ab/"
     end
 
     it "should not create a Regexp with its content when value is a Regexp" do
       value = Regexp.new("/ab/")
       Regexp.expects(:new).with("/ab/").never
 
       Puppet::Parser::AST::Regex.new :value => value
     end
   end
 
   describe "when evaluating" do
     it "should return self" do
       val = Puppet::Parser::AST::Regex.new :value => "/ab/"
 
       val.evaluate(@scope).should === val
     end
   end
 
   describe "when evaluate_match" do
     before :each do
       @value = stub 'regex'
       @value.stubs(:match).with("value").returns(true)
       Regexp.stubs(:new).returns(@value)
       @regex = Puppet::Parser::AST::Regex.new :value => "/ab/"
     end
 
     it "should issue the regexp match" do
       @value.expects(:match).with("value")
 
       @regex.evaluate_match("value", @scope)
     end
 
     it "should not downcase the paramater value" do
       @value.expects(:match).with("VaLuE")
 
       @regex.evaluate_match("VaLuE", @scope)
     end
 
     it "should set ephemeral scope vars if there is a match" do
       @scope.expects(:ephemeral_from).with(true, nil, nil)
 
       @regex.evaluate_match("value", @scope)
     end
 
     it "should return the match to the caller" do
       @value.stubs(:match).with("value").returns(:match)
       @scope.stubs(:ephemeral_from)
 
       @regex.evaluate_match("value", @scope)
     end
   end
 
   it "should return the regex source with to_s" do
     regex = stub 'regex'
     Regexp.stubs(:new).returns(regex)
 
     val = Puppet::Parser::AST::Regex.new :value => "/ab/"
 
     regex.expects(:source)
 
     val.to_s
   end
 
   it "should delegate match to the underlying regexp match method" do
     regex = Regexp.new("/ab/")
     val = Puppet::Parser::AST::Regex.new :value => regex
 
     regex.expects(:match).with("value")
 
     val.match("value")
   end
 end
 
 describe Puppet::Parser::AST::Variable do
   before :each do
     @scope = stub 'scope'
     @var = Puppet::Parser::AST::Variable.new(:value => "myvar")
   end
 
   it "should lookup the variable in scope" do
     @scope.expects(:lookupvar).with("myvar", false).returns(:myvalue)
     @var.safeevaluate(@scope).should == :myvalue
   end
 
   it "should return undef if the variable wasn't set" do
     @scope.expects(:lookupvar).with("myvar", false).returns(:undefined)
     @var.safeevaluate(@scope).should == :undef
   end
 
   describe "when converting to string" do
     it "should transform its value to a variable" do
       value = stub 'value', :is_a? => true, :to_s => "myvar"
       Puppet::Parser::AST::Variable.new( :value => value ).to_s.should == "\$myvar"
     end
   end
 end
 
 describe Puppet::Parser::AST::HostName do
   before :each do
     @scope = stub 'scope'
     @value = stub 'value', :=~ => false
     @value.stubs(:to_s).returns(@value)
     @value.stubs(:downcase).returns(@value)
     @host = Puppet::Parser::AST::HostName.new( :value => @value)
   end
 
   it "should raise an error if hostname is not valid" do
     lambda { Puppet::Parser::AST::HostName.new( :value => "not an hostname!" ) }.should raise_error
   end
 
   it "should not raise an error if hostname is a regex" do
     lambda { Puppet::Parser::AST::HostName.new( :value => Puppet::Parser::AST::Regex.new(:value => "/test/") ) }.should_not raise_error
   end
 
   it "should stringify the value" do
     value = stub 'value', :=~ => false
 
     value.expects(:to_s).returns("test")
 
     Puppet::Parser::AST::HostName.new(:value => value)
   end
 
   it "should downcase the value" do
     value = stub 'value', :=~ => false
     value.stubs(:to_s).returns("UPCASED")
     host = Puppet::Parser::AST::HostName.new(:value => value)
 
     host.value == "upcased"
   end
 
   it "should evaluate to its value" do
     @host.evaluate(@scope).should == @value
   end
 
   it "should delegate eql? to the underlying value if it is an HostName" do
     @value.expects(:eql?).with("value")
     @host.eql?("value")
   end
 
   it "should delegate eql? to the underlying value if it is not an HostName" do
     value = stub 'compared', :is_a? => true, :value => "value"
     @value.expects(:eql?).with("value")
     @host.eql?(value)
   end
 
   it "should delegate hash to the underlying value" do
     @value.expects(:hash)
     @host.hash
   end
 end
diff --git a/spec/unit/parser/ast/resource_reference_spec.rb b/spec/unit/parser/ast/resource_reference_spec.rb
index 7b48119f4..93419d963 100755
--- a/spec/unit/parser/ast/resource_reference_spec.rb
+++ b/spec/unit/parser/ast/resource_reference_spec.rb
@@ -1,46 +1,41 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::ResourceReference do
 
   ast = Puppet::Parser::AST
 
   before :each do
     @scope = Puppet::Parser::Scope.new
   end
 
   def newref(type, title)
     title = stub 'title', :safeevaluate => title
     ref = Puppet::Parser::AST::ResourceReference.new(:type => type, :title => title)
   end
 
   it "should correctly produce reference strings" do
     newref("File", "/tmp/yay").evaluate(@scope).to_s.should == "File[/tmp/yay]"
   end
 
   it "should produce a single resource when the title evaluates to a string" do
     newref("File", "/tmp/yay").evaluate(@scope).should == Puppet::Resource.new("file", "/tmp/yay")
   end
 
   it "should return an array of resources if given an array of titles" do
     titles = mock 'titles', :safeevaluate => ["title1","title2"]
     ref = ast::ResourceReference.new( :title => titles, :type => "File" )
     ref.evaluate(@scope).should == [
       Puppet::Resource.new("file", "title1"),
       Puppet::Resource.new("file", "title2")
     ]
   end
 
-  it "should pass its scope's namespaces to all created resource references" do
-    @scope.add_namespace "foo"
-    newref("File", "/tmp/yay").evaluate(@scope).namespaces.should == ["foo"]
-  end
-
   it "should return a correct representation when converting to string" do
     type = stub 'type', :is_a? => true, :to_s => "file"
     title = stub 'title', :is_a? => true, :to_s => "[/tmp/a, /tmp/b]"
 
     ast::ResourceReference.new( :type => type, :title => title ).to_s.should == "File[/tmp/a, /tmp/b]"
   end
 end
diff --git a/spec/unit/parser/ast/resource_spec.rb b/spec/unit/parser/ast/resource_spec.rb
index 58ffae925..5c94ac0e9 100755
--- a/spec/unit/parser/ast/resource_spec.rb
+++ b/spec/unit/parser/ast/resource_spec.rb
@@ -1,120 +1,127 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::Resource do
   ast = Puppet::Parser::AST
 
   before :each do
     @title = Puppet::Parser::AST::String.new(:value => "mytitle")
     @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
     @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
     @scope.stubs(:resource).returns(stub_everything)
     @resource = ast::Resource.new(:title => @title, :type => "file", :parameters => ast::ASTArray.new(:children => []) )
     @resource.stubs(:qualified_type).returns("Resource")
   end
 
   it "should evaluate all its parameters" do
     param = stub 'param'
     param.expects(:safeevaluate).with(@scope).returns Puppet::Parser::Resource::Param.new(:name => "myparam", :value => "myvalue", :source => stub("source"))
     @resource.stubs(:parameters).returns [param]
 
     @resource.evaluate(@scope)
   end
 
   it "should evaluate its title" do
     @resource.evaluate(@scope)[0].title.should == "mytitle"
   end
 
   it "should flatten the titles array" do
     titles = []
     %w{one two}.each do |title|
       titles << Puppet::Parser::AST::String.new(:value => title)
     end
 
     array = Puppet::Parser::AST::ASTArray.new(:children => titles)
 
     @resource.title = array
     result = @resource.evaluate(@scope).collect { |r| r.title }
     result.should be_include("one")
     result.should be_include("two")
   end
 
   it "should create and return one resource objects per title" do
     titles = []
     %w{one two}.each do |title|
       titles << Puppet::Parser::AST::String.new(:value => title)
     end
 
     array = Puppet::Parser::AST::ASTArray.new(:children => titles)
 
     @resource.title = array
     result = @resource.evaluate(@scope).collect { |r| r.title }
     result.should be_include("one")
     result.should be_include("two")
   end
 
   it "should handover resources to the compiler" do
     titles = []
     %w{one two}.each do |title|
       titles << Puppet::Parser::AST::String.new(:value => title)
     end
 
     array = Puppet::Parser::AST::ASTArray.new(:children => titles)
 
     @resource.title = array
     result = @resource.evaluate(@scope)
 
     result.each do |res|
       @compiler.catalog.resource(res.ref).should be_instance_of(Puppet::Parser::Resource)
     end
   end
   it "should generate virtual resources if it is virtual" do
     @resource.virtual = true
 
     result = @resource.evaluate(@scope)
     result[0].should be_virtual
   end
 
   it "should generate virtual and exported resources if it is exported" do
     @resource.exported = true
 
     result = @resource.evaluate(@scope)
     result[0].should be_virtual
     result[0].should be_exported
   end
 
   # Related to #806, make sure resources always look up the full path to the resource.
   describe "when generating qualified resources" do
     before do
       @scope = Puppet::Parser::Scope.new :compiler => Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
       @parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new)
       @parser.newdefine "one"
       @parser.newdefine "one::two"
       @parser.newdefine "three"
       @twoscope = @scope.newscope(:namespace => "one")
       @twoscope.resource = @scope.resource
     end
 
     def resource(type, params = nil)
       params ||= Puppet::Parser::AST::ASTArray.new(:children => [])
       Puppet::Parser::AST::Resource.new(:type => type, :title => Puppet::Parser::AST::String.new(:value => "myresource"), :parameters => params)
     end
 
     it "should be able to generate resources with fully qualified type information" do
       resource("two").evaluate(@twoscope)[0].type.should == "One::Two"
     end
 
     it "should be able to generate resources with unqualified type information" do
       resource("one").evaluate(@twoscope)[0].type.should == "One"
     end
 
     it "should correctly generate resources that can look up builtin types" do
       resource("file").evaluate(@twoscope)[0].type.should == "File"
     end
 
+    it "should correctly generate resources that can look up defined classes by title" do
+      @scope.known_resource_types.add_hostclass Puppet::Resource::Type.new(:hostclass, "Myresource", {})
+      res = resource("class").evaluate(@twoscope)[0]
+      res.type.should == "Class"
+      res.title.should == "Myresource"
+    end
+
     it "should fail for resource types that do not exist" do
       lambda { resource("nosuchtype").evaluate(@twoscope) }.should raise_error(Puppet::ParseError)
     end
   end
 end
diff --git a/spec/unit/parser/files_spec.rb b/spec/unit/parser/files_spec.rb
index fcfbfa613..3eb0db07e 100644
--- a/spec/unit/parser/files_spec.rb
+++ b/spec/unit/parser/files_spec.rb
@@ -1,201 +1,201 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/parser/files'
 
 describe Puppet::Parser::Files do
 
   before do
     @basepath = Puppet.features.posix? ? "/somepath" : "C:/somepath"
   end
 
   it "should have a method for finding a template" do
     Puppet::Parser::Files.should respond_to(:find_template)
   end
 
   it "should have a method for finding manifests" do
     Puppet::Parser::Files.should respond_to(:find_manifests)
   end
 
   describe "when searching for templates" do
     it "should return fully-qualified templates directly" do
       Puppet::Parser::Files.expects(:modulepath).never
       Puppet::Parser::Files.find_template(@basepath + "/my/template").should == @basepath + "/my/template"
     end
 
     it "should return the template from the first found module" do
       mod = mock 'module'
       Puppet::Node::Environment.new.expects(:module).with("mymod").returns mod
 
       mod.expects(:template).returns("/one/mymod/templates/mytemplate")
       Puppet::Parser::Files.find_template("mymod/mytemplate").should == "/one/mymod/templates/mytemplate"
     end
 
     it "should return the file in the templatedir if it exists" do
       Puppet.settings.expects(:value).with(:templatedir, nil).returns("/my/templates")
       Puppet[:modulepath] = "/one:/two"
       File.stubs(:directory?).returns(true)
       FileTest.stubs(:exist?).returns(true)
       Puppet::Parser::Files.find_template("mymod/mytemplate").should == "/my/templates/mymod/mytemplate"
     end
 
     it "should not raise an error if no valid templatedir exists and the template exists in a module" do
       mod = mock 'module'
       Puppet::Node::Environment.new.expects(:module).with("mymod").returns mod
 
       mod.expects(:template).returns("/one/mymod/templates/mytemplate")
       Puppet::Parser::Files.stubs(:templatepath).with(nil).returns(nil)
 
       Puppet::Parser::Files.find_template("mymod/mytemplate").should == "/one/mymod/templates/mytemplate"
     end
 
     it "should return unqualified templates if they exist in the template dir" do
       FileTest.stubs(:exist?).returns true
       Puppet::Parser::Files.stubs(:templatepath).with(nil).returns(["/my/templates"])
       Puppet::Parser::Files.find_template("mytemplate").should == "/my/templates/mytemplate"
     end
 
     it "should only return templates if they actually exist" do
       FileTest.expects(:exist?).with("/my/templates/mytemplate").returns true
       Puppet::Parser::Files.stubs(:templatepath).with(nil).returns(["/my/templates"])
       Puppet::Parser::Files.find_template("mytemplate").should == "/my/templates/mytemplate"
     end
 
     it "should return nil when asked for a template that doesn't exist" do
       FileTest.expects(:exist?).with("/my/templates/mytemplate").returns false
       Puppet::Parser::Files.stubs(:templatepath).with(nil).returns(["/my/templates"])
       Puppet::Parser::Files.find_template("mytemplate").should be_nil
     end
 
     it "should search in the template directories before modules" do
       FileTest.stubs(:exist?).returns true
       Puppet::Parser::Files.stubs(:templatepath).with(nil).returns(["/my/templates"])
       Puppet::Module.expects(:find).never
       Puppet::Parser::Files.find_template("mytemplate")
     end
 
     it "should accept relative templatedirs" do
       FileTest.stubs(:exist?).returns true
       Puppet[:templatedir] = "my/templates"
       File.expects(:directory?).with(File.join(Dir.getwd,"my/templates")).returns(true)
       Puppet::Parser::Files.find_template("mytemplate").should == File.join(Dir.getwd,"my/templates/mytemplate")
     end
 
     it "should use the environment templatedir if no module is found and an environment is specified" do
       FileTest.stubs(:exist?).returns true
       Puppet::Parser::Files.stubs(:templatepath).with("myenv").returns(["/myenv/templates"])
       Puppet::Parser::Files.find_template("mymod/mytemplate", "myenv").should == "/myenv/templates/mymod/mytemplate"
     end
 
     it "should use first dir from environment templatedir if no module is found and an environment is specified" do
       FileTest.stubs(:exist?).returns true
       Puppet::Parser::Files.stubs(:templatepath).with("myenv").returns(["/myenv/templates", "/two/templates"])
       Puppet::Parser::Files.find_template("mymod/mytemplate", "myenv").should == "/myenv/templates/mymod/mytemplate"
     end
 
     it "should use a valid dir when templatedir is a path for unqualified templates and the first dir contains template" do
       Puppet::Parser::Files.stubs(:templatepath).returns(["/one/templates", "/two/templates"])
       FileTest.expects(:exist?).with("/one/templates/mytemplate").returns(true)
       Puppet::Parser::Files.find_template("mytemplate").should == "/one/templates/mytemplate"
     end
 
     it "should use a valid dir when templatedir is a path for unqualified templates and only second dir contains template" do
       Puppet::Parser::Files.stubs(:templatepath).returns(["/one/templates", "/two/templates"])
       FileTest.expects(:exist?).with("/one/templates/mytemplate").returns(false)
       FileTest.expects(:exist?).with("/two/templates/mytemplate").returns(true)
       Puppet::Parser::Files.find_template("mytemplate").should == "/two/templates/mytemplate"
     end
 
     it "should use the node environment if specified" do
       mod = mock 'module'
       Puppet::Node::Environment.new("myenv").expects(:module).with("mymod").returns mod
 
       mod.expects(:template).returns("/my/modules/mymod/templates/envtemplate")
 
       Puppet::Parser::Files.find_template("mymod/envtemplate", "myenv").should == "/my/modules/mymod/templates/envtemplate"
     end
 
     it "should return nil if no template can be found" do
       Puppet::Parser::Files.find_template("foomod/envtemplate", "myenv").should be_nil
     end
 
     after { Puppet.settings.clear }
   end
 
   describe "when searching for manifests" do
     it "should ignore invalid modules" do
       mod = mock 'module'
       Puppet::Node::Environment.new.expects(:module).with("mymod").raises(Puppet::Module::InvalidName, "name is invalid")
       Puppet.expects(:value).with(:modulepath).never
       Dir.stubs(:glob).returns %w{foo}
 
       Puppet::Parser::Files.find_manifests("mymod/init.pp")
     end
   end
 
   describe "when searching for manifests when no module is found" do
     before do
       File.stubs(:find).returns(nil)
     end
 
     it "should not look for modules when paths are fully qualified" do
       Puppet.expects(:value).with(:modulepath).never
       file = @basepath + "/fully/qualified/file.pp"
       Dir.stubs(:glob).with(file).returns([file])
       Puppet::Parser::Files.find_manifests(file)
     end
 
     it "should return nil and an array of fully qualified files" do
       file = @basepath + "/fully/qualified/file.pp"
       Dir.stubs(:glob).with(file).returns([file])
       Puppet::Parser::Files.find_manifests(file).should == [nil, [file]]
     end
 
     it "should match against provided fully qualified patterns" do
       pattern = @basepath + "/fully/qualified/pattern/*"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns(%w{my file list})
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns(%w{my file list})
       Puppet::Parser::Files.find_manifests(pattern)[1].should == %w{my file list}
     end
 
     it "should look for files relative to the current directory" do
       cwd = Dir.getwd
       Dir.expects(:glob).with("#{cwd}/foobar/init.pp").returns(["#{cwd}/foobar/init.pp"])
       Puppet::Parser::Files.find_manifests("foobar/init.pp")[1].should == ["#{cwd}/foobar/init.pp"]
     end
 
     it "should only return files, not directories" do
       pattern = @basepath + "/fully/qualified/pattern/*"
       file = @basepath + "/my/file"
       dir = @basepath + "/my/directory"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns([file, dir])
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns([file, dir])
       FileTest.expects(:directory?).with(file).returns(false)
       FileTest.expects(:directory?).with(dir).returns(true)
       Puppet::Parser::Files.find_manifests(pattern)[1].should == [file]
     end
 
     it "should return files once only" do
       pattern = @basepath + "/fully/qualified/pattern/*"
-      Dir.expects(:glob).with(pattern+'{,.pp,.rb}').returns(%w{one two one})
+      Dir.expects(:glob).with(pattern+'{.pp,.rb}').returns(%w{one two one})
       Puppet::Parser::Files.find_manifests(pattern)[1].should == %w{one two}
     end
   end
 
   describe "when searching for manifests in a found module" do
     it "should return the name of the module and the manifests from the first found module" do
       mod = Puppet::Module.new("mymod")
       Puppet::Node::Environment.new.expects(:module).with("mymod").returns mod
       mod.expects(:match_manifests).with("init.pp").returns(%w{/one/mymod/manifests/init.pp})
       Puppet::Parser::Files.find_manifests("mymod/init.pp").should == ["mymod", ["/one/mymod/manifests/init.pp"]]
     end
 
     it "should use the node environment if specified" do
       mod = Puppet::Module.new("mymod")
       Puppet::Node::Environment.new("myenv").expects(:module).with("mymod").returns mod
       mod.expects(:match_manifests).with("init.pp").returns(%w{/one/mymod/manifests/init.pp})
       Puppet::Parser::Files.find_manifests("mymod/init.pp", :environment => "myenv")[1].should == ["/one/mymod/manifests/init.pp"]
     end
 
     after { Puppet.settings.clear }
   end
 end
diff --git a/spec/unit/parser/functions/extlookup_spec.rb b/spec/unit/parser/functions/extlookup_spec.rb
index bf2880345..a3dcaa742 100755
--- a/spec/unit/parser/functions/extlookup_spec.rb
+++ b/spec/unit/parser/functions/extlookup_spec.rb
@@ -1,85 +1,95 @@
 #! /usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'tempfile'
 
 describe "the extlookup function" do
 
   before :each do
     @scope = Puppet::Parser::Scope.new
-    
+
     @scope.stubs(:environment).returns(Puppet::Node::Environment.new('production'))
+    Puppet::Parser::Functions.function("extlookup")
   end
 
   it "should exist" do
     Puppet::Parser::Functions.function("extlookup").should == "function_extlookup"
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
     lambda { @scope.function_extlookup([]) }.should( raise_error(Puppet::ParseError))
   end
 
   it "should raise a ParseError if there is more than 3 arguments" do
     lambda { @scope.function_extlookup(["foo", "bar", "baz", "gazonk"]) }.should( raise_error(Puppet::ParseError))
   end
 
   it "should return the default" do
     result = @scope.function_extlookup([ "key", "default"])
     result.should == "default"
   end
 
   it "should lookup the key in a supplied datafile" do
     t = Tempfile.new('extlookup.csv') do
       t.puts 'key,value'
       t.puts 'nonkey,nonvalue'
       t.close
 
       result = @scope.function_extlookup([ "key", "default", t.path])
       result.should == "value"
     end
   end
 
   it "should return an array if the datafile contains more than two columns" do
     t = Tempfile.new('extlookup.csv') do
       t.puts 'key,value1,value2'
       t.puts 'nonkey,nonvalue,nonvalue'
       t.close
 
       result = @scope.function_extlookup([ "key", "default", t.path])
       result.should == ["value1", "value2"]
     end
   end
 
   it "should raise an error if there's no matching key and no default" do
     t = Tempfile.new('extlookup.csv') do
       t.puts 'key,value'
       t.puts 'nonkey,nonvalue'
       t.close
 
       result = @scope.function_extlookup([ "key", nil, t.path])
       result.should == "value"
     end
   end
 
   describe "should look in $extlookup_datadir for data files listed by $extlookup_precedence" do
-    before do 
+    before do
       @scope.stubs(:lookupvar).with('extlookup_datadir').returns("/tmp")
-      @scope.stubs(:lookupvar).with('extlookup_precedence').returns(["one","two"])
       File.open("/tmp/one.csv","w"){|one| one.puts "key,value1" }
       File.open("/tmp/two.csv","w") do |two|
         two.puts "key,value2"
         two.puts "key2,value_two"
       end
     end
 
     it "when the key is in the first file" do
+      @scope.stubs(:lookupvar).with('extlookup_precedence').returns(["one","two"])
       result = @scope.function_extlookup([ "key" ])
       result.should == "value1"
     end
 
     it "when the key is in the second file" do
+      @scope.stubs(:lookupvar).with('extlookup_precedence').returns(["one","two"])
       result = @scope.function_extlookup([ "key2" ])
       result.should == "value_two"
     end
+
+    it "should not modify extlookup_precedence data" do
+      variable = '%{fqdn}'
+      @scope.stubs(:lookupvar).with('extlookup_precedence').returns([variable,"one"])
+      @scope.stubs(:lookupvar).with('fqdn').returns('myfqdn')
+      result = @scope.function_extlookup([ "key" ])
+      variable.should == '%{fqdn}'
+    end
   end
 end
diff --git a/spec/unit/parser/functions/include_spec.rb b/spec/unit/parser/functions/include_spec.rb
index e5f051906..4f609b055 100644
--- a/spec/unit/parser/functions/include_spec.rb
+++ b/spec/unit/parser/functions/include_spec.rb
@@ -1,55 +1,33 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "the 'include' function" do
 
   before :each do
     Puppet::Node::Environment.stubs(:current).returns(nil)
     @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo"))
     @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
-    # MQR TODO: Without the following stub these tests cause hundreds of spurious errors in
-    #           subsequent tests.  With it, there are no spurious failures and all but one
-    #           of the tests (marked pending, bellow) fail.  This needs a better solution.
-    Puppet::Parser::Resource.stubs(:new).with('stage', :main, :scope => @scope).returns 'foo'
   end
 
   it "should exist" do
     Puppet::Parser::Functions.function("include").should == "function_include"
   end
 
   it "should include a single class" do
     inc = "foo"
     @compiler.expects(:evaluate_classes).with {|klasses,parser,lazy| klasses == [inc]}.returns([inc])
     @scope.function_include("foo")
   end
 
   it "should include multiple classes" do
     inc = ["foo","bar"]
     @compiler.expects(:evaluate_classes).with {|klasses,parser,lazy| klasses == inc}.returns(inc)
     @scope.function_include(["foo","bar"])
   end
 
   it "should not lazily evaluate the included class" do
     @compiler.expects(:evaluate_classes).with {|klasses,parser,lazy| lazy == false}.returns("foo")
     @scope.function_include("foo")
   end
-
-  it "should allow a parent to include its child" do
-    pending "Resolution of MQR TODO item, above"
-    @parent_type = Puppet::Resource::Type.new(:hostclass, "parent")
-    @parent_resource = Puppet::Parser::Resource.new(:hostclass, "parent", :scope => @scope)
-    @subscope = @parent_type.subscope(@scope,@parent_resource)
-    @scope.environment.known_resource_types.stubs(:find_hostclass).with{|nses,name| name.downcase == "parent"}.returns(@parent_type)
-
-    @type = Puppet::Resource::Type.new(:hostclass, "foo")
-    @type.stubs(:parent_scope).returns(@subscope)
-    @type.parent = "parent"
-    @resource = Puppet::Parser::Resource.new(:hostclass, "foo", :scope => @subscope)
-    @resource.stubs(:resource_type).returns(@type)
-    @scope.environment.known_resource_types.stubs(:find_hostclass).with{|nses,name| name.downcase == "foo"}.returns(@parent_type)
-    Puppet::Resource.stubs(:new).returns(@resource)
-    Puppet::Parser::Resource.stubs(:new).returns(@resource)
-    lambda { @subscope.function_include("foo") }.should_not raise_error
-  end
 end
diff --git a/spec/unit/parser/functions/require_spec.rb b/spec/unit/parser/functions/require_spec.rb
index bd42fa579..49c4bbf74 100755
--- a/spec/unit/parser/functions/require_spec.rb
+++ b/spec/unit/parser/functions/require_spec.rb
@@ -1,74 +1,74 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "the require function" do
 
   before :each do
     @catalog = stub 'catalog'
-    @compiler = stub 'compiler', :catalog => @catalog
+    @compiler = stub 'compiler', :catalog => @catalog, :environment => nil
 
     @scope = Puppet::Parser::Scope.new
     @scope.stubs(:findresource)
     @scope.stubs(:compiler).returns(@compiler)
     @klass = stub 'class', :name => "myclass"
     @scope.stubs(:find_hostclass).returns(@klass)
 
     @resource = Puppet::Parser::Resource.new(:file, "/my/file", :scope => @scope, :source => "source")
     @resource.stubs(:metaparam_compatibility_mode?).returns false
     @scope.stubs(:resource).returns @resource
   end
 
   it "should exist" do
     Puppet::Parser::Functions.function("require").should == "function_require"
   end
 
   it "should delegate to the 'include' puppet function" do
     @scope.expects(:function_include).with("myclass")
 
     @scope.function_require("myclass")
   end
 
   it "should set the 'require' prarameter on the resource to a resource reference" do
     @scope.stubs(:function_include)
     @scope.function_require("myclass")
 
     @resource["require"].should be_instance_of(Array)
     @resource["require"][0].should be_instance_of(Puppet::Resource)
   end
 
   it "should verify the 'include' function is loaded" do
     Puppet::Parser::Functions.expects(:function).with(:include).returns(:function_include)
     @scope.stubs(:function_include)
     @scope.function_require("myclass")
   end
 
   it "should include the class but not add a dependency if used on a client not at least version 0.25" do
     @resource.expects(:metaparam_compatibility_mode?).returns true
     @scope.expects(:warning)
     @resource.expects(:set_parameter).never
     @scope.expects(:function_include)
 
     @scope.function_require("myclass")
   end
 
   it "should lookup the absolute class path" do
     @scope.stubs(:function_include)
 
     @scope.expects(:find_hostclass).with("myclass").returns(@klass)
     @klass.expects(:name).returns("myclass")
 
     @scope.function_require("myclass")
   end
 
   it "should append the required class to the require parameter" do
     @scope.stubs(:function_include)
 
     one = Puppet::Resource.new(:file, "/one")
     @resource[:require] = one
     @scope.function_require("myclass")
 
     @resource[:require].should be_include(one)
     @resource[:require].detect { |r| r.to_s == "Class[Myclass]" }.should be_instance_of(Puppet::Resource)
   end
 end
diff --git a/spec/unit/parser/functions/tag_spec.rb b/spec/unit/parser/functions/tag_spec.rb
index ff37badbb..dac134134 100755
--- a/spec/unit/parser/functions/tag_spec.rb
+++ b/spec/unit/parser/functions/tag_spec.rb
@@ -1,24 +1,25 @@
 #! /usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "the 'tag' function" do
 
   before :each do
     @scope = Puppet::Parser::Scope.new
+    @scope.stubs(:environment).returns(nil)
   end
 
   it "should exist" do
     Puppet::Parser::Functions.function(:tag).should == "function_tag"
   end
 
   it "should tag the resource with any provided tags" do
     resource = Puppet::Parser::Resource.new(:file, "/file", :scope => @scope)
     @scope.expects(:resource).returns resource
 
     @scope.function_tag ["one", "two"]
 
     resource.should be_tagged("one")
     resource.should be_tagged("two")
   end
 end
diff --git a/spec/unit/parser/lexer_spec.rb b/spec/unit/parser/lexer_spec.rb
index a85d1b257..7e51423f4 100755
--- a/spec/unit/parser/lexer_spec.rb
+++ b/spec/unit/parser/lexer_spec.rb
@@ -1,649 +1,656 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/parser/lexer'
 
 # This is a special matcher to match easily lexer output
 Spec::Matchers.define :be_like do |*expected|
   match do |actual|
     expected.zip(actual).all? { |e,a| !e or a[0] == e or (e.is_a? Array and a[0] == e[0] and (a[1] == e[1] or (a[1].is_a?(Hash) and a[1][:value] == e[1]))) }
   end
 end
 __ = nil
 
 describe Puppet::Parser::Lexer do
   describe "when reading strings" do
     before { @lexer = Puppet::Parser::Lexer.new }
     it "should increment the line count for every carriage return in the string" do
       @lexer.line = 10
       @lexer.string = "this\nis\natest'"
       @lexer.slurpstring("'")
 
       @lexer.line.should == 12
     end
 
     it "should not increment the line count for escapes in the string" do
       @lexer.line = 10
       @lexer.string = "this\\nis\\natest'"
       @lexer.slurpstring("'")
 
       @lexer.line.should == 10
     end
   end
 end
 
 describe Puppet::Parser::Lexer::Token do
   before do
     @token = Puppet::Parser::Lexer::Token.new(%r{something}, :NAME)
   end
 
   [:regex, :name, :string, :skip, :incr_line, :skip_text, :accumulate].each do |param|
     it "should have a #{param.to_s} reader" do
       @token.should be_respond_to(param)
     end
 
     it "should have a #{param.to_s} writer" do
       @token.should be_respond_to(param.to_s + "=")
     end
   end
 end
 
 describe Puppet::Parser::Lexer::Token, "when initializing" do
   it "should create a regex if the first argument is a string" do
     Puppet::Parser::Lexer::Token.new("something", :NAME).regex.should == %r{something}
   end
 
   it "should set the string if the first argument is one" do
     Puppet::Parser::Lexer::Token.new("something", :NAME).string.should == "something"
   end
 
   it "should set the regex if the first argument is one" do
     Puppet::Parser::Lexer::Token.new(%r{something}, :NAME).regex.should == %r{something}
   end
 end
 
 describe Puppet::Parser::Lexer::TokenList do
   before do
     @list = Puppet::Parser::Lexer::TokenList.new
   end
 
   it "should have a method for retrieving tokens by the name" do
     token = @list.add_token :name, "whatever"
     @list[:name].should equal(token)
   end
 
   it "should have a method for retrieving string tokens by the string" do
     token = @list.add_token :name, "whatever"
     @list.lookup("whatever").should equal(token)
   end
 
   it "should add tokens to the list when directed" do
     token = @list.add_token :name, "whatever"
     @list[:name].should equal(token)
   end
 
   it "should have a method for adding multiple tokens at once" do
     @list.add_tokens "whatever" => :name, "foo" => :bar
     @list[:name].should_not be_nil
     @list[:bar].should_not be_nil
   end
 
   it "should fail to add tokens sharing a name with an existing token" do
     @list.add_token :name, "whatever"
     lambda { @list.add_token :name, "whatever" }.should raise_error(ArgumentError)
   end
 
   it "should set provided options on tokens being added" do
     token = @list.add_token :name, "whatever", :skip_text => true
     token.skip_text.should == true
   end
 
   it "should define any provided blocks as a :convert method" do
     token = @list.add_token(:name, "whatever")  do "foo" end
     token.convert.should == "foo"
   end
 
   it "should store all string tokens in the :string_tokens list" do
     one = @list.add_token(:name, "1")
     @list.string_tokens.should be_include(one)
   end
 
   it "should store all regex tokens in the :regex_tokens list" do
     one = @list.add_token(:name, %r{one})
     @list.regex_tokens.should be_include(one)
   end
 
   it "should not store string tokens in the :regex_tokens list" do
     one = @list.add_token(:name, "1")
     @list.regex_tokens.should_not be_include(one)
   end
 
   it "should not store regex tokens in the :string_tokens list" do
     one = @list.add_token(:name, %r{one})
     @list.string_tokens.should_not be_include(one)
   end
 
   it "should sort the string tokens inversely by length when asked" do
     one = @list.add_token(:name, "1")
     two = @list.add_token(:other, "12")
     @list.sort_tokens
     @list.string_tokens.should == [two, one]
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS do
   before do
     @lexer = Puppet::Parser::Lexer.new
   end
 
   {
     :LBRACK => '[',
     :RBRACK => ']',
     :LBRACE => '{',
     :RBRACE => '}',
     :LPAREN => '(',
     :RPAREN => ')',
     :EQUALS => '=',
     :ISEQUAL => '==',
     :GREATEREQUAL => '>=',
     :GREATERTHAN => '>',
     :LESSTHAN => '<',
     :LESSEQUAL => '<=',
     :NOTEQUAL => '!=',
     :NOT => '!',
     :COMMA => ',',
     :DOT => '.',
     :COLON => ':',
     :AT => '@',
     :LLCOLLECT => '<<|',
     :RRCOLLECT => '|>>',
     :LCOLLECT => '<|',
     :RCOLLECT => '|>',
     :SEMIC => ';',
     :QMARK => '?',
     :BACKSLASH => '\\',
     :FARROW => '=>',
     :PARROW => '+>',
     :APPENDS => '+=',
     :PLUS => '+',
     :MINUS => '-',
     :DIV => '/',
     :TIMES => '*',
     :LSHIFT => '<<',
     :RSHIFT => '>>',
     :MATCH => '=~',
     :NOMATCH => '!~',
     :IN_EDGE => '->',
     :OUT_EDGE => '<-',
     :IN_EDGE_SUB => '~>',
     :OUT_EDGE_SUB => '<~',
   }.each do |name, string|
     it "should have a token named #{name.to_s}" do
       Puppet::Parser::Lexer::TOKENS[name].should_not be_nil
     end
 
     it "should match '#{string}' for the token #{name.to_s}" do
       Puppet::Parser::Lexer::TOKENS[name].string.should == string
     end
   end
 
   {
     "case" => :CASE,
     "class" => :CLASS,
     "default" => :DEFAULT,
     "define" => :DEFINE,
     "import" => :IMPORT,
     "if" => :IF,
     "elsif" => :ELSIF,
     "else" => :ELSE,
     "inherits" => :INHERITS,
     "node" => :NODE,
     "and"  => :AND,
     "or"   => :OR,
     "undef"   => :UNDEF,
     "false" => :FALSE,
     "true" => :TRUE,
     "in" => :IN,
   }.each do |string, name|
     it "should have a keyword named #{name.to_s}" do
       Puppet::Parser::Lexer::KEYWORDS[name].should_not be_nil
     end
 
     it "should have the keyword for #{name.to_s} set to #{string}" do
       Puppet::Parser::Lexer::KEYWORDS[name].string.should == string
     end
   end
 
   # These tokens' strings don't matter, just that the tokens exist.
   [:STRING, :DQPRE, :DQMID, :DQPOST, :BOOLEAN, :NAME, :NUMBER, :COMMENT, :MLCOMMENT, :RETURN, :SQUOTE, :DQUOTE, :VARIABLE].each do |name|
     it "should have a token named #{name.to_s}" do
       Puppet::Parser::Lexer::TOKENS[name].should_not be_nil
     end
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:CLASSNAME] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:CLASSNAME] }
 
   it "should match against lower-case alpha-numeric terms separated by double colons" do
     @token.regex.should =~ "one::two"
   end
 
   it "should match against many lower-case alpha-numeric terms separated by double colons" do
     @token.regex.should =~ "one::two::three::four::five"
   end
 
   it "should match against lower-case alpha-numeric terms prefixed by double colons" do
     @token.regex.should =~ "::one"
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:CLASSREF] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:CLASSREF] }
 
   it "should match against single upper-case alpha-numeric terms" do
     @token.regex.should =~ "One"
   end
 
   it "should match against upper-case alpha-numeric terms separated by double colons" do
     @token.regex.should =~ "One::Two"
   end
 
   it "should match against many upper-case alpha-numeric terms separated by double colons" do
     @token.regex.should =~ "One::Two::Three::Four::Five"
   end
 
   it "should match against upper-case alpha-numeric terms prefixed by double colons" do
     @token.regex.should =~ "::One"
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:NAME] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:NAME] }
 
   it "should match against lower-case alpha-numeric terms" do
     @token.regex.should =~ "one-two"
   end
 
   it "should return itself and the value if the matched term is not a keyword" do
     Puppet::Parser::Lexer::KEYWORDS.expects(:lookup).returns(nil)
     @token.convert(stub("lexer"), "myval").should == [Puppet::Parser::Lexer::TOKENS[:NAME], "myval"]
   end
 
   it "should return the keyword token and the value if the matched term is a keyword" do
     keyword = stub 'keyword', :name => :testing
     Puppet::Parser::Lexer::KEYWORDS.expects(:lookup).returns(keyword)
     @token.convert(stub("lexer"), "myval").should == [keyword, "myval"]
   end
 
   it "should return the BOOLEAN token and 'true' if the matched term is the string 'true'" do
     keyword = stub 'keyword', :name => :TRUE
     Puppet::Parser::Lexer::KEYWORDS.expects(:lookup).returns(keyword)
     @token.convert(stub('lexer'), "true").should == [Puppet::Parser::Lexer::TOKENS[:BOOLEAN], true]
   end
 
   it "should return the BOOLEAN token and 'false' if the matched term is the string 'false'" do
     keyword = stub 'keyword', :name => :FALSE
     Puppet::Parser::Lexer::KEYWORDS.expects(:lookup).returns(keyword)
     @token.convert(stub('lexer'), "false").should == [Puppet::Parser::Lexer::TOKENS[:BOOLEAN], false]
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:NUMBER] do
   before do
     @token = Puppet::Parser::Lexer::TOKENS[:NUMBER]
     @regex = @token.regex
   end
 
   it "should match against numeric terms" do
     @regex.should =~ "2982383139"
   end
 
   it "should match against float terms" do
     @regex.should =~ "29823.235"
   end
 
   it "should match against hexadecimal terms" do
     @regex.should =~ "0xBEEF0023"
   end
 
   it "should match against float with exponent terms" do
     @regex.should =~ "10e23"
   end
 
   it "should match against float terms with negative exponents" do
     @regex.should =~ "10e-23"
   end
 
   it "should match against float terms with fractional parts and exponent" do
     @regex.should =~ "1.234e23"
   end
 
   it "should return the NAME token and the value" do
     @token.convert(stub("lexer"), "myval").should == [Puppet::Parser::Lexer::TOKENS[:NAME], "myval"]
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:COMMENT] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:COMMENT] }
 
   it "should match against lines starting with '#'" do
     @token.regex.should =~ "# this is a comment"
   end
 
   it "should be marked to get skipped" do
     @token.skip?.should be_true
   end
 
   it "should be marked to accumulate" do
     @token.accumulate?.should be_true
   end
 
   it "'s block should return the comment without the #" do
     @token.convert(@lexer,"# this is a comment")[1].should == "this is a comment"
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:MLCOMMENT] do
   before do
     @token = Puppet::Parser::Lexer::TOKENS[:MLCOMMENT]
     @lexer = stub 'lexer', :line => 0
   end
 
   it "should match against lines enclosed with '/*' and '*/'" do
     @token.regex.should =~ "/* this is a comment */"
   end
 
   it "should match multiple lines enclosed with '/*' and '*/'" do
     @token.regex.should =~ """/*
       this is a comment
       */"""
   end
 
   it "should increase the lexer current line number by the amount of lines spanned by the comment" do
     @lexer.expects(:line=).with(2)
     @token.convert(@lexer, "1\n2\n3")
   end
 
   it "should not greedily match comments" do
     match = @token.regex.match("/* first */ word /* second */")
     match[1].should == " first "
   end
 
   it "should be marked to accumulate" do
     @token.accumulate?.should be_true
   end
 
   it "'s block should return the comment without the comment marks" do
     @lexer.stubs(:line=).with(0)
 
     @token.convert(@lexer,"/* this is a comment */")[1].should == "this is a comment"
   end
 
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:RETURN] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:RETURN] }
 
   it "should match against carriage returns" do
     @token.regex.should =~ "\n"
   end
 
   it "should be marked to initiate text skipping" do
     @token.skip_text.should be_true
   end
 
   it "should be marked to increment the line" do
     @token.incr_line.should be_true
   end
 end
 
 def tokens_scanned_from(s)
   lexer = Puppet::Parser::Lexer.new
   lexer.string = s
   lexer.fullscan[0..-2]
 end
 
 describe Puppet::Parser::Lexer,"when lexing strings" do
   {
     %q{'single quoted string')}                                     => [[:STRING,'single quoted string']],
     %q{"double quoted string"}                                      => [[:STRING,'double quoted string']],
     %q{'single quoted string with an escaped "\\'"'}                => [[:STRING,'single quoted string with an escaped "\'"']],
     %q{'single quoted string with an escaped "\$"'}                 => [[:STRING,'single quoted string with an escaped "\$"']],
     %q{'single quoted string with an escaped "\."'}                 => [[:STRING,'single quoted string with an escaped "\."']],
+    %q{'single quoted string with an escaped "\n"'}                 => [[:STRING,'single quoted string with an escaped "\n"']],
     %q{'single quoted string with an escaped "\\\\"'}               => [[:STRING,'single quoted string with an escaped "\\\\"']],
     %q{"string with an escaped '\\"'"}                              => [[:STRING,"string with an escaped '\"'"]],
     %q{"string with an escaped '\\$'"}                              => [[:STRING,"string with an escaped '$'"]],
     %q{"string with $v (but no braces)"}                            => [[:DQPRE,"string with "],[:VARIABLE,'v'],[:DQPOST,' (but no braces)']],
     %q["string with ${v} in braces"]                                => [[:DQPRE,"string with "],[:VARIABLE,'v'],[:DQPOST,' in braces']],
     %q["string with ${qualified::var} in braces"]                   => [[:DQPRE,"string with "],[:VARIABLE,'qualified::var'],[:DQPOST,' in braces']],
     %q{"string with $v and $v (but no braces)"}                     => [[:DQPRE,"string with "],[:VARIABLE,"v"],[:DQMID," and "],[:VARIABLE,"v"],[:DQPOST," (but no braces)"]],
     %q["string with ${v} and ${v} in braces"]                       => [[:DQPRE,"string with "],[:VARIABLE,"v"],[:DQMID," and "],[:VARIABLE,"v"],[:DQPOST," in braces"]],
     %q["string with ${'a nested single quoted string'} inside it."] => [[:DQPRE,"string with "],[:STRING,'a nested single quoted string'],[:DQPOST,' inside it.']],
     %q["string with ${['an array ',$v2]} in it."]                   => [[:DQPRE,"string with "],:LBRACK,[:STRING,"an array "],:COMMA,[:VARIABLE,"v2"],:RBRACK,[:DQPOST," in it."]],
     %q{a simple "scanner" test}                                     => [[:NAME,"a"],[:NAME,"simple"], [:STRING,"scanner"],[:NAME,"test"]],
     %q{a simple 'single quote scanner' test}                        => [[:NAME,"a"],[:NAME,"simple"], [:STRING,"single quote scanner"],[:NAME,"test"]],
     %q{a harder 'a $b \c"'}                                         => [[:NAME,"a"],[:NAME,"harder"], [:STRING,'a $b \c"']],
     %q{a harder "scanner test"}                                     => [[:NAME,"a"],[:NAME,"harder"], [:STRING,"scanner test"]],
     %q{a hardest "scanner \"test\""}                                => [[:NAME,"a"],[:NAME,"hardest"],[:STRING,'scanner "test"']],
     %Q{a hardestest "scanner \\"test\\"\n"}                         => [[:NAME,"a"],[:NAME,"hardestest"],[:STRING,%Q{scanner "test"\n}]],
     %q{function("call")}                                            => [[:NAME,"function"],[:LPAREN,"("],[:STRING,'call'],[:RPAREN,")"]],
     %q["string with ${(3+5)/4} nested math."]                       => [[:DQPRE,"string with "],:LPAREN,[:NAME,"3"],:PLUS,[:NAME,"5"],:RPAREN,:DIV,[:NAME,"4"],[:DQPOST," nested math."]],
     %q["$$$$"]                                                      => [[:STRING,"$$$$"]],
     %q["$variable"]                                                 => [[:DQPRE,""],[:VARIABLE,"variable"],[:DQPOST,""]],
     %q["$var$other"]                                                => [[:DQPRE,""],[:VARIABLE,"var"],[:DQMID,""],[:VARIABLE,"other"],[:DQPOST,""]],
     %q["foo$bar$"]                                                  => [[:DQPRE,"foo"],[:VARIABLE,"bar"],[:DQPOST,"$"]],
     %q["foo$$bar"]                                                  => [[:DQPRE,"foo$"],[:VARIABLE,"bar"],[:DQPOST,""]],
     %q[""]                                                          => [[:STRING,""]],
   }.each { |src,expected_result|
     it "should handle #{src} correctly" do
       tokens_scanned_from(src).should be_like(*expected_result)
     end
   }
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:DOLLAR_VAR] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:DOLLAR_VAR] }
 
   it "should match against alpha words prefixed with '$'" do
     @token.regex.should =~ '$this_var'
   end
 
   it "should return the VARIABLE token and the variable name stripped of the '$'" do
     @token.convert(stub("lexer"), "$myval").should == [Puppet::Parser::Lexer::TOKENS[:VARIABLE], "myval"]
   end
 end
 
 describe Puppet::Parser::Lexer::TOKENS[:REGEX] do
   before { @token = Puppet::Parser::Lexer::TOKENS[:REGEX] }
 
   it "should match against any expression enclosed in //" do
     @token.regex.should =~ '/this is a regex/'
   end
 
   it 'should not match if there is \n in the regex' do
     @token.regex.should_not =~ "/this is \n a regex/"
   end
 
   describe "when scanning" do
     it "should not consider escaped slashes to be the end of a regex" do
       tokens_scanned_from("$x =~ /this \\/ foo/").should be_like(__,__,[:REGEX,%r{this / foo}])
     end
 
     it "should not lex chained division as a regex" do
       tokens_scanned_from("$x = $a/$b/$c").collect { |name, data| name }.should_not be_include( :REGEX )
     end
 
     it "should accept a regular expression after NODE" do
       tokens_scanned_from("node /www.*\.mysite\.org/").should be_like(__,[:REGEX,Regexp.new("www.*\.mysite\.org")])
     end
 
     it "should accept regular expressions in a CASE" do
       s = %q{case $variable {
         "something": {$othervar = 4096 / 2}
         /regex/: {notice("this notably sucks")}
         }
       }
       tokens_scanned_from(s).should be_like(
         :CASE,:VARIABLE,:LBRACE,:STRING,:COLON,:LBRACE,:VARIABLE,:EQUALS,:NAME,:DIV,:NAME,:RBRACE,[:REGEX,/regex/],:COLON,:LBRACE,:NAME,:LPAREN,:STRING,:RPAREN,:RBRACE,:RBRACE
       )
     end
 
   end
 
 
   it "should return the REGEX token and a Regexp" do
     @token.convert(stub("lexer"), "/myregex/").should == [Puppet::Parser::Lexer::TOKENS[:REGEX], Regexp.new(/myregex/)]
   end
 end
 
 describe Puppet::Parser::Lexer, "when lexing comments" do
   before { @lexer = Puppet::Parser::Lexer.new }
 
   it "should accumulate token in munge_token" do
     token = stub 'token', :skip => true, :accumulate? => true, :incr_line => nil, :skip_text => false
 
     token.stubs(:convert).with(@lexer, "# this is a comment").returns([token, " this is a comment"])
     @lexer.munge_token(token, "# this is a comment")
     @lexer.munge_token(token, "# this is a comment")
 
     @lexer.getcomment.should == " this is a comment\n this is a comment\n"
   end
 
   it "should add a new comment stack level on LBRACE" do
     @lexer.string = "{"
 
     @lexer.expects(:commentpush)
 
     @lexer.fullscan
   end
 
   it "should return the current comments on getcomment" do
     @lexer.string = "# comment"
     @lexer.fullscan
 
     @lexer.getcomment.should == "comment\n"
   end
 
   it "should discard the previous comments on blank line" do
     @lexer.string = "# 1\n\n# 2"
     @lexer.fullscan
 
     @lexer.getcomment.should == "2\n"
   end
 
   it "should skip whitespace before lexing the next token after a non-token" do
     tokens_scanned_from("/* 1\n\n */ \ntest").should be_like([:NAME, "test"])
   end
 
   it "should not return comments seen after the current line" do
     @lexer.string = "# 1\n\n# 2"
     @lexer.fullscan
 
     @lexer.getcomment(1).should == ""
   end
 
   it "should return a comment seen before the current line" do
     @lexer.string = "# 1\n# 2"
     @lexer.fullscan
 
     @lexer.getcomment(2).should == "1\n2\n"
   end
 end
 
 # FIXME: We need to rewrite all of these tests, but I just don't want to take the time right now.
 describe "Puppet::Parser::Lexer in the old tests" do
   before { @lexer = Puppet::Parser::Lexer.new }
 
   it "should do simple lexing" do
     {
       %q{\\}                      => [[:BACKSLASH,"\\"]],
       %q{simplest scanner test}   => [[:NAME,"simplest"],[:NAME,"scanner"],[:NAME,"test"]],
       %Q{returned scanner test\n} => [[:NAME,"returned"],[:NAME,"scanner"],[:NAME,"test"]]
     }.each { |source,expected|
       tokens_scanned_from(source).should be_like(*expected)
     }
   end
 
   it "should fail usefully" do
     lambda { tokens_scanned_from('^') }.should raise_error(RuntimeError)
   end
 
   it "should fail if the string is not set" do
     lambda { @lexer.fullscan }.should raise_error(Puppet::LexError)
   end
 
   it "should correctly identify keywords" do
     tokens_scanned_from("case").should be_like([:CASE, "case"])
   end
 
   it "should correctly parse class references" do
     %w{Many Different Words A Word}.each { |t| tokens_scanned_from(t).should be_like([:CLASSREF,t])}
   end
 
   # #774
   it "should correctly parse namespaced class refernces token" do
     %w{Foo ::Foo Foo::Bar ::Foo::Bar}.each { |t| tokens_scanned_from(t).should be_like([:CLASSREF, t]) }
   end
 
   it "should correctly parse names" do
     %w{this is a bunch of names}.each { |t| tokens_scanned_from(t).should be_like([:NAME,t]) }
   end
 
   it "should correctly parse names with numerals" do
     %w{1name name1 11names names11}.each { |t| tokens_scanned_from(t).should be_like([:NAME,t]) }
   end
 
   it "should correctly parse empty strings" do
     lambda { tokens_scanned_from('$var = ""') }.should_not raise_error
   end
 
   it "should correctly parse virtual resources" do
     tokens_scanned_from("@type {").should be_like([:AT, "@"], [:NAME, "type"], [:LBRACE, "{"])
   end
 
   it "should correctly deal with namespaces" do
     @lexer.string = %{class myclass}
     @lexer.fullscan
     @lexer.namespace.should == "myclass"
 
     @lexer.namepop
     @lexer.namespace.should == ""
 
     @lexer.string = "class base { class sub { class more"
     @lexer.fullscan
     @lexer.namespace.should == "base::sub::more"
 
     @lexer.namepop
     @lexer.namespace.should == "base::sub"
   end
 
+  it "should not put class instantiation on the namespace" do
+    @lexer.string = "class base { class sub { class { mode"
+    @lexer.fullscan
+    @lexer.namespace.should == "base::sub"
+  end
+
   it "should correctly handle fully qualified names" do
     @lexer.string = "class base { class sub::more {"
     @lexer.fullscan
     @lexer.namespace.should == "base::sub::more"
 
     @lexer.namepop
     @lexer.namespace.should == "base"
   end
 
   it "should correctly lex variables" do
     ["$variable", "$::variable", "$qualified::variable", "$further::qualified::variable"].each do |string|
       tokens_scanned_from(string).should be_like([:VARIABLE,string.sub(/^\$/,'')])
     end
   end
 end
 
 require 'puppettest/support/utils'
 describe "Puppet::Parser::Lexer in the old tests when lexing example files" do
   extend PuppetTest
   extend PuppetTest::Support::Utils
   textfiles do |file|
     it "should correctly lex #{file}" do
       lexer = Puppet::Parser::Lexer.new
       lexer.file = file
       lambda { lexer.fullscan }.should_not raise_error
     end
   end
 end
diff --git a/spec/unit/parser/resource_spec.rb b/spec/unit/parser/resource_spec.rb
index da49940b0..dae22fcaa 100755
--- a/spec/unit/parser/resource_spec.rb
+++ b/spec/unit/parser/resource_spec.rb
@@ -1,564 +1,558 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 # LAK: FIXME This is just new tests for resources; I have
 # not moved all tests over yet.
 
 describe Puppet::Parser::Resource do
   before do
     @node = Puppet::Node.new("yaynode")
     @known_resource_types = Puppet::Resource::TypeCollection.new("env")
     @compiler = Puppet::Parser::Compiler.new(@node)
     @compiler.environment.stubs(:known_resource_types).returns @known_resource_types
     @source = newclass ""
     @scope = @compiler.topscope
   end
 
   def mkresource(args = {})
     args[:source] ||= @source
     args[:scope] ||= @scope
 
     params = args[:parameters] || {:one => "yay", :three => "rah"}
     if args[:parameters] == :none
       args.delete(:parameters)
     elsif not args[:parameters].is_a? Array
       args[:parameters] = paramify(args[:source], params)
     end
 
     Puppet::Parser::Resource.new("resource", "testing", args)
   end
 
   def param(name, value, source)
     Puppet::Parser::Resource::Param.new(:name => name, :value => value, :source => source)
   end
 
   def paramify(source, hash)
     hash.collect do |name, value|
       Puppet::Parser::Resource::Param.new(
         :name => name, :value => value, :source => source
       )
     end
   end
 
   def newclass(name)
     @known_resource_types.add Puppet::Resource::Type.new(:hostclass, name)
   end
 
   def newdefine(name)
     @known_resource_types.add Puppet::Resource::Type.new(:definition, name)
   end
 
   def newnode(name)
     @known_resource_types.add Puppet::Resource::Type.new(:node, name)
   end
 
   it "should use the file lookup module" do
     Puppet::Parser::Resource.ancestors.should be_include(Puppet::FileCollection::Lookup)
   end
 
   it "should get its environment from its scope" do
-    scope = stub 'scope', :source => stub("source")
-    scope.expects(:environment).returns "foo"
+    scope = stub 'scope', :source => stub("source"), :namespaces => nil
+    scope.expects(:environment).returns("foo").at_least_once
     Puppet::Parser::Resource.new("file", "whatever", :scope => scope).environment.should == "foo"
   end
 
-  it "should get its namespaces from its scope" do
-    scope = stub 'scope', :source => stub("source")
-    scope.expects(:namespaces).returns %w{one two}
-    Puppet::Parser::Resource.new("file", "whatever", :scope => scope).namespaces.should == %w{one two}
-  end
-
   it "should use the resource type collection helper module" do
     Puppet::Parser::Resource.ancestors.should be_include(Puppet::Resource::TypeCollectionHelper)
   end
 
   it "should use the scope's environment as its environment" do
-    @scope.expects(:environment).returns "myenv"
+    @scope.expects(:environment).returns("myenv").at_least_once
     Puppet::Parser::Resource.new("file", "whatever", :scope => @scope).environment.should == "myenv"
   end
 
   it "should be isomorphic if it is builtin and models an isomorphic type" do
     Puppet::Type.type(:file).expects(:isomorphic?).returns(true)
     @resource = Puppet::Parser::Resource.new("file", "whatever", :scope => @scope, :source => @source).isomorphic?.should be_true
   end
 
   it "should not be isomorphic if it is builtin and models a non-isomorphic type" do
     Puppet::Type.type(:file).expects(:isomorphic?).returns(false)
     @resource = Puppet::Parser::Resource.new("file", "whatever", :scope => @scope, :source => @source).isomorphic?.should be_false
   end
 
   it "should be isomorphic if it is not builtin" do
     newdefine "whatever"
     @resource = Puppet::Parser::Resource.new("whatever", "whatever", :scope => @scope, :source => @source).isomorphic?.should be_true
   end
 
   it "should have a array-indexing method for retrieving parameter values" do
     @resource = mkresource
     @resource[:one].should == "yay"
   end
 
   it "should use a Puppet::Resource for converting to a ral resource" do
     trans = mock 'resource', :to_ral => "yay"
     @resource = mkresource
     @resource.expects(:to_resource).returns trans
     @resource.to_ral.should == "yay"
   end
 
   it "should be able to use the indexing operator to access parameters" do
     resource = Puppet::Parser::Resource.new("resource", "testing", :source => "source", :scope => @scope)
     resource["foo"] = "bar"
     resource["foo"].should == "bar"
   end
 
   it "should return the title when asked for a parameter named 'title'" do
     Puppet::Parser::Resource.new("resource", "testing", :source => @source, :scope => @scope)[:title].should == "testing"
   end
 
   describe "when initializing" do
     before do
       @arguments = {:scope => @scope}
     end
 
     it "should fail unless #{name.to_s} is specified" do
       lambda { Puppet::Parser::Resource.new('file', '/my/file') }.should raise_error(ArgumentError)
     end
 
     it "should set the reference correctly" do
       res = Puppet::Parser::Resource.new("resource", "testing", @arguments)
       res.ref.should == "Resource[testing]"
     end
 
     it "should be tagged with user tags" do
       tags = [ "tag1", "tag2" ]
       @arguments[:parameters] = [ param(:tag, tags , :source) ]
       res = Puppet::Parser::Resource.new("resource", "testing", @arguments)
       (res.tags & tags).should == tags
     end
   end
 
   describe "when evaluating" do
     it "should evaluate the associated AST definition" do
       definition = newdefine "mydefine"
       res = Puppet::Parser::Resource.new("mydefine", "whatever", :scope => @scope, :source => @source)
       definition.expects(:evaluate_code).with(res)
 
       res.evaluate
     end
 
     it "should evaluate the associated AST class" do
       @class = newclass "myclass"
       res = Puppet::Parser::Resource.new("class", "myclass", :scope => @scope, :source => @source)
       @class.expects(:evaluate_code).with(res)
       res.evaluate
     end
 
     it "should evaluate the associated AST node" do
       nodedef = newnode("mynode")
       res = Puppet::Parser::Resource.new("node", "mynode", :scope => @scope, :source => @source)
       nodedef.expects(:evaluate_code).with(res)
       res.evaluate
     end
   end
 
   describe "when finishing" do
     before do
       @class = newclass "myclass"
       @nodedef = newnode("mynode")
 
       @resource = Puppet::Parser::Resource.new("file", "whatever", :scope => @scope, :source => @source)
     end
 
     it "should do nothing if it has already been finished" do
       @resource.finish
       @resource.expects(:add_metaparams).never
       @resource.finish
     end
 
     it "should add all defaults available from the scope" do
       @resource.scope.expects(:lookupdefaults).with(@resource.type).returns(:owner => param(:owner, "default", @resource.source))
       @resource.finish
 
       @resource[:owner].should == "default"
     end
 
     it "should not replace existing parameters with defaults" do
       @resource.set_parameter :owner, "oldvalue"
       @resource.scope.expects(:lookupdefaults).with(@resource.type).returns(:owner => :replaced)
       @resource.finish
 
       @resource[:owner].should == "oldvalue"
     end
 
     it "should add a copy of each default, rather than the actual default parameter instance" do
       newparam = param(:owner, "default", @resource.source)
       other = newparam.dup
       other.value = "other"
       newparam.expects(:dup).returns(other)
       @resource.scope.expects(:lookupdefaults).with(@resource.type).returns(:owner => newparam)
       @resource.finish
 
       @resource[:owner].should == "other"
     end
 
     it "should be running in metaparam compatibility mode if running a version below 0.25" do
       catalog = stub 'catalog', :client_version => "0.24.8"
       @resource.stubs(:catalog).returns catalog
       @resource.should be_metaparam_compatibility_mode
     end
 
     it "should be running in metaparam compatibility mode if running no client version is available" do
       catalog = stub 'catalog', :client_version => nil
       @resource.stubs(:catalog).returns catalog
       @resource.should be_metaparam_compatibility_mode
     end
 
     it "should not be running in metaparam compatibility mode if running a version at or above 0.25" do
       catalog = stub 'catalog', :client_version => "0.25.0"
       @resource.stubs(:catalog).returns catalog
       @resource.should_not be_metaparam_compatibility_mode
     end
 
     it "should not copy relationship metaparams when not in metaparam compatibility mode" do
       @scope.setvar("require", "bar")
 
       @resource.stubs(:metaparam_compatibility_mode?).returns false
       @resource.class.publicize_methods(:add_metaparams)  { @resource.add_metaparams }
 
       @resource["require"].should be_nil
     end
 
     it "should copy relationship metaparams when in metaparam compatibility mode" do
       @scope.setvar("require", "bar")
 
       @resource.stubs(:metaparam_compatibility_mode?).returns true
       @resource.class.publicize_methods(:add_metaparams)  { @resource.add_metaparams }
 
       @resource["require"].should == "bar"
     end
 
     it "should stack relationship metaparams when in metaparam compatibility mode" do
       @resource.set_parameter("require", "foo")
       @scope.setvar("require", "bar")
 
       @resource.stubs(:metaparam_compatibility_mode?).returns true
       @resource.class.publicize_methods(:add_metaparams)  { @resource.add_metaparams }
 
       @resource["require"].should == ["foo", "bar"]
     end
   end
 
   describe "when being tagged" do
     before do
       @scope_resource = stub 'scope_resource', :tags => %w{srone srtwo}
       @scope.stubs(:resource).returns @scope_resource
       @resource = Puppet::Parser::Resource.new("file", "yay", :scope => @scope, :source => mock('source'))
     end
 
     it "should get tagged with the resource type" do
       @resource.tags.should be_include("file")
     end
 
     it "should get tagged with the title" do
       @resource.tags.should be_include("yay")
     end
 
     it "should get tagged with each name in the title if the title is a qualified class name" do
       resource = Puppet::Parser::Resource.new("file", "one::two", :scope => @scope, :source => mock('source'))
       resource.tags.should be_include("one")
       resource.tags.should be_include("two")
     end
 
     it "should get tagged with each name in the type if the type is a qualified class name" do
       resource = Puppet::Parser::Resource.new("one::two", "whatever", :scope => @scope, :source => mock('source'))
       resource.tags.should be_include("one")
       resource.tags.should be_include("two")
     end
 
     it "should not get tagged with non-alphanumeric titles" do
       resource = Puppet::Parser::Resource.new("file", "this is a test", :scope => @scope, :source => mock('source'))
       resource.tags.should_not be_include("this is a test")
     end
 
     it "should fail on tags containing '*' characters" do
       lambda { @resource.tag("bad*tag") }.should raise_error(Puppet::ParseError)
     end
 
     it "should fail on tags starting with '-' characters" do
       lambda { @resource.tag("-badtag") }.should raise_error(Puppet::ParseError)
     end
 
     it "should fail on tags containing ' ' characters" do
       lambda { @resource.tag("bad tag") }.should raise_error(Puppet::ParseError)
     end
 
     it "should allow alpha tags" do
       lambda { @resource.tag("good_tag") }.should_not raise_error(Puppet::ParseError)
     end
   end
 
   describe "when merging overrides" do
     before do
       @source = "source1"
       @resource = mkresource :source => @source
       @override = mkresource :source => @source
     end
 
     it "should fail when the override was not created by a parent class" do
       @override.source = "source2"
       @override.source.expects(:child_of?).with("source1").returns(false)
       lambda { @resource.merge(@override) }.should raise_error(Puppet::ParseError)
     end
 
     it "should succeed when the override was created in the current scope" do
       @resource.source = "source3"
       @override.source = @resource.source
       @override.source.expects(:child_of?).with("source3").never
       params = {:a => :b, :c => :d}
       @override.expects(:parameters).returns(params)
       @resource.expects(:override_parameter).with(:b)
       @resource.expects(:override_parameter).with(:d)
       @resource.merge(@override)
     end
 
     it "should succeed when a parent class created the override" do
       @resource.source = "source3"
       @override.source = "source4"
       @override.source.expects(:child_of?).with("source3").returns(true)
       params = {:a => :b, :c => :d}
       @override.expects(:parameters).returns(params)
       @resource.expects(:override_parameter).with(:b)
       @resource.expects(:override_parameter).with(:d)
       @resource.merge(@override)
     end
 
     it "should add new parameters when the parameter is not set" do
       @source.stubs(:child_of?).returns true
       @override.set_parameter(:testing, "value")
       @resource.merge(@override)
 
       @resource[:testing].should == "value"
     end
 
     it "should replace existing parameter values" do
       @source.stubs(:child_of?).returns true
       @resource.set_parameter(:testing, "old")
       @override.set_parameter(:testing, "value")
 
       @resource.merge(@override)
 
       @resource[:testing].should == "value"
     end
 
     it "should add values to the parameter when the override was created with the '+>' syntax" do
       @source.stubs(:child_of?).returns true
       param = Puppet::Parser::Resource::Param.new(:name => :testing, :value => "testing", :source => @resource.source)
       param.add = true
 
       @override.set_parameter(param)
 
       @resource.set_parameter(:testing, "other")
 
       @resource.merge(@override)
 
       @resource[:testing].should == %w{other testing}
     end
 
     it "should not merge parameter values when multiple resources are overriden with '+>' at once " do
       @resource_2 = mkresource :source => @source
 
       @resource.  set_parameter(:testing, "old_val_1")
       @resource_2.set_parameter(:testing, "old_val_2")
 
       @source.stubs(:child_of?).returns true
       param = Puppet::Parser::Resource::Param.new(:name => :testing, :value => "new_val", :source => @resource.source)
       param.add = true
       @override.set_parameter(param)
 
       @resource.  merge(@override)
       @resource_2.merge(@override)
 
       @resource  [:testing].should == %w{old_val_1 new_val}
       @resource_2[:testing].should == %w{old_val_2 new_val}
     end
 
     it "should promote tag overrides to real tags" do
       @source.stubs(:child_of?).returns true
       param = Puppet::Parser::Resource::Param.new(:name => :tag, :value => "testing", :source => @resource.source)
 
       @override.set_parameter(param)
 
       @resource.merge(@override)
 
       @resource.tagged?("testing").should be_true
     end
 
   end
 
   it "should be able to be converted to a normal resource" do
     @source = stub 'scope', :name => "myscope"
     @resource = mkresource :source => @source
     @resource.should respond_to(:to_resource)
   end
 
   it "should use its resource converter to convert to a transportable resource" do
     @source = stub 'scope', :name => "myscope"
     @resource = mkresource :source => @source
 
     newresource = Puppet::Resource.new(:file, "/my")
     Puppet::Resource.expects(:new).returns(newresource)
 
     newresource.expects(:to_trans).returns "mytrans"
 
     @resource.to_trans.should == "mytrans"
   end
 
   it "should return nil if converted to a transportable resource and it is virtual" do
     @source = stub 'scope', :name => "myscope"
     @resource = mkresource :source => @source
 
     @resource.expects(:virtual?).returns true
     @resource.to_trans.should be_nil
   end
 
   describe "when being converted to a resource" do
     before do
       @parser_resource = mkresource :scope => @scope, :parameters => {:foo => "bar", :fee => "fum"}
     end
 
     it "should create an instance of Puppet::Resource" do
       @parser_resource.to_resource.should be_instance_of(Puppet::Resource)
     end
 
     it "should set the type correctly on the Puppet::Resource" do
       @parser_resource.to_resource.type.should == @parser_resource.type
     end
 
     it "should set the title correctly on the Puppet::Resource" do
       @parser_resource.to_resource.title.should == @parser_resource.title
     end
 
     it "should copy over all of the parameters" do
       result = @parser_resource.to_resource.to_hash
 
       # The name will be in here, also.
       result[:foo].should == "bar"
       result[:fee].should == "fum"
     end
 
     it "should copy over the tags" do
       @parser_resource.tag "foo"
       @parser_resource.tag "bar"
 
       @parser_resource.to_resource.tags.should == @parser_resource.tags
     end
 
     it "should copy over the line" do
       @parser_resource.line = 40
       @parser_resource.to_resource.line.should == 40
     end
 
     it "should copy over the file" do
       @parser_resource.file = "/my/file"
       @parser_resource.to_resource.file.should == "/my/file"
     end
 
     it "should copy over the 'exported' value" do
       @parser_resource.exported = true
       @parser_resource.to_resource.exported.should be_true
     end
 
     it "should copy over the 'virtual' value" do
       @parser_resource.virtual = true
       @parser_resource.to_resource.virtual.should be_true
     end
 
     it "should convert any parser resource references to Puppet::Resource instances" do
       ref = Puppet::Resource.new("file", "/my/file")
       @parser_resource = mkresource :source => @source, :parameters => {:foo => "bar", :fee => ref}
       result = @parser_resource.to_resource
       result[:fee].should == Puppet::Resource.new(:file, "/my/file")
     end
 
     it "should convert any parser resource references to Puppet::Resource instances even if they are in an array" do
       ref = Puppet::Resource.new("file", "/my/file")
       @parser_resource = mkresource :source => @source, :parameters => {:foo => "bar", :fee => ["a", ref]}
       result = @parser_resource.to_resource
       result[:fee].should == ["a", Puppet::Resource.new(:file, "/my/file")]
     end
 
     it "should convert any parser resource references to Puppet::Resource instances even if they are in an array of array, and even deeper" do
       ref1 = Puppet::Resource.new("file", "/my/file1")
       ref2 = Puppet::Resource.new("file", "/my/file2")
       @parser_resource = mkresource :source => @source, :parameters => {:foo => "bar", :fee => ["a", [ref1,ref2]]}
       result = @parser_resource.to_resource
       result[:fee].should == ["a", Puppet::Resource.new(:file, "/my/file1"), Puppet::Resource.new(:file, "/my/file2")]
     end
 
     it "should fail if the same param is declared twice" do
       lambda do
         @parser_resource = mkresource :source => @source, :parameters => [
           Puppet::Parser::Resource::Param.new(
             :name => :foo, :value => "bar", :source => @source
           ),
           Puppet::Parser::Resource::Param.new(
             :name => :foo, :value => "baz", :source => @source
           )
         ]
       end.should raise_error(Puppet::ParseError)
     end
   end
 
   describe "when validating" do
     it "should check each parameter" do
       resource = Puppet::Parser::Resource.new :foo, "bar", :scope => @scope, :source => stub("source")
       resource[:one] = :two
       resource[:three] = :four
       resource.expects(:validate_parameter).with(:one)
       resource.expects(:validate_parameter).with(:three)
       resource.send(:validate)
     end
 
     it "should raise a parse error when there's a failure" do
       resource = Puppet::Parser::Resource.new :foo, "bar", :scope => @scope, :source => stub("source")
       resource[:one] = :two
       resource.expects(:validate_parameter).with(:one).raises ArgumentError
       lambda { resource.send(:validate) }.should raise_error(Puppet::ParseError)
     end
   end
 
   describe "when setting parameters" do
     before do
       @source = newclass "foobar"
       @resource = Puppet::Parser::Resource.new :foo, "bar", :scope => @scope, :source => @source
     end
 
     it "should accept Param instances and add them to the parameter list" do
       param = Puppet::Parser::Resource::Param.new :name => "foo", :value => "bar", :source => @source
       @resource.set_parameter(param)
       @resource["foo"].should == "bar"
     end
 
     it "should fail when provided a parameter name but no value" do
       lambda { @resource.set_parameter("myparam") }.should raise_error(ArgumentError)
     end
 
     it "should allow parameters to be set to 'false'" do
       @resource.set_parameter("myparam", false)
       @resource["myparam"].should be_false
     end
 
     it "should use its source when provided a parameter name and value" do
       @resource.set_parameter("myparam", "myvalue")
       @resource["myparam"].should == "myvalue"
     end
   end
 
   # part of #629 -- the undef keyword.  Make sure 'undef' params get skipped.
   it "should not include 'undef' parameters when converting itself to a hash" do
     resource = Puppet::Parser::Resource.new "file", "/tmp/testing", :source => mock("source"), :scope => mock("scope")
     resource[:owner] = :undef
     resource[:mode] = "755"
     resource.to_hash[:owner].should be_nil
   end
 end
diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb
index 8f005d551..83006b37b 100644
--- a/spec/unit/parser/type_loader_spec.rb
+++ b/spec/unit/parser/type_loader_spec.rb
@@ -1,201 +1,201 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/parser/type_loader'
 require 'puppet_spec/files'
 
 describe Puppet::Parser::TypeLoader do
   include PuppetSpec::Files
 
   before do
     @loader = Puppet::Parser::TypeLoader.new(:myenv)
   end
 
   it "should support an environment" do
     loader = Puppet::Parser::TypeLoader.new(:myenv)
     loader.environment.name.should == :myenv
   end
 
   it "should include the Environment Helper" do
     @loader.class.ancestors.should be_include(Puppet::Node::Environment::Helper)
   end
 
   it "should delegate its known resource types to its environment" do
     @loader.known_resource_types.should be_instance_of(Puppet::Resource::TypeCollection)
   end
 
   describe "when loading names from namespaces" do
     it "should do nothing if the name to import is an empty string" do
       @loader.expects(:name2files).never
       @loader.load_until(["foo"], "") { |f| false }.should be_nil
     end
 
     it "should turn the provided namespaces and name into a list of files" do
       @loader.expects(:name2files).with(["foo"], "bar").returns []
       @loader.load_until(["foo"], "bar") { |f| false }
     end
 
     it "should attempt to import each generated name" do
       @loader.expects(:name2files).returns %w{foo bar}
       @loader.expects(:import).with("foo",nil)
       @loader.expects(:import).with("bar",nil)
       @loader.load_until(["foo"], "bar") { |f| false }
     end
 
     it "should yield after each import" do
       yielded = []
       @loader.expects(:name2files).returns %w{foo bar}
       @loader.expects(:import).with("foo",nil)
       @loader.expects(:import).with("bar",nil)
       @loader.load_until(["foo"], "bar") { |f| yielded << f; false }
       yielded.should == %w{foo bar}
     end
 
     it "should stop importing when the yielded block returns true" do
       yielded = []
       @loader.expects(:name2files).returns %w{foo bar baz}
       @loader.expects(:import).with("foo",nil)
       @loader.expects(:import).with("bar",nil)
       @loader.expects(:import).with("baz",nil).never
       @loader.load_until(["foo"], "bar") { |f| true if f == "bar" }
     end
 
     it "should return the result of the block" do
       yielded = []
       @loader.expects(:name2files).returns %w{foo bar baz}
       @loader.expects(:import).with("foo",nil)
       @loader.expects(:import).with("bar",nil)
       @loader.expects(:import).with("baz",nil).never
       @loader.load_until(["foo"], "bar") { |f| 10 if f == "bar" }.should == 10
     end
 
     it "should return nil if the block never returns true" do
       @loader.expects(:name2files).returns %w{foo bar}
       @loader.expects(:import).with("foo",nil)
       @loader.expects(:import).with("bar",nil)
       @loader.load_until(["foo"], "bar") { |f| false }.should be_nil
     end
 
     it "should know when a given name has been loaded" do
       @loader.expects(:name2files).returns %w{file}
       @loader.expects(:import).with("file",nil)
       @loader.load_until(["foo"], "bar") { |f| true }
       @loader.should be_loaded("file")
     end
 
     it "should set the module name on any created resource types" do
       type = Puppet::Resource::Type.new(:hostclass, "mytype")
 
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{one}]
       @loader.stubs(:parse_file)
       @loader.load_until(["foo"], "one") { |f| type }
 
       type.module_name.should == "modname"
     end
   end
 
   describe "when mapping names to files" do
     {
       [["foo"], "::bar::baz"] => %w{bar/baz},
       [[""], "foo::bar"]      => %w{foo foo/bar},
       [%w{foo}, "bar"]        => %w{foo foo/bar bar},
       [%w{a b}, "bar"]        => %w{a a/bar b b/bar bar},
       [%w{a::b::c}, "bar"]    => %w{a a/b/c/bar bar},
       [%w{a::b}, "foo::bar"]  => %w{a a/b/foo/bar foo/bar}
     }.each do |inputs, outputs|
       it "should produce #{outputs.inspect} from the #{inputs[0].inspect} namespace and #{inputs[1]} name" do
         @loader.name2files(*inputs).should == outputs
       end
     end
   end
 
   describe "when importing" do
     before do
       Puppet::Parser::Files.stubs(:find_manifests).returns ["modname", %w{file}]
       @loader.stubs(:parse_file)
     end
 
     it "should return immediately when imports are being ignored" do
       Puppet::Parser::Files.expects(:find_manifests).never
       Puppet[:ignoreimport] = true
       @loader.import("foo").should be_nil
     end
 
     it "should find all manifests matching the file or pattern" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| pat == "myfile" }.returns ["modname", %w{one}]
       @loader.import("myfile")
     end
 
     it "should use the directory of the current file if one is set" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:cwd] == "/current" }.returns ["modname", %w{one}]
       @loader.import("myfile", "/current/file")
     end
 
     it "should pass the environment when looking for files" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:environment] == @loader.environment }.returns ["modname", %w{one}]
       @loader.import("myfile")
     end
 
     it "should fail if no files are found" do
       Puppet::Parser::Files.expects(:find_manifests).returns [nil, []]
       lambda { @loader.import("myfile") }.should raise_error(Puppet::ImportError)
     end
 
     it "should parse each found file" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
       @loader.expects(:parse_file).with("/one")
       @loader.import("myfile")
     end
 
     it "should make each file qualified before attempting to parse it" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{one}]
       @loader.expects(:parse_file).with("/current/one")
       @loader.import("myfile", "/current/file")
     end
 
     it "should know when a given file has been imported" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
       @loader.import("myfile")
 
       @loader.should be_imported("/one")
     end
 
     it "should not attempt to import files that have already been imported" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
       @loader.expects(:parse_file).once
       @loader.import("myfile")
 
       # This will fail if it tries to reimport the file.
       @loader.import("myfile")
     end
   end
 
   describe "when parsing a file" do
     before do
       @parser = Puppet::Parser::Parser.new(@loader.environment)
       @parser.stubs(:parse)
       @parser.stubs(:file=)
       Puppet::Parser::Parser.stubs(:new).with(@loader.environment).returns @parser
     end
 
     it "should create a new parser instance for each file using the current environment" do
       Puppet::Parser::Parser.expects(:new).with(@loader.environment).returns @parser
       @loader.parse_file("/my/file")
     end
 
     it "should assign the parser its file and parse" do
       @parser.expects(:file=).with("/my/file")
       @parser.expects(:parse)
       @loader.parse_file("/my/file")
     end
   end
 
   it "should be able to add classes to the current resource type collection" do
-    file = tmpfile("simple_file")
+    file = tmpfile("simple_file.pp")
     File.open(file, "w") { |f| f.puts "class foo {}" }
     @loader.import(file)
 
     @loader.known_resource_types.hostclass("foo").should be_instance_of(Puppet::Resource::Type)
   end
 end
diff --git a/spec/unit/rails/resource_spec.rb b/spec/unit/rails/resource_spec.rb
index 08deda65e..73c7f7af4 100755
--- a/spec/unit/rails/resource_spec.rb
+++ b/spec/unit/rails/resource_spec.rb
@@ -1,123 +1,123 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "Puppet::Rails::Resource" do
   confine "Cannot test without ActiveRecord" => Puppet.features.rails?
 
   def column(name, type)
     ActiveRecord::ConnectionAdapters::Column.new(name, nil, type, false)
   end
 
   before do
     require 'puppet/rails/resource'
 
     # Stub this so we don't need access to the DB.
     Puppet::Rails::Resource.stubs(:columns).returns([column("title", "string"), column("restype", "string"), column("exported", "boolean")])
   end
 
   describe "when creating initial resource arguments" do
     it "should set the restype to the resource's type" do
       Puppet::Rails::Resource.rails_resource_initial_args(Puppet::Resource.new(:file, "/file"))[:restype].should == "File"
     end
 
     it "should set the title to the resource's title" do
       Puppet::Rails::Resource.rails_resource_initial_args(Puppet::Resource.new(:file, "/file"))[:title].should == "/file"
     end
 
     it "should set the line to the resource's line if one is available" do
       resource = Puppet::Resource.new(:file, "/file")
       resource.line = 50
 
       Puppet::Rails::Resource.rails_resource_initial_args(resource)[:line].should == 50
     end
 
     it "should set 'exported' to true of the resource is exported" do
       resource = Puppet::Resource.new(:file, "/file")
       resource.exported = true
 
       Puppet::Rails::Resource.rails_resource_initial_args(resource)[:exported].should be_true
     end
 
     it "should set 'exported' to false of the resource is not exported" do
       resource = Puppet::Resource.new(:file, "/file")
       resource.exported = false
 
       Puppet::Rails::Resource.rails_resource_initial_args(resource)[:exported].should be_false
 
       resource = Puppet::Resource.new(:file, "/file")
       resource.exported = nil
 
       Puppet::Rails::Resource.rails_resource_initial_args(resource)[:exported].should be_false
     end
   end
 
   describe "when merging in a parser resource" do
     before do
       @parser = mock 'parser resource'
 
       @resource = Puppet::Rails::Resource.new
       [:merge_attributes, :merge_parameters, :merge_tags, :save].each { |m| @resource.stubs(m) }
     end
 
     it "should merge the attributes" do
       @resource.expects(:merge_attributes).with(@parser)
 
       @resource.merge_parser_resource(@parser)
     end
 
     it "should merge the parameters" do
       @resource.expects(:merge_parameters).with(@parser)
 
       @resource.merge_parser_resource(@parser)
     end
 
     it "should merge the tags" do
       @resource.expects(:merge_tags).with(@parser)
 
       @resource.merge_parser_resource(@parser)
     end
 
     it "should save itself" do
       @resource.expects(:save)
 
       @resource.merge_parser_resource(@parser)
     end
   end
 
   describe "merge_parameters" do
     it "should replace values that have changed" do
       @resource = Puppet::Rails::Resource.new
       @resource.params_list = [{"name" => "replace", "value" => 1, "id" => 100 }]
 
       Puppet::Rails::ParamValue.expects(:delete).with([100])
       param_values = stub "param_values"
       param_values.expects(:build).with({:value=>nil, :param_name=>nil, :line=>{"replace"=>2}})
       @resource.stubs(:param_values).returns(param_values)
 
       Puppet::Rails::ParamName.stubs(:accumulate_by_name)
 
       merge_resource = stub "merge_resource"
       merge_resource.expects(:line).returns({ "replace" => 2 })
       merge_resource.stubs(:each).yields([["replace", 2]])
 
       @resource.merge_parameters(merge_resource)
     end
   end
 
   describe "#to_resource" do
     it "should instantiate a Puppet::Parser::Resource" do
-      scope = stub "scope", :source => nil
+      scope = stub "scope", :source => nil, :environment => nil, :namespaces => nil
 
       @resource = Puppet::Rails::Resource.new
       @resource.stubs(:attributes).returns({
         "restype" => 'notify',
         "title"   => 'hello'
       })
       @resource.stubs(:param_names).returns([])
 
       @resource.to_resource(scope).should be_a(Puppet::Parser::Resource)
 
     end
   end
 end
diff --git a/spec/unit/resource/catalog_spec.rb b/spec/unit/resource/catalog_spec.rb
index 10cff91a3..2b6beb5e9 100755
--- a/spec/unit/resource/catalog_spec.rb
+++ b/spec/unit/resource/catalog_spec.rb
@@ -1,1078 +1,1078 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Resource::Catalog, "when compiling" do
 
   before do
     @basepath = Puppet.features.posix? ? "/somepath" : "C:/somepath"
     # stub this to not try to create state.yaml
     Puppet::Util::Storage.stubs(:store)
   end
 
   it "should be an Expirer" do
     Puppet::Resource::Catalog.ancestors.should be_include(Puppet::Util::Cacher::Expirer)
   end
 
   it "should always be expired if it's not applying" do
     @catalog = Puppet::Resource::Catalog.new("host")
     @catalog.expects(:applying?).returns false
     @catalog.should be_dependent_data_expired(Time.now)
   end
 
   it "should not be expired if it's applying and the timestamp is late enough" do
     @catalog = Puppet::Resource::Catalog.new("host")
     @catalog.expire
     @catalog.expects(:applying?).returns true
     @catalog.should_not be_dependent_data_expired(Time.now)
   end
 
   it "should be able to write its list of classes to the class file" do
     @catalog = Puppet::Resource::Catalog.new("host")
 
     @catalog.add_class "foo", "bar"
 
     Puppet.settings.expects(:value).with(:classfile).returns "/class/file"
 
     fh = mock 'filehandle'
     File.expects(:open).with("/class/file", "w").yields fh
 
     fh.expects(:puts).with "foo\nbar"
 
     @catalog.write_class_file
   end
 
   it "should have a client_version attribute" do
     @catalog = Puppet::Resource::Catalog.new("host")
     @catalog.client_version = 5
     @catalog.client_version.should == 5
   end
 
   it "should have a server_version attribute" do
     @catalog = Puppet::Resource::Catalog.new("host")
     @catalog.server_version = 5
     @catalog.server_version.should == 5
   end
 
   describe "when compiling" do
     it "should accept tags" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.tag("one")
       config.tags.should == %w{one}
     end
 
     it "should accept multiple tags at once" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.tag("one", "two")
       config.tags.should == %w{one two}
     end
 
     it "should convert all tags to strings" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.tag("one", :two)
       config.tags.should == %w{one two}
     end
 
     it "should tag with both the qualified name and the split name" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.tag("one::two")
       config.tags.include?("one").should be_true
       config.tags.include?("one::two").should be_true
     end
 
     it "should accept classes" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.add_class("one")
       config.classes.should == %w{one}
       config.add_class("two", "three")
       config.classes.should == %w{one two three}
     end
 
     it "should tag itself with passed class names" do
       config = Puppet::Resource::Catalog.new("mynode")
       config.add_class("one")
       config.tags.should == %w{one}
     end
   end
 
   describe "when extracting transobjects" do
 
     def mkscope
       @node = Puppet::Node.new("mynode")
       @compiler = Puppet::Parser::Compiler.new(@node)
 
       # XXX This is ridiculous.
       @compiler.send(:evaluate_main)
       @scope = @compiler.topscope
     end
 
     def mkresource(type, name)
       Puppet::Parser::Resource.new(type, name, :source => @source, :scope => @scope)
     end
 
     it "should fail if no 'main' stage can be found" do
       lambda { Puppet::Resource::Catalog.new("mynode").extract }.should raise_error(Puppet::DevError)
     end
 
     it "should warn if any non-main stages are present" do
       config = Puppet::Resource::Catalog.new("mynode")
 
       @scope = mkscope
       @source = mock 'source'
 
       main = mkresource("stage", "main")
       config.add_resource(main)
 
       other = mkresource("stage", "other")
       config.add_resource(other)
 
       Puppet.expects(:warning)
 
       config.extract
     end
 
     it "should always create a TransBucket for the 'main' stage" do
       config = Puppet::Resource::Catalog.new("mynode")
 
       @scope = mkscope
       @source = mock 'source'
 
       main = mkresource("stage", "main")
       config.add_resource(main)
 
       result = config.extract
       result.type.should == "Stage"
       result.name.should == "main"
     end
 
     # Now try it with a more complicated graph -- a three tier graph, each tier
     it "should transform arbitrarily deep graphs into isomorphic trees" do
       config = Puppet::Resource::Catalog.new("mynode")
 
       @scope = mkscope
       @scope.stubs(:tags).returns([])
       @source = mock 'source'
 
       # Create our scopes.
       top = mkresource "stage", "main"
 
       config.add_resource top
       topbucket = []
       topbucket.expects(:classes=).with([])
       top.expects(:to_trans).returns(topbucket)
       topres = mkresource "file", "/top"
       topres.expects(:to_trans).returns(:topres)
       config.add_edge top, topres
 
       middle = mkresource "class", "middle"
       middle.expects(:to_trans).returns([])
       config.add_edge top, middle
       midres = mkresource "file", "/mid"
       midres.expects(:to_trans).returns(:midres)
       config.add_edge middle, midres
 
       bottom = mkresource "class", "bottom"
       bottom.expects(:to_trans).returns([])
       config.add_edge middle, bottom
       botres = mkresource "file", "/bot"
       botres.expects(:to_trans).returns(:botres)
       config.add_edge bottom, botres
 
       toparray = config.extract
 
       # This is annoying; it should look like:
       #   [[[:botres], :midres], :topres]
       # but we can't guarantee sort order.
       toparray.include?(:topres).should be_true
 
       midarray = toparray.find { |t| t.is_a?(Array) }
       midarray.include?(:midres).should be_true
       botarray = midarray.find { |t| t.is_a?(Array) }
       botarray.include?(:botres).should be_true
     end
   end
 
   describe " when converting to a Puppet::Resource catalog" do
     before do
       @original = Puppet::Resource::Catalog.new("mynode")
       @original.tag(*%w{one two three})
       @original.add_class *%w{four five six}
 
       @top            = Puppet::TransObject.new 'top', "class"
       @topobject      = Puppet::TransObject.new '/topobject', "file"
       @middle         = Puppet::TransObject.new 'middle', "class"
       @middleobject   = Puppet::TransObject.new '/middleobject', "file"
       @bottom         = Puppet::TransObject.new 'bottom', "class"
       @bottomobject   = Puppet::TransObject.new '/bottomobject', "file"
 
       @resources = [@top, @topobject, @middle, @middleobject, @bottom, @bottomobject]
 
       @original.add_resource(*@resources)
 
       @original.add_edge(@top, @topobject)
       @original.add_edge(@top, @middle)
       @original.add_edge(@middle, @middleobject)
       @original.add_edge(@middle, @bottom)
       @original.add_edge(@bottom, @bottomobject)
 
       @catalog = @original.to_resource
     end
 
     it "should copy over the version" do
       @original.version = "foo"
       @original.to_resource.version.should == "foo"
     end
 
     it "should convert parser resources to plain resources" do
-      resource = Puppet::Parser::Resource.new(:file, "foo", :scope => stub("scope"), :source => stub("source"))
+      resource = Puppet::Parser::Resource.new(:file, "foo", :scope => stub("scope", :environment => nil, :namespaces => nil), :source => stub("source"))
       catalog = Puppet::Resource::Catalog.new("whev")
       catalog.add_resource(resource)
       new = catalog.to_resource
       new.resource(:file, "foo").class.should == Puppet::Resource
     end
 
     it "should add all resources as Puppet::Resource instances" do
       @resources.each { |resource| @catalog.resource(resource.ref).should be_instance_of(Puppet::Resource) }
     end
 
     it "should copy the tag list to the new catalog" do
       @catalog.tags.sort.should == @original.tags.sort
     end
 
     it "should copy the class list to the new catalog" do
       @catalog.classes.should == @original.classes
     end
 
     it "should duplicate the original edges" do
       @original.edges.each do |edge|
         @catalog.edge?(@catalog.resource(edge.source.ref), @catalog.resource(edge.target.ref)).should be_true
       end
     end
 
     it "should set itself as the catalog for each converted resource" do
       @catalog.vertices.each { |v| v.catalog.object_id.should equal(@catalog.object_id) }
     end
   end
 
   describe "when converting to a RAL catalog" do
     before do
       @original = Puppet::Resource::Catalog.new("mynode")
       @original.tag(*%w{one two three})
       @original.add_class *%w{four five six}
 
       @top            = Puppet::Resource.new :class, 'top'
       @topobject      = Puppet::Resource.new :file, @basepath+'/topobject'
       @middle         = Puppet::Resource.new :class, 'middle'
       @middleobject   = Puppet::Resource.new :file, @basepath+'/middleobject'
       @bottom         = Puppet::Resource.new :class, 'bottom'
       @bottomobject   = Puppet::Resource.new :file, @basepath+'/bottomobject'
 
       @resources = [@top, @topobject, @middle, @middleobject, @bottom, @bottomobject]
 
       @original.add_resource(*@resources)
 
       @original.add_edge(@top, @topobject)
       @original.add_edge(@top, @middle)
       @original.add_edge(@middle, @middleobject)
       @original.add_edge(@middle, @bottom)
       @original.add_edge(@bottom, @bottomobject)
 
       @catalog = @original.to_ral
     end
 
     it "should add all resources as RAL instances" do
       @resources.each { |resource| @catalog.resource(resource.ref).should be_instance_of(Puppet::Type) }
     end
 
     it "should copy the tag list to the new catalog" do
       @catalog.tags.sort.should == @original.tags.sort
     end
 
     it "should copy the class list to the new catalog" do
       @catalog.classes.should == @original.classes
     end
 
     it "should duplicate the original edges" do
       @original.edges.each do |edge|
         @catalog.edge?(@catalog.resource(edge.source.ref), @catalog.resource(edge.target.ref)).should be_true
       end
     end
 
     it "should set itself as the catalog for each converted resource" do
       @catalog.vertices.each { |v| v.catalog.object_id.should equal(@catalog.object_id) }
     end
 
     # This tests #931.
     it "should not lose track of resources whose names vary" do
       changer = Puppet::TransObject.new 'changer', 'test'
 
       config = Puppet::Resource::Catalog.new('test')
       config.add_resource(changer)
       config.add_resource(@top)
 
       config.add_edge(@top, changer)
 
       resource = stub 'resource', :name => "changer2", :title => "changer2", :ref => "Test[changer2]", :catalog= => nil, :remove => nil
 
       #changer is going to get duplicated as part of a fix for aliases 1094
       changer.expects(:dup).returns(changer)
       changer.expects(:to_ral).returns(resource)
 
       newconfig = nil
 
       proc { @catalog = config.to_ral }.should_not raise_error
       @catalog.resource("Test[changer2]").should equal(resource)
     end
 
     after do
       # Remove all resource instances.
       @catalog.clear(true)
     end
   end
 
   describe "when filtering" do
     before :each do
       @original = Puppet::Resource::Catalog.new("mynode")
       @original.tag(*%w{one two three})
       @original.add_class *%w{four five six}
 
       @r1 = stub_everything 'r1', :ref => "File[/a]"
       @r1.stubs(:respond_to?).with(:ref).returns(true)
       @r1.stubs(:dup).returns(@r1)
       @r1.stubs(:is_a?).returns(Puppet::Resource).returns(true)
 
       @r2 = stub_everything 'r2', :ref => "File[/b]"
       @r2.stubs(:respond_to?).with(:ref).returns(true)
       @r2.stubs(:dup).returns(@r2)
       @r2.stubs(:is_a?).returns(Puppet::Resource).returns(true)
 
       @resources = [@r1,@r2]
 
       @original.add_resource(@r1,@r2)
     end
 
     it "should transform the catalog to a resource catalog" do
       @original.expects(:to_catalog).with { |h,b| h == :to_resource }
 
       @original.filter
     end
 
     it "should scan each catalog resource in turn and apply filtering block" do
       @resources.each { |r| r.expects(:test?) }
       @original.filter do |r|
         r.test?
       end
     end
 
     it "should filter out resources which produce true when the filter block is evaluated" do
       @original.filter do |r|
         r == @r1
       end.resource("File[/a]").should be_nil
     end
 
     it "should not consider edges against resources that were filtered out" do
       @original.add_edge(@r1,@r2)
       @original.filter do |r|
         r == @r1
       end.edge(@r1,@r2).should be_empty
     end
   end
 
   describe "when functioning as a resource container" do
     before do
       @catalog = Puppet::Resource::Catalog.new("host")
       @one = Puppet::Type.type(:notify).new :name => "one"
       @two = Puppet::Type.type(:notify).new :name => "two"
       @dupe = Puppet::Type.type(:notify).new :name => "one"
     end
 
     it "should provide a method to add one or more resources" do
       @catalog.add_resource @one, @two
       @catalog.resource(@one.ref).should equal(@one)
       @catalog.resource(@two.ref).should equal(@two)
     end
 
     it "should add resources to the relationship graph if it exists" do
       relgraph = @catalog.relationship_graph
       @catalog.add_resource @one
       relgraph.should be_vertex(@one)
     end
 
     it "should yield added resources if a block is provided" do
       yielded = []
       @catalog.add_resource(@one, @two) { |r| yielded << r }
       yielded.length.should == 2
     end
 
     it "should set itself as the resource's catalog if it is not a relationship graph" do
       @one.expects(:catalog=).with(@catalog)
       @catalog.add_resource @one
     end
 
     it "should make all vertices available by resource reference" do
       @catalog.add_resource(@one)
       @catalog.resource(@one.ref).should equal(@one)
       @catalog.vertices.find { |r| r.ref == @one.ref }.should equal(@one)
     end
 
     it "should canonize how resources are referred to during retrieval when both type and title are provided" do
       @catalog.add_resource(@one)
 
       @catalog.resource("notify", "one").should equal(@one)
     end
 
     it "should canonize how resources are referred to during retrieval when just the title is provided" do
       @catalog.add_resource(@one)
 
       @catalog.resource("notify[one]", nil).should equal(@one)
     end
 
     it "should not allow two resources with the same resource reference" do
       @catalog.add_resource(@one)
 
       proc { @catalog.add_resource(@dupe) }.should raise_error(Puppet::Resource::Catalog::DuplicateResourceError)
     end
 
     it "should not store objects that do not respond to :ref" do
       proc { @catalog.add_resource("thing") }.should raise_error(ArgumentError)
     end
 
     it "should remove all resources when asked" do
       @catalog.add_resource @one
       @catalog.add_resource @two
       @one.expects :remove
       @two.expects :remove
       @catalog.clear(true)
     end
 
     it "should support a mechanism for finishing resources" do
       @one.expects :finish
       @two.expects :finish
       @catalog.add_resource @one
       @catalog.add_resource @two
 
       @catalog.finalize
     end
 
     it "should make default resources when finalizing" do
       @catalog.expects(:make_default_resources)
       @catalog.finalize
     end
 
     it "should add default resources to the catalog upon creation" do
       @catalog.make_default_resources
       @catalog.resource(:schedule, "daily").should_not be_nil
     end
 
     it "should optionally support an initialization block and should finalize after such blocks" do
       @one.expects :finish
       @two.expects :finish
       config = Puppet::Resource::Catalog.new("host") do |conf|
         conf.add_resource @one
         conf.add_resource @two
       end
     end
 
     it "should inform the resource that it is the resource's catalog" do
       @one.expects(:catalog=).with(@catalog)
       @catalog.add_resource @one
     end
 
     it "should be able to find resources by reference" do
       @catalog.add_resource @one
       @catalog.resource(@one.ref).should equal(@one)
     end
 
     it "should be able to find resources by reference or by type/title tuple" do
       @catalog.add_resource @one
       @catalog.resource("notify", "one").should equal(@one)
     end
 
     it "should have a mechanism for removing resources" do
       @catalog.add_resource @one
       @one.expects :remove
       @catalog.remove_resource(@one)
       @catalog.resource(@one.ref).should be_nil
       @catalog.vertex?(@one).should be_false
     end
 
     it "should have a method for creating aliases for resources" do
       @catalog.add_resource @one
       @catalog.alias(@one, "other")
       @catalog.resource("notify", "other").should equal(@one)
     end
 
     it "should ignore conflicting aliases that point to the aliased resource" do
       @catalog.alias(@one, "other")
       lambda { @catalog.alias(@one, "other") }.should_not raise_error
     end
 
     it "should create aliases for resources isomorphic resources whose names do not match their titles" do
       resource = Puppet::Type::File.new(:title => "testing", :path => @basepath+"/something")
 
       @catalog.add_resource(resource)
 
       @catalog.resource(:file, @basepath+"/something").should equal(resource)
     end
 
     it "should not create aliases for resources non-isomorphic resources whose names do not match their titles" do
       resource = Puppet::Type.type(:exec).new(:title => "testing", :command => "echo", :path => %w{/bin /usr/bin /usr/local/bin})
 
       @catalog.add_resource(resource)
 
       # Yay, I've already got a 'should' method
       @catalog.resource(:exec, "echo").object_id.should == nil.object_id
     end
 
     # This test is the same as the previous, but the behaviour should be explicit.
     it "should alias using the class name from the resource reference, not the resource class name" do
       @catalog.add_resource @one
       @catalog.alias(@one, "other")
       @catalog.resource("notify", "other").should equal(@one)
     end
 
     it "should ignore conflicting aliases that point to the aliased resource" do
       @catalog.alias(@one, "other")
       lambda { @catalog.alias(@one, "other") }.should_not raise_error
     end
 
     it "should fail to add an alias if the aliased name already exists" do
       @catalog.add_resource @one
       proc { @catalog.alias @two, "one" }.should raise_error(ArgumentError)
     end
 
     it "should not fail when a resource has duplicate aliases created" do
       @catalog.add_resource @one
       proc { @catalog.alias @one, "one" }.should_not raise_error
     end
 
     it "should not create aliases that point back to the resource" do
       @catalog.alias(@one, "one")
       @catalog.resource(:notify, "one").should be_nil
     end
 
     it "should be able to look resources up by their aliases" do
       @catalog.add_resource @one
       @catalog.alias @one, "two"
       @catalog.resource(:notify, "two").should equal(@one)
     end
 
     it "should remove resource aliases when the target resource is removed" do
       @catalog.add_resource @one
       @catalog.alias(@one, "other")
       @one.expects :remove
       @catalog.remove_resource(@one)
       @catalog.resource("notify", "other").should be_nil
     end
 
     it "should add an alias for the namevar when the title and name differ on isomorphic resource types" do
       resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
       resource.expects(:isomorphic?).returns(true)
       @catalog.add_resource(resource)
       @catalog.resource(:file, "other").should equal(resource)
       @catalog.resource(:file, @basepath+"/something").ref.should == resource.ref
     end
 
     it "should not add an alias for the namevar when the title and name differ on non-isomorphic resource types" do
       resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
       resource.expects(:isomorphic?).returns(false)
       @catalog.add_resource(resource)
       @catalog.resource(:file, resource.title).should equal(resource)
       # We can't use .should here, because the resources respond to that method.
       raise "Aliased non-isomorphic resource" if @catalog.resource(:file, resource.name)
     end
 
     it "should provide a method to create additional resources that also registers the resource" do
       args = {:name => "/yay", :ensure => :file}
       resource = stub 'file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay"
       Puppet::Type.type(:file).expects(:new).with(args).returns(resource)
       @catalog.create_resource :file, args
       @catalog.resource("File[/yay]").should equal(resource)
     end
   end
 
   describe "when applying" do
     before :each do
       @catalog = Puppet::Resource::Catalog.new("host")
 
       @transaction = mock 'transaction'
       Puppet::Transaction.stubs(:new).returns(@transaction)
       @transaction.stubs(:evaluate)
       @transaction.stubs(:add_times)
 
       Puppet.settings.stubs(:use)
     end
 
     it "should create and evaluate a transaction" do
       @transaction.expects(:evaluate)
       @catalog.apply
     end
 
     it "should provide the catalog retrieval time to the transaction" do
       @catalog.retrieval_duration = 5
       @transaction.expects(:add_times).with(:config_retrieval => 5)
       @catalog.apply
     end
 
     it "should use a retrieval time of 0 if none is set in the catalog" do
       @catalog.retrieval_duration = nil
       @transaction.expects(:add_times).with(:config_retrieval => 0)
       @catalog.apply
     end
 
     it "should return the transaction" do
       @catalog.apply.should equal(@transaction)
     end
 
     it "should yield the transaction if a block is provided" do
       @catalog.apply do |trans|
         trans.should equal(@transaction)
       end
     end
 
     it "should default to being a host catalog" do
       @catalog.host_config.should be_true
     end
 
     it "should be able to be set to a non-host_config" do
       @catalog.host_config = false
       @catalog.host_config.should be_false
     end
 
     it "should pass supplied tags on to the transaction" do
       @transaction.expects(:tags=).with(%w{one two})
       @catalog.apply(:tags => %w{one two})
     end
 
     it "should set ignoreschedules on the transaction if specified in apply()" do
       @transaction.expects(:ignoreschedules=).with(true)
       @catalog.apply(:ignoreschedules => true)
     end
 
     it "should expire cached data in the resources both before and after the transaction" do
       @catalog.expects(:expire).times(2)
       @catalog.apply
     end
 
     describe "host catalogs" do
 
       # super() doesn't work in the setup method for some reason
       before do
         @catalog.host_config = true
         Puppet::Util::Storage.stubs(:store)
       end
 
       it "should initialize the state database before applying a catalog" do
         Puppet::Util::Storage.expects(:load)
 
         # Short-circuit the apply, so we know we're loading before the transaction
         Puppet::Transaction.expects(:new).raises ArgumentError
         proc { @catalog.apply }.should raise_error(ArgumentError)
       end
 
       it "should sync the state database after applying" do
         Puppet::Util::Storage.expects(:store)
         @transaction.stubs :any_failed? => false
         @catalog.apply
       end
 
       after { Puppet.settings.clear }
     end
 
     describe "non-host catalogs" do
 
       before do
         @catalog.host_config = false
       end
 
       it "should never send reports" do
         Puppet[:report] = true
         Puppet[:summarize] = true
         @catalog.apply
       end
 
       it "should never modify the state database" do
         Puppet::Util::Storage.expects(:load).never
         Puppet::Util::Storage.expects(:store).never
         @catalog.apply
       end
 
       after { Puppet.settings.clear }
     end
   end
 
   describe "when creating a relationship graph" do
     before do
       Puppet::Type.type(:component)
       @catalog = Puppet::Resource::Catalog.new("host")
       @compone = Puppet::Type::Component.new :name => "one"
       @comptwo = Puppet::Type::Component.new :name => "two", :require => "Class[one]"
       @file = Puppet::Type.type(:file)
       @one = @file.new :path => @basepath+"/one"
       @two = @file.new :path => @basepath+"/two"
       @sub = @file.new :path => @basepath+"/two/subdir"
       @catalog.add_edge @compone, @one
       @catalog.add_edge @comptwo, @two
 
       @three = @file.new :path => @basepath+"/three"
       @four = @file.new :path => @basepath+"/four", :require => "File[#{@basepath}/three]"
       @five = @file.new :path => @basepath+"/five"
       @catalog.add_resource @compone, @comptwo, @one, @two, @three, @four, @five, @sub
 
       @relationships = @catalog.relationship_graph
     end
 
     it "should be able to create a relationship graph" do
       @relationships.should be_instance_of(Puppet::SimpleGraph)
     end
 
     it "should not have any components" do
       @relationships.vertices.find { |r| r.instance_of?(Puppet::Type::Component) }.should be_nil
     end
 
     it "should have all non-component resources from the catalog" do
       # The failures print out too much info, so i just do a class comparison
       @relationships.vertex?(@five).should be_true
     end
 
     it "should have all resource relationships set as edges" do
       @relationships.edge?(@three, @four).should be_true
     end
 
     it "should copy component relationships to all contained resources" do
       @relationships.edge?(@one, @two).should be_true
     end
 
     it "should add automatic relationships to the relationship graph" do
       @relationships.edge?(@two, @sub).should be_true
     end
 
     it "should get removed when the catalog is cleaned up" do
       @relationships.expects(:clear)
       @catalog.clear
       @catalog.instance_variable_get("@relationship_graph").should be_nil
     end
 
     it "should write :relationships and :expanded_relationships graph files if the catalog is a host catalog" do
       @catalog.clear
       graph = Puppet::SimpleGraph.new
       Puppet::SimpleGraph.expects(:new).returns graph
 
       graph.expects(:write_graph).with(:relationships)
       graph.expects(:write_graph).with(:expanded_relationships)
 
       @catalog.host_config = true
 
       @catalog.relationship_graph
     end
 
     it "should not write graph files if the catalog is not a host catalog" do
       @catalog.clear
       graph = Puppet::SimpleGraph.new
       Puppet::SimpleGraph.expects(:new).returns graph
 
       graph.expects(:write_graph).never
 
       @catalog.host_config = false
 
       @catalog.relationship_graph
     end
 
     it "should create a new relationship graph after clearing the old one" do
       @relationships.expects(:clear)
       @catalog.clear
       @catalog.relationship_graph.should be_instance_of(Puppet::SimpleGraph)
     end
 
     it "should remove removed resources from the relationship graph if it exists" do
       @catalog.remove_resource(@one)
       @catalog.relationship_graph.vertex?(@one).should be_false
     end
   end
 
   describe "when writing dot files" do
     before do
       @catalog = Puppet::Resource::Catalog.new("host")
       @name = :test
       @file = File.join(Puppet[:graphdir], @name.to_s + ".dot")
     end
 
     it "should only write when it is a host catalog" do
       File.expects(:open).with(@file).never
       @catalog.host_config = false
       Puppet[:graph] = true
       @catalog.write_graph(@name)
     end
 
     after do
       Puppet.settings.clear
     end
   end
 
   describe "when indirecting" do
     before do
       @real_indirection = Puppet::Resource::Catalog.indirection
 
       @indirection = stub 'indirection', :name => :catalog
 
       Puppet::Util::Cacher.expire
     end
 
     it "should redirect to the indirection for retrieval" do
       Puppet::Resource::Catalog.stubs(:indirection).returns(@indirection)
       @indirection.expects(:find)
       Puppet::Resource::Catalog.find(:myconfig)
     end
 
     it "should use the value of the 'catalog_terminus' setting to determine its terminus class" do
       # Puppet only checks the terminus setting the first time you ask
       # so this returns the object to the clean state
       # at the expense of making this test less pure
       Puppet::Resource::Catalog.indirection.reset_terminus_class
 
       Puppet.settings[:catalog_terminus] = "rest"
       Puppet::Resource::Catalog.indirection.terminus_class.should == :rest
     end
 
     it "should allow the terminus class to be set manually" do
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
       Puppet::Resource::Catalog.indirection.terminus_class.should == :rest
     end
 
     after do
       Puppet::Util::Cacher.expire
       @real_indirection.reset_terminus_class
     end
   end
 
   describe "when converting to yaml" do
     before do
       @catalog = Puppet::Resource::Catalog.new("me")
       @catalog.add_edge("one", "two")
     end
 
     it "should be able to be dumped to yaml" do
       YAML.dump(@catalog).should be_instance_of(String)
     end
   end
 
   describe "when converting from yaml" do
     before do
       @catalog = Puppet::Resource::Catalog.new("me")
       @catalog.add_edge("one", "two")
 
       text = YAML.dump(@catalog)
       @newcatalog = YAML.load(text)
     end
 
     it "should get converted back to a catalog" do
       @newcatalog.should be_instance_of(Puppet::Resource::Catalog)
     end
 
     it "should have all vertices" do
       @newcatalog.vertex?("one").should be_true
       @newcatalog.vertex?("two").should be_true
     end
 
     it "should have all edges" do
       @newcatalog.edge?("one", "two").should be_true
     end
   end
 end
 
 describe Puppet::Resource::Catalog, "when converting to pson" do
   confine "Missing 'pson' library" => Puppet.features.pson?
 
   before do
     @catalog = Puppet::Resource::Catalog.new("myhost")
   end
 
   def pson_output_should
     @catalog.class.expects(:pson_create).with { |hash| yield hash }.returns(:something)
   end
 
   # LAK:NOTE For all of these tests, we convert back to the resource so we can
   # trap the actual data structure then.
   it "should set its document_type to 'Catalog'" do
     pson_output_should { |hash| hash['document_type'] == "Catalog" }
 
     PSON.parse @catalog.to_pson
   end
 
   it "should set its data as a hash" do
     pson_output_should { |hash| hash['data'].is_a?(Hash) }
     PSON.parse @catalog.to_pson
   end
 
   [:name, :version, :tags, :classes].each do |param|
     it "should set its #{param} to the #{param} of the resource" do
       @catalog.send(param.to_s + "=", "testing") unless @catalog.send(param)
 
       pson_output_should { |hash| hash['data'][param.to_s] == @catalog.send(param) }
       PSON.parse @catalog.to_pson
     end
   end
 
   it "should convert its resources to a PSON-encoded array and store it as the 'resources' data" do
     one = stub 'one', :to_pson_data_hash => "one_resource", :ref => "Foo[one]"
     two = stub 'two', :to_pson_data_hash => "two_resource", :ref => "Foo[two]"
 
     @catalog.add_resource(one)
     @catalog.add_resource(two)
 
     # TODO this should really guarantee sort order
     PSON.parse(@catalog.to_pson,:create_additions => false)['data']['resources'].sort.should == ["one_resource", "two_resource"].sort
 
   end
 
   it "should convert its edges to a PSON-encoded array and store it as the 'edges' data" do
     one   = stub 'one',   :to_pson_data_hash => "one_resource",   :ref => 'Foo[one]'
     two   = stub 'two',   :to_pson_data_hash => "two_resource",   :ref => 'Foo[two]'
     three = stub 'three', :to_pson_data_hash => "three_resource", :ref => 'Foo[three]'
 
     @catalog.add_edge(one, two)
     @catalog.add_edge(two, three)
 
     @catalog.edge(one, two  ).expects(:to_pson_data_hash).returns "one_two_pson"
     @catalog.edge(two, three).expects(:to_pson_data_hash).returns "two_three_pson"
 
     PSON.parse(@catalog.to_pson,:create_additions => false)['data']['edges'].sort.should == %w{one_two_pson two_three_pson}.sort
   end
 end
 
 describe Puppet::Resource::Catalog, "when converting from pson" do
   confine "Missing 'pson' library" => Puppet.features.pson?
 
   def pson_result_should
     Puppet::Resource::Catalog.expects(:new).with { |hash| yield hash }
   end
 
   before do
     @data = {
       'name' => "myhost"
     }
     @pson = {
       'document_type' => 'Puppet::Resource::Catalog',
       'data' => @data,
       'metadata' => {}
     }
 
     @catalog = Puppet::Resource::Catalog.new("myhost")
     Puppet::Resource::Catalog.stubs(:new).returns @catalog
   end
 
   it "should be extended with the PSON utility module" do
     Puppet::Resource::Catalog.singleton_class.ancestors.should be_include(Puppet::Util::Pson)
   end
 
   it "should create it with the provided name" do
     Puppet::Resource::Catalog.expects(:new).with('myhost').returns @catalog
     PSON.parse @pson.to_pson
   end
 
   it "should set the provided version on the catalog if one is set" do
     @data['version'] = 50
     PSON.parse @pson.to_pson
     @catalog.version.should == @data['version']
   end
 
   it "should set any provided tags on the catalog" do
     @data['tags'] = %w{one two}
     PSON.parse @pson.to_pson
     @catalog.tags.should == @data['tags']
   end
 
   it "should set any provided classes on the catalog" do
     @data['classes'] = %w{one two}
     PSON.parse @pson.to_pson
     @catalog.classes.should == @data['classes']
   end
 
   it 'should convert the resources list into resources and add each of them' do
     @data['resources'] = [Puppet::Resource.new(:file, "/foo"), Puppet::Resource.new(:file, "/bar")]
 
     @catalog.expects(:add_resource).times(2).with { |res| res.type == "File" }
     PSON.parse @pson.to_pson
   end
 
   it 'should convert resources even if they do not include "type" information' do
     @data['resources'] = [Puppet::Resource.new(:file, "/foo")]
 
     @data['resources'][0].expects(:to_pson).returns '{"title":"/foo","tags":["file"],"type":"File"}'
 
     @catalog.expects(:add_resource).with { |res| res.type == "File" }
 
     PSON.parse @pson.to_pson
   end
 
   it 'should convert the edges list into edges and add each of them' do
     one = Puppet::Relationship.new("osource", "otarget", :event => "one", :callback => "refresh")
     two = Puppet::Relationship.new("tsource", "ttarget", :event => "two", :callback => "refresh")
 
     @data['edges'] = [one, two]
 
     @catalog.stubs(:resource).returns("eh")
 
     @catalog.expects(:add_edge).with { |edge| edge.event == "one" }
     @catalog.expects(:add_edge).with { |edge| edge.event == "two" }
 
     PSON.parse @pson.to_pson
   end
 
   it "should be able to convert relationships that do not include 'type' information" do
     one = Puppet::Relationship.new("osource", "otarget", :event => "one", :callback => "refresh")
     one.expects(:to_pson).returns "{\"event\":\"one\",\"callback\":\"refresh\",\"source\":\"osource\",\"target\":\"otarget\"}"
 
     @data['edges'] = [one]
 
     @catalog.stubs(:resource).returns("eh")
 
     @catalog.expects(:add_edge).with { |edge| edge.event == "one" }
 
     PSON.parse @pson.to_pson
   end
 
   it "should set the source and target for each edge to the actual resource" do
     edge = Puppet::Relationship.new("source", "target")
 
     @data['edges'] = [edge]
 
     @catalog.expects(:resource).with("source").returns("source_resource")
     @catalog.expects(:resource).with("target").returns("target_resource")
 
     @catalog.expects(:add_edge).with { |edge| edge.source == "source_resource" and edge.target == "target_resource" }
 
     PSON.parse @pson.to_pson
   end
 
   it "should fail if the source resource cannot be found" do
     edge = Puppet::Relationship.new("source", "target")
 
     @data['edges'] = [edge]
 
     @catalog.expects(:resource).with("source").returns(nil)
     @catalog.stubs(:resource).with("target").returns("target_resource")
 
     lambda { PSON.parse @pson.to_pson }.should raise_error(ArgumentError)
   end
 
   it "should fail if the target resource cannot be found" do
     edge = Puppet::Relationship.new("source", "target")
 
     @data['edges'] = [edge]
 
     @catalog.stubs(:resource).with("source").returns("source_resource")
     @catalog.expects(:resource).with("target").returns(nil)
 
     lambda { PSON.parse @pson.to_pson }.should raise_error(ArgumentError)
   end
 
   describe "#title_key_for_ref" do
     it "should parse a resource ref string into a pair" do
       @catalog.title_key_for_ref("Title[name]").should == ["Title", "name"]
     end
     it "should parse a resource ref string into a pair, even if there's a newline inside the name" do
       @catalog.title_key_for_ref("Title[na\nme]").should == ["Title", "na\nme"]
     end
   end
 end
diff --git a/spec/unit/resource/type_collection_spec.rb b/spec/unit/resource/type_collection_spec.rb
index 45fc05da0..577aea42b 100644
--- a/spec/unit/resource/type_collection_spec.rb
+++ b/spec/unit/resource/type_collection_spec.rb
@@ -1,440 +1,467 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/resource/type_collection'
 require 'puppet/resource/type'
 
 describe Puppet::Resource::TypeCollection do
   before do
     @instance = Puppet::Resource::Type.new(:hostclass, "foo")
     @code = Puppet::Resource::TypeCollection.new("env")
   end
 
   it "should require an environment at initialization" do
     env = Puppet::Node::Environment.new("testing")
     Puppet::Resource::TypeCollection.new(env).environment.should equal(env)
   end
 
   it "should convert the environment into an environment instance if a string is provided" do
     env = Puppet::Node::Environment.new("testing")
     Puppet::Resource::TypeCollection.new("testing").environment.should equal(env)
   end
 
   it "should create a 'loader' at initialization" do
     Puppet::Resource::TypeCollection.new("testing").loader.should be_instance_of(Puppet::Parser::TypeLoader)
   end
 
   it "should be able to add a resource type" do
     Puppet::Resource::TypeCollection.new("env").should respond_to(:add)
   end
 
   it "should consider '<<' to be an alias to 'add' but should return self" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.expects(:add).with "foo"
     loader.expects(:add).with "bar"
     loader << "foo" << "bar"
   end
 
   it "should set itself as the code collection for added resource types" do
     loader = Puppet::Resource::TypeCollection.new("env")
 
     node = Puppet::Resource::Type.new(:node, "foo")
 
     @code.add(node)
     @code.node("foo").should equal(node)
 
     node.resource_type_collection.should equal(@code)
   end
 
   it "should store node resource types as nodes" do
     node = Puppet::Resource::Type.new(:node, "foo")
 
     @code.add(node)
     @code.node("foo").should equal(node)
   end
 
   it "should store hostclasses as hostclasses" do
     klass = Puppet::Resource::Type.new(:hostclass, "foo")
 
     @code.add(klass)
     @code.hostclass("foo").should equal(klass)
   end
 
   it "should store definitions as definitions" do
     define = Puppet::Resource::Type.new(:definition, "foo")
 
     @code.add(define)
     @code.definition("foo").should equal(define)
   end
 
   it "should merge new classes with existing classes of the same name" do
     loader = Puppet::Resource::TypeCollection.new("env")
     first = Puppet::Resource::Type.new(:hostclass, "foo")
     second = Puppet::Resource::Type.new(:hostclass, "foo")
     loader.add first
     first.expects(:merge).with(second)
     loader.add(second)
   end
 
   it "should remove all nodes, classes, and definitions when cleared" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.add Puppet::Resource::Type.new(:hostclass, "class")
     loader.add Puppet::Resource::Type.new(:definition, "define")
     loader.add Puppet::Resource::Type.new(:node, "node")
 
     loader.clear
     loader.hostclass("class").should be_nil
     loader.definition("define").should be_nil
     loader.node("node").should be_nil
   end
 
   describe "when looking up names" do
     before do
       @type = Puppet::Resource::Type.new(:hostclass, "ns::klass")
     end
 
     it "should support looking up with multiple namespaces" do
       @code.add @type
       @code.find_hostclass(%w{boo baz ns}, "klass").should equal(@type)
     end
 
     it "should not attempt to import anything when the type is already defined" do
       @code.add @type
       @code.loader.expects(:import).never
       @code.find_hostclass(%w{ns}, "klass").should equal(@type)
     end
 
     describe "that need to be loaded" do
       it "should use the loader to load the files" do
         @code.loader.expects(:load_until).with(["ns"], "klass")
         @code.find_or_load(["ns"], "klass", :hostclass)
       end
 
       it "should downcase the name and downcase and array-fy the namespaces before passing to the loader" do
         @code.loader.expects(:load_until).with(["ns"], "klass")
         @code.find_or_load("Ns", "Klass", :hostclass)
       end
 
       it "should attempt to find the type when the loader yields" do
         @code.loader.expects(:load_until).yields
         @code.expects(:find).with(["ns"], "klass", :hostclass).times(2).returns(false).then.returns(true)
         @code.find_or_load("ns", "klass", :hostclass)
       end
 
       it "should return the result of 'load_until'" do
         @code.loader.expects(:load_until).returns "foo"
         @code.find_or_load("Ns", "Klass", :hostclass).should == "foo"
       end
 
       it "should return nil if the name isn't found" do
         @code.stubs(:load_until).returns(nil)
         @code.find_or_load("Ns", "Klass", :hostclass).should be_nil
       end
     end
   end
 
   %w{hostclass node definition}.each do |data|
     before do
       @instance = Puppet::Resource::Type.new(data, "foo")
     end
 
     it "should have a method for adding a #{data}" do
       Puppet::Resource::TypeCollection.new("env").should respond_to("add_#{data}")
     end
 
     it "should use the name of the instance to add it" do
       loader = Puppet::Resource::TypeCollection.new("env")
       loader.send("add_#{data}", @instance)
       loader.send(data, @instance.name).should equal(@instance)
     end
 
     unless data == "hostclass"
       it "should fail to add a #{data} when one already exists" do
         loader = Puppet::Resource::TypeCollection.new("env")
         loader.add @instance
         lambda { loader.add(@instance) }.should raise_error(Puppet::ParseError)
       end
     end
 
     it "should return the added #{data}" do
       loader = Puppet::Resource::TypeCollection.new("env")
 
       loader.add(@instance).should equal(@instance)
     end
 
     it "should be able to retrieve #{data} by name" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(data, "bar")
       loader.add instance
       loader.send(data, "bar").should equal(instance)
     end
 
     it "should retrieve #{data} insensitive to case" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(data, "Bar")
       loader.add instance
       loader.send(data, "bAr").should equal(instance)
     end
 
     it "should return nil when asked for a #{data} that has not been added" do
       Puppet::Resource::TypeCollection.new("env").send(data, "foo").should be_nil
     end
 
     it "should be able to retrieve all #{data}s" do
       plurals = { "hostclass" => "hostclasses", "node" => "nodes", "definition" => "definitions" }
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(data, "foo")
       loader.add instance
       loader.send(plurals[data]).should == { "foo" => instance }
     end
   end
 
   describe "when finding a qualified instance" do
     it "should return any found instance if the instance name is fully qualified" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar")
       loader.add instance
       loader.find("namespace", "::foo::bar", :hostclass).should equal(instance)
     end
 
     it "should return nil if the instance name is fully qualified and no such instance exists" do
       loader = Puppet::Resource::TypeCollection.new("env")
       loader.find("namespace", "::foo::bar", :hostclass).should be_nil
     end
 
     it "should be able to find classes in the base namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo")
       loader.add instance
       loader.find("", "foo", :hostclass).should equal(instance)
     end
 
     it "should return the partially qualified object if it exists in a provided namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar::baz")
       loader.add instance
       loader.find("foo", "bar::baz", :hostclass).should equal(instance)
     end
 
     it "should be able to find partially qualified objects in any of the provided namespaces" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar::baz")
       loader.add instance
       loader.find(["nons", "foo", "otherns"], "bar::baz", :hostclass).should equal(instance)
     end
 
     it "should return the unqualified object if it exists in a provided namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar")
       loader.add instance
       loader.find("foo", "bar", :hostclass).should equal(instance)
     end
 
     it "should return the unqualified object if it exists in the parent namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar")
       loader.add instance
       loader.find("foo::bar::baz", "bar", :hostclass).should equal(instance)
     end
 
     it "should should return the partially qualified object if it exists in the parent namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar::baz")
       loader.add instance
       loader.find("foo::bar", "bar::baz", :hostclass).should equal(instance)
     end
 
     it "should return the qualified object if it exists in the root namespace" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar::baz")
       loader.add instance
       loader.find("foo::bar", "foo::bar::baz", :hostclass).should equal(instance)
     end
 
     it "should return nil if the object cannot be found" do
       loader = Puppet::Resource::TypeCollection.new("env")
       instance = Puppet::Resource::Type.new(:hostclass, "foo::bar::baz")
       loader.add instance
       loader.find("foo::bar", "eh", :hostclass).should be_nil
     end
+
+    describe "when topscope has a class that has the same name as a local class" do
+      before do
+        @loader = Puppet::Resource::TypeCollection.new("env")
+        [ "foo::bar", "bar" ].each do |name|
+          @loader.add Puppet::Resource::Type.new(:hostclass, name)
+        end
+      end
+
+      it "should favor the local class, if the name is unqualified" do
+        @loader.find("foo", "bar",   :hostclass).name.should == 'foo::bar'
+      end
+
+      it "should only look in the topclass, if the name is qualified" do
+        @loader.find("foo", "::bar", :hostclass).name.should == 'bar'
+      end
+
+    end
+    
+    it "should not look in the local scope for classes when the name is qualified" do
+        @loader = Puppet::Resource::TypeCollection.new("env")
+        @loader.add Puppet::Resource::Type.new(:hostclass, "foo::bar")
+
+        @loader.find("foo", "::bar", :hostclass).should == nil
+    end
+
   end
 
   it "should use the generic 'find' method with an empty namespace to find nodes" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.expects(:find).with("", "bar", :node)
     loader.find_node(stub("ignored"), "bar")
   end
 
   it "should use the 'find_or_load' method to find hostclasses" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.expects(:find_or_load).with("foo", "bar", :hostclass)
     loader.find_hostclass("foo", "bar")
   end
 
   it "should use the 'find_or_load' method to find definitions" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.expects(:find_or_load).with("foo", "bar", :definition)
     loader.find_definition("foo", "bar")
   end
 
   it "should indicate whether any nodes are defined" do
     loader = Puppet::Resource::TypeCollection.new("env")
     loader.add_node(Puppet::Resource::Type.new(:node, "foo"))
     loader.should be_nodes
   end
 
   it "should indicate whether no nodes are defined" do
     Puppet::Resource::TypeCollection.new("env").should_not be_nodes
   end
 
   describe "when finding nodes" do
     before :each do
       @loader = Puppet::Resource::TypeCollection.new("env")
     end
 
     it "should return any node whose name exactly matches the provided node name" do
       node = Puppet::Resource::Type.new(:node, "foo")
       @loader << node
 
       @loader.node("foo").should equal(node)
     end
 
     it "should return the first regex node whose regex matches the provided node name" do
       node1 = Puppet::Resource::Type.new(:node, /\w/)
       node2 = Puppet::Resource::Type.new(:node, /\d/)
       @loader << node1 << node2
 
       @loader.node("foo10").should equal(node1)
     end
 
     it "should preferentially return a node whose name is string-equal over returning a node whose regex matches a provided name" do
       node1 = Puppet::Resource::Type.new(:node, /\w/)
       node2 = Puppet::Resource::Type.new(:node, "foo")
       @loader << node1 << node2
 
       @loader.node("foo").should equal(node2)
     end
   end
 
   describe "when managing files" do
     before do
       @loader = Puppet::Resource::TypeCollection.new("env")
       Puppet::Util::LoadedFile.stubs(:new).returns stub("watched_file")
     end
 
     it "should have a method for specifying a file should be watched" do
       @loader.should respond_to(:watch_file)
     end
 
     it "should have a method for determining if a file is being watched" do
       @loader.watch_file("/foo/bar")
       @loader.should be_watching_file("/foo/bar")
     end
 
     it "should use LoadedFile to watch files" do
       Puppet::Util::LoadedFile.expects(:new).with("/foo/bar").returns stub("watched_file")
       @loader.watch_file("/foo/bar")
     end
 
     it "should be considered stale if any files have changed" do
       file1 = stub 'file1', :changed? => false
       file2 = stub 'file2', :changed? => true
       Puppet::Util::LoadedFile.expects(:new).times(2).returns(file1).then.returns(file2)
       @loader.watch_file("/foo/bar")
       @loader.watch_file("/other/bar")
 
       @loader.should be_stale
     end
 
     it "should not be considered stable if no files have changed" do
       file1 = stub 'file1', :changed? => false
       file2 = stub 'file2', :changed? => false
       Puppet::Util::LoadedFile.expects(:new).times(2).returns(file1).then.returns(file2)
       @loader.watch_file("/foo/bar")
       @loader.watch_file("/other/bar")
 
       @loader.should_not be_stale
     end
   end
 
   describe "when performing initial import" do
     before do
       @parser = stub 'parser', :file= => nil, :string => nil, :parse => nil
       Puppet::Parser::Parser.stubs(:new).returns @parser
       @code = Puppet::Resource::TypeCollection.new("env")
     end
 
     it "should create a new parser instance" do
       Puppet::Parser::Parser.expects(:new).returns @parser
       @code.perform_initial_import
     end
 
     it "should set the parser's string to the 'code' setting and parse if code is available" do
       Puppet.settings[:code] = "my code"
       @parser.expects(:string=).with "my code"
       @parser.expects(:parse)
       @code.perform_initial_import
     end
 
     it "should set the parser's file to the 'manifest' setting and parse if no code is available and the manifest is available" do
       File.stubs(:expand_path).with("/my/file").returns "/my/file"
       File.expects(:exist?).with("/my/file").returns true
       Puppet.settings[:manifest] = "/my/file"
       @parser.expects(:file=).with "/my/file"
       @parser.expects(:parse)
       @code.perform_initial_import
     end
 
     it "should not attempt to load a manifest if none is present" do
       File.stubs(:expand_path).with("/my/file").returns "/my/file"
       File.expects(:exist?).with("/my/file").returns false
       Puppet.settings[:manifest] = "/my/file"
       @parser.expects(:file=).never
       @parser.expects(:parse).never
       @code.perform_initial_import
     end
 
     it "should fail helpfully if there is an error importing" do
       File.stubs(:exist?).returns true
       @parser.expects(:parse).raises ArgumentError
       lambda { @code.perform_initial_import }.should raise_error(Puppet::Error)
     end
 
     it "should not do anything if the ignore_import settings is set" do
       Puppet.settings[:ignoreimport] = true
       @parser.expects(:string=).never
       @parser.expects(:file=).never
       @parser.expects(:parse).never
       @code.perform_initial_import
     end
   end
 
   describe "when determining the configuration version" do
     before do
       @code = Puppet::Resource::TypeCollection.new("env")
     end
 
     it "should default to the current time" do
       time = Time.now
 
       Time.stubs(:now).returns time
       @code.version.should == time.to_i
     end
 
     it "should use the output of the environment's config_version setting if one is provided" do
       @code.environment.stubs(:[]).with(:config_version).returns("/my/foo")
 
       Puppet::Util.expects(:execute).with(["/my/foo"]).returns "output\n"
       @code.version.should == "output"
     end
 
     it "should raise a puppet parser error if executing config_version fails" do
       @code.environment.stubs(:[]).with(:config_version).returns("test")
       Puppet::Util.expects(:execute).raises(Puppet::ExecutionFailure.new("msg"))
 
       lambda { @code.version }.should raise_error(Puppet::ParseError)
     end
 
   end
+
 end
diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb
index 0ef4a5166..4d3942c5c 100755
--- a/spec/unit/resource/type_spec.rb
+++ b/spec/unit/resource/type_spec.rb
@@ -1,722 +1,723 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/resource/type'
 
 describe Puppet::Resource::Type do
   it "should have a 'name' attribute" do
     Puppet::Resource::Type.new(:hostclass, "foo").name.should == "foo"
   end
 
   [:code, :doc, :line, :file, :resource_type_collection, :ruby_code].each do |attr|
     it "should have a '#{attr}' attribute" do
       type = Puppet::Resource::Type.new(:hostclass, "foo")
       type.send(attr.to_s + "=", "yay")
       type.send(attr).should == "yay"
     end
   end
 
   [:hostclass, :node, :definition].each do |type|
     it "should know when it is a #{type}" do
       Puppet::Resource::Type.new(type, "foo").send("#{type}?").should be_true
     end
   end
 
   it "should indirect 'resource_type'" do
     Puppet::Resource::Type.indirection.name.should == :resource_type
   end
 
   it "should default to 'parser' for its terminus class" do
     Puppet::Resource::Type.indirection.terminus_class.should == :parser
   end
 
   describe "when converting to json" do
     before do
       @type = Puppet::Resource::Type.new(:hostclass, "foo")
     end
 
     def from_json(json)
       Puppet::Resource::Type.from_pson(json)
     end
 
     def double_convert
       Puppet::Resource::Type.from_pson(PSON.parse(@type.to_pson))
     end
 
     it "should include the name and type" do
       double_convert.name.should == @type.name
       double_convert.type.should == @type.type
     end
 
     it "should include any arguments" do
       @type.set_arguments("one" => nil, "two" => "foo")
 
       double_convert.arguments.should == {"one" => nil, "two" => "foo"}
     end
 
     it "should include any extra attributes" do
       @type.file = "/my/file"
       @type.line = 50
 
       double_convert.file.should == "/my/file"
       double_convert.line.should == 50
     end
   end
 
   describe "when a node"  do
     it "should allow a regex as its name" do
       lambda { Puppet::Resource::Type.new(:node, /foo/) }.should_not raise_error
     end
 
     it "should allow a AST::HostName instance as its name" do
       regex = Puppet::Parser::AST::Regex.new(:value => /foo/)
       name = Puppet::Parser::AST::HostName.new(:value => regex)
       lambda { Puppet::Resource::Type.new(:node, name) }.should_not raise_error
     end
 
     it "should match against the regexp in the AST::HostName when a HostName instance is provided" do
       regex = Puppet::Parser::AST::Regex.new(:value => /\w/)
       name = Puppet::Parser::AST::HostName.new(:value => regex)
       node = Puppet::Resource::Type.new(:node, name)
 
       node.match("foo").should be_true
     end
 
     it "should return the value of the hostname if provided a string-form AST::HostName instance as the name" do
       name = Puppet::Parser::AST::HostName.new(:value => "foo")
       node = Puppet::Resource::Type.new(:node, name)
 
       node.name.should == "foo"
     end
 
     describe "and the name is a regex" do
       it "should have a method that indicates that this is the case" do
         Puppet::Resource::Type.new(:node, /w/).should be_name_is_regex
       end
 
       it "should set its namespace to ''" do
         Puppet::Resource::Type.new(:node, /w/).namespace.should == ""
       end
 
       it "should return the regex converted to a string when asked for its name" do
         Puppet::Resource::Type.new(:node, /ww/).name.should == "ww"
       end
 
       it "should downcase the regex when returning the name as a string" do
         Puppet::Resource::Type.new(:node, /W/).name.should == "w"
       end
 
       it "should remove non-alpha characters when returning the name as a string" do
         Puppet::Resource::Type.new(:node, /w*w/).name.should_not include("*")
       end
 
       it "should remove leading dots when returning the name as a string" do
         Puppet::Resource::Type.new(:node, /.ww/).name.should_not =~ /^\./
       end
 
       it "should have a method for matching its regex name against a provided name" do
         Puppet::Resource::Type.new(:node, /.ww/).should respond_to(:match)
       end
 
       it "should return true when its regex matches the provided name" do
         Puppet::Resource::Type.new(:node, /\w/).match("foo").should be_true
       end
 
       it "should return false when its regex does not match the provided name" do
         (!!Puppet::Resource::Type.new(:node, /\d/).match("foo")).should be_false
       end
 
       it "should return true when its name, as a string, is matched against an equal string" do
         Puppet::Resource::Type.new(:node, "foo").match("foo").should be_true
       end
 
       it "should return false when its name is matched against an unequal string" do
         Puppet::Resource::Type.new(:node, "foo").match("bar").should be_false
       end
 
       it "should match names insensitive to case" do
         Puppet::Resource::Type.new(:node, "fOo").match("foO").should be_true
       end
     end
 
     it "should return the name converted to a string when the name is not a regex" do
       pending "Need to define LoadedCode behaviour first"
       name = Puppet::Parser::AST::HostName.new(:value => "foo")
       Puppet::Resource::Type.new(:node, name).name.should == "foo"
     end
 
     it "should return the name converted to a string when the name is a regex" do
       pending "Need to define LoadedCode behaviour first"
       name = Puppet::Parser::AST::HostName.new(:value => /regex/)
       Puppet::Resource::Type.new(:node, name).name.should == /regex/.to_s
     end
 
     it "should mark any created scopes as a node scope" do
       pending "Need to define LoadedCode behaviour first"
       name = Puppet::Parser::AST::HostName.new(:value => /regex/)
       Puppet::Resource::Type.new(:node, name).name.should == /regex/.to_s
     end
   end
 
   describe "when initializing" do
     it "should require a resource super type" do
       Puppet::Resource::Type.new(:hostclass, "foo").type.should == :hostclass
     end
 
     it "should fail if provided an invalid resource super type" do
       lambda { Puppet::Resource::Type.new(:nope, "foo") }.should raise_error(ArgumentError)
     end
 
     it "should set its name to the downcased, stringified provided name" do
       Puppet::Resource::Type.new(:hostclass, "Foo::Bar".intern).name.should == "foo::bar"
     end
 
     it "should set its namespace to the downcased, stringified qualified name for classes" do
       Puppet::Resource::Type.new(:hostclass, "Foo::Bar::Baz".intern).namespace.should == "foo::bar::baz"
     end
 
     [:definition, :node].each do |type|
       it "should set its namespace to the downcased, stringified qualified portion of the name for #{type}s" do
         Puppet::Resource::Type.new(type, "Foo::Bar::Baz".intern).namespace.should == "foo::bar"
       end
     end
 
     %w{code line file doc}.each do |arg|
       it "should set #{arg} if provided" do
         type = Puppet::Resource::Type.new(:hostclass, "foo", arg.to_sym => "something")
         type.send(arg).should == "something"
       end
     end
 
     it "should set any provided arguments with the keys as symbols" do
       type = Puppet::Resource::Type.new(:hostclass, "foo", :arguments => {:foo => "bar", :baz => "biz"})
       type.should be_valid_parameter("foo")
       type.should be_valid_parameter("baz")
     end
 
     it "should set any provided arguments with they keys as strings" do
       type = Puppet::Resource::Type.new(:hostclass, "foo", :arguments => {"foo" => "bar", "baz" => "biz"})
       type.should be_valid_parameter(:foo)
       type.should be_valid_parameter(:baz)
     end
 
     it "should function if provided no arguments" do
       type = Puppet::Resource::Type.new(:hostclass, "foo")
       type.should_not be_valid_parameter(:foo)
     end
   end
 
   describe "when testing the validity of an attribute" do
     it "should return true if the parameter was typed at initialization" do
       Puppet::Resource::Type.new(:hostclass, "foo", :arguments => {"foo" => "bar"}).should be_valid_parameter("foo")
     end
 
     it "should return true if it is a metaparam" do
       Puppet::Resource::Type.new(:hostclass, "foo").should be_valid_parameter("require")
     end
 
     it "should return true if the parameter is named 'name'" do
       Puppet::Resource::Type.new(:hostclass, "foo").should be_valid_parameter("name")
     end
 
     it "should return false if it is not a metaparam and was not provided at initialization" do
       Puppet::Resource::Type.new(:hostclass, "foo").should_not be_valid_parameter("yayness")
     end
   end
 
   describe "when creating a subscope" do
     before do
       @scope = stub 'scope', :newscope => nil
       @resource = stub 'resource'
       @type = Puppet::Resource::Type.new(:hostclass, "foo")
     end
 
     it "should return a new scope created with the provided scope as the parent" do
       @scope.expects(:newscope).returns "foo"
       @type.subscope(@scope, @resource).should == "foo"
     end
 
     it "should set the source as itself" do
       @scope.expects(:newscope).with { |args| args[:source] == @type }
       @type.subscope(@scope, @resource)
     end
 
     it "should set the scope's namespace to its namespace" do
       @type.expects(:namespace).returns "yayness"
       @scope.expects(:newscope).with { |args| args[:namespace] == "yayness" }
       @type.subscope(@scope, @resource)
     end
 
     it "should set the scope's resource to the provided resource" do
       @scope.expects(:newscope).with { |args| args[:resource] == @resource }
       @type.subscope(@scope, @resource)
     end
   end
 
   describe "when setting its parameters in the scope" do
     before do
       @scope = Puppet::Parser::Scope.new(:compiler => stub("compiler", :environment => Puppet::Node::Environment.new), :source => stub("source"))
       @resource = Puppet::Parser::Resource.new(:foo, "bar", :scope => @scope)
       @type = Puppet::Resource::Type.new(:hostclass, "foo")
     end
 
     it "should set each of the resource's parameters as variables in the scope" do
       @type.set_arguments :foo => nil, :boo => nil
       @resource[:foo] = "bar"
       @resource[:boo] = "baz"
 
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("foo").should == "bar"
       @scope.lookupvar("boo").should == "baz"
     end
 
     it "should set the variables as strings" do
       @type.set_arguments :foo => nil
       @resource[:foo] = "bar"
 
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("foo").should == "bar"
     end
 
     it "should fail if any of the resource's parameters are not valid attributes" do
       @type.set_arguments :foo => nil
       @resource[:boo] = "baz"
 
       lambda { @type.set_resource_parameters(@resource, @scope) }.should raise_error(Puppet::ParseError)
     end
 
     it "should evaluate and set its default values as variables for parameters not provided by the resource" do
       @type.set_arguments :foo => stub("value", :safeevaluate => "something")
       @type.set_resource_parameters(@resource, @scope)
       @scope.lookupvar("foo").should == "something"
     end
 
     it "should set all default values as parameters in the resource" do
       @type.set_arguments :foo => stub("value", :safeevaluate => "something")
 
       @type.set_resource_parameters(@resource, @scope)
 
       @resource[:foo].should == "something"
     end
 
     it "should fail if the resource does not provide a value for a required argument" do
       @type.set_arguments :foo => nil
       @resource.expects(:to_hash).returns({})
 
       lambda { @type.set_resource_parameters(@resource, @scope) }.should raise_error(Puppet::ParseError)
     end
 
     it "should set the resource's title as a variable if not otherwise provided" do
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("title").should == "bar"
     end
 
     it "should set the resource's name as a variable if not otherwise provided" do
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("name").should == "bar"
     end
 
     it "should set its module name in the scope if available" do
       @type.module_name = "mymod"
 
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("module_name").should == "mymod"
     end
 
     it "should set its caller module name in the scope if available" do
       @scope.expects(:parent_module_name).returns "mycaller"
 
       @type.set_resource_parameters(@resource, @scope)
 
       @scope.lookupvar("caller_module_name").should == "mycaller"
     end
   end
 
   describe "when describing and managing parent classes" do
     before do
       @code = Puppet::Resource::TypeCollection.new("env")
       @parent = Puppet::Resource::Type.new(:hostclass, "bar")
       @code.add @parent
 
       @child = Puppet::Resource::Type.new(:hostclass, "foo", :parent => "bar")
       @code.add @child
 
       @env   = stub "environment", :known_resource_types => @code
       @scope = stub "scope", :environment => @env, :namespaces => [""]
     end
 
     it "should be able to define a parent" do
       Puppet::Resource::Type.new(:hostclass, "foo", :parent => "bar")
     end
 
     it "should use the code collection to find the parent resource type" do
       @child.parent_type(@scope).should equal(@parent)
     end
 
     it "should be able to find parent nodes" do
       parent = Puppet::Resource::Type.new(:node, "bar")
       @code.add parent
       child = Puppet::Resource::Type.new(:node, "foo", :parent => "bar")
       @code.add child
 
       child.parent_type(@scope).should equal(parent)
     end
 
     it "should cache a reference to the parent type" do
-      @code.expects(:hostclass).once.with("bar").returns @parent
+      @code.stubs(:hostclass).with("foo::bar").returns nil
+      @code.expects(:hostclass).with("bar").once.returns @parent
       @child.parent_type(@scope)
       @child.parent_type
     end
 
     it "should correctly state when it is another type's child" do
       @child.parent_type(@scope)
       @child.should be_child_of(@parent)
     end
 
     it "should be considered the child of a parent's parent" do
       @grandchild = Puppet::Resource::Type.new(:hostclass, "baz", :parent => "foo")
       @code.add @grandchild
 
       @child.parent_type(@scope)
       @grandchild.parent_type(@scope)
 
       @grandchild.should be_child_of(@parent)
     end
 
     it "should correctly state when it is not another type's child" do
       @notchild = Puppet::Resource::Type.new(:hostclass, "baz")
       @code.add @notchild
 
       @notchild.should_not be_child_of(@parent)
     end
   end
 
   describe "when evaluating its code" do
     before do
       @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
       @scope = Puppet::Parser::Scope.new :compiler => @compiler
       @resource = Puppet::Parser::Resource.new(:foo, "yay", :scope => @scope)
 
       # This is so the internal resource lookup works, yo.
       @compiler.catalog.add_resource @resource
 
       @known_resource_types = stub 'known_resource_types'
       @resource.stubs(:known_resource_types).returns @known_resource_types
       @type = Puppet::Resource::Type.new(:hostclass, "foo")
     end
 
     it "should set all of its parameters in a subscope" do
       subscope = stub 'subscope', :compiler => @compiler
       @type.expects(:subscope).with(@scope, @resource).returns subscope
       @type.expects(:set_resource_parameters).with(@resource, subscope)
 
       @type.evaluate_code(@resource)
     end
 
     it "should not create a subscope for the :main class" do
       @resource.stubs(:title).returns(:main)
       @type.expects(:subscope).never
       @type.expects(:set_resource_parameters).with(@resource, @scope)
 
       @type.evaluate_code(@resource)
     end
 
     it "should store the class scope" do
       @type.evaluate_code(@resource)
       @scope.class_scope(@type).should be_instance_of(@scope.class)
     end
 
     it "should still create a scope but not store it if the type is a definition" do
       @type = Puppet::Resource::Type.new(:definition, "foo")
       @type.evaluate_code(@resource)
       @scope.class_scope(@type).should be_nil
     end
 
     it "should evaluate the AST code if any is provided" do
       code = stub 'code'
       @type.stubs(:code).returns code
       @type.stubs(:subscope).returns stub_everything("subscope", :compiler => @compiler)
       code.expects(:safeevaluate).with @type.subscope
 
       @type.evaluate_code(@resource)
     end
 
     describe "and ruby code is provided" do
       it "should create a DSL Resource API and evaluate it" do
         @type.stubs(:ruby_code).returns(proc { "foo" })
         @api = stub 'api'
         Puppet::DSL::ResourceAPI.expects(:new).with { |res, scope, code| code == @type.ruby_code }.returns @api
         @api.expects(:evaluate)
 
         @type.evaluate_code(@resource)
       end
     end
 
     it "should noop if there is no code" do
       @type.expects(:code).returns nil
 
       @type.evaluate_code(@resource)
     end
 
     describe "and it has a parent class" do
       before do
         @parent_type = Puppet::Resource::Type.new(:hostclass, "parent")
         @type.parent = "parent"
         @parent_resource = Puppet::Parser::Resource.new(:class, "parent", :scope => @scope)
 
         @compiler.add_resource @scope, @parent_resource
 
         @type.resource_type_collection = @scope.known_resource_types
         @type.resource_type_collection.add @parent_type
       end
 
       it "should evaluate the parent's resource" do
         @type.parent_type(@scope)
         
         @type.evaluate_code(@resource)
 
         @scope.class_scope(@parent_type).should_not be_nil
       end
 
       it "should not evaluate the parent's resource if it has already been evaluated" do
         @parent_resource.evaluate
         
         @type.parent_type(@scope)
 
         @parent_resource.expects(:evaluate).never
 
         @type.evaluate_code(@resource)
       end
 
       it "should use the parent's scope as its base scope" do
         @type.parent_type(@scope)
 
         @type.evaluate_code(@resource)
 
         @scope.class_scope(@type).parent.object_id.should == @scope.class_scope(@parent_type).object_id
       end
     end
 
     describe "and it has a parent node" do
       before do
         @type = Puppet::Resource::Type.new(:node, "foo")
         @parent_type = Puppet::Resource::Type.new(:node, "parent")
         @type.parent = "parent"
         @parent_resource = Puppet::Parser::Resource.new(:node, "parent", :scope => @scope)
 
         @compiler.add_resource @scope, @parent_resource
 
         @type.resource_type_collection = @scope.known_resource_types
         @type.resource_type_collection.stubs(:node).with("parent").returns(@parent_type)
         @type.resource_type_collection.stubs(:node).with("Parent").returns(@parent_type)
       end
 
       it "should evaluate the parent's resource" do
         @type.parent_type(@scope)
 
         @type.evaluate_code(@resource)
 
         @scope.class_scope(@parent_type).should_not be_nil
       end
 
       it "should not evaluate the parent's resource if it has already been evaluated" do
         @parent_resource.evaluate
         
         @type.parent_type(@scope)
 
         @parent_resource.expects(:evaluate).never
 
         @type.evaluate_code(@resource)
       end
 
       it "should use the parent's scope as its base scope" do
         @type.parent_type(@scope)
 
         @type.evaluate_code(@resource)
 
         @scope.class_scope(@type).parent.object_id.should == @scope.class_scope(@parent_type).object_id
       end
     end
   end
 
   describe "when creating a resource" do
     before do
       @node = Puppet::Node.new("foo", :environment => 'env')
       @compiler = Puppet::Parser::Compiler.new(@node)
       @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
 
       @top = Puppet::Resource::Type.new :hostclass, "top"
       @middle = Puppet::Resource::Type.new :hostclass, "middle", :parent => "top"
 
       @code = Puppet::Resource::TypeCollection.new("env")
       @code.add @top
       @code.add @middle
       
       @node.environment.stubs(:known_resource_types).returns(@code)
     end
 
     it "should create a resource instance" do
       @top.mk_plain_resource(@scope).should be_instance_of(Puppet::Parser::Resource)
     end
 
     it "should set its resource type to 'class' when it is a hostclass" do
       Puppet::Resource::Type.new(:hostclass, "top").mk_plain_resource(@scope).type.should == "Class"
     end
 
     it "should set its resource type to 'node' when it is a node" do
       Puppet::Resource::Type.new(:node, "top").mk_plain_resource(@scope).type.should == "Node"
     end
 
     it "should fail when it is a definition" do
       lambda { Puppet::Resource::Type.new(:definition, "top").mk_plain_resource(@scope) }.should raise_error(ArgumentError)
     end
 
     it "should add the created resource to the scope's catalog" do
       @top.mk_plain_resource(@scope)
 
       @compiler.catalog.resource(:class, "top").should be_instance_of(Puppet::Parser::Resource)
     end
 
     it "should evaluate the parent class if one exists" do
       @middle.mk_plain_resource(@scope)
 
       @compiler.catalog.resource(:class, "top").should be_instance_of(Puppet::Parser::Resource)
     end
 
     it "should fail to evaluate if a parent class is defined but cannot be found" do
       othertop = Puppet::Resource::Type.new :hostclass, "something", :parent => "yay"
       @code.add othertop
       lambda { othertop.mk_plain_resource(@scope) }.should raise_error(Puppet::ParseError)
     end
 
     it "should not create a new resource if one already exists" do
       @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
       @compiler.catalog.expects(:add_resource).never
       @top.mk_plain_resource(@scope)
     end
 
     it "should return the existing resource when not creating a new one" do
       @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
       @compiler.catalog.expects(:add_resource).never
       @top.mk_plain_resource(@scope).should == "something"
     end
 
     it "should not create a new parent resource if one already exists and it has a parent class" do
       @top.mk_plain_resource(@scope)
 
       top_resource = @compiler.catalog.resource(:class, "top")
 
       @middle.mk_plain_resource(@scope)
 
       @compiler.catalog.resource(:class, "top").should equal(top_resource)
     end
 
     # #795 - tag before evaluation.
     it "should tag the catalog with the resource tags when it is evaluated" do
       @middle.mk_plain_resource(@scope)
 
       @compiler.catalog.should be_tagged("middle")
     end
 
     it "should tag the catalog with the parent class tags when it is evaluated" do
       @middle.mk_plain_resource(@scope)
 
       @compiler.catalog.should be_tagged("top")
     end
   end
 
   describe "when merging code from another instance" do
     def code(str)
       Puppet::Parser::AST::Leaf.new :value => str
     end
 
     it "should fail unless it is a class" do
       lambda { Puppet::Resource::Type.new(:node, "bar").merge("foo") }.should raise_error(Puppet::Error)
     end
 
     it "should fail unless the source instance is a class" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar")
       source = Puppet::Resource::Type.new(:node, "foo")
       lambda { dest.merge(source) }.should raise_error(Puppet::Error)
     end
 
     it "should fail if both classes have different parent classes" do
       code = Puppet::Resource::TypeCollection.new("env")
       {"a" => "b", "c" => "d"}.each do |parent, child|
         code.add Puppet::Resource::Type.new(:hostclass, parent)
         code.add Puppet::Resource::Type.new(:hostclass, child, :parent => parent)
       end
       lambda { code.hostclass("b").merge(code.hostclass("d")) }.should raise_error(Puppet::Error)
     end
 
     it "should fail if it's named 'main' and 'freeze_main' is enabled" do
       Puppet.settings[:freeze_main] = true
       code = Puppet::Resource::TypeCollection.new("env")
       code.add Puppet::Resource::Type.new(:hostclass, "")
       other = Puppet::Resource::Type.new(:hostclass, "")
       lambda { code.hostclass("").merge(other) }.should raise_error(Puppet::Error)
     end
 
     it "should copy the other class's parent if it has not parent" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar")
 
       parent = Puppet::Resource::Type.new(:hostclass, "parent")
       source = Puppet::Resource::Type.new(:hostclass, "foo", :parent => "parent")
       dest.merge(source)
 
       dest.parent.should == "parent"
     end
 
     it "should copy the other class's documentation as its docs if it has no docs" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar")
       source = Puppet::Resource::Type.new(:hostclass, "foo", :doc => "yayness")
       dest.merge(source)
 
       dest.doc.should == "yayness"
     end
 
     it "should append the other class's docs to its docs if it has any" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar", :doc => "fooness")
       source = Puppet::Resource::Type.new(:hostclass, "foo", :doc => "yayness")
       dest.merge(source)
 
       dest.doc.should == "foonessyayness"
     end
 
     it "should turn its code into an ASTArray if necessary" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar", :code => code("foo"))
       source = Puppet::Resource::Type.new(:hostclass, "foo", :code => code("bar"))
 
       dest.merge(source)
 
       dest.code.should be_instance_of(Puppet::Parser::AST::ASTArray)
     end
 
     it "should set the other class's code as its code if it has none" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar")
       source = Puppet::Resource::Type.new(:hostclass, "foo", :code => code("bar"))
 
       dest.merge(source)
 
       dest.code.value.should == "bar"
     end
 
     it "should append the other class's code to its code if it has any" do
       dcode = Puppet::Parser::AST::ASTArray.new :children => [code("dest")]
       dest = Puppet::Resource::Type.new(:hostclass, "bar", :code => dcode)
 
       scode = Puppet::Parser::AST::ASTArray.new :children => [code("source")]
       source = Puppet::Resource::Type.new(:hostclass, "foo", :code => scode)
 
       dest.merge(source)
 
       dest.code.children.collect { |l| l.value }.should == %w{dest source}
     end
   end
 end
diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index 204a2b02e..e65e8a13a 100755
--- a/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
@@ -1,818 +1,782 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/resource'
 
 describe Puppet::Resource do
 
   before do
     @basepath = Puppet.features.posix? ? "/somepath" : "C:/somepath"
   end
 
   [:catalog, :file, :line].each do |attr|
     it "should have an #{attr} attribute" do
       resource = Puppet::Resource.new("file", "/my/file")
       resource.should respond_to(attr)
       resource.should respond_to(attr.to_s + "=")
     end
   end
 
   it "should have a :title attribute" do
     Puppet::Resource.new(:user, "foo").title.should == "foo"
   end
 
   it "should require the type and title" do
     lambda { Puppet::Resource.new }.should raise_error(ArgumentError)
   end
 
   it "should canonize types to capitalized strings" do
     Puppet::Resource.new(:user, "foo").type.should == "User"
   end
 
   it "should canonize qualified types so all strings are capitalized" do
     Puppet::Resource.new("foo::bar", "foo").type.should == "Foo::Bar"
   end
 
   it "should tag itself with its type" do
     Puppet::Resource.new("file", "/f").should be_tagged("file")
   end
 
   it "should tag itself with its title if the title is a valid tag" do
     Puppet::Resource.new("user", "bar").should be_tagged("bar")
   end
 
   it "should not tag itself with its title if the title is a not valid tag" do
     Puppet::Resource.new("file", "/bar").should_not be_tagged("/bar")
   end
 
   it "should allow setting of attributes" do
     Puppet::Resource.new("file", "/bar", :file => "/foo").file.should == "/foo"
     Puppet::Resource.new("file", "/bar", :exported => true).should be_exported
   end
 
   it "should set its type to 'Class' and its title to the passed title if the passed type is :component and the title has no square brackets in it" do
     ref = Puppet::Resource.new(:component, "foo")
     ref.type.should == "Class"
     ref.title.should == "Foo"
   end
 
   it "should interpret the title as a reference and assign appropriately if the type is :component and the title contains square brackets" do
     ref = Puppet::Resource.new(:component, "foo::bar[yay]")
     ref.type.should == "Foo::Bar"
     ref.title.should == "yay"
   end
 
   it "should set the type to 'Class' if it is nil and the title contains no square brackets" do
     ref = Puppet::Resource.new(nil, "yay")
     ref.type.should == "Class"
     ref.title.should == "Yay"
   end
 
   it "should interpret the title as a reference and assign appropriately if the type is nil and the title contains square brackets" do
     ref = Puppet::Resource.new(nil, "foo::bar[yay]")
     ref.type.should == "Foo::Bar"
     ref.title.should == "yay"
   end
 
   it "should interpret the title as a reference and assign appropriately if the type is nil and the title contains nested square brackets" do
     ref = Puppet::Resource.new(nil, "foo::bar[baz[yay]]")
     ref.type.should == "Foo::Bar"
     ref.title.should =="baz[yay]"
   end
 
   it "should interpret the type as a reference and assign appropriately if the title is nil and the type contains square brackets" do
     ref = Puppet::Resource.new("foo::bar[baz]")
     ref.type.should == "Foo::Bar"
     ref.title.should =="baz"
   end
 
   it "should be able to extract its information from a Puppet::Type instance" do
     ral = Puppet::Type.type(:file).new :path => @basepath+"/foo"
     ref = Puppet::Resource.new(ral)
     ref.type.should == "File"
     ref.title.should == @basepath+"/foo"
   end
 
 
   it "should fail if the title is nil and the type is not a valid resource reference string" do
     lambda { Puppet::Resource.new("foo") }.should raise_error(ArgumentError)
   end
 
   it "should fail if the title is a hash and the type is not a valid resource reference string" do
     lambda { Puppet::Resource.new({:type => "foo", :title => "bar"}) }.should raise_error(ArgumentError,
       'Puppet::Resource.new does not take a hash as the first argument. Did you mean ("foo", "bar") ?'
     )
   end
 
   it "should be able to produce a backward-compatible reference array" do
     Puppet::Resource.new("foobar", "/f").to_trans_ref.should == %w{Foobar /f}
   end
 
   it "should be taggable" do
     Puppet::Resource.ancestors.should be_include(Puppet::Util::Tagging)
   end
 
   it "should have an 'exported' attribute" do
     resource = Puppet::Resource.new("file", "/f")
     resource.exported = true
     resource.exported.should == true
     resource.should be_exported
   end
 
   it "should support an environment attribute" do
     Puppet::Resource.new("file", "/my/file", :environment => :foo).environment.name.should == :foo
   end
 
-  it "should support specifying namespaces" do
-    Puppet::Resource.new("file", "/my/file", :namespaces => ["foo"]).namespaces.should == ["foo"]
-  end
-
-  it "should convert namespaces to an array if not specified as one" do
-    Puppet::Resource.new("file", "/my/file", :namespaces => "foo").namespaces.should == ["foo"]
-  end
-
-  it "should default to a single amespace of an empty string" do
-    Puppet::Resource.new("file", "/my/file").namespaces.should == [""]
-  end
-
   describe "and munging its type and title" do
     describe "when modeling a builtin resource" do
       it "should be able to find the resource type" do
         Puppet::Resource.new("file", "/my/file").resource_type.should equal(Puppet::Type.type(:file))
       end
 
       it "should set its type to the capitalized type name" do
         Puppet::Resource.new("file", "/my/file").type.should == "File"
       end
     end
 
     describe "when modeling a defined resource" do
       describe "that exists" do
         before do
           @type = Puppet::Resource::Type.new(:definition, "foo::bar")
           Puppet::Node::Environment.new.known_resource_types.add @type
         end
 
         it "should set its type to the capitalized type name" do
           Puppet::Resource.new("foo::bar", "/my/file").type.should == "Foo::Bar"
         end
 
         it "should be able to find the resource type" do
           Puppet::Resource.new("foo::bar", "/my/file").resource_type.should equal(@type)
         end
 
         it "should set its title to the provided title" do
           Puppet::Resource.new("foo::bar", "/my/file").title.should == "/my/file"
         end
-
-        describe "and the resource is unqualified and models a qualified resource type" do
-          it "should set its type to the fully qualified resource type" do
-            Puppet::Resource.new("bar", "/my/file", :namespaces => %w{foo}).type.should == "Foo::Bar"
-          end
-
-          it "should be able to find the resource type" do
-            Puppet::Resource.new("bar", "/my/file", :namespaces => %w{foo}).resource_type.should equal(@type)
-          end
-        end
       end
 
       describe "that does not exist" do
         it "should set its resource type to the capitalized resource type name" do
           Puppet::Resource.new("foo::bar", "/my/file").type.should == "Foo::Bar"
         end
       end
     end
 
     describe "when modeling a node" do
       # Life's easier with nodes, because they can't be qualified.
       it "should set its type to 'Node' and its title to the provided title" do
         node = Puppet::Resource.new("node", "foo")
         node.type.should == "Node"
         node.title.should == "foo"
       end
     end
 
     describe "when modeling a class" do
       it "should set its type to 'Class'" do
         Puppet::Resource.new("class", "foo").type.should == "Class"
       end
 
       describe "that exists" do
         before do
           @type = Puppet::Resource::Type.new(:hostclass, "foo::bar")
           Puppet::Node::Environment.new.known_resource_types.add @type
         end
 
         it "should set its title to the capitalized, fully qualified resource type" do
           Puppet::Resource.new("class", "foo::bar").title.should == "Foo::Bar"
         end
 
         it "should be able to find the resource type" do
           Puppet::Resource.new("class", "foo::bar").resource_type.should equal(@type)
         end
-
-        describe "and the resource is unqualified and models a qualified class" do
-          it "should set its title to the fully qualified resource type" do
-            Puppet::Resource.new("class", "bar", :namespaces => %w{foo}).title.should == "Foo::Bar"
-          end
-
-          it "should be able to find the resource type" do
-            Puppet::Resource.new("class", "bar", :namespaces => %w{foo}).resource_type.should equal(@type)
-          end
-
-          it "should set its type to 'Class'" do
-            Puppet::Resource.new("class", "bar", :namespaces => %w{foo}).type.should == "Class"
-          end
-        end
       end
 
       describe "that does not exist" do
         it "should set its type to 'Class' and its title to the capitalized provided name" do
           klass = Puppet::Resource.new("class", "foo::bar")
           klass.type.should == "Class"
           klass.title.should == "Foo::Bar"
         end
       end
 
       describe "and its name is set to the empty string" do
         it "should set its title to :main" do
           Puppet::Resource.new("class", "").title.should == :main
         end
 
         describe "and a class exists whose name is the empty string" do # this was a bit tough to track down
           it "should set its title to :main" do
             @type = Puppet::Resource::Type.new(:hostclass, "")
             Puppet::Node::Environment.new.known_resource_types.add @type
 
             Puppet::Resource.new("class", "").title.should == :main
           end
         end
       end
 
       describe "and its name is set to :main" do
         it "should set its title to :main" do
           Puppet::Resource.new("class", :main).title.should == :main
         end
 
         describe "and a class exists whose name is the empty string" do # this was a bit tough to track down
           it "should set its title to :main" do
             @type = Puppet::Resource::Type.new(:hostclass, "")
             Puppet::Node::Environment.new.known_resource_types.add @type
 
             Puppet::Resource.new("class", :main).title.should == :main
           end
         end
       end
     end
   end
 
   it "should return nil when looking up resource types that don't exist" do
     Puppet::Resource.new("foobar", "bar").resource_type.should be_nil
   end
 
   it "should not fail when an invalid parameter is used and strict mode is disabled" do
     type = Puppet::Resource::Type.new(:definition, "foobar")
     Puppet::Node::Environment.new.known_resource_types.add type
     resource = Puppet::Resource.new("foobar", "/my/file")
     resource[:yay] = true
   end
 
   it "should be considered equivalent to another resource if their type and title match and no parameters are set" do
     Puppet::Resource.new("file", "/f").should == Puppet::Resource.new("file", "/f")
   end
 
   it "should be considered equivalent to another resource if their type, title, and parameters are equal" do
     Puppet::Resource.new("file", "/f", :parameters => {:foo => "bar"}).should == Puppet::Resource.new("file", "/f", :parameters => {:foo => "bar"})
   end
 
   it "should not be considered equivalent to another resource if their type and title match but parameters are different" do
     Puppet::Resource.new("file", "/f", :parameters => {:fee => "baz"}).should_not == Puppet::Resource.new("file", "/f", :parameters => {:foo => "bar"})
   end
 
   it "should not be considered equivalent to a non-resource" do
     Puppet::Resource.new("file", "/f").should_not == "foo"
   end
 
   it "should not be considered equivalent to another resource if their types do not match" do
     Puppet::Resource.new("file", "/f").should_not == Puppet::Resource.new("exec", "/f")
   end
 
   it "should not be considered equivalent to another resource if their titles do not match" do
     Puppet::Resource.new("file", "/foo").should_not == Puppet::Resource.new("file", "/f")
   end
 
   describe "when referring to a resource with name canonicalization" do
     it "should canonicalize its own name" do
       res = Puppet::Resource.new("file", "/path/")
       res.uniqueness_key.should == ["/path"]
       res.ref.should == "File[/path/]"
     end
   end
 
   describe "when running in strict mode" do
     it "should be strict" do
       Puppet::Resource.new("file", "/path", :strict => true).should be_strict
     end
 
     it "should fail if invalid parameters are used" do
       lambda { Puppet::Resource.new("file", "/path", :strict => true, :parameters => {:nosuchparam => "bar"}) }.should raise_error
     end
 
     it "should fail if the resource type cannot be resolved" do
       lambda { Puppet::Resource.new("nosuchtype", "/path", :strict => true) }.should raise_error
     end
   end
 
   describe "when managing parameters" do
     before do
       @resource = Puppet::Resource.new("file", "/my/file")
     end
 
     it "should correctly detect when provided parameters are not valid for builtin types" do
       Puppet::Resource.new("file", "/my/file").should_not be_valid_parameter("foobar")
     end
 
     it "should correctly detect when provided parameters are valid for builtin types" do
       Puppet::Resource.new("file", "/my/file").should be_valid_parameter("mode")
     end
 
     it "should correctly detect when provided parameters are not valid for defined resource types" do
       type = Puppet::Resource::Type.new(:definition, "foobar")
       Puppet::Node::Environment.new.known_resource_types.add type
       Puppet::Resource.new("foobar", "/my/file").should_not be_valid_parameter("myparam")
     end
 
     it "should correctly detect when provided parameters are valid for defined resource types" do
       type = Puppet::Resource::Type.new(:definition, "foobar", :arguments => {"myparam" => nil})
       Puppet::Node::Environment.new.known_resource_types.add type
       Puppet::Resource.new("foobar", "/my/file").should be_valid_parameter("myparam")
     end
 
     it "should allow setting and retrieving of parameters" do
       @resource[:foo] = "bar"
       @resource[:foo].should == "bar"
     end
 
     it "should allow setting of parameters at initialization" do
       Puppet::Resource.new("file", "/my/file", :parameters => {:foo => "bar"})[:foo].should == "bar"
     end
 
     it "should canonicalize retrieved parameter names to treat symbols and strings equivalently" do
       @resource[:foo] = "bar"
       @resource["foo"].should == "bar"
     end
 
     it "should canonicalize set parameter names to treat symbols and strings equivalently" do
       @resource["foo"] = "bar"
       @resource[:foo].should == "bar"
     end
 
     it "should set the namevar when asked to set the name" do
       resource = Puppet::Resource.new("user", "bob")
       Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
       resource[:name] = "bob"
       resource[:myvar].should == "bob"
     end
 
     it "should return the namevar when asked to return the name" do
       resource = Puppet::Resource.new("user", "bob")
       Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
       resource[:myvar] = "test"
       resource[:name].should == "test"
     end
 
     it "should be able to set the name for non-builtin types" do
       resource = Puppet::Resource.new(:foo, "bar")
       resource[:name] = "eh"
       lambda { resource[:name] = "eh" }.should_not raise_error
     end
 
     it "should be able to return the name for non-builtin types" do
       resource = Puppet::Resource.new(:foo, "bar")
       resource[:name] = "eh"
       resource[:name].should == "eh"
     end
 
     it "should be able to iterate over parameters" do
       @resource[:foo] = "bar"
       @resource[:fee] = "bare"
       params = {}
       @resource.each do |key, value|
         params[key] = value
       end
       params.should == {:foo => "bar", :fee => "bare"}
     end
 
     it "should include Enumerable" do
       @resource.class.ancestors.should be_include(Enumerable)
     end
 
     it "should have a method for testing whether a parameter is included" do
       @resource[:foo] = "bar"
       @resource.should be_has_key(:foo)
       @resource.should_not be_has_key(:eh)
     end
 
     it "should have a method for providing the list of parameters" do
       @resource[:foo] = "bar"
       @resource[:bar] = "foo"
       keys = @resource.keys
       keys.should be_include(:foo)
       keys.should be_include(:bar)
     end
 
     it "should have a method for providing the number of parameters" do
       @resource[:foo] = "bar"
       @resource.length.should == 1
     end
 
     it "should have a method for deleting parameters" do
       @resource[:foo] = "bar"
       @resource.delete(:foo)
       @resource[:foo].should be_nil
     end
 
     it "should have a method for testing whether the parameter list is empty" do
       @resource.should be_empty
       @resource[:foo] = "bar"
       @resource.should_not be_empty
     end
 
     it "should be able to produce a hash of all existing parameters" do
       @resource[:foo] = "bar"
       @resource[:fee] = "yay"
 
       hash = @resource.to_hash
       hash[:foo].should == "bar"
       hash[:fee].should == "yay"
     end
 
     it "should not provide direct access to the internal parameters hash when producing a hash" do
       hash = @resource.to_hash
       hash[:foo] = "bar"
       @resource[:foo].should be_nil
     end
 
     it "should use the title as the namevar to the hash if no namevar is present" do
       resource = Puppet::Resource.new("user", "bob")
       Puppet::Type.type(:user).stubs(:key_attributes).returns [:myvar]
       resource.to_hash[:myvar].should == "bob"
     end
 
     it "should set :name to the title if :name is not present for non-builtin types" do
       krt = Puppet::Resource::TypeCollection.new("myenv")
       krt.add Puppet::Resource::Type.new(:definition, :foo)
       resource = Puppet::Resource.new :foo, "bar"
       resource.stubs(:known_resource_types).returns krt
       resource.to_hash[:name].should == "bar"
     end
   end
 
   describe "when serializing" do
     before do
       @resource = Puppet::Resource.new("file", "/my/file")
       @resource["one"] = "test"
       @resource["two"] = "other"
     end
 
     it "should be able to be dumped to yaml" do
       proc { YAML.dump(@resource) }.should_not raise_error
     end
 
     it "should produce an equivalent yaml object" do
       text = YAML.dump(@resource)
 
       newresource = YAML.load(text)
       newresource.title.should == @resource.title
       newresource.type.should == @resource.type
       %w{one two}.each do |param|
         newresource[param].should == @resource[param]
       end
     end
   end
 
   describe "when converting to a RAL resource" do
     it "should use the resource type's :new method to create the resource if the resource is of a builtin type" do
       resource = Puppet::Resource.new("file", @basepath+"/my/file")
       result = resource.to_ral
       result.should be_instance_of(Puppet::Type.type(:file))
       result[:path].should == @basepath+"/my/file"
     end
 
     it "should convert to a component instance if the resource type is not of a builtin type" do
       resource = Puppet::Resource.new("foobar", "somename")
       result = resource.to_ral
 
       result.should be_instance_of(Puppet::Type.type(:component))
       result.title.should == "Foobar[somename]"
     end
   end
 
   it "should be able to convert itself to Puppet code" do
     Puppet::Resource.new("one::two", "/my/file").should respond_to(:to_manifest)
   end
 
   describe "when converting to puppet code" do
     before do
       @resource = Puppet::Resource.new("one::two", "/my/file", :parameters => {:noop => true, :foo => %w{one two}})
     end
 
     it "should print the type and title" do
       @resource.to_manifest.should be_include("one::two { '/my/file':\n")
     end
 
     it "should print each parameter, with the value single-quoted" do
       @resource.to_manifest.should be_include("    noop => 'true'")
     end
 
     it "should print array values appropriately" do
       @resource.to_manifest.should be_include("    foo => ['one','two']")
     end
   end
 
   it "should be able to convert itself to a TransObject instance" do
     Puppet::Resource.new("one::two", "/my/file").should respond_to(:to_trans)
   end
 
   describe "when converting to a TransObject" do
     describe "and the resource is not an instance of a builtin type" do
       before do
         @resource = Puppet::Resource.new("foo", "bar")
       end
 
       it "should return a simple TransBucket if it is not an instance of a builtin type" do
         bucket = @resource.to_trans
         bucket.should be_instance_of(Puppet::TransBucket)
         bucket.type.should == @resource.type
         bucket.name.should == @resource.title
       end
 
       it "should return a simple TransBucket if it is a stage" do
         @resource = Puppet::Resource.new("stage", "bar")
         bucket = @resource.to_trans
         bucket.should be_instance_of(Puppet::TransBucket)
         bucket.type.should == @resource.type
         bucket.name.should == @resource.title
       end
 
       it "should copy over the resource's file" do
         @resource.file = "/foo/bar"
         @resource.to_trans.file.should == "/foo/bar"
       end
 
       it "should copy over the resource's line" do
         @resource.line = 50
         @resource.to_trans.line.should == 50
       end
     end
 
     describe "and the resource is an instance of a builtin type" do
       before do
         @resource = Puppet::Resource.new("file", "bar")
       end
 
       it "should return a TransObject if it is an instance of a builtin resource type" do
         trans = @resource.to_trans
         trans.should be_instance_of(Puppet::TransObject)
         trans.type.should == "file"
         trans.name.should == @resource.title
       end
 
       it "should copy over the resource's file" do
         @resource.file = "/foo/bar"
         @resource.to_trans.file.should == "/foo/bar"
       end
 
       it "should copy over the resource's line" do
         @resource.line = 50
         @resource.to_trans.line.should == 50
       end
 
       # Only TransObjects support tags, annoyingly
       it "should copy over the resource's tags" do
         @resource.tag "foo"
         @resource.to_trans.tags.should == @resource.tags
       end
 
       it "should copy the resource's parameters into the transobject and convert the parameter name to a string" do
         @resource[:foo] = "bar"
         @resource.to_trans["foo"].should == "bar"
       end
 
       it "should be able to copy arrays of values" do
         @resource[:foo] = %w{yay fee}
         @resource.to_trans["foo"].should == %w{yay fee}
       end
 
       it "should reduce single-value arrays to just a value" do
         @resource[:foo] = %w{yay}
         @resource.to_trans["foo"].should == "yay"
       end
 
       it "should convert resource references into the backward-compatible form" do
         @resource[:foo] = Puppet::Resource.new(:file, "/f")
         @resource.to_trans["foo"].should == %w{File /f}
       end
 
       it "should convert resource references into the backward-compatible form even when within arrays" do
         @resource[:foo] = ["a", Puppet::Resource.new(:file, "/f")]
         @resource.to_trans["foo"].should == ["a", %w{File /f}]
       end
     end
   end
 
   describe "when converting to pson" do
     confine "Missing 'pson' library" => Puppet.features.pson?
 
     def pson_output_should
       @resource.class.expects(:pson_create).with { |hash| yield hash }
     end
 
     it "should include the pson util module" do
       Puppet::Resource.singleton_class.ancestors.should be_include(Puppet::Util::Pson)
     end
 
     # LAK:NOTE For all of these tests, we convert back to the resource so we can
     # trap the actual data structure then.
 
     it "should set its type to the provided type" do
       Puppet::Resource.from_pson(PSON.parse(Puppet::Resource.new("File", "/foo").to_pson)).type.should == "File"
     end
 
     it "should set its title to the provided title" do
       Puppet::Resource.from_pson(PSON.parse(Puppet::Resource.new("File", "/foo").to_pson)).title.should == "/foo"
     end
 
     it "should include all tags from the resource" do
       resource = Puppet::Resource.new("File", "/foo")
       resource.tag("yay")
 
       Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).tags.should == resource.tags
     end
 
     it "should include the file if one is set" do
       resource = Puppet::Resource.new("File", "/foo")
       resource.file = "/my/file"
 
       Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).file.should == "/my/file"
     end
 
     it "should include the line if one is set" do
       resource = Puppet::Resource.new("File", "/foo")
       resource.line = 50
 
       Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).line.should == 50
     end
 
     it "should include the 'exported' value if one is set" do
       resource = Puppet::Resource.new("File", "/foo")
       resource.exported = true
 
       Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_true
     end
 
     it "should set 'exported' to false if no value is set" do
       resource = Puppet::Resource.new("File", "/foo")
 
       Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_false
     end
 
     it "should set all of its parameters as the 'parameters' entry" do
       resource = Puppet::Resource.new("File", "/foo")
       resource[:foo] = %w{bar eh}
       resource[:fee] = %w{baz}
 
       result = Puppet::Resource.from_pson(PSON.parse(resource.to_pson))
       result["foo"].should == %w{bar eh}
       result["fee"].should == %w{baz}
     end
 
     it "should serialize relationships as reference strings" do
       resource = Puppet::Resource.new("File", "/foo")
       resource[:requires] = Puppet::Resource.new("File", "/bar")
       result = Puppet::Resource.from_pson(PSON.parse(resource.to_pson))
       result[:requires].should == "File[/bar]"
     end
 
     it "should serialize multiple relationships as arrays of reference strings" do
       resource = Puppet::Resource.new("File", "/foo")
       resource[:requires] = [Puppet::Resource.new("File", "/bar"), Puppet::Resource.new("File", "/baz")]
       result = Puppet::Resource.from_pson(PSON.parse(resource.to_pson))
       result[:requires].should == [ "File[/bar]",  "File[/baz]" ]
     end
   end
 
   describe "when converting from pson" do
     confine "Missing 'pson' library" => Puppet.features.pson?
 
     def pson_result_should
       Puppet::Resource.expects(:new).with { |hash| yield hash }
     end
 
     before do
       @data = {
         'type' => "file",
         'title' => @basepath+"/yay",
       }
     end
 
     it "should set its type to the provided type" do
       Puppet::Resource.from_pson(@data).type.should == "File"
     end
 
     it "should set its title to the provided title" do
       Puppet::Resource.from_pson(@data).title.should == @basepath+"/yay"
     end
 
     it "should tag the resource with any provided tags" do
       @data['tags'] = %w{foo bar}
       resource = Puppet::Resource.from_pson(@data)
       resource.tags.should be_include("foo")
       resource.tags.should be_include("bar")
     end
 
     it "should set its file to the provided file" do
       @data['file'] = "/foo/bar"
       Puppet::Resource.from_pson(@data).file.should == "/foo/bar"
     end
 
     it "should set its line to the provided line" do
       @data['line'] = 50
       Puppet::Resource.from_pson(@data).line.should == 50
     end
 
     it "should 'exported' to true if set in the pson data" do
       @data['exported'] = true
       Puppet::Resource.from_pson(@data).exported.should be_true
     end
 
     it "should 'exported' to false if not set in the pson data" do
       Puppet::Resource.from_pson(@data).exported.should be_false
     end
 
     it "should fail if no title is provided" do
       @data.delete('title')
       lambda { Puppet::Resource.from_pson(@data) }.should raise_error(ArgumentError)
     end
 
     it "should fail if no type is provided" do
       @data.delete('type')
       lambda { Puppet::Resource.from_pson(@data) }.should raise_error(ArgumentError)
     end
 
     it "should set each of the provided parameters" do
       @data['parameters'] = {'foo' => %w{one two}, 'fee' => %w{three four}}
       resource = Puppet::Resource.from_pson(@data)
       resource['foo'].should == %w{one two}
       resource['fee'].should == %w{three four}
     end
 
     it "should convert single-value array parameters to normal values" do
       @data['parameters'] = {'foo' => %w{one}}
       resource = Puppet::Resource.from_pson(@data)
       resource['foo'].should == %w{one}
     end
   end
 
   describe "it should implement to_resource" do
     resource = Puppet::Resource.new("file", "/my/file")
     resource.to_resource.should == resource
   end
 
   describe "because it is an indirector model" do
     it "should include Puppet::Indirector" do
       Puppet::Resource.should be_is_a(Puppet::Indirector)
     end
 
     it "should have a default terminus" do
       Puppet::Resource.indirection.terminus_class.should == :ral
     end
 
     it "should have a name" do
       Puppet::Resource.new("file", "/my/file").name.should == "File//my/file"
     end
   end
 
   describe "when resolving resources with a catalog" do
     it "should resolve all resources using the catalog" do
       catalog = mock 'catalog'
       resource = Puppet::Resource.new("foo::bar", "yay")
       resource.catalog = catalog
 
       catalog.expects(:resource).with("Foo::Bar[yay]").returns(:myresource)
 
       resource.resolve.should == :myresource
     end
   end
 
   describe "when generating the uniqueness key" do
     it "should include all of the key_attributes in alphabetical order by attribute name" do
       Puppet::Type.type(:file).stubs(:key_attributes).returns [:myvar, :owner, :path]
       Puppet::Type.type(:file).stubs(:title_patterns).returns(
         [ [ /(.*)/, [ [:path, lambda{|x| x} ] ] ] ]
       )
       res = Puppet::Resource.new("file", "/my/file", :parameters => {:owner => 'root', :content => 'hello'})
       res.uniqueness_key.should == [ nil, 'root', '/my/file']
     end
   end
 end
diff --git a/spec/unit/transaction/resource_harness_spec.rb b/spec/unit/transaction/resource_harness_spec.rb
index 31965c92c..255481ae4 100755
--- a/spec/unit/transaction/resource_harness_spec.rb
+++ b/spec/unit/transaction/resource_harness_spec.rb
@@ -1,401 +1,401 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/transaction/resource_harness'
 
 describe Puppet::Transaction::ResourceHarness do
   before do
     @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new)
     @resource = Puppet::Type.type(:file).new :path => "/my/file"
     @harness = Puppet::Transaction::ResourceHarness.new(@transaction)
     @current_state = Puppet::Resource.new(:file, "/my/file")
     @resource.stubs(:retrieve).returns @current_state
     @status = Puppet::Resource::Status.new(@resource)
     Puppet::Resource::Status.stubs(:new).returns @status
   end
 
   it "should accept a transaction at initialization" do
     harness = Puppet::Transaction::ResourceHarness.new(@transaction)
     harness.transaction.should equal(@transaction)
   end
 
   it "should delegate to the transaction for its relationship graph" do
     @transaction.expects(:relationship_graph).returns "relgraph"
     Puppet::Transaction::ResourceHarness.new(@transaction).relationship_graph.should == "relgraph"
   end
 
   describe "when copying audited parameters" do
     before do
       @resource = Puppet::Type.type(:file).new :path => "/foo/bar", :audit => :mode
     end
 
     it "should do nothing if no parameters are being audited" do
       @resource[:audit] = []
       @harness.expects(:cached).never
       @harness.copy_audited_parameters(@resource, {}).should == []
     end
 
     it "should do nothing if an audited parameter already has a desired value set" do
       @resource[:mode] = "755"
       @harness.expects(:cached).never
       @harness.copy_audited_parameters(@resource, {}).should == []
     end
 
     it "should copy any cached values to the 'should' values" do
       @harness.cache(@resource, :mode, "755")
       @harness.copy_audited_parameters(@resource, {}).should == [:mode]
 
       @resource[:mode].should == 0755
     end
 
     it "should cache and log the current value if no cached values are present" do
-      @resource.expects(:info)
+      @resource.expects(:debug)
       @harness.copy_audited_parameters(@resource, {:mode => "755"}).should == []
 
       @harness.cached(@resource, :mode).should == "755"
     end
   end
 
   describe "when evaluating a resource" do
     it "should create and return a resource status instance for the resource" do
       @harness.evaluate(@resource).should be_instance_of(Puppet::Resource::Status)
     end
 
     it "should fail if no status can be created" do
       Puppet::Resource::Status.expects(:new).raises ArgumentError
 
       lambda { @harness.evaluate(@resource) }.should raise_error
     end
 
     it "should retrieve the current state of the resource" do
       @resource.expects(:retrieve).returns @current_state
       @harness.evaluate(@resource)
     end
 
     it "should mark the resource as failed and return if the current state cannot be retrieved" do
       @resource.expects(:retrieve).raises ArgumentError
       @harness.evaluate(@resource).should be_failed
     end
 
     it "should use the status and retrieved state to determine which changes need to be made" do
       @harness.expects(:changes_to_perform).with(@status, @resource).returns []
       @harness.evaluate(@resource)
     end
 
     it "should mark the status as out of sync and apply the created changes if there are any" do
       changes = %w{mychanges}
       @harness.expects(:changes_to_perform).returns changes
       @harness.expects(:apply_changes).with(@status, changes)
       @harness.evaluate(@resource).should be_out_of_sync
     end
 
     it "should cache the last-synced time" do
       changes = %w{mychanges}
       @harness.stubs(:changes_to_perform).returns changes
       @harness.stubs(:apply_changes)
       @harness.expects(:cache).with { |resource, name, time| name == :synced and time.is_a?(Time) }
       @harness.evaluate(@resource)
     end
 
     it "should flush the resource when applying changes if appropriate" do
       changes = %w{mychanges}
       @harness.stubs(:changes_to_perform).returns changes
       @harness.stubs(:apply_changes)
       @resource.expects(:flush)
       @harness.evaluate(@resource)
     end
 
     it "should use the status and retrieved state to determine which changes need to be made" do
       @harness.expects(:changes_to_perform).with(@status, @resource).returns []
       @harness.evaluate(@resource)
     end
 
     it "should not attempt to apply changes if none need to be made" do
       @harness.expects(:changes_to_perform).returns []
       @harness.expects(:apply_changes).never
       @harness.evaluate(@resource).should_not be_out_of_sync
     end
 
     it "should store the resource's evaluation time in the resource status" do
       @harness.evaluate(@resource).evaluation_time.should be_instance_of(Float)
     end
 
     it "should set the change count to the total number of changes" do
       changes = %w{a b c d}
       @harness.expects(:changes_to_perform).returns changes
       @harness.expects(:apply_changes).with(@status, changes)
       @harness.evaluate(@resource).change_count.should == 4
     end
   end
 
   describe "when creating changes" do
     before do
       @current_state = Puppet::Resource.new(:file, "/my/file")
       @resource.stubs(:retrieve).returns @current_state
       Puppet.features.stubs(:root?).returns true
     end
 
     it "should retrieve the current values from the resource" do
       @resource.expects(:retrieve).returns @current_state
       @harness.changes_to_perform(@status, @resource)
     end
 
     it "should cache that the resource was checked" do
       @harness.expects(:cache).with { |resource, name, time| name == :checked and time.is_a?(Time) }
       @harness.changes_to_perform(@status, @resource)
     end
 
     it "should create changes with the appropriate property and current value" do
       @resource[:ensure] = :present
       @current_state[:ensure] = :absent
 
       change = stub 'change'
       Puppet::Transaction::Change.expects(:new).with(@resource.parameter(:ensure), :absent).returns change
 
       @harness.changes_to_perform(@status, @resource)[0].should equal(change)
     end
 
     it "should not attempt to manage properties that do not have desired values set" do
       mode = @resource.newattr(:mode)
       @current_state[:mode] = :absent
 
       mode.expects(:insync?).never
 
       @harness.changes_to_perform(@status, @resource)
     end
 
     it "should copy audited parameters" do
       @resource[:audit] = :mode
       @harness.cache(@resource, :mode, "755")
       @harness.changes_to_perform(@status, @resource)
       @resource[:mode].should == 0755
     end
 
     it "should mark changes created as a result of auditing as auditing changes" do
       @current_state[:mode] = 0644
       @resource[:audit] = :mode
       @harness.cache(@resource, :mode, "755")
       @harness.changes_to_perform(@status, @resource)[0].must be_auditing
     end
 
     describe "and the 'ensure' parameter is present but not in sync" do
       it "should return a single change for the 'ensure' parameter" do
         @resource[:ensure] = :present
         @resource[:mode] = "755"
         @current_state[:ensure] = :absent
         @current_state[:mode] = :absent
 
         @resource.stubs(:retrieve).returns @current_state
 
         changes = @harness.changes_to_perform(@status, @resource)
         changes.length.should == 1
         changes[0].property.name.should == :ensure
       end
     end
 
     describe "and the 'ensure' parameter should be set to 'absent', and is correctly set to 'absent'" do
       it "should return no changes" do
         @resource[:ensure] = :absent
         @resource[:mode] = "755"
         @current_state[:ensure] = :absent
         @current_state[:mode] = :absent
 
         @harness.changes_to_perform(@status, @resource).should == []
       end
     end
 
     describe "and the 'ensure' parameter is 'absent' and there is no 'desired value'" do
       it "should return no changes" do
         @resource.newattr(:ensure)
         @resource[:mode] = "755"
         @current_state[:ensure] = :absent
         @current_state[:mode] = :absent
 
         @harness.changes_to_perform(@status, @resource).should == []
       end
     end
 
     describe "and non-'ensure' parameters are not in sync" do
       it "should return a change for each parameter that is not in sync" do
         @resource[:ensure] = :present
         @resource[:mode] = "755"
         @resource[:owner] = 0
         @current_state[:ensure] = :present
         @current_state[:mode] = 0444
         @current_state[:owner] = 50
 
         mode = stub 'mode_change'
         owner = stub 'owner_change'
         Puppet::Transaction::Change.expects(:new).with(@resource.parameter(:mode), 0444).returns mode
         Puppet::Transaction::Change.expects(:new).with(@resource.parameter(:owner), 50).returns owner
 
         changes = @harness.changes_to_perform(@status, @resource)
         changes.length.should == 2
         changes.should be_include(mode)
         changes.should be_include(owner)
       end
     end
 
     describe "and all parameters are in sync" do
       it "should return an empty array" do
         @resource[:ensure] = :present
         @resource[:mode] = "755"
         @current_state[:ensure] = :present
         @current_state[:mode] = 0755
         @harness.changes_to_perform(@status, @resource).should == []
       end
     end
   end
 
   describe "when applying changes" do
     before do
       @change1 = stub 'change1', :apply => stub("event", :status => "success"), :auditing? => false
       @change2 = stub 'change2', :apply => stub("event", :status => "success"), :auditing? => false
       @changes = [@change1, @change2]
     end
 
     it "should apply the change" do
       @change1.expects(:apply).returns( stub("event", :status => "success") )
       @change2.expects(:apply).returns( stub("event", :status => "success") )
 
       @harness.apply_changes(@status, @changes)
     end
 
     it "should mark the resource as changed" do
       @harness.apply_changes(@status, @changes)
 
       @status.should be_changed
     end
 
     it "should queue the resulting event" do
       @harness.apply_changes(@status, @changes)
 
       @status.events.should be_include(@change1.apply)
       @status.events.should be_include(@change2.apply)
     end
 
     it "should cache the new value if it is an auditing change" do
       @change1.expects(:auditing?).returns true
       property = stub 'property', :name => "foo", :resource => "myres"
       @change1.stubs(:property).returns property
       @change1.stubs(:is).returns "myval"
 
       @harness.apply_changes(@status, @changes)
 
       @harness.cached("myres", "foo").should == "myval"
     end
   end
 
   describe "when determining whether the resource can be changed" do
     before do
       @resource.stubs(:purging?).returns true
       @resource.stubs(:deleting?).returns true
     end
 
     it "should be true if the resource is not being purged" do
       @resource.expects(:purging?).returns false
       @harness.should be_allow_changes(@resource)
     end
 
     it "should be true if the resource is not being deleted" do
       @resource.expects(:deleting?).returns false
       @harness.should be_allow_changes(@resource)
     end
 
     it "should be true if the resource has no dependents" do
       @harness.relationship_graph.expects(:dependents).with(@resource).returns []
       @harness.should be_allow_changes(@resource)
     end
 
     it "should be true if all dependents are being deleted" do
       dep = stub 'dependent', :deleting? => true
       @harness.relationship_graph.expects(:dependents).with(@resource).returns [dep]
       @resource.expects(:purging?).returns true
       @harness.should be_allow_changes(@resource)
     end
 
     it "should be false if the resource's dependents are not being deleted" do
       dep = stub 'dependent', :deleting? => false, :ref => "myres"
       @resource.expects(:warning)
       @harness.relationship_graph.expects(:dependents).with(@resource).returns [dep]
       @harness.should_not be_allow_changes(@resource)
     end
   end
 
   describe "when finding the schedule" do
     before do
       @catalog = Puppet::Resource::Catalog.new
       @resource.catalog = @catalog
     end
 
     it "should warn and return nil if the resource has no catalog" do
       @resource.catalog = nil
       @resource.expects(:warning)
 
       @harness.schedule(@resource).should be_nil
     end
 
     it "should return nil if the resource specifies no schedule" do
       @harness.schedule(@resource).should be_nil
     end
 
     it "should fail if the named schedule cannot be found" do
       @resource[:schedule] = "whatever"
       @resource.expects(:fail)
       @harness.schedule(@resource)
     end
 
     it "should return the named schedule if it exists" do
       sched = Puppet::Type.type(:schedule).new(:name => "sched")
       @catalog.add_resource(sched)
       @resource[:schedule] = "sched"
       @harness.schedule(@resource).to_s.should == sched.to_s
     end
   end
 
   describe "when determining if a resource is scheduled" do
     before do
       @catalog = Puppet::Resource::Catalog.new
       @resource.catalog = @catalog
       @status = Puppet::Resource::Status.new(@resource)
     end
 
     it "should return true if 'ignoreschedules' is set" do
       Puppet[:ignoreschedules] = true
       @resource[:schedule] = "meh"
       @harness.should be_scheduled(@status, @resource)
     end
 
     it "should return true if the resource has no schedule set" do
       @harness.should be_scheduled(@status, @resource)
     end
 
     it "should return the result of matching the schedule with the cached 'checked' time if a schedule is set" do
       t = Time.now
       @harness.expects(:cached).with(@resource, :checked).returns(t)
 
       sched = Puppet::Type.type(:schedule).new(:name => "sched")
       @catalog.add_resource(sched)
       @resource[:schedule] = "sched"
 
       sched.expects(:match?).with(t.to_i).returns "feh"
 
       @harness.scheduled?(@status, @resource).should == "feh"
     end
   end
 
   it "should be able to cache data in the Storage module" do
     data = {}
     Puppet::Util::Storage.expects(:cache).with(@resource).returns data
     @harness.cache(@resource, :foo, "something")
 
     data[:foo].should == "something"
   end
 
   it "should be able to retrieve data from the cache" do
     data = {:foo => "other"}
     Puppet::Util::Storage.expects(:cache).with(@resource).returns data
     @harness.cached(@resource, :foo).should == "other"
   end
 end
diff --git a/spec/unit/type/schedule_spec.rb b/spec/unit/type/schedule_spec.rb
index 6975529b2..420cffd44 100755
--- a/spec/unit/type/schedule_spec.rb
+++ b/spec/unit/type/schedule_spec.rb
@@ -1,333 +1,333 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 module ScheduleTesting
 
   def format(time)
     time.strftime("%H:%M:%S")
   end
 
   def diff(unit, incr, method, count)
     diff = Time.now.to_i.send(method, incr * count)
     Time.at(diff)
   end
 
   def month(method, count)
     diff(:hour, 3600 * 24 * 30, method, count)
   end
 
   def week(method, count)
     diff(:hour, 3600 * 24 * 7, method, count)
   end
 
   def day(method, count)
     diff(:hour, 3600 * 24, method, count)
   end
 
   def hour(method, count)
     diff(:hour, 3600, method, count)
   end
 
   def min(method, count)
     diff(:min, 60, method, count)
   end
 
   def sec(method, count)
     diff(:sec, 1, method, count)
   end
 
 end
 
 describe Puppet::Type.type(:schedule) do
   before :each do
-    Puppet.settings.stubs(:value).with(:ignoreschedules).returns(false)
+    Puppet[:ignoreschedules] = false
 
     @schedule = Puppet::Type.type(:schedule).new(:name => "testing")
   end
 
   describe Puppet::Type.type(:schedule) do
     include ScheduleTesting
 
     it "should default to :distance for period-matching" do
       @schedule[:periodmatch].should == :distance
     end
 
     it "should default to a :repeat of 1" do
       @schedule[:repeat].should == 1
     end
 
     it "should never match when the period is :never" do
       @schedule[:period] = :never
       @schedule.match?.should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when producing default schedules" do
     include ScheduleTesting
 
     %w{hourly daily weekly monthly never}.each do |period|
       period = period.to_sym
       it "should produce a #{period} schedule with the period set appropriately" do
         schedules = Puppet::Type.type(:schedule).mkdefaultschedules
         schedules.find { |s| s[:name] == period.to_s and s[:period] == period }.should be_instance_of(Puppet::Type.type(:schedule))
       end
     end
 
     it "should produce a schedule named puppet with a period of hourly and a repeat of 2" do
       schedules = Puppet::Type.type(:schedule).mkdefaultschedules
       schedules.find { |s|
         s[:name] == "puppet" and s[:period] == :hourly and s[:repeat] == 2
       }.should be_instance_of(Puppet::Type.type(:schedule))
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching ranges" do
     include ScheduleTesting
 
     it "should match when the start time is before the current time and the end time is after the current time" do
       @schedule[:range] = "#{format(Time.now - 10)} - #{format(Time.now + 10)}"
       @schedule.match?.should be_true
     end
 
     it "should not match when the start time is after the current time" do
       @schedule[:range] = "#{format(Time.now + 5)} - #{format(Time.now + 10)}"
       @schedule.match?.should be_false
     end
 
     it "should not match when the end time is previous to the current time" do
       @schedule[:range] = "#{format(Time.now - 10)} - #{format(Time.now - 5)}"
       @schedule.match?.should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching hourly by distance" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :hourly
       @schedule[:periodmatch] = :distance
     end
 
     it "should match an hour ago" do
       @schedule.match?(hour("-", 1)).should be_true
     end
 
     it "should not match now" do
       @schedule.match?(Time.now).should be_false
     end
 
     it "should not match 59 minutes ago" do
       @schedule.match?(min("-", 59)).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching daily by distance" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :daily
       @schedule[:periodmatch] = :distance
     end
 
     it "should match when the previous time was one day ago" do
       @schedule.match?(day("-", 1)).should be_true
     end
 
     it "should not match when the previous time is now" do
       @schedule.match?(Time.now).should be_false
     end
 
     it "should not match when the previous time was 23 hours ago" do
       @schedule.match?(hour("-", 23)).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching weekly by distance" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :weekly
       @schedule[:periodmatch] = :distance
     end
 
     it "should match seven days ago" do
       @schedule.match?(day("-", 7)).should be_true
     end
 
     it "should not match now" do
       @schedule.match?(Time.now).should be_false
     end
 
     it "should not match six days ago" do
       @schedule.match?(day("-", 6)).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching monthly by distance" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :monthly
       @schedule[:periodmatch] = :distance
     end
 
     it "should match 32 days ago" do
       @schedule.match?(day("-", 32)).should be_true
     end
 
     it "should not match now" do
       @schedule.match?(Time.now).should be_false
     end
 
     it "should not match 27 days ago" do
       @schedule.match?(day("-", 27)).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching hourly by number" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :hourly
       @schedule[:periodmatch] = :number
     end
 
     it "should match if the times are one minute apart and the current minute is 0" do
       current = Time.now
 
       # Subtract an hour, reset the minute to zero, then add 59 minutes, so we're the previous hour plus 59 minutes.
       previous = (current - 3600 - (current.min * 60) + (59 * 60))
 
       # Now set the "current" time to the zero minute of the current hour.
       now = (current - (current.min * 60))
       Time.stubs(:now).returns(now)
       @schedule.match?(previous).should be_true
     end
 
     it "should not match if the times are 58 minutes apart and the current minute is 59" do
       current = Time.now
 
       # reset the minute to zero
       previous = current - (current.min * 60)
 
       # Now set the "current" time to the 59th minute of the current hour.
       now = (current - (current.min * 60) + (59 * 60))
       Time.stubs(:now).returns(now)
       @schedule.match?(previous).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching daily by number" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :daily
       @schedule[:periodmatch] = :number
     end
 
     it "should match if the times are one minute apart and the current minute and hour are 0" do
       zero = Time.now
 
       # Reset the current time to X:00:00
       current = zero - (zero.hour * 3600) - (zero.min * 60) - zero.sec
 
       # Now set the previous time to one minute before that
       previous = current - 60
 
       Time.stubs(:now).returns(current)
       @schedule.match?(previous).should be_true
     end
 
     it "should not match if the times are 23 hours and 58 minutes apart and the current hour is 23 and the current minute is 59" do
       zero = Time.now
 
       # Reset the previous time to 00:00:00
       previous = zero - (zero.hour * 3600) - (zero.min * 60) - zero.sec
 
       # Set the current time to 23:59
       now = previous + (23 * 3600) + (59 * 60)
 
       Time.stubs(:now).returns(now)
       @schedule.match?(previous).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching weekly by number" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :weekly
       @schedule[:periodmatch] = :number
     end
 
     it "should match if the previous time is prior to the most recent Sunday" do
       now = Time.now
 
       # Subtract the number days we've progressed into the week, plus one because we're zero-indexed.
       previous = now - (3600 * 24 * (now.wday + 1))
 
       @schedule.match?(previous).should be_true
     end
 
     it "should not match if the previous time is after the most recent Saturday" do
       now = Time.now
 
       # Subtract the number days we've progressed into the week
       previous = now - (3600 * 24 * now.wday)
 
       @schedule.match?(previous).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching monthly by number" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :monthly
       @schedule[:periodmatch] = :number
     end
 
     it "should match when the previous time is prior to the first day of this month" do
       now = Time.now
 
       # Subtract the number days we've progressed into the month
       previous = now - (3600 * 24 * now.day)
 
       @schedule.match?(previous).should be_true
     end
 
     it "should not match when the previous time is after the last day of last month" do
       now = Time.now
 
       # Subtract the number days we've progressed into the month, minus one
       previous = now - (3600 * 24 * (now.day - 1))
 
       @schedule.match?(previous).should be_false
     end
   end
 
   describe Puppet::Type.type(:schedule), "when matching with a repeat greater than one" do
     include ScheduleTesting
 
     before do
       @schedule[:period] = :daily
       @schedule[:repeat] = 2
     end
 
     it "should fail if the periodmatch is 'number'" do
       @schedule[:periodmatch] = :number
       proc { @schedule[:repeat] = 2 }.should raise_error(Puppet::Error)
     end
 
     it "should match if the previous run was further away than the distance divided by the repeat" do
       previous = Time.now - (3600 * 13)
       @schedule.match?(previous).should be_true
     end
 
     it "should not match if the previous run was closer than the distance divided by the repeat" do
       previous = Time.now - (3600 * 11)
       @schedule.match?(previous).should be_false
     end
   end
 end
diff --git a/tasks/rake/tracdocs.rake b/tasks/rake/tracdocs.rake
deleted file mode 100644
index d26d8fc17..000000000
--- a/tasks/rake/tracdocs.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-task :tracdocs do
-    require 'puppet'
-    require 'puppet/util/reference'
-    Puppet::Util::Reference.references.each do |ref|
-        sh "puppetdoc -m trac -r #{ref.to_s}"
-    end 
-end
-
diff --git a/test/certmgr/support.rb b/test/certmgr/support.rb
index 3138c94d7..060c458d8 100755
--- a/test/certmgr/support.rb
+++ b/test/certmgr/support.rb
@@ -1,104 +1,105 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/sslcertificates/support'
 require 'mocha'
 
 class TestCertSupport < Test::Unit::TestCase
   include PuppetTest
   MissingCertificate = Puppet::SSLCertificates::Support::MissingCertificate
 
   class CertUser
     include Puppet::SSLCertificates::Support
   end
 
   def setup
     super
     Puppet::Util::SUIDManager.stubs(:asuser).yields
     @user = CertUser.new
     @ca = Puppet::SSLCertificates::CA.new
     @client = Puppet::Network::Client.ca.new(:CA => @ca)
   end
 
   # Yay, metaprogramming
   def test_keytype
     [:key, :csr, :cert, :ca_cert].each do |name|
       assert(Puppet::SSLCertificates::Support.method_defined?(name), "No retrieval method for #{name}")
       maker = "mk_#{name}"
       assert(Puppet::SSLCertificates::Support.method_defined?(maker), "No maker method for #{name}")
     end
   end
 
   def test_keys
     keys = [:hostprivkey, :hostpubkey].each { |n| Puppet[n] = tempfile }
 
     key = nil
     assert_nothing_raised do
       key = @user.key
     end
 
     assert_logged(:info, /Creating a new SSL/, "Did not log about new key")
     keys.each do |file|
 
             assert(
         FileTest.exists?(Puppet[file]),
         
         "Did not create #{file} key file")
     end
 
     # Make sure it's a valid key
     assert_nothing_raised("Created key is invalid") do
       OpenSSL::PKey::RSA.new(File.read(Puppet[:hostprivkey]))
     end
 
     # now make sure we can read it in
     other = CertUser.new
     assert_nothing_raised("Could not read key in") do
       other.key
     end
 
     assert_equal(@user.key.to_s, other.key.to_s, "Keys are not equal")
   end
 
   def test_csr
     csr = nil
     assert_nothing_raised("Could not create csr") do
       csr = @user.csr
     end
 
     assert(FileTest.exists?(Puppet[:hostcsr]), "did not create csr file")
     assert_instance_of(OpenSSL::X509::Request, csr)
   end
 
   def test_cacert
     @user = CertUser.new
 
     assert_raise(MissingCertificate, "Did not fail when missing cacert") do
       @user.ca_cert
     end
   end
 
   # Fixing #1382.  This test will always fail on Darwin, because its
   # FS is case-insensitive.
   unless Facter.value(:operatingsystem) == "Darwin"
     def test_uppercase_files_are_renamed_and_read
       # Write a key out to disk in a file containing upper-case.
       key = OpenSSL::PKey::RSA.new(32)
       should_path = Puppet[:hostprivkey]
 
       dir, file = File.split(should_path)
-      newfile = file.sub(/^([a-z.]+)\./) { $1.upcase + "."}
+      newfile = file.sub(/^([-a-z.0-9]+)\./) { $1.upcase + "."}
       upper_path = File.join(dir, newfile)
+p upper_path
       File.open(upper_path, "w") { |f| f.print key.to_s }
 
       user = CertUser.new
 
       assert_equal(key.to_s, user.read_key.to_s, "Did not read key in from disk")
       assert(! FileTest.exist?(upper_path), "Upper case file was not removed")
       assert(FileTest.exist?(should_path), "File was not renamed to lower-case file")
       assert_equal(key.to_s, user.read_key.to_s, "Did not read key in from disk")
     end
   end
 end
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 5a433c724..8cda8eeb2 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -1,746 +1,746 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'mocha'
 require 'puppet'
 require 'puppet/parser/parser'
 require 'puppettest'
 require 'puppettest/support/utils'
 
 class TestParser < Test::Unit::TestCase
   include PuppetTest
   include PuppetTest::ParserTesting
   include PuppetTest::Support::Utils
   def setup
     super
     Puppet[:parseonly] = true
     #@lexer = Puppet::Parser::Lexer.new
   end
 
   def teardown
     super
     Puppet::Node::Environment.clear
   end
 
   def test_each_file
     textfiles { |file|
       Puppet::Node::Environment.clear
       parser = mkparser
       Puppet.debug("parsing #{file}") if __FILE__ == $0
       assert_nothing_raised {
         parser.file = file
         parser.parse
       }
     }
   end
 
   def test_failers
     failers { |file|
       parser = mkparser
       Puppet.debug("parsing failer #{file}") if __FILE__ == $0
       assert_raise(Puppet::ParseError, "Did not fail while parsing #{file}") {
         parser.file = file
         ast = parser.parse
         config = mkcompiler(parser)
         config.compile
         #ast.hostclass("").evaluate config.topscope
       }
     }
   end
 
   def test_arrayrvalues
     parser = mkparser
     ret = nil
     file = tempfile
     assert_nothing_raised {
       parser.string = "file { \"#{file}\": mode => [755, 640] }"
     }
 
     assert_nothing_raised {
       ret = parser.parse
     }
   end
 
   def test_arrayrvalueswithtrailingcomma
     parser = mkparser
     ret = nil
     file = tempfile
     assert_nothing_raised {
       parser.string = "file { \"#{file}\": mode => [755, 640,] }"
     }
 
     assert_nothing_raised {
       ret = parser.parse
     }
   end
 
   def mkmanifest(file)
     name = File.join(tmpdir, "file#{rand(100)}")
     @@tmpfiles << name
 
     File.open(file, "w") { |f|
       f.puts "file { \"%s\": ensure => file, mode => 755 }\n" % name
     }
   end
 
   def test_importglobbing
     basedir = File.join(tmpdir, "importesting")
     @@tmpfiles << basedir
     Dir.mkdir(basedir)
 
     subdir = "subdir"
     Dir.mkdir(File.join(basedir, subdir))
     manifest = File.join(basedir, "manifest")
     File.open(manifest, "w") { |f|
       f.puts "import \"%s/*\"" % subdir
     }
 
     4.times { |i|
-      path = File.join(basedir, subdir, "subfile#{i}")
+      path = File.join(basedir, subdir, "subfile#{i}.pp")
       mkmanifest(path)
     }
 
     assert_nothing_raised("Could not parse multiple files") {
       parser = mkparser
       parser.file = manifest
       parser.parse
     }
   end
 
   def test_nonexistent_import
     basedir = File.join(tmpdir, "importesting")
     @@tmpfiles << basedir
     Dir.mkdir(basedir)
     manifest = File.join(basedir, "manifest")
     File.open(manifest, "w") do |f|
       f.puts "import \" no such file \""
     end
     assert_raise(Puppet::ParseError) {
       parser = mkparser
       parser.file = manifest
       parser.parse
     }
   end
 
   def test_trailingcomma
     path = tempfile
     str = %{file { "#{path}": ensure => file, }
     }
 
     parser = mkparser
     parser.string = str
 
     assert_nothing_raised("Could not parse trailing comma") {
       parser.parse
     }
   end
 
   def test_importedclasses
-    imported = tempfile
-    importer = tempfile
+    imported = tempfile '.pp'
+    importer = tempfile '.pp'
 
     made = tempfile
 
     File.open(imported, "w") do |f|
       f.puts %{class foo { file { "#{made}": ensure => file }}}
     end
 
     File.open(importer, "w") do |f|
       f.puts %{import "#{imported}"\ninclude foo}
     end
 
     parser = mkparser
     parser.file = importer
 
     # Make sure it parses fine
     assert_nothing_raised {
       parser.parse
     }
 
     # Now make sure it actually does the work
     assert_creates(importer, made)
   end
 
   # Make sure fully qualified and unqualified files can be imported
   def test_fqfilesandlocalfiles
     dir = tempfile
     Dir.mkdir(dir)
     importer = File.join(dir, "site.pp")
     fullfile = File.join(dir, "full.pp")
     localfile = File.join(dir, "local.pp")
 
     files = []
 
     File.open(importer, "w") do |f|
       f.puts %{import "#{fullfile}"\ninclude full\nimport "local.pp"\ninclude local}
     end
 
     fullmaker = tempfile
     files << fullmaker
 
     File.open(fullfile, "w") do |f|
       f.puts %{class full { file { "#{fullmaker}": ensure => file }}}
     end
 
     localmaker = tempfile
     files << localmaker
 
     File.open(localfile, "w") do |f|
       f.puts %{class local { file { "#{localmaker}": ensure => file }}}
     end
 
     parser = mkparser
     parser.file = importer
 
     # Make sure it parses
     assert_nothing_raised {
       parser.parse
     }
 
     # Now make sure it actually does the work
     assert_creates(importer, *files)
   end
 
   # Make sure the parser adds '.pp' when necessary
   def test_addingpp
     dir = tempfile
     Dir.mkdir(dir)
     importer = File.join(dir, "site.pp")
     localfile = File.join(dir, "local.pp")
 
     files = []
 
     File.open(importer, "w") do |f|
       f.puts %{import "local"\ninclude local}
     end
 
     file = tempfile
     files << file
 
     File.open(localfile, "w") do |f|
       f.puts %{class local { file { "#{file}": ensure => file }}}
     end
 
     parser = mkparser
     parser.file = importer
 
     assert_nothing_raised {
       parser.parse
     }
   end
 
   # Make sure that file importing changes file relative names.
   def test_changingrelativenames
     dir = tempfile
     Dir.mkdir(dir)
     Dir.mkdir(File.join(dir, "subdir"))
     top = File.join(dir, "site.pp")
     subone = File.join(dir, "subdir/subone")
     subtwo = File.join(dir, "subdir/subtwo")
 
     files = []
     file = tempfile
     files << file
 
     File.open(subone + ".pp", "w") do |f|
       f.puts %{class one { file { "#{file}": ensure => file }}}
     end
 
     otherfile = tempfile
     files << otherfile
     File.open(subtwo + ".pp", "w") do |f|
       f.puts %{import "subone"\n class two inherits one {
         file { "#{otherfile}": ensure => file }
       }}
     end
 
     File.open(top, "w") do |f|
       f.puts %{import "subdir/subtwo"}
     end
 
     parser = mkparser
     parser.file = top
 
     assert_nothing_raised {
       parser.parse
     }
   end
 
   # Defaults are purely syntactical, so it doesn't make sense to be able to
   # collect them.
   def test_uncollectabledefaults
     string = "@Port { protocols => tcp }"
 
     assert_raise(Puppet::ParseError) {
       mkparser.parse(string)
     }
   end
 
   # Verify that we can parse collections
   def test_collecting
     text = "Port <| |>"
     parser = mkparser
     parser.string = text
 
     ret = nil
     assert_nothing_raised {
       ret = parser.parse
     }
 
     ret.hostclass("").code.each do |obj|
       assert_instance_of(AST::Collection, obj)
     end
   end
 
   def test_emptyfile
     file = tempfile
     File.open(file, "w") do |f|
       f.puts %{}
     end
     parser = mkparser
     parser.file = file
     assert_nothing_raised {
       parser.parse
     }
   end
 
   def test_multiple_nodes_named
     file = tempfile
     other = tempfile
 
     File.open(file, "w") do |f|
       f.puts %{
 node nodeA, nodeB {
   file { "#{other}": ensure => file }
 
 }
 }
     end
 
     parser = mkparser
     parser.file = file
     ast = nil
     assert_nothing_raised {
       ast = parser.parse
     }
   end
 
   def test_emptyarrays
     str = %{$var = []\n}
 
     parser = mkparser
     parser.string = str
 
     # Make sure it parses fine
     assert_nothing_raised {
       parser.parse
     }
   end
 
   # Make sure function names aren't reserved words.
   def test_functionnamecollision
     str = %{tag yayness
 tag(rahness)
 
 file { "/tmp/yayness":
   tag => "rahness",
   ensure => exists
 }
 }
     parser = mkparser
     parser.string = str
 
     # Make sure it parses fine
     assert_nothing_raised {
       parser.parse
     }
   end
 
   def test_metaparams_in_definition_prototypes
     parser = mkparser
 
 
     assert_raise(Puppet::ParseError) {
       parser.parse %{define mydef($schedule) {}}
     }
 
     assert_nothing_raised {
       parser.parse %{define adef($schedule = false) {}}
       parser.parse %{define mydef($schedule = daily) {}}
     }
   end
 
   def test_parsingif
     parser = mkparser
     exec = proc do |val|
       %{exec { "/bin/echo #{val}": logoutput => true }}
     end
     str1 = %{if true { #{exec.call("true")} }}
     ret = nil
     assert_nothing_raised {
       ret = parser.parse(str1).hostclass("").code[0]
     }
     assert_instance_of(Puppet::Parser::AST::IfStatement, ret)
     parser = mkparser
     str2 = %{if true { #{exec.call("true")} } else { #{exec.call("false")} }}
     ret = parser.parse(str2).hostclass("").code[0]
     assert_instance_of(Puppet::Parser::AST::IfStatement, ret)
     assert_instance_of(Puppet::Parser::AST::Else, ret.else)
   end
 
   def test_hostclass
     parser = mkparser
 
     assert_nothing_raised {
       parser.parse %{class myclass { class other {} }}
     }
     assert(parser.hostclass("myclass"), "Could not find myclass")
     assert(parser.hostclass("myclass::other"), "Could not find myclass::other")
 
     assert_nothing_raised {
       parser.parse "class base {}
       class container {
         class deep::sub inherits base {}
       }"
     }
     sub = parser.hostclass("container::deep::sub")
     assert(sub, "Could not find sub")
 
     # Now try it with a parent class being a fq class
     assert_nothing_raised {
       parser.parse "class container::one inherits container::deep::sub {}"
     }
     sub = parser.hostclass("container::one")
     assert(sub, "Could not find one")
     assert_equal("container::deep::sub", sub.parent)
 
     # Finally, try including a qualified class
     assert_nothing_raised("Could not include fully qualified class") {
       parser.parse "include container::deep::sub"
     }
   end
 
   def test_topnamespace
     parser = mkparser
 
     # Make sure we put the top-level code into a class called "" in
     # the "" namespace
     assert_nothing_raised do
       out = parser.parse ""
 
       assert_instance_of(Puppet::Resource::TypeCollection, out)
       assert_nil(parser.hostclass(""), "Got a 'main' class when we had no code")
     end
 
     # Now try something a touch more complicated
     parser.initvars
     assert_nothing_raised do
       out = parser.parse "Exec { path => '/usr/bin:/usr/sbin' }"
       assert_instance_of(Puppet::Resource::TypeCollection, out)
       assert_equal("", parser.hostclass("").name)
       assert_equal("", parser.hostclass("").namespace)
     end
   end
 
   # Make sure virtual and exported resources work appropriately.
   def test_virtualresources
     tests = [:virtual]
     if Puppet.features.rails?
       catalog_cache_class = Puppet::Resource::Catalog.indirection.cache_class
       facts_cache_class = Puppet::Node::Facts.indirection.cache_class
       node_cache_class = Puppet::Node.indirection.cache_class
       Puppet[:storeconfigs] = true
       tests << :exported
     end
 
     tests.each do |form|
       parser = mkparser
 
       if form == :virtual
         at = "@"
       else
         at = "@@"
       end
 
       check = proc do |res, msg|
         if res.is_a?(Puppet::Parser::Resource)
           txt = res.ref
         else
           txt = res.class
         end
         # Real resources get marked virtual when exported
         if form == :virtual or res.is_a?(Puppet::Parser::Resource)
           assert(res.virtual, "#{msg} #{at}#{txt} is not virtual")
         end
         if form == :virtual
           assert(! res.exported, "#{msg} #{at}#{txt} is exported")
         else
           assert(res.exported, "#{msg} #{at}#{txt} is not exported")
         end
       end
 
       ret = nil
       assert_nothing_raised do
         ret = parser.parse("#{at}file { '/tmp/testing': owner => root }")
       end
 
       assert_instance_of(AST::ASTArray, ret.hostclass("").code)
       resdef = ret.hostclass("").code[0]
       assert_instance_of(AST::Resource, resdef)
       assert_equal("/tmp/testing", resdef.title.value)
       # We always get an astarray back, so...
       check.call(resdef, "simple resource")
 
       # Now let's try it with multiple resources in the same spec
       assert_nothing_raised do
         ret = parser.parse("#{at}file { ['/tmp/1', '/tmp/2']: owner => root }")
       end
 
       ret.hostclass("").code.each do |res|
         assert_instance_of(AST::Resource, res)
         check.call(res, "multiresource")
       end
     end
 
   ensure
     if Puppet.features.rails?
       Puppet[:storeconfigs] = false
       Puppet::Resource::Catalog.cache_class =  catalog_cache_class
       Puppet::Node::Facts.cache_class = facts_cache_class
       Puppet::Node.cache_class = node_cache_class
     end
   end
 
   def test_collections
     tests = [:virtual]
     if Puppet.features.rails?
       catalog_cache_class = Puppet::Resource::Catalog.indirection.cache_class
       facts_cache_class = Puppet::Node::Facts.indirection.cache_class
       node_cache_class = Puppet::Node.indirection.cache_class
       Puppet[:storeconfigs] = true
       tests << :exported
     end
 
     tests.each do |form|
       Puppet::Node::Environment.clear
       parser = mkparser
 
       if form == :virtual
         arrow = "<||>"
       else
         arrow = "<<||>>"
       end
 
       ret = nil
       assert_nothing_raised do
         ret = parser.parse("File #{arrow}")
       end
 
       coll = ret.hostclass("").code[0]
       assert_instance_of(AST::Collection, coll)
       assert_equal(form, coll.form)
     end
 
   ensure
     if Puppet.features.rails?
       Puppet[:storeconfigs] = false
       Puppet::Resource::Catalog.cache_class =  catalog_cache_class
       Puppet::Node::Facts.cache_class = facts_cache_class
       Puppet::Node.cache_class = node_cache_class
     end
   end
 
   def test_collectionexpressions
     %w{== !=}.each do |oper|
       Puppet::Node::Environment.clear
       str = "File <| title #{oper} '/tmp/testing' |>"
 
       parser = mkparser
 
       res = nil
       assert_nothing_raised do
         res = parser.parse(str).hostclass("").code[0]
       end
 
       assert_instance_of(AST::Collection, res)
 
       query = res.query
       assert_instance_of(AST::CollExpr, query)
 
       assert_equal(:virtual, query.form)
       assert_equal("title", query.test1.value)
       assert_equal("/tmp/testing", query.test2.value)
       assert_equal(oper, query.oper)
     end
   end
 
   def test_collectionstatements
     %w{and or}.each do |joiner|
       str = "File <| title == '/tmp/testing' #{joiner} owner == root |>"
 
       parser = mkparser
 
       res = nil
       assert_nothing_raised do
         res = parser.parse(str).hostclass("").code[0]
       end
 
       assert_instance_of(AST::Collection, res)
 
       query = res.query
       assert_instance_of(AST::CollExpr, query)
 
       assert_equal(joiner, query.oper)
       assert_instance_of(AST::CollExpr, query.test1)
       assert_instance_of(AST::CollExpr, query.test2)
     end
   end
 
   def test_collectionstatements_with_parens
     [
       "(title == '/tmp/testing' and owner == root) or owner == wheel",
       "(title == '/tmp/testing')"
     ].each do |test|
       str = "File <| #{test} |>"
       parser = mkparser
 
       res = nil
       assert_nothing_raised("Could not parse '#{test}'") do
         res = parser.parse(str).hostclass("").code[0]
       end
 
       assert_instance_of(AST::Collection, res)
 
       query = res.query
       assert_instance_of(AST::CollExpr, query)
 
       #assert_equal(joiner, query.oper)
       #assert_instance_of(AST::CollExpr, query.test1)
       #assert_instance_of(AST::CollExpr, query.test2)
     end
   end
 
   def test_fully_qualified_definitions
     parser = mkparser
 
     assert_nothing_raised("Could not parse fully-qualified definition") {
       parser.parse %{define one::two { }}
     }
     assert(parser.definition("one::two"), "Could not find one::two with no namespace")
 
     # Now try using the definition
     assert_nothing_raised("Could not parse fully-qualified definition usage") {
       parser.parse %{one::two { yayness: }}
     }
   end
 
   # #524
   def test_functions_with_no_arguments
     parser = mkparser
     assert_nothing_raised("Could not parse statement function with no args") {
       parser.parse %{tag()}
     }
     assert_nothing_raised("Could not parse rvalue function with no args") {
       parser.parse %{$testing = template()}
     }
   end
 
   # #774
   def test_fully_qualified_collection_statement
     parser = mkparser
     assert_nothing_raised("Could not parse fully qualified collection statement") {
       parser.parse %{Foo::Bar <||>}
     }
   end
 
   def test_multiple_imports_on_one_line
-    one = tempfile
-    two = tempfile
-    base = tempfile
+    one = tempfile '.pp'
+    two = tempfile '.pp'
+    base = tempfile '.pp'
     File.open(one, "w") { |f| f.puts "$var = value" }
     File.open(two, "w") { |f| f.puts "$var = value" }
     File.open(base, "w") { |f| f.puts "import '#{one}', '#{two}'" }
 
     parser = mkparser
     parser.file = base
 
     # Importing is logged at debug time.
     Puppet::Util::Log.level = :debug
     assert_nothing_raised("Parser could not import multiple files at once") do
       parser.parse
     end
 
     [one, two].each do |file|
       assert(@logs.detect { |l| l.message =~ /importing '#{file}'/}, "did not import #{file}")
     end
   end
 
   def test_cannot_assign_qualified_variables
     parser = mkparser
     assert_raise(Puppet::ParseError, "successfully assigned a qualified variable") do
       parser.parse("$one::two = yay")
     end
   end
 
   # #629 - undef keyword
   def test_undef
     parser = mkparser
     result = nil
     assert_nothing_raised("Could not parse assignment to undef") {
       result = parser.parse %{$variable = undef}
     }
 
     main = result.hostclass("").code
     children = main.children
     assert_instance_of(AST::VarDef, main.children[0])
     assert_instance_of(AST::Undef, main.children[0].value)
   end
 
   # Prompted by #729 -- parsing should not modify the interpreter.
   def test_parse
     parser = mkparser
 
     str = "file { '/tmp/yay': ensure => file }\nclass yay {}\nnode foo {}\ndefine bar {}\n"
     result = nil
     assert_nothing_raised("Could not parse") do
       result = parser.parse(str)
     end
     assert_instance_of(Puppet::Resource::TypeCollection, result, "Did not get a ASTSet back from parsing")
 
     assert_instance_of(Puppet::Resource::Type, result.hostclass("yay"), "Did not create 'yay' class")
     assert_instance_of(Puppet::Resource::Type, result.hostclass(""), "Did not create main class")
     assert_instance_of(Puppet::Resource::Type, result.definition("bar"), "Did not create 'bar' definition")
     assert_instance_of(Puppet::Resource::Type, result.node("foo"), "Did not create 'foo' node")
   end
 
   def test_namesplit
     parser = mkparser
 
     assert_nothing_raised do
       {"base::sub" => %w{base sub},
         "main" => ["", "main"],
         "one::two::three::four" => ["one::two::three", "four"],
       }.each do |name, ary|
         result = parser.namesplit(name)
         assert_equal(ary, result, "#{name} split to #{result}")
       end
     end
   end
 
   # Make sure class, node, and define methods are case-insensitive
   def test_structure_case_insensitivity
     parser = mkparser
 
     result = nil
     assert_nothing_raised do
       result = parser.newclass "Yayness"
     end
     assert_equal(result, parser.find_hostclass("", "yayNess"))
 
     assert_nothing_raised do
       result = parser.newdefine "FunTest"
     end
     assert_equal(result, parser.find_definition("", "fUntEst"), "#{"fUntEst"} was not matched")
   end
 end
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index e31a31902..294d0ef8d 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -1,339 +1,339 @@
 # Add .../test/lib
 testlib = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(testlib) unless $LOAD_PATH.include?(testlib)
 # Add .../lib
 mainlib = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 $LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib)
 
 require 'puppet'
 
 # include any gems in vendor/gems
 Dir["#{mainlib}/../vendor/gems/**"].each do |path|
   libpath = File.join(path, "lib")
   if File.directory?(libpath)
     $LOAD_PATH.unshift(libpath)
   else
     $LOAD_PATH.unshift(path)
   end
 end
 
 require 'mocha'
 
 # Only load the test/unit class if we're not in the spec directory.
 # Else we get the bogus 'no tests, no failures' message.
 unless Dir.getwd =~ /spec/
   require 'test/unit'
 end
 
 # Yay; hackish but it works
 if ARGV.include?("-d")
   ARGV.delete("-d")
   $console = true
 end
 
 # Some monkey-patching to allow us to test private methods.
 class Class
   def publicize_methods(*methods)
     saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
 
     self.class_eval { public(*saved_private_instance_methods) }
     yield
     self.class_eval { private(*saved_private_instance_methods) }
   end
 end
 
 module PuppetTest
   # These need to be here for when rspec tests use these
   # support methods.
   @@tmpfiles = []
 
   # Munge cli arguments, so we can enable debugging if we want
   # and so we can run just specific methods.
   def self.munge_argv
     require 'getoptlong'
 
 
       result = GetoptLong.new(
 
         [ "--debug",    "-d", GetoptLong::NO_ARGUMENT       ],
         [ "--resolve",  "-r", GetoptLong::REQUIRED_ARGUMENT ],
         [ "-n",               GetoptLong::REQUIRED_ARGUMENT ],
 
         [ "--help",     "-h", GetoptLong::NO_ARGUMENT       ]
     )
 
     usage = "USAGE: TESTOPTS='[-n <method> -n <method> ...] [-d]' rake [target] [target] ..."
 
     opts = []
 
     dir = method = nil
     result.each { |opt,arg|
       case opt
       when "--resolve"
         dir, method = arg.split(",")
       when "--debug"
         $puppet_debug = true
         Puppet::Util::Log.level = :debug
         Puppet::Util::Log.newdestination(:console)
       when "--help"
         puts usage
         exit
       else
         opts << opt << arg
       end
     }
     suites = nil
 
     args = ARGV.dup
 
     # Reset the options, so the test suite can deal with them (this is
     # what makes things like '-n' work).
     opts.each { |o| ARGV << o }
 
     args
   end
 
   # Find the root of the Puppet tree; this is not the test directory, but
   # the parent of that dir.
   def basedir(*list)
     unless defined?(@@basedir)
       Dir.chdir(File.dirname(__FILE__)) do
         @@basedir = File.dirname(File.dirname(Dir.getwd))
       end
     end
     if list.empty?
       @@basedir
     else
       File.join(@@basedir, *list)
     end
   end
 
   def datadir(*list)
     File.join(basedir, "test", "data", *list)
   end
 
   def exampledir(*args)
     @@exampledir = File.join(basedir, "examples") unless defined?(@@exampledir)
 
     if args.empty?
       return @@exampledir
     else
       return File.join(@@exampledir, *args)
     end
   end
 
   module_function :basedir, :datadir, :exampledir
 
   def cleanup(&block)
     @@cleaners << block
   end
 
   # Rails clobbers RUBYLIB, thanks
   def libsetup
     curlibs = ENV["RUBYLIB"].split(":")
     $LOAD_PATH.reject do |dir| dir =~ /^\/usr/ end.each do |dir|
       curlibs << dir unless curlibs.include?(dir)
     end
 
     ENV["RUBYLIB"] = curlibs.join(":")
   end
 
   def logcollector
     collector = []
     Puppet::Util::Log.newdestination(collector)
     cleanup do
       Puppet::Util::Log.close(collector)
     end
     collector
   end
 
   def rake?
     $0 =~ /test_loader/
   end
 
   # Redirect stdout and stderr
   def redirect
     @stderr = tempfile
     @stdout = tempfile
     $stderr = File.open(@stderr, "w")
     $stdout = File.open(@stdout, "w")
 
     cleanup do
       $stderr = STDERR
       $stdout = STDOUT
     end
   end
 
   def setup
     ENV["PATH"] += File::PATH_SEPARATOR + "/usr/sbin" unless ENV["PATH"].split(File::PATH_SEPARATOR).include?("/usr/sbin")
     @memoryatstart = Puppet::Util.memory
     if defined?(@@testcount)
       @@testcount += 1
     else
       @@testcount = 0
     end
 
 
       @configpath = File.join(
         tmpdir,
 
       "configdir" + @@testcount.to_s + "/"
     )
 
     unless defined? $user and $group
       $user = nonrootuser.uid.to_s
       $group = nonrootgroup.gid.to_s
     end
 
     Puppet.settings.clear
     Puppet[:user] = $user
     Puppet[:group] = $group
 
     Puppet[:confdir] = @configpath
     Puppet[:vardir] = @configpath
 
     Dir.mkdir(@configpath) unless File.exists?(@configpath)
 
     @@tmpfiles << @configpath << tmpdir
     @@tmppids = []
 
     @@cleaners = []
 
     @logs = []
 
     # If we're running under rake, then disable debugging and such.
     #if rake? or ! Puppet[:debug]
     #if defined?($puppet_debug) or ! rake?
       Puppet[:color] = false if textmate?
       Puppet::Util::Log.newdestination(@logs)
       if defined? $console
         Puppet.info @method_name
         Puppet::Util::Log.newdestination(:console)
         Puppet[:trace] = true
       end
       Puppet::Util::Log.level = :debug
       #$VERBOSE = 1
     #else
     #    Puppet::Util::Log.close
     #    Puppet::Util::Log.newdestination(@logs)
     #    Puppet[:httplog] = tempfile
     #end
 
     Puppet[:ignoreschedules] = true
 
     #@start = Time.now
 
     #Facter.stubs(:value).returns "stubbed_value"
     #Facter.stubs(:to_hash).returns({})
   end
 
-  def tempfile
+  def tempfile(suffix = '')
     if defined?(@@tmpfilenum)
       @@tmpfilenum += 1
     else
       @@tmpfilenum = 1
     end
 
-    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s)
+    f = File.join(self.tmpdir, "tempfile_" + @@tmpfilenum.to_s + suffix)
     @@tmpfiles ||= []
     @@tmpfiles << f
     f
   end
 
   def textmate?
     !!ENV["TM_FILENAME"]
   end
 
   def tstdir
     dir = tempfile
     Dir.mkdir(dir)
     dir
   end
 
   def tmpdir
     unless @tmpdir
       @tmpdir = case Facter["operatingsystem"].value
         when "Darwin"; "/private/tmp"
         when "SunOS"; "/var/tmp"
         else
           "/tmp"
             end
 
 
       @tmpdir = File.join(@tmpdir, "puppettesting#{Process.pid}")
 
       unless File.exists?(@tmpdir)
         FileUtils.mkdir_p(@tmpdir)
         File.chmod(01777, @tmpdir)
       end
     end
     @tmpdir
   end
 
   def remove_tmp_files
     @@tmpfiles.each { |file|
       unless file =~ /tmp/
         puts "Not deleting tmpfile #{file}"
         next
       end
       if FileTest.exists?(file)
         system("chmod -R 755 #{file}")
         system("rm -rf #{file}")
       end
     }
     @@tmpfiles.clear
   end
 
   def teardown
     #@stop = Time.now
     #File.open("/tmp/test_times.log", ::File::WRONLY|::File::CREAT|::File::APPEND) { |f| f.puts "%0.4f %s %s" % [@stop - @start, @method_name, self.class] }
     @@cleaners.each { |cleaner| cleaner.call }
 
     remove_tmp_files
 
     @@tmppids.each { |pid|
       %x{kill -INT #{pid} 2>/dev/null}
     }
 
     @@tmppids.clear
 
     Puppet::Util::Storage.clear
     Puppet.clear
     Puppet.settings.clear
     Puppet::Util::Cacher.expire
 
     @memoryatend = Puppet::Util.memory
     diff = @memoryatend - @memoryatstart
 
     Puppet.info "#{self.class}##{@method_name} memory growth (#{@memoryatstart} to #{@memoryatend}): #{diff}" if diff > 1000
 
     # reset all of the logs
     Puppet::Util::Log.close_all
     @logs.clear
 
     # Just in case there are processes waiting to die...
     require 'timeout'
 
     begin
       Timeout::timeout(5) do
         Process.waitall
       end
     rescue Timeout::Error
       # just move on
     end
   end
 
   def logstore
     @logs = []
     Puppet::Util::Log.newdestination(@logs)
   end
 end
 
 require 'puppettest/support'
 require 'puppettest/filetesting'
 require 'puppettest/fakes'
 require 'puppettest/exetest'
 require 'puppettest/parsertesting'
 require 'puppettest/servertest'
 require 'puppettest/testcase'