puppet 5.5.1 → 5.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 150276769f3f7d3b0d1144c7cc955ec30ef7079f
+  data.tar.gz: 2c346495b89018f0040fd15dac9ceea9972bc241
+SHA512:
+  metadata.gz: c145fc602f225f17256e87cf111da9350a28ae59e9f2574d5e6fbdaeb452f7015ac4c19ca79d87eeaaf40d57298b3e1447779662d2c4b5fa5eb8a20d6249389c
+  data.tar.gz: 05a8ba3218ee7ad635005adfe67ade21b9df1e55a57dcf7c01f82783fdcd59e9687d3efb1feec476bc6ddb6c43a6409618f10d859a0fef0b868aed6ff0d07e52

data/CONTRIBUTING.md

@@ -32,7 +32,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 * 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.
-  * A ticket is not necessary for [trivial changes](https://docs.puppet.com/community/trivial_patch_exemption.html)
+  * A ticket is not necessary for [trivial changes](https://puppet.com/community/trivial-patch-exemption-policy)
 * Fork the repository on GitHub.
 
 ## Making Changes
@@ -90,7 +90,7 @@ user-facing strings are marked in new PRs before merging.
 
 ## Making Trivial Changes
 
-For [changes of a trivial nature](https://docs.puppet.com/community/trivial_patch_exemption.html), it is not always necessary to create a new
+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.
@@ -160,7 +160,7 @@ ensure the issue has been resolved.
 
 ## 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/README.md

@@ -18,7 +18,7 @@ Documentation for Puppet and related projects can be found online at the
 
 HTTP API
 --------
-[HTTP API Index](https://puppet.com/docs/puppet/5.4/http_api/http_api_index.html)
+[HTTP API Index](https://puppet.com/docs/puppet/5.5/http_api/http_api_index.html)
 
 Installation
 ------------
@@ -28,7 +28,7 @@ which also includes orchestration features, a web console, and professional supp
 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://puppet.com/docs/puppet/5.4/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 Puppet from Source](https://docs.puppet.com/puppet/3.8/from_source.html) guide on the docs site.

data/conf/auth.conf

@@ -7,7 +7,7 @@
 # otherwise, the general rules may "steal" requests that should be
 # governed by the specific rules.
 #
-# See https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html
+# See https://puppet.com/docs/puppet/latest/config_file_auth.html
 # for a more complete description of auth.conf's behavior.
 #
 # Supported syntax:
@@ -64,7 +64,7 @@
 # file access in auth.conf by controlling the /file_metadata(s)/<mount point>,
 # /file_content(s)/<mount point>, and /static_file_content/<file> paths. See the
 # Puppet Server documentation at
-# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
+# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
 #
 # If you are not using Puppet Server, or are using Puppet Server but with the
 # "jruby-puppet.use-legacy-auth-conf" setting set to "true", you could set the

data/conf/environment.conf

@@ -1,6 +1,6 @@
 # Each environment can have an environment.conf file. Its settings will only
 # affect its own environment. See docs for more info:
-# https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
+# https://puppet.com/docs/puppet/latest/config_file_environment.html
 
 # Any unspecified settings use default values; some of those defaults are based
 # on puppet.conf settings.

data/conf/fileserver.conf

@@ -34,4 +34,4 @@
 #
 # For details and an example, see the auth.conf file. If you're using Puppet
 # Server, see the Puppet Server documentation at
-# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
+# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.

data/conf/puppet.conf

@@ -1,6 +1,6 @@
 # This file can be used to override the default puppet settings.
 # See the following links for more details on what settings are available:
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html
+# - https://puppet.com/docs/puppet/latest/config_important_settings.html
+# - https://puppet.com/docs/puppet/latest/config_about_settings.html
+# - https://puppet.com/docs/puppet/latest/config_file_main.html
+# - https://puppet.com/docs/puppet/latest/configuration.html

data/ext/README.environment

@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
 puppet master.
 
 For more information see
-https://docs.puppet.com/puppet/latest/reference/environments.html
+https://puppet.com/docs/puppet/latest/environments_about.html

data/ext/debian/copyright

@@ -7,13 +7,13 @@ Maintainer:
  Nigel Kersten <nigel@explanatorygap.net>,
  Stig Sandbeck Mathisen <ssm@debian.org>
 Source: git://github.com/puppetlabs/puppet.git,
- https://docs.puppetlabs.com/puppet/latest/reference/install_pre.html
+ https://puppet.com/docs/puppet/latest/install_pre.html
 
 Copyright: 2005-2015 Puppet Labs
 License: Apache 2.0
 
 Files: debian/*
-Copyright: 
+Copyright:
  Andrew Pollock <apollock@debian.org>,
  Jamie Wilkinson <jaq@debian.org>,
  Matthew Palmer <mpalmer@debian.org>,

data/ext/debian/puppetmaster.README.debian

@@ -11,7 +11,7 @@ To run Passenger with Apache, install the puppetmaster-passenger package. It
 automatically sets up an apache2 virtual host that runs puppetmaster under
 Passenger.
 
-For more information, see https://docs.puppetlabs.com/guides/passenger.html.
+For more information, see https://puppet.com/docs/puppet/latest/passenger.html.
 For information about the Puppet-designed Puppet Server, which deprecates
 the Passenger/Apache stack, see
-https://docs.puppetlabs.com/puppetserver/latest/.
+https://puppet.com/docs/puppetserver/latest/.

data/ext/hiera/hiera.yaml

@@ -4,7 +4,7 @@ defaults:
   # The default value for "datadir" is "data" under the same directory as the hiera.yaml
   # file (this file)
   # When specifying a datadir, make sure the directory exists.
-  # See https://docs.puppet.com/puppet/latest/environments.html for further details on environments.
+  # See https://puppet.com/docs/puppet/latest/environments_about.html for further details on environments.
   # datadir: data
   # data_hash: yaml_data
 hierarchy:

data/ext/puppet-test

@@ -23,7 +23,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+# https://puppet.com/docs/puppet/latest/config_about_settings.html
 # for the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.

data/ext/rack/example-passenger-vhost.conf

@@ -1,6 +1,6 @@
 # This Apache 2 virtual host config shows how to use Puppet as a Rack
 # application via Passenger. See
-# https://docs.puppetlabs.com/guides/passenger.html for more information.
+# https://puppet.com/docs/puppet/latest/passenger.html for more information.
 
 # You can also use the included config.ru file to run Puppet with other Rack
 # servers instead of Passenger.

data/ext/regexp_nodes/regexp_nodes.rb

@@ -2,24 +2,24 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# https://docs.puppetlabs.com/guides/external_nodes.html
+# https://puppet.com/docs/puppet/latest/lang_write_functions_in_puppet.html
 #
 # = Usage
 # regexp_nodes.rb <host>
 #
 # = Description
 # This classifier implements filesystem autoloading: It looks through classes,
-# parameters, and environment subdirectories, looping through each file it 
-# finds.  Each file's contents are a regexp-per-line which, if they match the 
-# hostname passed to the program as ARGV[0], sets a class, parameter value 
+# parameters, and environment subdirectories, looping through each file it
+# finds.  Each file's contents are a regexp-per-line which, if they match the
+# hostname passed to the program as ARGV[0], sets a class, parameter value
 # or environment named the same thing as the file itself. At the end, the
-# resultant data structure is returned back to the puppet master process as 
+# resultant data structure is returned back to the puppet master process as
 # yaml.
 #
 # = Caveats
 # Since the files are read in directory order, multiple matches for a given
 # hostname in the parameters/ and environment/ subdirectories will return the
-# last-read value.  (Multiple classes/ matches don't cause a problem; the 
+# last-read value.  (Multiple classes/ matches don't cause a problem; the
 # class is either incuded or it isn't)
 #
 # Unmatched hostnames in any of the environment/ files will cause 'production'
@@ -28,10 +28,10 @@
 #
 # = Examples
 # Based on the example files in the classes/ and parameters/ subdirectories
-# in the distribution, classes/database will set the 'database' class for 
-# hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with 
-# 'mysql' anywhere in the hostname.  Similarly, hosts beginning with 'www' or 
-# 'web' or the hostname 'leterel' (my workstation) will be assigned the 
+# in the distribution, classes/database will set the 'database' class for
+# hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with
+# 'mysql' anywhere in the hostname.  Similarly, hosts beginning with 'www' or
+# 'web' or the hostname 'leterel' (my workstation) will be assigned the
 # 'webserver' class.
 #
 # Under parameters/ there is one subdirectory 'service' which
@@ -42,7 +42,7 @@
 #
 # In the environment/ subdirectory, any hosts matching '^dev-' and a single
 # production host which serves as 'canary in the coal mine' will be put into
-# the development environment 
+# the development environment
 #
 # = Author
 # Eric Sorenson <eric@explosive.net>
@@ -186,7 +186,7 @@ class ExternalNode
     end
   end
 
-  # match_environment is similar to match_classes but it overwrites 
+  # match_environment is similar to match_classes but it overwrites
   # any previously set value (usually just the default, 'production')
   # with a match
   def match_environment(fullpath)

data/ext/upload_facts.rb

@@ -58,7 +58,7 @@ is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
+https://puppet.com/docs/puppet/latest/configuration.html for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.

data/lib/hiera/puppet_function.rb

@@ -62,7 +62,7 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
     unless Puppet[:strict] == :off
       #TRANSLATORS 'lookup' is a puppet function and should not be translated
       message = _("The function '%{class_name}' is deprecated in favor of using 'lookup'.") % { class_name: self.class.name }
-      message += ' '+ _("See https://docs.puppet.com/puppet/%{minor_version}/reference/deprecated_language.html") %
+      message += ' '+ _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
           { minor_version: Puppet.minor_version }
       Puppet.warn_once('deprecations', self.class.name, message)
     end

data/lib/puppet.rb

@@ -127,7 +127,7 @@ module Puppet
   # Now that settings are loaded we have the code loaded to be able to issue
   # deprecation warnings. Warn if we're on a deprecated ruby version.
   if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
-    Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://docs.puppet.com/puppet/latest/system_requirements.html#ruby for a list of supported ruby versions.") % { version: RUBY_VERSION })
+    Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions.") % { version: RUBY_VERSION })
   end
 
   # Initialize puppet's settings. This is intended only for use by external tools that are not

data/lib/puppet/application/agent.rb

@@ -166,7 +166,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet agent with '--genconfig'.
 

data/lib/puppet/application/apply.rb

@@ -78,7 +78,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/application/cert.rb

@@ -194,7 +194,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet cert with
 '--genconfig'.

data/lib/puppet/application/device.rb

@@ -83,7 +83,7 @@ puppet-device(8) -- #{summary}
 
 SYNOPSIS
 --------
-Retrieves catalogs from the Puppet master and applies them to remote devices. 
+Retrieves catalogs from the Puppet master and applies them to remote devices.
 
 This subcommand can be run manually; or periodically using cron,
 a scheduled task, or a similar tool.
@@ -106,9 +106,9 @@ retrieve and apply catalogs, and store reports.
 
 USAGE NOTES
 -----------
-Devices managed by the puppet-device subcommand on a Puppet agent are 
-configured in device.conf, which is located at $confdir/device.conf by default, 
-and is configurable with the $deviceconfig setting. 
+Devices managed by the puppet-device subcommand on a Puppet agent are
+configured in device.conf, which is located at $confdir/device.conf by default,
+and is configurable with the $deviceconfig setting.
 
 The device.conf file is an INI-like file, with one section per device:
 
@@ -117,20 +117,20 @@ type <TYPE>
 url <URL>
 debug
 
-The section name specifies the certname of the device. 
+The section name specifies the certname of the device.
 
 The values for the type and url properties are specific to each type of device.
 
 The optional debug property specifies transport-level debugging,
 and is limited to telnet and ssh transports.
 
-See https://docs.puppet.com/puppet/latest/config_file_device.html for details.
+See https://puppet.com/docs/puppet/latest/config_file_device.html for details.
 
 
 OPTIONS
 -------
-Note that any setting that's valid in the configuration file is also a valid 
-long argument. For example, 'server' is a valid configuration parameter, so 
+Note that any setting that's valid in the configuration file is also a valid
+long argument. For example, 'server' is a valid configuration parameter, so
 you can specify '--server <servername>' as an argument.
 
 * --debug:

data/lib/puppet/application/lookup.rb

@@ -151,7 +151,7 @@ You can provide multiple lookup keys to this command, but it only returns a
 value for the first found key, omitting the rest.
 
 For more details about how Hiera works, see the Hiera documentation:
-https://docs.puppet.com/puppet/latest/hiera_intro.html
+https://puppet.com/docs/puppet/latest/hiera_intro.html
 
 OPTIONS
 -------

data/lib/puppet/application/master.rb

@@ -65,7 +65,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet master with '--genconfig'.
 

data/lib/puppet/application/resource.rb

@@ -76,7 +76,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/application/script.rb

@@ -55,7 +55,7 @@ valid setting, so you can specify '--environment mytest'
 as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

data/lib/puppet/defaults.rb

@@ -201,7 +201,7 @@ module Puppet
     :static_catalogs => {
       :default    => true,
       :type       => :boolean,
-      :desc       => "Whether to compile a [static catalog](https://docs.puppet.com/puppet/latest/static_catalogs.html#enabling-or-disabling-static-catalogs),
+      :desc       => "Whether to compile a [static catalog](https://puppet.com/docs/puppet/latest/static_catalogs.html#enabling-or-disabling-static-catalogs),
         which occurs only on a Puppet Server master when the `code-id-command` and
         `code-content-command` settings are configured in its `puppetserver.conf` file.",
     },
@@ -352,7 +352,7 @@ module Puppet
 
         This setting must have a value set to enable **directory environments.** The
         recommended value is `$codedir/environments`. For more details, see
-        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
+        <https://puppet.com/docs/puppet/latest/environments_about.html>",
       :type    => :path,
     },
     :always_retry_plugins => {
@@ -441,7 +441,7 @@ module Puppet
 
         * `plain` --- Returns no data, so that the main manifest controls all node configuration.
         * `exec` --- Uses an
-          [external node classifier (ENC)](https://docs.puppet.com/puppet/latest/nodes_external.html),
+          [external node classifier (ENC)](https://puppet.com/docs/puppet/latest/nodes_external.html),
           configured by the `external_nodes` setting. This lets you pull a list of Puppet classes
           from any external system, using a small glue script to perform the request and format the
           result as YAML.
@@ -709,15 +709,15 @@ module Puppet
         `certname` setting as its requested Subject CN.
 
         This is the name used when managing a node's permissions in
-        [auth.conf](https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
+        [auth.conf](https://puppet.com/docs/puppet/latest/config_file_auth.html).
         In most cases, it is also used as the node's name when matching
-        [node definitions](https://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
+        [node definitions](https://puppet.com/docs/puppet/latest/lang_node_definitions.html)
         and requesting data from an ENC. (This can be changed with the `node_name_value`
         and `node_name_fact` settings, although you should only do so if you have
         a compelling reason.)
 
         A node's certname is available in Puppet manifests as `$trusted['certname']`. (See
-        [Facts and Built-In Variables](https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
+        [Facts and Built-In Variables](https://puppet.com/docs/puppet/latest/lang_facts_and_builtin_vars.html)
         for more details.)
 
         * For best compatibility, you should limit the value of `certname` to
@@ -752,7 +752,7 @@ change this setting; you also need to:
 * On the server: Stop Puppet Server.
 * On the CA server: Revoke and clean the server's old certificate. (`puppet cert clean <NAME>`)
 * On the server: Delete the old certificate (and any old certificate signing requests)
-  from the [ssldir](https://docs.puppetlabs.com/puppet/latest/reference/dirs_ssldir.html).
+  from the [ssldir](https://puppet.com/docs/puppet/latest/dirs_ssldir.html).
 * On the server: Run `puppet agent -t --ca_server <CA HOSTNAME>` to request a new certificate
 * On the CA server: Sign the certificate request, explicitly allowing alternate names
   (`puppet cert sign --allow-dns-alt-names <NAME>`).
@@ -1084,7 +1084,7 @@ EOT
         the request.
 
         For info on autosign configuration files, see
-        [the guide to Puppet's config files](https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html).",
+        [the guide to Puppet's config files](https://puppet.com/docs/puppet/latest/config_about_settings.html).",
     },
     :allow_duplicate_certs => {
       :default    => false,
@@ -1157,7 +1157,7 @@ EOT
         directory environments instead. If you need to use something other than the
         environment's `manifests` directory as the main manifest, you can set
         `manifest` in environment.conf. For more info, see
-        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
+        <https://puppet.com/docs/puppet/latest/environments_about.html>",
     },
     :modulepath => {
       :default => "",
@@ -1171,7 +1171,7 @@ EOT
         directory environments instead. If you need to use something other than the
         default modulepath of `<ACTIVE ENVIRONMENT'S MODULES DIR>:$basemodulepath`,
         you can set `modulepath` in environment.conf. For more info, see
-        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
+        <https://puppet.com/docs/puppet/latest/environments_about.html>",
     },
     :config_version => {
       :default    => "",
@@ -1183,7 +1183,7 @@ EOT
       Setting a global value for config_version in puppet.conf is not allowed
       (but it can be overridden from the commandline). Please set a
       per-environment value in environment.conf instead. For more info, see
-      <https://docs.puppet.com/puppet/latest/reference/environments.html>",
+      <https://puppet.com/docs/puppet/latest/environments_about.html>",
     }
   )
 
@@ -1286,7 +1286,13 @@ EOT
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
+      :default => lambda do
+        if Puppet::Util::Platform.windows?
+          '$codedir/modules'
+        else
+          '$codedir/modules:/opt/puppetlabs/puppet/modules'
+        end
+      end,
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
@@ -1295,7 +1301,7 @@ EOT
         These are the modules that will be used by _all_ environments. Note that
         the `modules` directory of the active environment will have priority over
         any global directories. For more info, see
-        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
+        <https://puppet.com/docs/puppet/latest/environments_about.html>",
     },
     :ssl_client_header => {
       :default    => "HTTP_X_CLIENT_DN",
@@ -1481,7 +1487,7 @@ EOT
         For control over logging destinations, see the `--logdest` command line
         option in the manual pages for puppet master, puppet agent, and puppet
         apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
-        or read them online at https://docs.puppetlabs.com/puppet/latest/reference/man/."
+        or read them online at https://puppet.com/docs/puppet/latest/man/."
     },
     :server => {
       :default => "puppet",
@@ -1550,7 +1556,7 @@ EOT
         event _would_ have been sent.
 
         **Important note:**
-        [The `noop` metaparameter](https://docs.puppetlabs.com/puppet/latest/reference/metaparameter.html#noop)
+        [The `noop` metaparameter](https://puppet.com/docs/puppet/latest/metaparameter.html#noop)
         allows you to apply individual resources in noop mode, and will override
         the global value of the `noop` setting. This means a resource with
         `noop => false` _will_ be changed if necessary, even when running puppet
@@ -1893,7 +1899,7 @@ EOT
 
           Generally, an ENC script makes requests to an external data source.
 
-          For more info, see [the ENC documentation](https://docs.puppet.com/puppet/latest/nodes_external.html).",
+          For more info, see [the ENC documentation](https://puppet.com/docs/puppet/latest/nodes_external.html).",
     }
     )