openvox 9.0.0.pre.alpha2 → 9.0.0.pre.beta2

data/lib/puppet/type.rb

@@ -1238,18 +1238,18 @@ class Type
   newmetaparam(:noop) do
     desc "Whether to apply this resource in noop mode.
 
-      When applying a resource in noop mode, Puppet will check whether it is in sync,
+      When applying a resource in noop mode, OpenVox will check whether it is in sync,
       like it does when running normally. However, if a resource attribute is not in
-      the desired state (as declared in the catalog), Puppet will take no
+      the desired state (as declared in the catalog), OpenVox will take no
       action, and will instead report the changes it _would_ have made. These
-      simulated changes will appear in the report sent to the primary Puppet server, or
+      simulated changes will appear in the report sent to the primary OpenVox server, or
       be shown on the console if running puppet agent or puppet apply in the
       foreground. The simulated changes will not send refresh events to any
-      subscribing or notified resources, although Puppet will log that a refresh
+      subscribing or notified resources, although OpenVox will log that a refresh
       event _would_ have been sent.
 
       **Important note:**
-      [The `noop` setting](https://puppet.com/docs/puppet/latest/configuration.html#noop)
+      [The `noop` setting](https://docs.openvoxproject.org/openvox/latest/configuration.html#noop)
       allows you to globally enable or disable noop mode, but it will _not_ override
       the `noop` metaparameter on individual resources. That is, the value of the
       global `noop` setting will _only_ affect resources that do not have an explicit
@@ -1265,11 +1265,11 @@ class Type
   end
 
   newmetaparam(:schedule) do
-    desc "A schedule to govern when Puppet is allowed to manage this resource.
+    desc "A schedule to govern when OpenVox is allowed to manage this resource.
       The value of this metaparameter must be the `name` of a `schedule`
       resource. This means you must declare a schedule resource, then
       refer to it by name; see
-      [the docs for the `schedule` type](https://puppet.com/docs/puppet/latest/type.html#schedule)
+      [the docs for the `schedule` type](https://docs.openvoxproject.org/openvox/latest/type.html#schedule)
       for more info.
 
           schedule { 'everyday':
@@ -1290,21 +1290,21 @@ class Type
       attribute name, an array of attribute names, or `all`.
 
       Auditing a resource attribute has two effects: First, whenever a catalog
-      is applied with puppet apply or puppet agent, Puppet will check whether
+      is applied with puppet apply or puppet agent, OpenVox will check whether
       that attribute of the resource has been modified, comparing its current
       value to the previous run; any change will be logged alongside any actions
-      performed by Puppet while applying the catalog.
+      performed by OpenVox while applying the catalog.
 
       Secondly, marking a resource attribute for auditing will include that
       attribute in inspection reports generated by puppet inspect; see the
       puppet inspect documentation for more details.
 
       Managed attributes for a resource can also be audited, but note that
-      changes made by Puppet will be logged as additional modifications. (I.e.
+      changes made by OpenVox will be logged as additional modifications. (I.e.
       if a user manually edits a file whose contents are audited and managed,
       puppet agent's next two runs will both log an audit notice: the first run
       will log the user's edit and then revert the file to the desired state,
-      and the second run will log the edit made by Puppet.)"
+      and the second run will log the edit made by OpenVox.)"
 
     validate do |list|
       list = Array(list).collect(&:to_sym)
@@ -1371,7 +1371,7 @@ class Type
   end
 
   newmetaparam(:alias) do
-    desc "Creates an alias for the resource.  Puppet uses this internally when you
+    desc "Creates an alias for the resource.  OpenVox uses this internally when you
       provide a symbolic title and an explicit namevar value:
 
           file { 'sshdconfig':
@@ -1404,7 +1404,7 @@ class Type
             mode => '0644',
           }
 
-      There's no way here for the Puppet parser to know that these two stanzas
+      There's no way here for the OpenVox parser to know that these two stanzas
       should be affecting the same file.
 
       "
@@ -1445,7 +1445,7 @@ class Type
           }
 
       Tags are useful for things like applying a subset of a host's configuration
-      with [the `tags` setting](https://puppet.com/docs/puppet/latest/configuration.html#tags)
+      with [the `tags` setting](https://docs.openvoxproject.org/openvox/latest/configuration.html#tags)
       (e.g. `puppet agent --test --tags bootstrap`)."
 
     munge do |tags|
@@ -1577,7 +1577,7 @@ class Type
 
   newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => { :direction => :in, :events => :NONE }) do
     desc "One or more resources that this resource depends on, expressed as
-      [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
+      [resource references](https://docs.openvoxproject.org/openvox/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1586,17 +1586,17 @@ class Type
       This is one of the four relationship metaparameters, along with
       `before`, `notify`, and `subscribe`. For more context, including the
       alternate chaining arrow (`->` and `~>`) syntax, see
-      [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
+      [the language page on relationships](https://docs.openvoxproject.org/openvox/latest/lang_relationships.html)."
   end
 
   newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => { :direction => :in, :events => :ALL_EVENTS, :callback => :refresh }) do
     desc "One or more resources that this resource depends on, expressed as
-      [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
+      [resource references](https://docs.openvoxproject.org/openvox/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
       * The subscribed resources will be applied _before_ this resource.
-      * If Puppet makes changes to any of the subscribed resources, it will cause
+      * If OpenVox makes changes to any of the subscribed resources, it will cause
         this resource to _refresh._ (Refresh behavior varies by resource
         type: services will restart, mounts will unmount and re-mount, etc. Not
         all types can refresh.)
@@ -1604,12 +1604,12 @@ class Type
       This is one of the four relationship metaparameters, along with
       `before`, `require`, and `notify`. For more context, including the
       alternate chaining arrow (`->` and `~>`) syntax, see
-      [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
+      [the language page on relationships](https://docs.openvoxproject.org/openvox/latest/lang_relationships.html)."
   end
 
   newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => { :direction => :out, :events => :NONE }) do
     desc "One or more resources that depend on this resource, expressed as
-      [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
+      [resource references](https://docs.openvoxproject.org/openvox/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1618,17 +1618,17 @@ class Type
       This is one of the four relationship metaparameters, along with
       `require`, `notify`, and `subscribe`. For more context, including the
       alternate chaining arrow (`->` and `~>`) syntax, see
-      [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
+      [the language page on relationships](https://docs.openvoxproject.org/openvox/latest/lang_relationships.html)."
   end
 
   newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => { :direction => :out, :events => :ALL_EVENTS, :callback => :refresh }) do
     desc "One or more resources that depend on this resource, expressed as
-      [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
+      [resource references](https://docs.openvoxproject.org/openvox/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
       * This resource will be applied _before_ the notified resources.
-      * If Puppet makes changes to this resource, it will cause all of the
+      * If OpenVox makes changes to this resource, it will cause all of the
         notified resources to _refresh._ (Refresh behavior varies by resource
         type: services will restart, mounts will unmount and re-mount, etc. Not
         all types can refresh.)
@@ -1636,7 +1636,7 @@ class Type
       This is one of the four relationship metaparameters, along with
       `before`, `require`, and `subscribe`. For more context, including the
       alternate chaining arrow (`->` and `~>`) syntax, see
-      [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
+      [the language page on relationships](https://docs.openvoxproject.org/openvox/latest/lang_relationships.html)."
   end
 
   newmetaparam(:stage) do
@@ -1649,7 +1649,7 @@ class Type
       By default, all classes are declared in the `main` stage. To assign a class
       to a different stage, you must:
 
-      * Declare the new stage as a [`stage` resource](https://puppet.com/docs/puppet/latest/type.html#stage).
+      * Declare the new stage as a [`stage` resource](https://docs.openvoxproject.org/openvox/latest/type.html#stage).
       * Declare an order relationship between the new stage and the `main` stage.
       * Use the resource-like syntax to declare the class, and set the `stage`
         metaparameter to the name of the desired stage.
@@ -1834,7 +1834,7 @@ class Type
       # like Puppet::Type::Ssh_authorized_key::ParameterProvider.
       desc <<-EOT
         The specific backend to use for this `#{to_s.split('::')[2].downcase}`
-        resource. You will seldom need to specify this --- Puppet will usually
+        resource. You will seldom need to specify this --- OpenVox will usually
         discover the appropriate provider for your platform.
       EOT
 
@@ -2152,7 +2152,7 @@ class Type
   #  to objects called from elsewhere, or not. ;-)</irony>
   #
   # @comment Types (which map to resources in the languages) are entirely composed of
-  #   attribute value pairs.  Generally, Puppet calls any of these things an
+  #   attribute value pairs.  Generally, OpenVox calls any of these things an
   #   'attribute', but these attributes always take one of three specific
   #   forms:  parameters, metaparams, or properties.
 

data/lib/puppet/util/character_encoding.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# A module to centralize heuristics/practices for managing character encoding in Puppet
+# A module to centralize heuristics/practices for managing character encoding in OpenVox
 
 module Puppet::Util::CharacterEncoding
   class << self
@@ -22,7 +22,7 @@ module Puppet::Util::CharacterEncoding
         if original_encoding == Encoding::UTF_8
           unless string_copy.valid_encoding?
             Puppet.debug {
-              _("%{value} is already labeled as UTF-8 but this encoding is invalid. It cannot be transcoded by Puppet.") % { value: string.dump }
+              _("%{value} is already labeled as UTF-8 but this encoding is invalid. It cannot be transcoded by OpenVox.") % { value: string.dump }
             }
           end
           # String is already valid UTF-8 - noop
@@ -44,7 +44,7 @@ module Puppet::Util::CharacterEncoding
         # error on ruby's part, ie Encoding::UndefinedConversionError on a
         # failure to encode!.
         Puppet.debug {
-          _("%{error}: %{value} cannot be transcoded by Puppet.") % { error: detail.inspect, value: string.dump }
+          _("%{error}: %{value} cannot be transcoded by OpenVox.") % { error: detail.inspect, value: string.dump }
         }
         string_copy
       end

data/lib/puppet/util/command_line.rb

@@ -135,7 +135,7 @@ module Puppet
               Puppet::ModuleTranslations.load_from_modulepath(configured_environment.modules)
               Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
 
-              # Puppet requires Facter, which initializes its lookup paths. Reset Facter to
+              # OpenVox requires OpenFact, which initializes its lookup paths. Reset OpenFact to
               # pickup the new $LOAD_PATH.
               Puppet.runtime[:facter].reset
             end

data/lib/puppet/util/execution.rb

@@ -106,7 +106,7 @@ module Puppet::Util::Execution
   #   elements should be the individual arguments to that executable.
   # @param options [Hash] a Hash of options
   # @option options [String] :cwd the directory from which to run the command. Raises an error if the directory does not exist.
-  #   This option is only available on the agent. It cannot be used on the master, meaning it cannot be used in, for example,
+  #   This option is only available on the agent. It cannot be used on the server, meaning it cannot be used in, for example,
   #   regular functions, hiera backends, or report processors.
   # @option options [Boolean]  :failonfail if this value is set to true, then this method will raise an error if the
   #   command is not executed successfully.

data/lib/puppet/util/filetype.rb

@@ -193,7 +193,7 @@ class Puppet::Util::FileType
     # Read a specific @path's cron tab.
     def read
       unless Puppet::Util.uid(@path)
-        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case Puppet creates them in the middle of the run.") % { path: @path }
+        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case OpenVox creates them in the middle of the run.") % { path: @path }
 
         return ""
       end
@@ -204,7 +204,7 @@ class Puppet::Util::FileType
       when /no crontab for/
         ""
       when /are not allowed to/
-        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
+        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case OpenVox authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
         ""
       else
@@ -258,7 +258,7 @@ class Puppet::Util::FileType
     # Read a specific @path's cron tab.
     def read
       unless Puppet::Util.uid(@path)
-        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case Puppet creates them in the middle of the run.") % { path: @path }
+        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case OpenVox creates them in the middle of the run.") % { path: @path }
 
         return ""
       end
@@ -269,7 +269,7 @@ class Puppet::Util::FileType
       when /can't open your crontab/
         ""
       when /you are not authorized to use cron/
-        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
+        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case OpenVox authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
         ""
       else
@@ -309,7 +309,7 @@ class Puppet::Util::FileType
     # Read a specific @path's cron tab.
     def read
       unless Puppet::Util.uid(@path)
-        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case Puppet creates them in the middle of the run.") % { path: @path }
+        Puppet.debug _("The %{path} user does not exist. Treating their crontab file as empty in case OpenVox creates them in the middle of the run.") % { path: @path }
 
         return ""
       end
@@ -320,7 +320,7 @@ class Puppet::Util::FileType
       when /open.*in.*directory/
         ""
       when /not.*authorized.*cron/
-        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
+        Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case OpenVox authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
         ""
       else

data/lib/puppet/util/log.rb

@@ -116,7 +116,7 @@ class Puppet::Util::Log
     # loglevel changed
     @loglevel = loglevel
 
-    # Enable or disable Facter debugging
+    # Enable or disable OpenFact debugging
     Puppet.runtime[:facter].debugging(level == :debug)
   end
 
@@ -157,7 +157,7 @@ class Puppet::Util::Log
         newdestination(:console)
       end
 
-      # Re-raise (end exit Puppet) because we could not set up logging correctly.
+      # Re-raise (end exit OpenVox) because we could not set up logging correctly.
       raise detail
     end
   end

data/lib/puppet/util/logging.rb

@@ -145,7 +145,7 @@ module Logging
   end
 
   # Logs a warning whose origin comes from Puppet source rather than somewhere
-  # internal within Puppet.  Otherwise the same as deprecation_warning()
+  # internal within OpenVox.  Otherwise the same as deprecation_warning()
   #
   # @param message [String] The message to log (logs via warning)
   # @param options [Hash]
@@ -253,8 +253,8 @@ module Logging
     end
   end
 
-  # Sets up Facter logging.
-  # This method causes Facter output to be forwarded to Puppet.
+  # Sets up OpenFact logging.
+  # This method causes OpenFact output to be forwarded to OpenVox.
   def self.setup_facter_logging!
     Puppet.runtime[:facter]
     true

data/lib/puppet/util/plist.rb

@@ -46,7 +46,7 @@ module Puppet::Util::Plist
                                                   { :failonfail => true, :combine => true })
           return parse_plist(plist)
         rescue Puppet::ExecutionFailure => detail
-          message = _("Cannot read file %{file_path}; Puppet is skipping it.") % { file_path: file_path }
+          message = _("Cannot read file %{file_path}; OpenVox is skipping it.") % { file_path: file_path }
           message += '\n' + _("Details: %{detail}") % { detail: detail }
           Puppet.warning(message)
         end

data/lib/puppet/util/profiler/around_profiler.rb

@@ -39,7 +39,7 @@ class Puppet::Util::Profiler::AroundProfiler
 
   # Profile a block of code and log the time it took to execute.
   #
-  # This outputs logs entries to the Puppet masters logging destination
+  # This outputs log entries to the OpenVox server's logging destination
   # providing the time it took, a message describing the profiled code
   # and a leaf location marking where the profile method was called
   # in the profiled hierarchy.

data/lib/puppet/util/profiler.rb

@@ -40,7 +40,7 @@ module Puppet::Util::Profiler
 
   # Profile a block of code and log the time it took to execute.
   #
-  # This outputs logs entries to the Puppet masters logging destination
+  # This outputs log entries to the OpenVox server's logging destination
   # providing the time it took, a message describing the profiled code
   # and a leaf location marking where the profile method was called
   # in the profiled hierarchy.

data/lib/puppet/util/rdoc.rb

@@ -16,9 +16,12 @@ module Puppet::Util::RDoc
 
     r = RDoc::RDoc.new
 
-    # specify our own format & where to output
-    options = ["--fmt", "puppet",
-               "--quiet",
+    # Documentation is rendered by RDoc's default generator using our custom
+    # parser. The historical custom "puppet" generator and its HTML template
+    # targeted RDoc 1.x and could not be loaded under any supported RDoc; the
+    # template also carried a CC-BY-1.0 license, which is incompatible with
+    # the Debian Free Software Guidelines. Both were removed.
+    options = ["--quiet",
                "--exclude", "/modules/[^/]*/spec/.*$",
                "--exclude", "/modules/[^/]*/files/.*$",
                "--exclude", "/modules/[^/]*/tests/.*$",

data/lib/puppet/util/selinux.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Provides utility functions to help interface Puppet to SELinux.
+# Provides utility functions to help interface OpenVox to SELinux.
 #
 # This requires the very new SELinux Ruby bindings.  These bindings closely
 # mirror the SELinux C library interface.
@@ -111,7 +111,7 @@ module Puppet::Util::SELinux
   # This updates the actual SELinux label on the file.  You can update
   # only a single component or update the entire context.
   # The caveat is that since setting a partial context makes no sense the
-  # file has to already exist.  Puppet (via the File resource) will always
+  # file has to already exist.  OpenVox (via the File resource) will always
   # just try to set components, even if all values are specified by the manifest.
   # I believe that the OS should always provide at least a fall-through context
   # though on any well-running system.
@@ -123,7 +123,7 @@ module Puppet::Util::SELinux
       context = Selinux.lgetfilecon(file)[1]
       if context == -1
         # We can't set partial context components when no context exists
-        # unless/until we can find a way to make Puppet call this method
+        # unless/until we can find a way to make OpenVox call this method
         # once for all selinux file label attributes.
         Puppet.warning _("Can't set SELinux context on file unless the file already has some kind of context")
         return nil
@@ -157,7 +157,7 @@ module Puppet::Util::SELinux
 
   # Since this call relies on get_selinux_default_context it also needs a
   # full non-relative path to the file.  Fortunately, that seems to be all
-  # Puppet uses.  This will set the file's SELinux context to the policy's
+  # OpenVox uses.  This will set the file's SELinux context to the policy's
   # default context (if any) if it differs from the context currently on
   # the file.
   def set_selinux_default_context(file, resource_ensure = nil)
@@ -178,7 +178,7 @@ module Puppet::Util::SELinux
   # potential issues when mcstransd is not functional.
   #
   # It is not marked private because it is needed by File's
-  # selcontext.rb, but it is not intended for use outside of Puppet's
+  # selcontext.rb, but it is not intended for use outside of OpenVox's
   # code.
   #
   # @param category [String] An selinux category, such as "s0" or "SystemLow"

data/lib/puppet/util/tag_set.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
 require_relative '../../puppet/network/format_support'
 
 class Puppet::Util::TagSet < Set

data/lib/puppet/util/windows/adsi.rb

@@ -288,7 +288,7 @@ module Puppet::Util::Windows::ADSI
       rescue WIN32OLERuntimeError => e
         # ERROR_BAD_USERNAME 2202L from winerror.h
         if e.message =~ /8007089A/m
-          raise Puppet::Error, _("Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class }
+          raise Puppet::Error, _("OpenVox is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class }
         end
 
         raise Puppet::Error.new(_("%{object_class} update failed: %{error}") % { object_class: object_class.capitalize, error: e }, e)

data/lib/puppet/util/windows/com.rb

@@ -129,7 +129,7 @@ module Puppet::Util::Windows::COM
   module Instance
     def self.[](iface)
       Class.new(iface) do
-        send(:include, Helpers)
+        include Helpers
 
         def initialize(pointer)
           self.pointer = pointer
@@ -158,7 +158,7 @@ module Puppet::Util::Windows::COM
   module Factory
     def self.[](iface, clsid)
       Class.new(iface) do
-        send(:include, Helpers)
+        include Helpers
 
         const_set(:CLSID, clsid)
 

data/lib/puppet/util/windows/eventlog.rb

@@ -3,8 +3,8 @@
 require 'ffi'
 
 # Puppet::Util::Windows::EventLog needs to be requirable without having loaded
-# any other parts of Puppet so it can be leveraged independently by the code
-# that runs Puppet as a service on Windows.
+# any other parts of OpenVox so it can be leveraged independently by the code
+# that runs OpenVox as a service on Windows.
 #
 # For this reason we:
 # - Define Puppet::Util::Windows
@@ -21,7 +21,7 @@ class Puppet::Util::Windows::EventLog
   EVENTLOG_INFORMATION_TYPE = 0x0004
 
   # These are duplicate definitions from Puppet::Util::Windows::ApiTypes,
-  # established here so this class can be standalone from Puppet, and public so
+  # established here so this class can be standalone from OpenVox, and public so
   # we can reference them in tests.
   NULL_HANDLE = 0
   WIN32_FALSE = 0
@@ -88,7 +88,7 @@ class Puppet::Util::Windows::EventLog
 
     # Query event identifier info for a given log level
     # @param level [Symbol] an event log level
-    # @return [Array] Win API Event ID, Puppet Event ID
+    # @return [Array] Win API Event ID, OpenVox Event ID
     # @api public
     def to_native(level)
       case level
@@ -107,9 +107,9 @@ class Puppet::Util::Windows::EventLog
   private
 
   # For the purposes of allowing this class to be standalone, the following are
-  # duplicate definitions from elsewhere in Puppet:
+  # duplicate definitions from elsewhere in OpenVox:
 
-  # If we're loaded via Puppet we should keep the previous behavior of raising
+  # If we're loaded via OpenVox we should keep the previous behavior of raising
   # Puppet::Util::Windows::Error on errors. If we aren't, at least concatenate
   # the error code to the exception message to pass this information on to the
   # user

data/lib/puppet/util/windows/file.rb

@@ -213,7 +213,7 @@ module Puppet::Util::Windows::File
   module_function :reparse_point?
 
   def symlink?(file_name)
-    # Puppet currently only handles mount point and symlink reparse points, ignores others
+    # OpenVox currently only handles mount point and symlink reparse points, ignores others
     reparse_point?(file_name) && symlink_reparse_point?(file_name)
   end
   module_function :symlink?
@@ -340,7 +340,7 @@ module Puppet::Util::Windows::File
   end
   private_class_method :resolve_symlink
 
-  # these reparse point types are the only ones Puppet currently understands
+  # these reparse point types are the only ones OpenVox currently understands
   # so rather than raising an exception in readlink, prefer to not consider
   # the path a symlink when stat'ing later
   def self.symlink_reparse_point?(path)

data/lib/puppet/util/windows/security.rb

@@ -5,7 +5,7 @@
 #
 # The primary goal of this mapping is to ensure that owner, group, and
 # modes can be round-tripped in a consistent and deterministic
-# way. Otherwise, Puppet might think file resources are out-of-sync
+# way. Otherwise, OpenVox might think file resources are out-of-sync
 # every time it runs. A secondary goal is to provide equivalent
 # permissions for common use-cases. For example, setting the owner to
 # "Administrators", group to "Users", and mode to 750 (which also
@@ -52,8 +52,8 @@
 #   be mapped into the 3 class POSIX model. The get_mode method will
 #   set the S_IEXTRA bit flag indicating that an access control entry
 #   was found whose SID is neither the owner, group, or other. This
-#   enables Puppet to detect when file/dirs are out-of-sync,
-#   especially those that Puppet did not create, but is attempting
+#   enables OpenVox to detect when file/dirs are out-of-sync,
+#   especially those that OpenVox did not create, but is attempting
 #   to manage.
 # * A special case of this is S_ISYSTEM_MISSING, which is set when the
 #   SYSTEM permissions are *not* present on the DACL.

data/lib/puppet/util.rb

@@ -44,6 +44,7 @@ module Util
   # @deprecated Use ENV instead
   # @api private
   def get_env(name, mode = default_env)
+    Puppet.deprecation_warning(_("Puppet::Util.get_env is deprecated and will be removed in a future version. Use ENV[] directly instead."))
     ENV.fetch(name, nil)
   end
   module_function :get_env
@@ -51,6 +52,7 @@ module Util
   # @deprecated Use ENV instead
   # @api private
   def get_environment(mode = default_env)
+    Puppet.deprecation_warning(_("Puppet::Util.get_environment is deprecated and will be removed in a future version. Use ENV.to_hash directly instead."))
     ENV.to_hash
   end
   module_function :get_environment
@@ -58,6 +60,7 @@ module Util
   # @deprecated Use ENV instead
   # @api private
   def clear_environment(mode = default_env)
+    Puppet.deprecation_warning(_("Puppet::Util.clear_environment is deprecated and will be removed in a future version. Use ENV.clear directly instead."))
     ENV.clear
   end
   module_function :clear_environment
@@ -65,6 +68,7 @@ module Util
   # @deprecated Use ENV instead
   # @api private
   def set_env(name, value = nil, mode = default_env)
+    Puppet.deprecation_warning(_("Puppet::Util.set_env is deprecated and will be removed in a future version. Use ENV[]= directly instead."))
     ENV[name] = value
   end
   module_function :set_env
@@ -72,7 +76,8 @@ module Util
   # @deprecated Use ENV instead
   # @api private
   def merge_environment(env_hash, mode = default_env)
-    ENV.merge!(hash.transform_keys(&:to_s))
+    Puppet.deprecation_warning(_("Puppet::Util.merge_environment is deprecated and will be removed in a future version. Use ENV.merge! directly instead."))
+    ENV.merge!(env_hash.transform_keys(&:to_s))
   end
   module_function :merge_environment
 
@@ -257,7 +262,7 @@ module Util
     end
 
     # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
-    # library uses that to test what platform it's on.  Normally in Puppet we
+    # library uses that to test what platform it's on.  Normally in OpenVox we
     # would use Puppet.features.microsoft_windows?, but this method needs to
     # be called during the initialization of features so it can't depend on
     # that.
@@ -739,7 +744,7 @@ module Util
   module_function :deterministic_rand_int
 
   # Executes a block of code, wrapped around Facter.load_external(false) and
-  # Facter.load_external(true) which will cause Facter to not evaluate external facts.
+  # Facter.load_external(true) which will cause OpenFact to not evaluate external facts.
   def skip_external_facts
     return yield unless Puppet.runtime[:facter].load_external?