(IAC-982) - Remove inappropriate terminology

Author: David Swan

Diff for: .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 }}
@@ -41,7 +41,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 }}
@@ -61,7 +61,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 for: .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 }}
@@ -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 }}
@@ -60,7 +60,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 for: README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-docker.svg?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-docker)
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-docker.svg?branch=main)](https://travis-ci.org/puppetlabs/puppetlabs-docker)
 [![Puppet Forge](https://img.shields.io/puppetforge/v/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker)
 [![Puppet Forge Downloads](http://img.shields.io/puppetforge/dt/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker)
 [![Puppet Forge Endorsement](https://img.shields.io/puppetforge/e/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker)
@@ -655,11 +655,11 @@ To supply multiple overide compose files add the following to the manifest file:
 
 ```puppet
 docker_compose {'test':
-  compose_files => ['master-docker-compose.yml', 'override-compose.yml'],
+  compose_files => ['server-docker-compose.yml', 'override-compose.yml'],
 }
 ```
 
-Please note you should supply your master docker-compose file as the first element in the array. As per docker, multi compose file support compose files are merged in the order they are specified in the array.
+Please note you should supply your server docker-compose file as the first element in the array. As per docker, multi compose file support compose files are merged in the order they are specified in the array.
 
 If you are using a v3.2 compose file or above on a Docker Swarm cluster, use the `docker::stack` class. Include the file resource before you run the stack command.
 
@@ -1000,7 +1000,7 @@ docker::plugin {'foo/fooplugin:latest'
 
 ## Reference
 
-For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-docker/blob/master/REFERENCE.md).
+For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-docker/blob/main/REFERENCE.md).
 
 ## Limitations
 
@@ -1018,7 +1018,7 @@ This module supports:
 
 ## Development
 
-If you would like to contribute to this module, see the guidelines in [CONTRIBUTING.MD](https://github.com/puppetlabs/puppetlabs-docker/blob/master/CONTRIBUTING.md).
+If you would like to contribute to this module, see the guidelines in [CONTRIBUTING.MD](https://github.com/puppetlabs/puppetlabs-docker/blob/main/CONTRIBUTING.md).
 
 ## Acceptance
 

Diff for: REFERENCE.md

@@ -73,7 +73,7 @@ from the registry
 * [`swarm_init`](#swarm_init): Initializes a swarm
 * [`swarm_join`](#swarm_join): Join a swarm
 * [`swarm_leave`](#swarm_leave): Leave a swarm
-* [`swarm_token`](#swarm_token): Gets the swarm token from the master
+* [`swarm_token`](#swarm_token): Gets the swarm token from the server
 * [`swarm_update`](#swarm_update): Updates an existing service.
 
 ## Classes
@@ -3544,7 +3544,7 @@ Auxiliary ipv4 or ipv6 addresses used by the Network driver
 
 ##### `gateway`
 
-An ipv4 or ipv6 gateway for the master subnet
+An ipv4 or ipv6 gateway for the server subnet
 
 ##### `ip_range`
 
@@ -4139,7 +4139,7 @@ Force this node to leave the swarm, ignoring warnings
 
 ### `swarm_token`
 
-Gets the swarm token from the master
+Gets the swarm token from the server
 
 **Supports noop?** false
 

Diff for: lib/puppet/type/docker_network.rb

@@ -18,7 +18,7 @@
   end
 
   newparam(:gateway) do
-    desc 'An ipv4 or ipv6 gateway for the master subnet'
+    desc 'An ipv4 or ipv6 gateway for the server subnet'
   end
 
   newparam(:ip_range) do

Diff for: spec/acceptance_swarm/swarm_spec.rb

@@ -72,7 +72,7 @@ class { 'docker': #{docker_args} }
     end
   end
 
-  context 'Creating a swarm master' do
+  context 'Creating a swarm server' do
     let(:token) { shell('docker swarm join-token -q worker').stdout.strip }
 
     it 'is idempotent' do

Diff for: tasks/swarm_token.json

@@ -1,5 +1,5 @@
 {
-  "description": "Gets the swarm token from the master",
+  "description": "Gets the swarm token from the server",
   "input_method": "stdin",
   "parameters": {
     "node_role": {