(IAC-978) - Removal of inappropriate terminology

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 064443f2f9048afb83352a80f75b36b14429aeb2..8424781b1445411364b219e5e6f824b18f9336c5 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.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: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -59,7 +59,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 }}

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 8d23ec342fd4b434e3b27b5158a9c21b93c46cc9..c243ad396762d7d786b5e74952de0a3e369f7325 100644 (file)
--- a/.github/workflows/weekly.yml
+++ b/.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: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -58,7 +58,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 }}

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a9fb3a5cd686bd5f281ea3c2eaec843d65b25cd..9c171f9949f5d5e4106c8d58dc547308b1857594 100644 (file)
--- a/CONTRIBUTING.md
+++ b/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.

diff --git a/README.md b/README.md
index df9ec5091d09571c6a68132283af4de4997f9ce7..53f0228cbadd0c32c0666e757b97ed99fb83487f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -286,14 +286,14 @@ class { 'apt':
 
 ### More Information
 
-See [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/master/REFERENCE.md) for all other reference documentation.
+See [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/main/REFERENCE.md) for all other reference documentation.
 
 <a id="limitations"></a> 
 ## Limitations
 
 This module is not designed to be split across [run stages](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html).
 
-For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/master/metadata.json)
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/main/metadata.json)
 
 ### Adding new sources or PPAs
 

diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index c4c9a9a6f27641b76ded78384735f6fb55472b7a..eb0803c7817504ba5a35f1cc91d72d8ffdd999f8 100644 (file)
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -266,13 +266,13 @@ class { 'apt':
 
 ### 詳細情報
 
-その他すべてのリファレンスマニュアルについては、[REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/master/REFERENCE.md)を参照してください。
+その他すべてのリファレンスマニュアルについては、[REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/main/REFERENCE.md)を参照してください。
 
 ## 制約
 
 このモジュールは、[実行ステージ](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html)に分割するようには設計されていません。
 
-サポート対象のオペレーティングシステムの全リストについては、[metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/master/metadata.json)を参照してください。
+サポート対象のオペレーティングシステムの全リストについては、[metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/main/metadata.json)を参照してください。
 
 ### 新しいソースまたはPPAの追加
 

diff --git a/spec/unit/puppet/provider/apt_key_spec.rb b/spec/unit/puppet/provider/apt_key_spec.rb
index ca35ff7d6b10986e28329bf70c41293ba5ec6528..7b87017810ede129f731ac161cb6ae8dc53829fd 100644 (file)
--- a/spec/unit/puppet/provider/apt_key_spec.rb
+++ b/spec/unit/puppet/provider/apt_key_spec.rb
@@ -15,6 +15,7 @@ describe Puppet::Type.type(:apt_key).provider(:apt_key) do
 
   context 'self.instances no key' do
     before :each do
+      # Unable to remove `master` from below terminology as it relies on outside code
       allow(described_class).to receive(:apt_key).with(
         ['adv', '--no-tty', '--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode'],
       ).and_return('uid:-::::1284991450::07BEBE04F4AE4A8E885A761325717D8509D9C1DC::Ubuntu Extras Archive Automatic Signing Key <ftpmaster@ubuntu.com>::::::::::0:')