diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
| commit | 80c9a8feeae6203026f61215e100e95078c61a04 (patch) | |
| tree | e70920f96b88bdc9e985e2439f395371d5ffe2be /manifests | |
| parent | 1434f3cea6f6e2a1b939d91cb5ff66338cc87d32 (diff) | |
| parent | a8d4bbd9e234ea577e27d83df95a61b374ac484b (diff) | |
Merge branch 'v2.1.x' into v2.2.x
* v2.1.x:
(maint) Add semantic versioning info to README
Docs: Clarify the use case for the anchor type
Docs: Remove author emails from stdlib functions
Docs: Copyedit function doc strings
Docs: Correct indentation of markdown code examples
Docs: Update documentation of stdlib classes
Docs: Update file_line documentation
Docs: Improve example in merge function
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 12 | ||||
| -rw-r--r-- | manifests/stages.pp | 11 |
2 files changed, 13 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c804568..500ad77 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,16 +1,18 @@ # Class: stdlib # -# This module manages stdlib +# This module manages stdlib. Most of stdlib's features are automatically +# loaded by Puppet, but this class should be declared in order to use the +# standardized run stages. # -# Parameters: +# Parameters: none # # Actions: # -# Requires: +# Declares all other classes in the stdlib module. Currently, this consists +# of stdlib::stages. # -# Sample Usage: +# Requires: nothing # -# [Remember: No empty lines between comments and class definition] class stdlib { class { 'stdlib::stages': } diff --git a/manifests/stages.pp b/manifests/stages.pp index 365b905..eb15fd6 100644 --- a/manifests/stages.pp +++ b/manifests/stages.pp @@ -1,8 +1,9 @@ # Class: stdlib::stages # -# This class manages a standard set of Run Stages for Puppet. +# This class manages a standard set of run stages for Puppet. It is managed by +# the stdlib class, and should not be declared independently. # -# The high level stages are (In order): +# The high level stages are (in order): # # * setup # * main @@ -13,19 +14,19 @@ # * deploy_app # * deploy # -# Parameters: +# Parameters: none # # Actions: # # Declares various run-stages for deploying infrastructure, # language runtimes, and application layers. # -# Requires: +# Requires: nothing # # Sample Usage: # # node default { -# include stdlib::stages +# include stdlib # class { java: stage => 'runtime' } # } # |