Merge pull request #799 from eimlav/string-fix

(maint) - Fix cut off summary for apt_key

diff --git a/REFERENCE.md b/REFERENCE.md
index ded9ade0e188141f7a359e9f752f831b71717233..3e1347a9f9381370073d78e505055866113cefeb 100644 (file)
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -31,7 +31,9 @@ _Public Resource types_
 
 _Private Resource types_
 
-* `apt_key`: This type provides Puppet with the capabilities to manage GPG keys needed by apt to perform package validation. Apt has it's own GPG keyring 
+* `apt_key`: This type provides Puppet with the capabilities to manage GPG keys needed
+by apt to perform package validation. Apt has it's own GPG keyring that can
+be manipulated through the `apt-key` command.
 
 **Tasks**
 
@@ -444,7 +446,7 @@ The following parameters are available in the `apt::key` defined type.
 
 ##### `id`
 
-Data type: `String`
+Data type: `Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/]`
 
 Specifies a GPG key to authenticate Apt package signatures. Valid options: a string containing a key ID (8 or 16 hexadecimal
 characters, optionally prefixed with "0x") or a full key fingerprint (40 hexadecimal characters).
@@ -469,7 +471,7 @@ Default value: `undef`
 
 ##### `source`
 
-Data type: `Optional[String]`
+Data type: `Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]]`
 
 Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or
 an absolute path.
@@ -478,7 +480,7 @@ Default value: `undef`
 
 ##### `server`
 
-Data type: `String`
+Data type: `Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/]`
 
 Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
 hkp://).

diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb
index 5150ee8ed29f3c3d2c0f8bd5e9be37f07c02487f..e192077ae6fcfba966bc70a83ad94fa860dc2671 100644 (file)
--- a/lib/puppet/type/apt_key.rb
+++ b/lib/puppet/type/apt_key.rb
@@ -3,9 +3,9 @@ require 'puppet/parameter/boolean'
 
 Puppet::Type.newtype(:apt_key) do
   @doc = <<-MANIFEST
-    This type provides Puppet with the capabilities to manage GPG keys needed
-    by apt to perform package validation. Apt has it's own GPG keyring that can
-    be manipulated through the `apt-key` command.
+    @summary This type provides Puppet with the capabilities to manage GPG keys needed
+      by apt to perform package validation. Apt has it's own GPG keyring that can
+      be manipulated through the `apt-key` command.
 
     @example Basic usage
       apt_key { '6F6B15509CF8E59E6E469F327F438280EF8D349F':