Fixed #14975 - Fixed incorrect help text in puppet doc application
tidy.rb: Added info about the default value of 'type' to the doc.
Merge remote-tracking branch 'upstream/3.x'

* upstream/3.x: (50 commits)
  (Maint) Fix Could not find Puppet Face :foo
  (Maint) Add tags to .gitignore for ctags
  (maint) Remove duplicate key in requestdir default
  (maint) Standardize on /usr/bin/env ruby -S rspec
  (maint) Add trailing newlines to all files
  (#15202) Handle paths with files in them
  (#15202) Fix acceptance tests for creating non-existance directories
  (#15202) Make puppet module install create parent directories
  Fix spec test failures from diff warning
  Fix Puppet::Util.execute is deprecated warning
  (Maint) Fixed up acceptance tests for pluginsync on windows
  (Maint) Make a CRL valid on the same second it is updated
  (Maint) Clarify flow of CRL generation and update
  (Maint) Moved ca test to correct location
  (Maint) Clarify what certs are being created in ca tests
  (Maint) Remove unneeded checks from ca tests
  (Maint) Remove unused variables from ca tests
  (Maint) Attempt to fix flickering test
  (Maint) Fix up directories used in pluginsync test
  Fix run_mode test w/rt expanding tilde in user dir values
  ...
Merge branch 'master' of github.com:puppetlabs/puppet
Use a valid locale when setting LC_ALL in the exec posix provider test

Fixes #15467
Merge pull request #921 from rtyler/issues/lc-all-15467

Use a valid locale when setting LC_ALL in the exec posix provider test
Merge branch '3.x'

* 3.x: (76 commits)
  Extract host validation in store report processor
  Use cross-platform absolute paths in file_serving tests
  (#15493) Fix test to expect https not http
  (#15492) Deprecate the usage of Puppet::Util.execute in module face
  (#15221) Create /etc/puppet/modules directory for puppet module tool
  (Maint:) Fix bad doc strings for two settings ("wether")
  Try again to avoid circular dependency in file indirections
  Remove useless tests for Envelope
  Clear deprecation warnings between tests
  Avoid circular requirement in FileMetadata indirection
  (Maint) Document common Windows issues
  (#11868) Use `Installer` automation interface to query package state
  (#3120) Fixup default descriptions
  (#3120) Disambiguate the localcacert setting
  Eliminate require calls at runtime.
  Fix broken TransBucket transformation tests.
  Fix broken ability to remove resources from the catalog.
  Fix type check when transforming catalog.
  Fix all trivial "should to must" errors in our tests.
  Enforce "must not should" on Puppet::Type instances in tests.
  ...
Merge branch '3.x'

* 3.x:
  (Maint) Require the right file for md5
Merge remote-tracking branch 'upstream/3.x'

* upstream/3.x:
  (Maint) Spec test wasn't testing anything
  (#14964) Unlink Tempfiles consistently across different ruby versions
  Escape unicode in ca specs
Avoid circular requirement in FileMetadata indirection
Try again to avoid circular dependency in file indirections

Requiring the model at the end of the file seems the best approach for now.
Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc
Merge branch '3.x'

* 3.x:
  Fix webrick spec to work on Windows
Update main readme to have links to contrib and dev docs

Our README currently rendered on github doesn't show people how get into
the contribution process.  I've added a very small section to point to
the other doc files that exist in our repositories.  This was based on
feedback at the Community Leadership Summit 2012.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Introduce a Gemfile to make dependency management easier for new (and old) contributors

This should allow new contributors to clone the repo then:

 * `bundle install`
 * `bundle exec rspec`
 * HACK

Right now, the Gemfile assumes that facter will be located in the same parent
directory as the puppet/ directory, this can change once Facter 2.0 is released

Fixes #15464
Add the parallel_tests gem to the Gemfile for speedier specs

I cut test time by more than half with `parallel_rspec` (`bundle exec rake
spec` versus `bundle exec parallel_rspec spec`)
Remove the unnecessary Gemfile.lock
Merge pull request #920 from rtyler/issues/gemfile-15464

Introduce a Gemfile to make dependency management easier for contributors
Merge pull request #933 from stahnma/update_readme

Update main readme to have links to contrib and dev docs
Switch Rakefile off deprecated rake/gempackagetask

Fixes #15463