Merge pull request #271 from david22swan/IAC-1450/main/inappropriate_terminology

(IAC-1459) - Removal of Inappropriate Terminology

Author: Disha-maker

.rubocop_todo.yml

@@ -20,8 +20,8 @@ Layout/ClosingHeredocIndentation:
   Enabled: false
 
 # Offense count: 5
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Configuration parameters: Denylist.
+# Denylist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'spec/acceptance/generate_markdown_spec.rb'

CHANGELOG.md

@@ -233,7 +233,7 @@ All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with t
   - Note: this means Markdown text in YARD comments and tags, not a change in the output of strings
 - New commandline options: --emit-json and --emit-json-stdout to generate JSON documentation **(PDOC-84)**
 - Runtime dependency on Puppet has been removed, allowing strings to function in Puppet Enterprise 3.8 **(PDOC-80)**
-  - Note that the gem still requires puppet. We recommend that the strings gem be installed with puppet, as suggested in the  [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#installing-puppet-strings)
+  - Note that the gem still requires puppet. We recommend that the strings gem be installed with puppet, as suggested in the  [README](https://github.com/puppetlabs/puppet-strings/blob/main/README.md#installing-puppet-strings)
 - New gemspec requirement on Ruby version 1.9.3, the oldest supported Ruby version
 
 ### BugFixes
@@ -253,8 +253,8 @@ All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with t
 ### Features
 - Support for JSON output **(PDOC-23)**
   - Strings now has the ability to produce a JSON representation of a given puppet module
-  - The details of the JSON schema can be found [here](https://github.com/puppetlabs/puppet-strings/blob/master/json_dom.md)
-  - For details on how to generate JSON, see the [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#running-puppet-strings)
+  - The details of the JSON schema can be found [here](https://github.com/puppetlabs/puppet-strings/blob/main/json_dom.md)
+  - For details on how to generate JSON, see the [README](https://github.com/puppetlabs/puppet-strings/blob/main/README.md#running-puppet-strings)
 - Migrate to ruby gems as a distribution method **(PDOC-28)**
   - This is the last release of strings that will be available as a puppet module
   - The 0.4.0 release will be released concurrently as a ruby gem

COMMITTERS.md

@@ -4,7 +4,7 @@ Committing changes to Strings
 We would like to make it easier for community members to contribute to strings
 using pull requests, even if it makes the task of reviewing and committing
 these changes a little harder.  Pull requests are only ever based on a single
-branch. As a result contributors should target their changes at the master branch.
+branch. As a result contributors should target their changes at the main branch.
 This makes the process of contributing a little easier for the contributor since 
 they don't need to concern themselves with the question, "What branch do I base my changes
 on?"  This is already called out in the [CONTRIBUTING.md](http://goo.gl/XRH2J).
@@ -17,7 +17,7 @@ effort to make sure the end users must opt-in to new behavior that is
 incompatible with previous behavior.  We employ the use of [feature
 flags](http://stackoverflow.com/questions/7707383/what-is-a-feature-flag) as
 the primary way to achieve this user opt-in behavior.  Finally, it is the
-responsibility of the committer to make sure the `master` branch
+responsibility of the committer to make sure the `main` branch
 is clean and working at all times.  Clean means that dead code is not
 allowed, everything needs to be usable in some manner at all points in time.
 
@@ -45,9 +45,9 @@ making the decision what base branch to merge the change set into.
 
 **base branch** - A branch in Git that contains an active history of changes
 and will eventually be released using semantic version guidelines.  The branch
-named `master` will always exist as a base branch.
+named `main` will always exist as a base branch.
 
-**master branch** - The branch where new functionality that and bug fixes are
+**main branch** - The branch where new functionality that and bug fixes are
 merged.
 
 **security** - Where critical security fixes are merged.  These change sets
@@ -70,7 +70,7 @@ This section provides a guide to help a committer decide the specific base
 branch that a change set should be merged into.
 
 The latest minor release of a major release is the only base branch that should
-be patched.  These patches will be merged into `master` if they contain new
+be patched.  These patches will be merged into `main` if they contain new
 functionality and  if they fix a critical bug.  Older minor releases in a major release 
 do not get patched.
 
@@ -87,7 +87,7 @@ security branch as the base branch.  Please send all security related
 information or patches to security@puppet.com as per our [Security
 Policy](https://puppet.com/security/).
 
-The CI systems are configured to run against `master`.  Over time, this branch 
+The CI systems are configured to run against `main`.  Over time, this branch 
 will refer to different versions, but its name will remain fixed to avoid having 
 to update CI jobs and tasks as new versions are released.
 
@@ -108,7 +108,7 @@ branch:
    documentation being kept up to date?
  * Does the change set include clean code?  (software code that is formatted
    correctly and in an organized manner so that another coder can easily read
-   or modify it.)  HINT: `git diff master --check`
+   or modify it.)  HINT: `git diff main --check`
  * Does the change set conform to the contributing guide?
 
 Commit citizen guidelines:
@@ -118,13 +118,13 @@ This section aims to provide guidelines for being a good commit citizen by
 paying attention to our automated build tools.
 
  * Don’t push on a broken build.  (A broken build is defined as a failing job
-   in [Puppet Strings](https://jenkins.puppetlabs.com/job/platform_puppet-strings_unit-ruby_master/)
+   in [Puppet Strings](https://travis-ci.com/github/puppetlabs/puppet-strings)
    page.)
  * Watch the build until your changes have gone through green
  * Update the ticket status and target version.  The target version field in
    our issue tracker should be updated to be the next release of Puppet.  For
    example, if the most recent release of Puppet is 3.1.1 and you merge a
-   backwards compatible change set into master, then the target version should
+   backwards compatible change set into main, then the target version should
    be 3.2.0 in the issue tracker.)
  * Ensure the pull request is closed (Hint: amend your merge commit to contain
    the string `closes #123` where 123 is the pull request number and github
@@ -135,7 +135,7 @@ Example Procedure
 
 This section helps a committer rebase and merge a contribution into the base branch.
 
-Suppose a contributor submits a pull request based on master.  The change set
+Suppose a contributor submits a pull request based on main.  The change set
 fixes a bug reported against strings 0.1.0  which is the most recently released
 version of strings.
 
@@ -147,20 +147,20 @@ branch to track the remote branch.
     Branch jeffmccune-pdoc-34_fix_foo_error set up to track remote branch pdoc-34-fix_foo_error from jeffmccune.
     Switched to a new branch 'jeffmccune-pdoc-34_fix_foo_error'
 
-It's possible that more changes have been merged into master since the pull
+It's possible that more changes have been merged into main since the pull
 request was submitted. In this case it may be necessary to rebase the branch
 that contains the changes:
 
-    $ git rebase upstream/master
+    $ git rebase upstream/main
 
 After the branch has been checked out and rebased, the committer should ensure that
 the code review check list has been completed.
 
 Now that we have a topic branch containing the change set based on the most recent 
-`master` branch, the committer merges in:
+`main` branch, the committer merges in:
 
-    $ git checkout master
-    Switched to branch 'master'
+    $ git checkout main
+    Switched to branch 'main'
     $ git merge --no-ff --log jeffmccune-pdoc-34_fix_foo_error
     Merge made by the 'recursive' strategy.
      foo | 0
@@ -173,12 +173,12 @@ preserve the usefulness of `git branch --contains`.  If there are any merge
 conflicts, they are to be resolved in the merge commit itself and not by
 re-writing (rebasing) the patches for one base branch, but not another.
 
-Once the change set has been merged into `master`, the committer pushes.
+Once the change set has been merged into `main`, the committer pushes.
 Please note, the checklist should be complete at this point. It's helpful to make
 sure your local branches are up to date to avoid one of the branches failing to fast
 forward while the other succeeds.
 
-    $ git push origin master:master
+    $ git push origin main:main
 
 That's it!  The committer then updates the pull request, updates the issue in
 our issue tracker, and keeps an eye on the [build

CONTRIBUTING.md

@@ -23,7 +23,7 @@ Before you submit your issue, take a minute to...
    reported.
 
 2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or release tag.
+   latest `main` or release tag.
 
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as **detailed as possible** in your issue. What is
@@ -48,12 +48,12 @@ Example:
 ## Making Changes
 
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
+  * This is usually the main branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master; `git checkout -b
-    fix/master/my_contribution master`. Please avoid working directly on the
-    `master` branch.
+  * To quickly create a topic branch based on main; `git checkout -b
+    fix/main/my_contribution main`. Please avoid working directly on the
+    `main` branch.
 * Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the proper format.
@@ -109,7 +109,7 @@ a ticket number.
 
 ## Cutting a release
 
-To cut a new release, from a current `master` checkout:
+To cut a new release, from a current `main` checkout:
 
 * Start the release branch with `git checkout -b release-prep`
 * Update `lib/puppet-strings/version.rb` to the new version

HISTORY.md

@@ -114,7 +114,7 @@ All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with t
   - Note: this means Markdown text in YARD comments and tags, not a change in the output of strings
 - New commandline options: --emit-json and --emit-json-stdout to generate JSON documentation **(PDOC-84)**
 - Runtime dependency on Puppet has been removed, allowing strings to function in Puppet Enterprise 3.8 **(PDOC-80)**
-  - Note that the gem still requires puppet. We recommend that the strings gem be installed with puppet, as suggested in the  [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#installing-puppet-strings)
+  - Note that the gem still requires puppet. We recommend that the strings gem be installed with puppet, as suggested in the  [README](https://github.com/puppetlabs/puppet-strings/blob/main/README.md#installing-puppet-strings)
 - New gemspec requirement on Ruby version 1.9.3, the oldest supported Ruby version
 
 ### BugFixes
@@ -134,8 +134,8 @@ All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with t
 ### Features
 - Support for JSON output **(PDOC-23)**
   - Strings now has the ability to produce a JSON representation of a given puppet module
-  - The details of the JSON schema can be found [here](https://github.com/puppetlabs/puppet-strings/blob/master/json_dom.md)
-  - For details on how to generate JSON, see the [README](https://github.com/puppetlabs/puppet-strings/blob/master/README.md#running-puppet-strings)
+  - The details of the JSON schema can be found [here](https://github.com/puppetlabs/puppet-strings/blob/main/json_dom.md)
+  - For details on how to generate JSON, see the [README](https://github.com/puppetlabs/puppet-strings/blob/main/README.md#running-puppet-strings)
 - Migrate to ruby gems as a distribution method **(PDOC-28)**
   - This is the last release of strings that will be available as a puppet module
   - The 0.4.0 release will be released concurrently as a ruby gem

README.md

@@ -1,6 +1,6 @@
 Puppet Strings
 ==============
-[![Build Status](https://travis-ci.org/puppetlabs/puppet-strings.png?branch=master)](https://travis-ci.org/puppetlabs/puppet-strings) [![Gem Version](https://badge.fury.io/rb/puppet-strings.svg)](https://badge.fury.io/rb/puppet-strings)
+[![Build Status](https://travis-ci.org/puppetlabs/puppet-strings.png?branch=main)](https://travis-ci.org/puppetlabs/puppet-strings) [![Gem Version](https://badge.fury.io/rb/puppet-strings.svg)](https://badge.fury.io/rb/puppet-strings)
 
 Puppet Strings generates documentation for Puppet code and extensions written in Puppet and Ruby. Strings processes code and YARD-style code comments to create documentation in HTML, Markdown, or JSON formats.
 
@@ -70,7 +70,7 @@ Here are a few other good resources for getting started with documentation:
 
 We love contributions from the community!
 
-If you'd like to contribute to `puppet-strings`, check out [CONTRIBUTING.md](https://github.com/puppetlabs/puppet-strings/blob/master/CONTRIBUTING.md) to get information on the contribution process.
+If you'd like to contribute to `puppet-strings`, check out [CONTRIBUTING.md](https://github.com/puppetlabs/puppet-strings/blob/main/CONTRIBUTING.md) to get information on the contribution process.
 
 ### Running Specs
 
@@ -141,9 +141,9 @@ Bug fixes and ongoing development will occur in minor releases for the current m
 
 [repo]: https://github.com/puppetlabs/puppet-strings
 [issues]: https://github.com/puppetlabs/puppet-strings/issues
-[LICENSE]: https://github.com/puppetlabs/puppet-strings/blob/master/LICENSE
-[changelog]: https://github.com/puppetlabs/puppet-strings/blob/master/CHANGELOG.md
-[contributing]: https://github.com/puppetlabs/puppet-strings/blob/master/CONTRIBUTING.md
-[committers]: https://github.com/puppetlabs/puppet-strings/blob/master/COMMITTERS.md
+[LICENSE]: https://github.com/puppetlabs/puppet-strings/blob/main/LICENSE
+[changelog]: https://github.com/puppetlabs/puppet-strings/blob/main/CHANGELOG.md
+[contributing]: https://github.com/puppetlabs/puppet-strings/blob/main/CONTRIBUTING.md
+[committers]: https://github.com/puppetlabs/puppet-strings/blob/main/COMMITTERS.md
 [Puppet community Slack]: https://slack.puppet.com
 

Rakefile

@@ -18,7 +18,7 @@ if Bundler.rubygems.find_name('puppet_litmus').any?
           original_with_runner(deep_duplicate_object(config_data), deep_duplicate_object(inventory_data)) { |runner| yield runner }
         end
 
-        # From https://github.com/puppetlabs/pdk/blob/master/lib/pdk/util.rb
+        # From https://github.com/puppetlabs/pdk/blob/main/lib/pdk/util.rb
         # Workaround for https://github.com/puppetlabs/bolt/issues/1614
         def self.deep_duplicate_object(object)
           if object.is_a?(Array)

misc/ANNOUNCEMENT_TEMPLATE.md

@@ -4,7 +4,7 @@ Before sending, do check that all links are still valid. Feel free to adjust the
 
 The github rendering of the markdown seems to copy&paste acceptably into Google Inbox.
 
-The [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/master/CHANGELOG.md) is a good starting point for finding enhancements and bug-fixes.
+The [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/main/CHANGELOG.md) is a good starting point for finding enhancements and bug-fixes.
 
 ---
 
@@ -29,7 +29,7 @@ The new release also contains the following notable bugfixes:
 * E
 * F
 
-See the [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/master/CHANGELOG.md) for a full list of changes
+See the [CHANGELOG](https://github.com/puppetlabs/puppet-strings/blob/main/CHANGELOG.md) for a full list of changes
 
 We encourage all module developers to review puppet-strings and use it when creating modules.
 

spec/unit/puppet-strings/yard/handlers/ruby/data_type_handler_spec.rb

@@ -261,7 +261,7 @@ def suppress_yard_logging
 
   describe 'parsing a valid data type definition' do
     # TODO: What about testing for `type_parameters => {}`
-    # e.g. https://github.com/puppetlabs/puppet/blob/master/lib/puppet/datatypes/error.rb
+    # e.g. https://github.com/puppetlabs/puppet/blob/main/lib/puppet/datatypes/error.rb
     let(:source) { <<-SOURCE
 # An example Puppet Data Type in Ruby.
 #