puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb

@@ -14,7 +14,7 @@ class Puppet::Parser::Compiler
         end
       end
       assumed_exports.each_pair do |key, (param, cap)|
-        raise CatalogValidationError.new("Capability '#{cap}' referenced by '#{param.name}' is never exported", param.file, param.line) unless exported.include?(key)
+        raise CatalogValidationError.new(_("Capability '%{cap}' referenced by '%{param}' is never exported") % { cap: cap, param: param.name }, param.file, param.line) unless exported.include?(key)
       end
       nil
     end
@@ -53,7 +53,7 @@ class Puppet::Parser::Compiler
         unless rt.nil? || !rt.is_capability?
           title_key = catalog.title_key_for_ref(value.ref)
           if hash.include?(title_key)
-            raise CatalogValidationError.new("'#{value}' is exported by both '#{hash[title_key]}' and '#{resource}'", param.file, param.line)
+            raise CatalogValidationError.new(_("'%{value}' is exported by both '%{hash}' and '%{resource}'") % { value: value, hash: hash[title_key], resource: resource }, param.file, param.line)
           else
             hash[title_key] = resource
           end

data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb

@@ -5,6 +5,7 @@ class Puppet::Parser::Compiler
     def validate
       catalog.resources.each do |resource|
         next unless resource.is_a?(Puppet::Parser::Resource)
+        next if resource.virtual?
         resource.eachparam do |param|
           pclass = Puppet::Type.metaparamclass(param.name)
           validate_relationship(param) if !pclass.nil? && pclass < Puppet::Type::RelationshipMetaparam
@@ -23,21 +24,17 @@ class Puppet::Parser::Compiler
       if has_capability?(param.value)
         unless CAPABILITY_ACCEPTED_METAPARAMS[param.name]
           raise CatalogValidationError.new(
-            "'#{param.name}' is not a valid relationship to a capability", 
+            _("'%{param}' is not a valid relationship to a capability") % { param: param.name },
               param.file, param.line)
         end
-      elsif Puppet[:strict] != :off
-        # all other relationships requires the referenced resource to exist when mode is strict
+      else
+        # all other relationships requires the referenced resource to exist
         refs = param.value.is_a?(Array) ? param.value.flatten : [param.value]
         refs.each do |r|
           next if r.nil? || r == :undef
           unless catalog.resource(r.to_s)
-            msg = "Could not find resource '#{r.to_s}' in parameter '#{param.name.to_s}'"
-            if Puppet[:strict] == :error
-              raise CatalogValidationError.new(msg, param.file, param.line)
-            else
-              Puppet.warn_once(:undefined_resources, r.to_s, msg, param.file, param.line)
-            end
+            msg = _("Could not find resource '%{res}' in parameter '%{param}'") % { res: r.to_s, param: param.name.to_s }
+            raise CatalogValidationError.new(msg, param.file, param.line)
           end
         end
       end

data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb

@@ -11,7 +11,7 @@ class Puppet::Parser::Compiler
 
       catalog.downstream_from_vertex(the_site_resource).keys.each do |r|
         unless r.is_application_component? || r.resource_type.application?
-          raise CatalogValidationError.new("Only application components can appear inside a site - #{r} is not allowed", r.file, r.line)
+          raise CatalogValidationError.new(_("Only application components can appear inside a site - %{res} is not allowed") % { res: r }, r.file, r.line)
         end
       end
     end

data/lib/puppet/parser/e4_parser_adapter.rb

@@ -21,7 +21,7 @@ class E4ParserAdapter
   def parse(string = nil)
     self.string= string if string
     parser = Pops::Parser::EvaluatingParser.singleton
-    parse_result =
+    model =
     if @use == :string
       # Parse with a source_file to set in created AST objects (it was either given, or it may be unknown
       # if caller did not set a file and the present a string.
@@ -36,7 +36,6 @@ class E4ParserAdapter
     # * a Model::Program
     # * a Model::Expression
     #
-    model = parse_result.nil? ? nil : parse_result.current
     args = {}
     Pops::Model::AstTransformer.new(@file).merge_location(args, model)
 

data/lib/puppet/parser/environment_compiler.rb

@@ -9,7 +9,7 @@ class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
       node.environment = env
       new(node, :code_id => code_id).compile
     rescue => detail
-      message = "#{detail} in environment #{env.name}"
+      message = _("%{detail} in environment %{env}") % { detail: detail, env: env.name }
       Puppet.log_exception(detail, message)
       raise Puppet::Error, message, detail.backtrace
     end
@@ -56,30 +56,28 @@ class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
   def compile
     add_function_overrides
     begin
-      Puppet.override(@context_overrides, "For compiling environment catalog #{environment.name}") do
+      Puppet.override(@context_overrides, _("For compiling environment catalog %{env}") % { env: environment.name }) do
         @catalog.environment_instance = environment
 
-        Puppet::Util::Profiler.profile("Env Compile: Created settings scope", [:compiler, :create_settings_scope]) { create_settings_scope }
+        Puppet::Util::Profiler.profile(_("Env Compile: Created settings scope"), [:compiler, :create_settings_scope]) { create_settings_scope }
 
-        activate_binder
+        Puppet::Util::Profiler.profile(_("Env Compile: Evaluated main"), [:compiler, :evaluate_main]) { evaluate_main }
 
-        Puppet::Util::Profiler.profile("Env Compile: Evaluated main", [:compiler, :evaluate_main]) { evaluate_main }
+        Puppet::Util::Profiler.profile(_("Env Compile: Evaluated site"), [:compiler, :evaluate_site]) { evaluate_site }
 
-        Puppet::Util::Profiler.profile("Env Compile: Evaluated site", [:compiler, :evaluate_site]) { evaluate_site }
+        Puppet::Util::Profiler.profile(_("Env Compile: Evaluated application instances"), [:compiler, :evaluate_applications]) { evaluate_applications }
 
-        Puppet::Util::Profiler.profile("Env Compile: Evaluated application instances", [:compiler, :evaluate_applications]) { evaluate_applications }
+        Puppet::Util::Profiler.profile(_("Env Compile: Prune"), [:compiler, :prune_catalog]) { prune_catalog }
 
-        Puppet::Util::Profiler.profile("Env Compile: Prune", [:compiler, :prune_catalog]) { prune_catalog }
-
-        Puppet::Util::Profiler.profile("Env Compile: Validate Catalog pre-finish", [:compiler, :validate_pre_finish]) do
+        Puppet::Util::Profiler.profile(_("Env Compile: Validate Catalog pre-finish"), [:compiler, :validate_pre_finish]) do
           validate_catalog(CatalogValidator::PRE_FINISH)
         end
 
-        Puppet::Util::Profiler.profile("Env Compile: Finished catalog", [:compiler, :finish_catalog]) { finish }
+        Puppet::Util::Profiler.profile(_("Env Compile: Finished catalog"), [:compiler, :finish_catalog]) { finish }
 
         fail_on_unevaluated
 
-        Puppet::Util::Profiler.profile("Env Compile: Validate Catalog final", [:compiler, :validate_final]) do
+        Puppet::Util::Profiler.profile(_("Env Compile: Validate Catalog final"), [:compiler, :validate_final]) do
           validate_catalog(CatalogValidator::FINAL)
         end
 
@@ -133,7 +131,7 @@ class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
     @catalog.add_resource(resource)
 
     if !resource.class? && resource[:stage]
-      raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage"
+      raise ArgumentError, _("Only classes can set 'stage'; normal resources like %{resource} cannot change run stage") % { resource: resource }
     end
 
     # Stages should not be inside of classes.  They are always a
@@ -155,13 +153,13 @@ class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
   end
 
   def on_empty_site
-    Puppet.warning("Environment Compiler: Could not find a site definition to evaluate")
+    Puppet.warning(_("Environment Compiler: Could not find a site definition to evaluate"))
   end
 
   def evaluate_applications
     exceptwrap do
       resources.select { |resource| type = resource.resource_type; type.is_a?(Puppet::Resource::Type) && type.application? }.each do |resource|
-        Puppet::Util::Profiler.profile("Evaluated application #{resource}", [:compiler, :evaluate_resource, resource]) do
+        Puppet::Util::Profiler.profile(_("Evaluated application %{resource}") % { resource: resource }, [:compiler, :evaluate_resource, resource]) do
           resource.evaluate
         end
       end

data/lib/puppet/parser/functions.rb

@@ -146,7 +146,7 @@ module Puppet::Parser::Functions
     name = name.intern
     environment = options[:environment] || Puppet.lookup(:current_environment)
 
-    Puppet.warning "Overwriting previous definition for function #{name}" if get_function(name, environment)
+    Puppet.warning _("Overwriting previous definition for function %{name}") % { name: name } if get_function(name, environment)
 
     arity = options[:arity] || -1
     ftype = options[:type] || :statement
@@ -164,16 +164,16 @@ module Puppet::Parser::Functions
     env_module = environment_module(environment)
 
     env_module.send(:define_method, fname) do |*args|
-      Puppet::Util::Profiler.profile("Called #{name}", [:functions, name]) do
+      Puppet::Util::Profiler.profile(_("Called %{name}") % { name: name }, [:functions, name]) do
         if args[0].is_a? Array
           if arity >= 0 and args[0].size != arity
-            raise ArgumentError, "#{name}(): Wrong number of arguments given (#{args[0].size} for #{arity})"
+            raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for %{arity})") % { name: name, arg_count: args[0].size, arity: arity }
           elsif arity < 0 and args[0].size < (arity+1).abs
-            raise ArgumentError, "#{name}(): Wrong number of arguments given (#{args[0].size} for minimum #{(arity+1).abs})"
+            raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})") % { name: name, arg_count: args[0].size, min_arg_count: (arity+1).abs }
           end
           self.send(real_fname, args[0])
         else
-          raise ArgumentError, "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
+          raise ArgumentError, _("custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)")
         end
       end
     end
@@ -272,7 +272,7 @@ module Puppet::Parser::Functions
 
   class Error
     def self.is4x(name)
-      raise Puppet::ParseError, "#{name}() can only be called using the 4.x function API. See Scope#call_function"
+      raise Puppet::ParseError, _("%{name}() can only be called using the 4.x function API. See Scope#call_function") % { name: name }
     end
   end
 end

data/lib/puppet/parser/functions/assert_type.rb

@@ -56,5 +56,5 @@ For more information about data types, see the
 - Since 4.0.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('assert_type')
+  Error.is4x('assert_type')
 end

data/lib/puppet/parser/functions/binary_file.rb

@@ -20,5 +20,5 @@ To search for the existence of files, use the `find_file()` function.
 - since 4.8.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('binary_file')
+  Error.is4x('binary_file')
 end

data/lib/puppet/parser/functions/break.rb

@@ -35,5 +35,5 @@ Would notice the value `[10]`
 * Since 4.8.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('break')
+  Error.is4x('break')
 end

data/lib/puppet/parser/functions/contain.rb

@@ -25,6 +25,6 @@ allowing the function call to `contain` to directly continue.
 "
 ) do |classes|
   # Call the 4.x version of this function in case 3.x ruby code uses this function
-  Puppet.warn_once(:deprecation, '3xfunction#contain', "Calling function_contain via the Scope class is deprecated. Use Scope#call_function instead")
+  Puppet.warn_once('deprecations', '3xfunction#contain', _("Calling function_contain via the Scope class is deprecated. Use Scope#call_function instead"))
   call_function('contain', classes)
 end

data/lib/puppet/parser/functions/create_resources.rb

@@ -47,10 +47,10 @@ Puppet::Parser::Functions::newfunction(:create_resources, :arity => -3, :doc =>
     final value of a parameter (just as when setting a parameter to `undef` in a puppet language
     resource declaration).
   ENDHEREDOC
-  raise ArgumentError, ("create_resources(): wrong number of arguments (#{args.length}; must be 2 or 3)") if args.length > 3
-  raise ArgumentError, ('create_resources(): second argument must be a hash') unless args[1].is_a?(Hash)
+  raise ArgumentError, (_("create_resources(): wrong number of arguments (%{count}; must be 2 or 3)") % { count: args.length }) if args.length > 3
+  raise ArgumentError, (_('create_resources(): second argument must be a hash')) unless args[1].is_a?(Hash)
   if args.length == 3
-    raise ArgumentError, ('create_resources(): third argument, if provided, must be a hash') unless args[2].is_a?(Hash)
+    raise ArgumentError, (_('create_resources(): third argument, if provided, must be a hash')) unless args[2].is_a?(Hash)
   end
 
   type, instances, defaults = args

data/lib/puppet/parser/functions/defined.rb

@@ -103,5 +103,5 @@ defined('$tmp_file2')
 - Since 4.0.0 includes all future parser features
 DOC
 ) do |vals|
-  Puppet::Parser::Functions::Error.is4x('defined')
+  Error.is4x('defined')
 end

data/lib/puppet/parser/functions/dig.rb

@@ -25,5 +25,5 @@ Would notice the value 100.
 * Since 4.5.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('dig')
+  Error.is4x('dig')
 end

data/lib/puppet/parser/functions/each.rb

@@ -100,5 +100,5 @@ documentation.
 - Since 4.0.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('each')
+  Error.is4x('each')
 end

data/lib/puppet/parser/functions/epp.rb

@@ -22,9 +22,6 @@ function like this:
 `epp('apache/vhost/_docroot.epp', { 'docroot' => '/var/www/html',
 'virtual_docroot' => '/var/www/example' })`
 
-This function can also accept an absolute path, which can load a template file
-from anywhere on disk.
-
 Puppet produces a syntax error if you pass more parameters than are declared in
 the template's parameter tag. When passing parameters to a template that
 contains a parameter tag, use the same names as the tag's declared parameters.
@@ -35,5 +32,5 @@ function fails to pass any required parameter.
 
 - Since 4.0.0") do |args|
 
-  Puppet::Parser::Functions::Error.is4x('epp')
+  Error.is4x('epp')
 end

data/lib/puppet/parser/functions/file.rb

@@ -28,6 +28,6 @@ Puppet::Parser::Functions::newfunction(
     if path
       Puppet::FileSystem.read_preserve_line_endings(path)
     else
-      raise Puppet::ParseError, "Could not find any files from #{vals.join(", ")}"
+      raise Puppet::ParseError, _("Could not find any files from %{values}") % { values: vals.join(", ") }
     end
 end

data/lib/puppet/parser/functions/filter.rb

@@ -74,5 +74,5 @@ $filtered_data = $data.filter |$keys, $values| { $keys =~ /berry$/ and $values <
 - Since 4.0.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('filter')
+  Error.is4x('filter')
 end

data/lib/puppet/parser/functions/find_file.rb

@@ -23,6 +23,6 @@ The function returns `undef` if none of the given paths were found
 - since 4.8.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('find_file')
+  Error.is4x('find_file')
 end
 

data/lib/puppet/parser/functions/generate.rb

@@ -11,7 +11,8 @@ Puppet::Parser::Functions::newfunction(:generate, :arity => -2, :type => :rvalue
     generators, so all shell metacharacters are passed directly to
     the generator.") do |args|
 
-      raise Puppet::ParseError, "Generators must be fully qualified" unless Puppet::Util.absolute_path?(args[0])
+      #TRANSLATORS "fully qualified" refers to a fully qualified file system path
+      raise Puppet::ParseError, _("Generators must be fully qualified") unless Puppet::Util.absolute_path?(args[0])
 
       if Puppet.features.microsoft_windows?
         valid = args[0] =~ /^[a-z]:(?:[\/\\][-.~\w]+)+$/i
@@ -21,17 +22,17 @@ Puppet::Parser::Functions::newfunction(:generate, :arity => -2, :type => :rvalue
 
       unless valid
         raise Puppet::ParseError,
-          "Generators can only contain alphanumerics, file separators, and dashes"
+          _("Generators can only contain alphanumerics, file separators, and dashes")
       end
 
       if args[0] =~ /\.\./
         raise Puppet::ParseError,
-          "Can not use generators with '..' in them."
+          _("Can not use generators with '..' in them.")
       end
 
       begin
         Dir.chdir(File.dirname(args[0])) { Puppet::Util::Execution.execute(args).to_str }
       rescue Puppet::ExecutionFailure => detail
-        raise Puppet::ParseError, "Failed to execute generator #{args[0]}: #{detail}", detail.backtrace
+        raise Puppet::ParseError, _("Failed to execute generator %{generator}: %{detail}") % { generator: args[0], detail: detail }, detail.backtrace
       end
 end

data/lib/puppet/parser/functions/hiera_include.rb

@@ -89,7 +89,7 @@ Note that calls using the 'override level' option are not directly supported by
 result must be post processed to get exactly the same result, for example using simple hash/array `+` or
 with calls to stdlib's `deep_merge` function depending on kind of hiera call and setting of merge in hiera.yaml.
 
-See [the documentation](http://links.puppetlabs.com/hierainclude) for more information
+See [the documentation](http://links.puppet.com/hierainclude) for more information
 and a more detailed example of how `hiera_include` uses array merge lookups to classify
 nodes.
 

data/lib/puppet/parser/functions/include.rb

@@ -28,6 +28,7 @@ the future parser's resource and relationship expressions.
 - Since 4.0.0 support for class and resource type values, absolute names
 - Since 4.7.0 returns an Array[Type[Class]] of all included classes 
 ") do |classes|
-  Puppet.warn_once(:deprecation, '3xfunction#include', "Calling function_include via the Scope class is deprecated. Use Scope#call_function instead")
   call_function('include', classes)
+  #TRANSLATORS "function_include", "Scope", and "Scope#call_function" refer to Puppet internals and should not be translated
+  Puppet.warn_once('deprecations', '3xfunction#include', _("Calling function_include via the Scope class is deprecated. Use Scope#call_function instead"))
 end

data/lib/puppet/parser/functions/inline_epp.rb

@@ -47,5 +47,5 @@ END
 - Since 3.5
 - Requires [future parser](/puppet/3.8/reference/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
 
-  Puppet::Parser::Functions::Error.is4x('inline_epp')
+  Error.is4x('inline_epp')
 end

data/lib/puppet/parser/functions/inline_template.rb

@@ -15,7 +15,7 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :arit
         wrapper.result(string)
       rescue => detail
         raise Puppet::ParseError,
-          "Failed to parse inline template: #{detail}", detail.backtrace
+          _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
       end
     end.join("")
 end

data/lib/puppet/parser/functions/lest.rb

@@ -45,5 +45,5 @@ Would notice the value `20`
 * Since 4.5.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('lest')
+  Error.is4x('lest')
 end

data/lib/puppet/parser/functions/map.rb

@@ -72,5 +72,5 @@ $transformed_data = $data.map |$key,$value| { $value }
 - Since 4.0.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('map')
+  Error.is4x('map')
 end

data/lib/puppet/parser/functions/match.rb

@@ -39,5 +39,5 @@ $matches = ["abc123","def456"].match(/([a-z]+)([1-9]+)/)
 - Since 4.0.0
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('match')
+  Error.is4x('match')
 end

data/lib/puppet/parser/functions/new.rb

@@ -56,14 +56,16 @@ Would fail with an assertion error (since value is less than 0).
 The following sections show the arguments and conversion rules
 per data type built into the Puppet Type System.
 
-### Conversion to Optional[T] and NotUndef[T]
+Conversion to Optional[T] and NotUndef[T]
+-----------------------------------------
 
 Conversion to these data types is the same as a conversion to the type argument `T`.
 In the case of `Optional[T]` it is accepted that the argument to convert may be `undef`.
 It is however not acceptable to give other arguments (than `undef`) that cannot be
 converted to `T`.
 
-### Conversion to Integer
+Conversion to Integer
+---------------------
 
 A new `Integer` can be created from `Integer`, `Float`, `Boolean`, and `String` values.
 For conversion from `String` it is possible to specify the radix (base).
@@ -111,7 +113,8 @@ $a_number = Integer(true)          # results in 1
 $a_number = Integer(-38, 10, true) # results in 38
 ```
 
-### Conversion to Float
+Conversion to Float
+-------------------
 
 A new `Float` can be created from `Integer`, `Float`, `Boolean`, and `String` values.
 For conversion from `String` both float and integer formats are supported.
@@ -123,13 +126,15 @@ function Float.new(
 )
 ```
 
+
 * For an integer, the floating point fraction of `.0` is added to the value.
 * A `Boolean` `true` is converted to 1.0, and a `false` to 0.0
 * In `String` format, integer prefixes for hex and binary are understood (but not octal since
   floating point in string format may start with a '0').
 * When `abs` is set to `true`, the result will be an absolute floating point value.
 
-### Conversion to Numeric
+Conversion to Numeric
+---------------------
 
 A new `Integer` or `Float` can be created from `Integer`, `Float`, `Boolean` and
 `String` values.
@@ -158,7 +163,8 @@ $a_number = Numeric(-42.3, true) # results in 42.3
 $a_number = Numeric(-42, true)   # results in 42
 ```
 
-### Conversion to Timespan
+Conversion to Timespan
+-------------------
 
 A new `Timespan` can be created from `Integer`, `Float`, `String`, and `Hash` values. Several variants of the constructor are provided.
 
@@ -275,7 +281,8 @@ $duration = Timespan('10:03.5', '%M:%S.%L') # 10 minutes, 3 seconds, and 5 milli
 $duration = Timespan('10:03.5', '%M:%S.%N') # 10 minutes, 3 seconds, and 5 nano-seconds
 ```
 
-### Conversion to Timestamp
+Conversion to Timestamp
+-------------------
 
 A new `Timestamp` can be created from `Integer`, `Float`, `String`, and `Hash` values. Several variants of the constructor are provided.
 
@@ -468,7 +475,8 @@ $ts = Timestamp('2016-08-24T12:13:14', default, 'PST')   # 2016-08-24 20:13:14.0
 
 ```
 
-### Conversion to String
+Conversion to String
+--------------------
 
 Conversion to `String` is the most comprehensive conversion as there are many
 use cases where a string representation is wanted. The defaults for the many options
@@ -511,7 +519,7 @@ included in a string format.
 Note that all data type supports the formats `s` and `p` with the meaning "default string representation" and
 "default programmatic string representation" (which for example means that a String is quoted in 'p' format).
 
-#### Signatures of String conversion
+### Signatures of String conversion
 
 ```puppet
 type Format = Pattern[/^%([\s\+\-#0\[\{<\(\|]*)([1-9][0-9]*)?(?:\.([0-9]+))?([a-zA-Z])/]
@@ -569,7 +577,7 @@ $str = String([1,2,3], $formats) # produces '(0x1, 0x2, 0x3)'
 The given formats are merged with the default formats, and matching of values to convert against format is based on
 the specificity of the mapped type; for example, different formats can be used for short and long arrays.
 
-#### Integer to String
+### Integer to String
 
 | Format  | Integer Formats
 | ------  | ---------------
@@ -584,7 +592,7 @@ the specificity of the mapped type; for example, different formats can be used f
 
 Defaults to `d`.
 
-#### Float to String
+### Float to String
 
 | Format  | Float formats
 | ------  | -------------
@@ -598,7 +606,7 @@ Defaults to `d`.
 
 Defaults to `p`.
 
-#### String to String
+### String to String
 
 | Format | String
 | ------ | ------
@@ -612,7 +620,7 @@ Defaults to `p`.
 
 Defaults to `s` at top level and `p` inside array or hash.
 
-#### Boolean to String
+### Boolean to String
 
 | Format    | Boolean Formats
 | ----      | -------------------
@@ -623,14 +631,14 @@ Defaults to `s` at top level and `p` inside array or hash.
 | s         | String 'true' / 'false'.
 | p         | String 'true' / 'false'.
 
-#### Regexp to String
+### Regexp to String
 
 | Format    | Regexp Formats
 | ----      | --------------
 | s         | No delimiters, quoted if alternative flag `#` is used.
 | p         | Delimiters `/ /`.
 
-#### Undef to String
+### Undef to String
 
 | Format    | Undef formats
 | ------    | -------------
@@ -643,7 +651,7 @@ Defaults to `s` at top level and `p` inside array or hash.
 | V         | String 'N/A'.
 | u         | String 'undef', or 'undefined' if alternative `#` flag is used.
 
-#### Default value to String
+### Default value to String
 
 | Format    | Default formats
 | ------    | ---------------
@@ -651,7 +659,7 @@ Defaults to `s` at top level and `p` inside array or hash.
 | s         | Same as d.
 | p         | Same as d.
 
-#### Binary value to String
+### Binary value to String
 
 | Format    | Default formats
 | ------    | ---------------
@@ -668,7 +676,7 @@ Defaults to `s` at top level and `p` inside array or hash.
   as hex escaped characters on the form `\\xHH` where `H` is a hex digit.
 * The width and precision values are applied to the text part only in `%p` format.
 
-#### Array & Tuple to String
+### Array & Tuple to String
 
 | Format    | Array/Tuple Formats
 | ------    | -------------
@@ -683,7 +691,7 @@ The alternate form flag `#` will cause indentation of nested array or hash conta
 it is taken as the maximum allowed length of a sequence of elements (not including delimiters). If this max length
 is exceeded, each element will be indented.
 
-#### Hash & Struct to String
+### Hash & Struct to String
 
 | Format    | Hash/Struct Formats
 | ------    | -------------
@@ -697,14 +705,14 @@ more information about options.
 
 The alternate form flag `#` will format each hash key/value entry indented on a separate line.
 
-#### Type to String
+### Type to String
 
 | Format    | Array/Tuple Formats
 | ------    | -------------
 | s         | The same as `p`, quoted if alternative flag `#` is used.
 | p         | Outputs the type in string form as specified by the Puppet Language.
 
-#### Flags
+### Flags
 
 | Flag     | Effect
 | ------   | ------
@@ -715,7 +723,8 @@ The alternate form flag `#` will format each hash key/value entry indented on a
 | 0        | Pad with 0 instead of space for widths larger than value.
 | <[({\|   | Defines an enclosing pair <> [] () {} or \| \| when used with a container type.
 
-### Conversion to Boolean
+Conversion to Boolean
+---
 
 Accepts a single value as argument:
 
@@ -726,7 +735,8 @@ Accepts a single value as argument:
   * `false` if 'false', 'no', 'n' (case independent compare)
 * Boolean is already boolean and is simply returned
 
-### Conversion to Array and Tuple
+Conversion to Array and Tuple
+---
 
 When given a single value as argument:
 
@@ -751,7 +761,8 @@ $arr = Array($value, true)
 Conversion to a `Tuple` works exactly as conversion to an `Array`, only that the constructed array is
 asserted against the given tuple type.
 
-### Conversion to Hash and Struct
+Conversion to Hash and Struct
+---
 
 Accepts a single value as argument:
 
@@ -764,8 +775,8 @@ Accepts a single value as argument:
 Conversion to a `Struct` works exactly as conversion to a `Hash`, only that the constructed hash is
 asserted against the given struct type.
 
-### Conversion to a Regexp
-
+Conversion to a Regexp
+---
 A `String` can be converted into a `Regexp`
 
 **Example**: Converting a String into a Regexp
@@ -777,7 +788,8 @@ if('foo.com' =~ $r) {
 }
 ```
 
-### Creating a SemVer
+Creating a SemVer
+---
 
 A SemVer object represents a single [Semantic Version](http://semver.org/).
 It can be created from a String, individual values for its parts, or a hash specifying the value per part.
@@ -826,7 +838,8 @@ notice(SemVer('2.3.4') =~ $t) # false
 notice(SemVer('3.4.5') =~ $t) # true
 ```
 
-### Creating a SemVerRange
+Creating a SemVerRange
+---
 
 A `SemVerRange` object represents a range of `SemVer`. It can be created from
 a `String`, or from two `SemVer` instances, where either end can be given as
@@ -860,9 +873,10 @@ function SemVerRange.new(
 )
 ```
 
-For examples of `SemVerRange` use, see "Creating a SemVer".
+For examples of `SemVerRange` use see "Creating a SemVer"
 
-### Creating a Binary
+Creating a Binary
+---
 
 A `Binary` object represents a sequence of bytes and it can be created from a String in Base64 format,
 an Array containing byte values. A Binary can also be created from a Hash containing the value to convert to
@@ -882,6 +896,7 @@ function Binary.new(
   Optional[Base64Format] $format
 )
 
+
 function Binary.new(
   Array[ByteInteger] $byte_array
 }
@@ -919,6 +934,6 @@ $b = binary_file('mymodule/mypicture.jpg')
 
 DOC
 ) do |args|
-  Puppet::Parser::Functions::Error.is4x('new')
+  Error.is4x('new')
 end