Merge remote-tracking branch 'upstream/6.x' into merge_6x_main_jan

* upstream/6.x:
  (packaging) Updating manpage file for 6.x
  (PUP-11405) Replace deprecated/changed Psych YAML methods, pin rdoc

Conflicts:
	lib/puppet/util/yaml.rb

The conflict was in the Puppet::Util::Yaml.load_file method because
it was removed in Puppet 7. The patch to safe_load applied cleanly
and is preserved in main.

Author: joshcooper

lib/puppet/util/yaml.rb

@@ -24,7 +24,11 @@ class YamlLoadError < Puppet::Error; end
   # @raise [YamlLoadException] If deserialization fails.
   # @return The parsed YAML, which can be Hash, Array or scalar types.
   def self.safe_load(yaml, allowed_classes = [], filename = nil)
-    data = YAML.safe_load(yaml, allowed_classes, [], true, filename)
+    if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+      data = YAML.safe_load(yaml, permitted_classes: allowed_classes, aliases: true, filename: filename)
+    else
+      data = YAML.safe_load(yaml, allowed_classes, [], true, filename)
+    end
     data = false if data.nil?
     data
   rescue ::Psych::DisallowedClass => detail