puppet 5.0.0 → 6.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: b54142084fb822aa85a40f5e383869469ec2b3d8be722ce8c32ce7837c81d4b6
+  data.tar.gz: 9e9769a816524a8ec54392fcbca962bf08d37fe285f69b5fcbd43d765f33a666
+SHA512:
+  metadata.gz: 49f0b565d47831d73b95d6ccd6616febab630c49985ec7a8cca488e80f5830478952a50efbb5876e4b75506a985d2f56f2b658394e223b1218c941417823681c
+  data.tar.gz: fd573546cde9cc6606c7808d1a437bfb9e341d46b2f95370a27ce3a0fa35e370f87369bf62f3368b2447c2c4ed61b27e296abf7d9954a683e441ee9c3dc8754b

data/CONTRIBUTING.md

@@ -22,19 +22,18 @@ be added in modules. Exceptions would be things like new cross-OS providers
 and updates to existing core types.
 
 If you are unsure of whether your contribution should be implemented as a
-module or part of Puppet Core, you may visit
-[#puppet-dev on Freenode IRC](https://freenode.net) or ask on the
-[puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
-for advice.
+module or part of Puppet Core, you may visit [#puppet-dev on slack](https://puppetcommunity.slack.com/), or ask on
+the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev) for advice.
 
 ## Getting Started
 
-* Make sure you have a [Jira account](https://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
+* Make sure you have a [Jira account](https://tickets.puppetlabs.com).
+* Make sure you have a [GitHub account](https://github.com/signup/free).
+* Submit a Jira ticket for your issue if one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
+  * A ticket is not necessary for [trivial changes](https://puppet.com/community/trivial-patch-exemption-policy)
+* Fork the repository on GitHub.
 
 ## Making Changes
 
@@ -42,29 +41,31 @@ for advice.
   * This is usually the master branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master; `git checkout -b
+  * To quickly create a topic branch based on master, run `git checkout -b
     fix/master/my_contribution master`. Please avoid working directly on the
     `master` branch.
-* Make commits of logical units.
+* Make commits of logical and atomic units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (PUP-1234) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
+* Make sure your commit messages are in the proper format. If the commit
+  addresses an issue filed in the
+  [Puppet Jira project](https://tickets.puppetlabs.com/browse/PUP), start
+  the first line of the commit with the issue number in parentheses.
+
+  ```
+      (PUP-1234) Make the example in CONTRIBUTING imperative and concrete
+
+      Without this patch applied the example commit message in the CONTRIBUTING
+      document is not a concrete example. This is a problem because the
+      contributor is left to imagine what the commit message should look like
+      based on a description rather than an example. This patch fixes the
+      problem by making the example concrete and imperative.
+
+      The first line is a real-life imperative statement with a ticket number
+      from our issue tracker. The body describes the behavior without the patch,
+      why this is a problem, and how the patch fixes the problem when applied.
+  ```
 * Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
+* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md)
 
 ## Writing Translatable Code
 
@@ -75,9 +76,10 @@ wrapped in the `_()` translation function, so they can be extracted into files
 for the translators.
 
 When adding user-facing strings to your work, follow these guidelines:
+
 * Use full sentences. Strings built up out of concatenated bits are hard to translate.
-* Use string formatting instead of interpolation.
-    Ex. `_('Creating new user %{name}.') % { name: user.name }`
+* Use string formatting instead of interpolation. Use the hash format and give good names to the placeholder values that can be used by translators to understand the meaning of the formatted values.
+  For example: `_('Creating new user %{name}.') % { name: user.name }`
 * Use `n_()` for pluralization. (see gettext gem docs linked above for details)
 
 It is the responsibility of contributors and code reviewers to ensure that all
@@ -85,32 +87,38 @@ user-facing strings are marked in new PRs before merging.
 
 ## Making Trivial Changes
 
-### Documentation
+For [changes of a trivial nature](https://puppet.com/community/trivial-patch-exemption-policy), it is not always necessary to create a new
+ticket in Jira. In this case, it is appropriate to start the first line of a
+commit with one of  `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
+number.
 
-For changes of a trivial nature to comments and documentation, it is not
-always necessary to create a new ticket in Jira. In this case, it is
-appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number.
+If a Jira ticket exists for the documentation commit, you can include it
+after the `(docs)` token.
 
-````
-    (doc) Add documentation commit example to CONTRIBUTING
+```
+    (docs)(DOCUMENT-000) Add docs commit example to CONTRIBUTING
 
     There is no example for contributing a documentation commit
     to the Puppet repository. This is a problem because the contributor
     is left to assume how a commit of this nature may appear.
 
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a
+    The first line is a real-life imperative statement with '(docs)' in
+    place of what would have been the PUP project ticket number in a
     non-documentation related commit. The body describes the nature of
     the new documentation or comments added.
-````
+```
+
+For commits that address trivial repository maintenance tasks or packaging
+issues, start the first line of the commit with `(maint)` or `(packaging)`,
+respectively.
 
 ## Submitting Changes
 
 * Sign the [Contributor License Agreement](http://links.puppet.com/cla).
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to the repository in the puppetlabs organization.
-* Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
+* Update your Jira ticket to mark that you have submitted code and are ready
+  for it to be reviewed (Status: Ready for Merge).
   * Include a link to the pull request in the ticket.
 * The core team looks at Pull Requests on a regular basis in a weekly triage
   meeting that we hold in a public Google Hangout. The hangout is announced in
@@ -122,6 +130,7 @@ a ticket number.
   weeks we may close the pull request if it isn't showing any activity.
 
 ## Revert Policy
+
 By running tests in advance and by engaging with peer review for prospective
 changes, your contributions have a high probability of becoming long lived
 parts of the the project. After being merged, the code will run through a
@@ -142,12 +151,13 @@ ticket. This test(s) should be used to check future submissions of the code to
 ensure the issue has been resolved.
 
 ### Summary
+
 * Changes resulting in test pipeline failures will be reverted if they cannot
   be resolved within one business day.
 
-# Additional Resources
+## Additional Resources
 
-* [Puppet community guidelines](https://docs.puppet.com/community/community_guidelines.html)
+* [Puppet community guidelines](https://puppet.com/community/community-guidelines)
 * [Bug tracker (Jira)](https://tickets.puppetlabs.com)
 * [Contributor License Agreement](http://links.puppet.com/cla)
 * [General GitHub documentation](https://help.github.com/)

data/Gemfile

@@ -1,103 +1,70 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
+gemspec
+
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+    [fake_version, { git: $1, branch: $2, require: false }].compact
   elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+    ['>= 0', { path: File.expand_path($1), require: false }]
   else
-    [place, { :require => false }]
+    [place, { require: false }]
   end
 end
 
-# C Ruby (MRI) or Rubinius, but NOT Windows
-platforms :ruby do
-  gem 'pry', :group => :development
-  gem 'redcarpet', '~> 2.0', :group => :development
-  gem "racc", "1.4.9", :group => :development
-
-  # To enable the augeas feature, use this gem.
-  # Note that it is a native gem, so the augeas headers/libs
-  # are neeed.
-  #gem 'ruby-augeas', :group => :development
+# override .gemspec deps - may issue warning depending on Bundler version
+gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
+gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
+gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
+gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])
+
+group(:features) do
+  gem 'diff-lcs', '~> 1.3', require: false
+  gem 'hiera-eyaml', require: false
+  gem 'hocon', '~> 1.0', require: false
+  # requires native libshadow headers/libs
+  # gem 'libshadow', '~> 1.0', require: false, platforms: [:ruby]
+  gem 'minitar', '~> 0.6', require: false
+  gem 'msgpack', '~> 1.2', require: false
+  gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
+  # requires native augeas headers/libs
+  # gem 'ruby-augeas', require: false, platforms: [:ruby]
+  # requires native ldap headers/libs
+  # gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
+  gem 'puppetserver-ca', '~> 0.5', require: false
 end
 
-gem "puppet", :path => File.dirname(__FILE__), :require => false
-gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
-gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 3.2.1', '< 4'])
-# PUP-7115 - return to a gem dependency in Puppet 5
-# gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ['>= 0.1.3', '< 2'])
-# i18n support (gettext-setup and dependencies)
-gem 'gettext-setup', '>= 0.10', '< 1.0', :require => false
-gem 'locale', '~> 2.1', :require => false
-
-group(:development, :test) do
-  gem "rake", "10.1.1", :require => false
-  gem "rspec", "~> 3.1", :require => false
-  gem "rspec-its", "~> 1.1", :require => false
-  gem "rspec-collection_matchers", "~> 1.1", :require => false
-  gem "rspec-legacy_formatters", "~> 1.0", :require => false
-
-  # Mocha is not compatible across minor version changes; because of this only
-  # versions matching ~> 0.10.5 are supported. All other versions are unsupported
-  # and can be expected to fail.
-  gem "mocha", "~> 0.10.5", :require => false
-
-  gem "yarjuf", "~> 2.0"
-
-  # json-schema does not support windows, so omit it from the platforms list
-  # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
-  gem "multi_json", "1.7.7", :require => false, :platforms => [:ruby, :jruby]
-  gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
-
-  gem "rubocop", "~> 0.39.0", :platforms => [:ruby]
-  # pin rainbow gem as 2.2.1 requires rubygems 2.6.9+ and (donotwant)
-  gem "rainbow", "< 2.2.1", :platforms => [:ruby]
-
-  gem 'rdoc', "~> 4.1", :platforms => [:ruby]
-  gem 'yard'
-
-  # webmock requires addressable as as of 2.5.0 addressable started
-  # requiring the public_suffix gem which requires Ruby 2
-  gem 'addressable', '< 2.5.0'
-  gem 'webmock', '~> 1.24'
-  gem 'vcr', '~> 2.9'
-  gem "hiera-eyaml", :require => false
+group(:test) do
+  gem "json-schema", "~> 2.0", require: false
+  gem "mocha", '~> 1.5.0', require: false
+  gem "rake", '~> 12.2.1', require: false
+  gem "rspec", "~> 3.1", require: false
+  gem "rspec-its", "~> 1.1", require: false
+  gem "rspec-collection_matchers", "~> 1.1", require: false
+  gem 'vcr', '~> 2.9', require: false
+  gem 'webmock', '~> 1.24', require: false
+  gem 'yard', require: false
+
+  gem 'rubocop', '~> 0.49', require: false, platforms: [:ruby]
+  gem 'rubocop-i18n', '~> 1.2.0', require: false, platforms: [:ruby]
 end
 
-group(:development) do
+group(:development, optional: true) do
+  gem 'memory_profiler', require: false, platforms: [:mri]
+  gem 'pry', require: false, platforms: [:ruby]
+  gem "racc", "1.4.9", require: false, platforms: [:ruby]
   if RUBY_PLATFORM != 'java'
-    gem 'ruby-prof', '>= 0.16.0', :require => false
+    gem 'ruby-prof', '>= 0.16.0', require: false
   end
 end
 
-group(:extra) do
-  gem "rack", "~> 1.4", :require => false
-  gem "puppetlabs_spec_helper", :require => false
-  gem "msgpack", :require => false
+group(:packaging) do
+  gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.99')
 end
 
-require 'yaml'
-data = YAML.load_file(File.join(File.dirname(__FILE__), 'ext', 'project_data.yaml'))
-bundle_platforms = data['bundle_platforms']
-x64_platform = Gem::Platform.local.cpu == 'x64'
-data['gem_platform_dependencies'].each_pair do |gem_platform, info|
-  next if gem_platform == 'x86-mingw32' && x64_platform
-  next if gem_platform == 'x64-mingw32' && !x64_platform
-  if bundle_deps = info['gem_runtime_dependencies']
-    bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
-    if bundle_platform == "all"
-      bundle_deps.each_pair do |name, version|
-        gem(name, version, :require => false)
-      end
-    else
-      platform(bundle_platform.intern) do
-        bundle_deps.each_pair do |name, version|
-          gem(name, version, :require => false)
-        end
-      end
-    end
-  end
+group(:documentation) do
+  gem 'gettext-setup', '~> 0.28', require: false, platforms: [:ruby]
+  gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
 end
 
 if File.exists? "#{__FILE__}.local"

data/Gemfile.lock

@@ -0,0 +1,156 @@
+PATH
+  remote: .
+  specs:
+    puppet (6.0.0)
+      CFPropertyList (~> 2.2)
+      facter (>= 2.0.1, < 4)
+      fast_gettext (~> 1.1.2)
+      hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
+      locale (~> 2.1)
+      multi_json (~> 1.13)
+      semantic_puppet (~> 1.0)
+
+GEM
+  remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
+  specs:
+    CFPropertyList (2.3.6)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    artifactory (2.8.2)
+    ast (2.4.0)
+    coderay (1.1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    facter (2.5.1)
+    fast_gettext (1.1.2)
+    gettext (3.2.9)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.30)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
+      locale
+    hashdiff (0.3.7)
+    hiera (3.4.4)
+    hiera-eyaml (2.1.0)
+      highline (~> 1.6.19)
+      trollop (~> 2.0)
+    highline (1.6.21)
+    hocon (1.2.5)
+    hpricot (0.8.6)
+    httpclient (2.8.3)
+    json-schema (2.8.0)
+      addressable (>= 2.4)
+    locale (2.1.2)
+    memory_profiler (0.9.11)
+    metaclass (0.0.4)
+    method_source (0.9.0)
+    minitar (0.6.1)
+    mocha (1.5.0)
+      metaclass (~> 0.0.1)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    mustache (1.0.5)
+    packaging (0.99.8)
+      artifactory
+      rake (~> 12.2.1)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.3)
+    puppet-resource_api (1.5.0)
+      hocon (>= 1.0)
+    puppetserver-ca (0.7.0)
+      facter (>= 2.0.1, < 4)
+    racc (1.4.9)
+    rainbow (2.2.2)
+      rake
+    rake (12.2.1)
+    rdiscount (2.2.0.1)
+    rdoc (6.0.4)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-i18n (1.2.0)
+      rubocop (~> 0.49.0)
+    ruby-prof (0.17.0)
+    ruby-progressbar (1.10.0)
+    safe_yaml (1.0.4)
+    semantic_puppet (1.0.2)
+    text (1.3.1)
+    trollop (2.9.9)
+    unicode-display_width (1.4.0)
+    vcr (2.9.3)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yard (0.9.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  diff-lcs (~> 1.3)
+  gettext-setup (~> 0.28)
+  hiera-eyaml
+  hocon (~> 1.0)
+  json-schema (~> 2.0)
+  memory_profiler
+  minitar (~> 0.6)
+  mocha (~> 1.5.0)
+  msgpack (~> 1.2)
+  packaging (~> 0.99)
+  pry
+  puppet!
+  puppet-resource_api (~> 1.5)
+  puppetserver-ca (~> 0.5)
+  racc (= 1.4.9)
+  rake (~> 12.2.1)
+  rdoc (~> 6.0)
+  ronn (~> 0.7.3)
+  rspec (~> 3.1)
+  rspec-collection_matchers (~> 1.1)
+  rspec-its (~> 1.1)
+  rubocop (~> 0.49)
+  rubocop-i18n (~> 1.2.0)
+  ruby-prof (>= 0.16.0)
+  semantic_puppet (~> 1.0)
+  vcr (~> 2.9)
+  webmock (~> 1.24)
+  yard
+
+BUNDLED WITH
+   1.16.2

data/MAINTAINERS

@@ -33,34 +33,15 @@
       "github": "Iristyle",
       "name": "Ethan J. Brown"
     },
-    {
-      "github": "HAIL9000",
-      "email": "hailee@puppet.com",
-      "name": "Hailee Kenney"
-    },
     {
       "github": "er0ck",
       "email": "eric.thompson@puppet.com",
       "name": "Eric Thompson"
     },
-    {
-      "github": "johnduarte",
-      "email": "john.duarte@puppet.com",
-      "name": "John Duarte"
-    },
-    {
-      "github": "adrienthebo",
-      "name": "Adrien Thebo"
-    },
     {
       "github": "jtappa",
       "email": "jorie@puppet.com",
       "name": "Jorie Tappa"
-    },
-    {
-      "github": "MosesMendoza",
-      "email": "moses@puppet.com",
-      "name": "Moses Mendoza"
     }
   ]
 }

data/README.md

@@ -1,8 +1,10 @@
 Puppet
 ======
 
-[![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
-[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.png)](https://inch-ci.org/github/puppetlabs/puppet)
+[![Travis Status](https://travis-ci.org/puppetlabs/puppet.svg?branch=master)](https://travis-ci.org/puppetlabs/puppet)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/cvhpypd4504sevqq/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet/branch/master)
+[![Gem Version](https://badge.fury.io/rb/puppet.svg)](https://badge.fury.io/rb/puppet)
+[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.svg)](https://inch-ci.org/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server
@@ -12,51 +14,51 @@ Documentation
 -------------
 
 Documentation for Puppet and related projects can be found online at the
-[Puppet Docs site](https://docs.puppetlabs.com).
+[Puppet Docs site](https://puppet.com/docs).
 
 HTTP API
 --------
-[HTTP API Index](https://docs.puppetlabs.com/puppet/latest/reference/http_api/http_api_index.html)
+[HTTP API Index](https://puppet.com/docs/puppet/5.5/http_api/http_api_index.html)
 
 Installation
 ------------
 
-The best way to run Puppet is with [Puppet Enterprise](https://puppetlabs.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise (PE)](https://puppet.com/puppet/puppet-enterprise),
 which also includes orchestration features, a web console, and professional support.
-[The PE documentation is available here.](https://docs.puppetlabs.com/pe/latest)
+The PE documentation is [available here.](https://puppet.com/docs/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](http://docs.puppetlabs.com/puppet/latest/reference/install_pre.html)
+[see the installation guide on the docs site.](https://puppet.com/docs/puppet/5.5/install_pre.html)
 
 If you need to run Puppet from source as a tester or developer,
-[see the running from source guide on the docs site.](https://docs.puppetlabs.com/guides/from_source.html)
+see the [Running Puppet from Source](https://docs.puppet.com/puppet/3.8/from_source.html) guide on the docs site.
 
 Developing and Contributing
 ------
 
 We'd love to get contributions from you! For a quick guide to getting your
-system setup for developing take a look at our [Quickstart
-Guide](docs/quickstart.md). Once you are up and running, take a look at the
-[Contribution Documents](CONTRIBUTING.md) to see how to get your changes merged
+system setup for developing, take a look at our [Quickstart
+Guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md). Once you are up and running, take a look at the
+[Contribution Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md) to see how to get your changes merged
 in.
 
-For more complete docs on developing with puppet you can take a look at the
-rest of the [developer documents](docs/index.md).
+For more complete docs on developing with Puppet, take a look at the
+rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/master/docs/index.md).
 
 License
 -------
 
-See [LICENSE](LICENSE) file.
+See [LICENSE](https://github.com/puppetlabs/puppet/blob/master/LICENSE) file.
 
 Support
 -------
 
 Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com).  A [mailing
 list](https://groups.google.com/forum/?fromgroups#!forum/puppet-users) is
-available for asking questions and getting help from others. In addition there
+available for asking questions and getting help from others. In addition, there
 is an active #puppet channel on Freenode.
 
-We use semantic version numbers for our releases, and recommend that users stay
+We use semantic version numbers for our releases and recommend that users stay
 as up-to-date as possible by upgrading to patch releases and minor releases as
 they become available.
 
@@ -71,4 +73,4 @@ a best effort to backport that fix onto the latest Puppet 3 release.
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
-[Puppet Enterprise Support Lifecycle](https://puppetlabs.com/misc/puppet-enterprise-lifecycle)
+[Puppet Enterprise Support Lifecycle](https://puppet.com/misc/puppet-enterprise-lifecycle)