diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-22 11:41:53 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-22 11:41:53 -0700 |
| commit | 6bf5b7fea8ef4d04809e78eef84029a0773d4747 (patch) | |
| tree | cc264fef5811c7d5e8000bc4048bab86b87064a0 /lib | |
| parent | e80063468e404a6827ea6ec458ae34ca84619eed (diff) | |
| parent | f6da3339f59bbd9243a03dc1e417b1fed7955c7e (diff) | |
| download | puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.tar.gz puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.tar.xz puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.zip | |
Merge branch 'ticket/next/maint-fix_require_spec_helper_for_ruby_19' into next
* ticket/next/maint-fix_require_spec_helper_for_ruby_19:
maint: Change code for finding spec_helper to work with Ruby 1.9
Fix error "invalid multibyte char (US-ASCII)" under Ruby 1.9
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type/macauthorization.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/type/macauthorization.rb b/lib/puppet/type/macauthorization.rb index e89aa7c89..b16ab6dde 100644 --- a/lib/puppet/type/macauthorization.rb +++ b/lib/puppet/type/macauthorization.rb @@ -2,7 +2,7 @@ Puppet::Type.newtype(:macauthorization) do @doc = "Manage the Mac OS X authorization database. See the [Apple developer site](http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html) for more information. - + **Autorequires:** If Puppet is managing the `/etc/authorization` file, each macauthorization resource will autorequire it." @@ -33,8 +33,8 @@ Puppet::Type.newtype(:macauthorization) 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. + 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 |
