(IAC-1004) - Removal of inappropriate terminology

Removal of any offensive or inappropriate terminology from the code base.

Author: David Swan

.github/pull_request_template.md

@@ -3,13 +3,13 @@ BEFORE YOU CREATE A PULL REQUEST:
 
 Ensure you have read over
 
-CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-registry/blob/master/CONTRIBUTING.md
+CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-registry/blob/main/CONTRIBUTING.md
 
 We provide defined guidance (as such, we strongly adhere to it).
 
 A summary of our expectations:
  - A ticket was created at https://tickets.puppetlabs.com/secure/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&components=11482&summary=%5BREGISTRY%5D%20, or you have an existing ticket #
- - You are not submitting a pull request from your MASTER branch.
+ - You are not submitting a pull request from your Main branch.
  - The first line of your  git commit message has the ticket # and a short summary of the fix, followed by a detailed explanation of the fix in the git commit body.
  - Your git commit message format is important. We have a very defined expectation for this format and are keep to it. Really, READ the entire Contributing document. It will save you and us time.
  - Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us.

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -40,7 +40,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@master
+      uses: puppetlabs/action-litmus_spec@main
       with:
         puppet_gem_version: ${{ matrix.puppet_gem_version }}
         check: ${{ matrix.check }}

.github/workflows/weekly.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -39,7 +39,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@master
+      uses: puppetlabs/action-litmus_spec@main
       with:
         puppet_gem_version: ${{ matrix.puppet_gem_version }}
         check: ${{ matrix.check }}

CHANGELOG.md

@@ -46,7 +46,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 - Fix types to no longer use unsupported proc title patterns ([MODULES-6818](https://tickets.puppetlabs.com/browse/MODULES-6818))
-- Fix acceptance tests in master-agent scenarios ([FM-6934](https://tickets.puppetlabs.com/browse/FM-6934))
+- Fix acceptance tests in server-agent scenarios ([FM-6934](https://tickets.puppetlabs.com/browse/FM-6934))
 - Use case insensitive search when purging ([MODULES-7534](https://tickets.puppetlabs.com/browse/MODULES-7534))
 
 ### Removed

CONTRIBUTING.md

@@ -108,7 +108,7 @@ process as easy as possible.
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
-      directly on "master".
+      directly on "main".
       It makes things much easier to keep track of, especially if
       you decide to work on another thing before your first change
       is merged in.

HISTORY.md

@@ -14,7 +14,7 @@
 
 ### Fixed
 - Fix types to no longer use unsupported proc title patterns ([MODULES-6818](https://tickets.puppetlabs.com/browse/MODULES-6818))
-- Fix acceptance tests in master-agent scenarios ([FM-6934](https://tickets.puppetlabs.com/browse/FM-6934))
+- Fix acceptance tests in server-agent scenarios ([FM-6934](https://tickets.puppetlabs.com/browse/FM-6934))
 - Use case insensitive search when purging ([MODULES-7534](https://tickets.puppetlabs.com/browse/MODULES-7534))
 
 ### Removed

README.md

@@ -1,5 +1,5 @@
 # registry
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-registry.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-registry)
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-registry.png?branch=main)](https://travis-ci.org/puppetlabs/puppetlabs-registry)
 
 #### Table of Contents
 
@@ -22,7 +22,7 @@ The Registry is a hierarchical database built into Microsoft Windows. It stores
 
 ## Setup
 
-This module must be installed on your Puppet master. We've tested it with Puppet agents running on Windows Server 2008 R2, 2012, and 2012 R2.
+This module must be installed on your Puppet server. We've tested it with Puppet agents running on Windows Server 2008 R2, 2012, and 2012 R2.
 
 ### Beginning with registry
 
@@ -73,14 +73,14 @@ registry_value { 'PuppetDescription':
 
 ``` puppet
 class myapp {
-  registry::value { 'puppetmaster':
+  registry::value { 'puppetserver':
     key  => 'HKLM\Software\Vendor\PuppetLabs',
     data => 'puppet.puppet.com',
   }
 }
 ```
 
-Puppet looks up the key 'HKLM\Software\Vendor\PuppetLabs' and makes sure it contains a value named 'puppetmaster' containing the string 'puppet.puppet.com'.
+Puppet looks up the key 'HKLM\Software\Vendor\PuppetLabs' and makes sure it contains a value named 'puppetserver' containing the string 'puppet.puppet.com'.
 
 ### Set the default value for a key
 
@@ -146,13 +146,13 @@ This is an alternative approach to using INSTSRV.EXE [1](http://support.microsof
 registry::service { puppet:
   ensure       => present,
   display_name => "Puppet Agent",
-  description  => "Periodically fetches and applies configurations from a Puppet master server.",
+  description  => "Periodically fetches and applies configurations from a Puppet Server.",
   command      => 'C:\PuppetLabs\Puppet\service\daemon.bat',
 }
 ```
 
 ## Reference
-For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-registry/blob/master/REFERENCE.md)
+For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-registry/blob/main/REFERENCE.md)
 
 ## Limitations
 
@@ -167,7 +167,7 @@ Puppet Inc modules on the Puppet Forge are open projects, and community contribu
 
 We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
-If you would like to contribute to this module, please follow the rules in the [CONTRIBUTING.md](https://github.com/puppetlabs/puppetlabs-registry/blob/master/CONTRIBUTING.md). For more information, see our [module contribution guide.](https://puppet.com/docs/puppet/latest/contributing.html)
+If you would like to contribute to this module, please follow the rules in the [CONTRIBUTING.md](https://github.com/puppetlabs/puppetlabs-registry/blob/main/CONTRIBUTING.md). For more information, see our [module contribution guide.](https://puppet.com/docs/puppet/latest/contributing.html)
 
 ### Contributors
 

REFERENCE.md

@@ -36,7 +36,7 @@ registry::service { puppet:
   ensure       => present,
   display_name => 'Puppet Agent',
   description  => 'Periodically fetches and applies
-                configurations from a Puppet master server.',
+                configurations from a Puppet Server.',
   command      => 'C:\PuppetLabs\Puppet\service\daemon.bat',
 }
 ```
@@ -105,11 +105,11 @@ value.  Puppet will automatically manage the parent key for you.
 
 #### Examples
 
-##### This example will automatically manage the key. It will also create a value named 'puppetmaster' inside this key.
+##### This example will automatically manage the key. It will also create a value named 'puppetserver' inside this key.
 
 ```puppet
 class myapp {
-  registry::value { 'puppetmaster':
+  registry::value { 'puppetserver':
     key => 'HKLM\Software\Vendor\PuppetLabs',
     data => 'puppet.puppetlabs.com',
   }

manifests/service.pp

@@ -28,7 +28,7 @@
 #     ensure       => present,
 #     display_name => 'Puppet Agent',
 #     description  => 'Periodically fetches and applies
-#                   configurations from a Puppet master server.',
+#                   configurations from a Puppet Server.',
 #     command      => 'C:\PuppetLabs\Puppet\service\daemon.bat',
 #   }
 #

manifests/value.pp

@@ -28,9 +28,9 @@
 #   - Stdlib Module
 #
 #
-# @example This example will automatically manage the key.  It will also create a value named 'puppetmaster' inside this key.
+# @example This example will automatically manage the key.  It will also create a value named 'puppetserver' inside this key.
 #   class myapp {
-#     registry::value { 'puppetmaster':
+#     registry::value { 'puppetserver':
 #       key => 'HKLM\Software\Vendor\PuppetLabs',
 #       data => 'puppet.puppetlabs.com',
 #     }

metadata.json

@@ -34,6 +34,6 @@
   ],
   "description": "This module provides a native type and provider to manage keys and values in the Windows Registry",
   "pdk-version": "1.18.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gd610ead"
+  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
+  "template-ref": "heads/main-0-gd610ead"
 }