Merge pull request #366 from david22swan/IAC-1011/main/removal_of_inappropriate_terminology

(IAC-1011) - Removal of inappropriate terminology

Author: michaeltlombardi

.github/workflows/release.yml

@@ -19,7 +19,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 }}
@@ -36,7 +36,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 }}
@@ -54,7 +54,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 }}
@@ -75,7 +75,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

@@ -68,7 +68,7 @@ All notable changes to this project will be documented in this file. The format
 
 ### Changed
 
-- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/LICENSE))
+- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/LICENSE))
 
 ### Fixed
 
@@ -95,8 +95,8 @@ All notable changes to this project will be documented in this file. The format
 
 - Fix problem installing sql instance when an array of SQL Admins are specified. ([MODULES-6356](https://tickets.puppetlabs.com/browse/MODULES-6356))
 - Fix AppVeyor OpenSSL bug.([Modsync commit with discussion](https://github.com/puppetlabs/modulesync_configs/commit/f04d0d1119cb5cbd4c3aac76047c4c766ae1fcb2))
-- During acceptance testing, only execute master provisioning steps if there is
-  a master in the hosts array.
+- During acceptance testing, only execute server provisioning steps if there is
+  a server in the hosts array.
 - Stop running `gem update bundler` during Travis runs. ([MODULES-6339](https://tickets.puppetlabs.com/browse/MODULES-6339))
 - The `sqlserver_tsql` resource now returns errors from sql queries properly. ([MODULES-6281](https://tickets.puppetlabs.com/browse/MODULES-6281))
 
@@ -263,7 +263,7 @@ attempts to reinstall an instance that already exists ([MODULES-6022](https://ti
 
 Initial release.
 
-[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..master
+[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..main
 [2.5.1]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.5.0..v2.5.1
 [2.5.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.4.0..2.5.0
 [2.4.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.3.0..2.4.0

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

@@ -39,7 +39,7 @@
 
 ### Changed
 
-- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/LICENSE))
+- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/LICENSE))
 
 ### Fixed
 
@@ -66,8 +66,8 @@
 
 - Fix problem installing sql instance when an array of SQL Admins are specified. ([MODULES-6356](https://tickets.puppetlabs.com/browse/MODULES-6356))
 - Fix AppVeyor OpenSSL bug.([Modsync commit with discussion](https://github.com/puppetlabs/modulesync_configs/commit/f04d0d1119cb5cbd4c3aac76047c4c766ae1fcb2))
-- During acceptance testing, only execute master provisioning steps if there is
-  a master in the hosts array.
+- During acceptance testing, only execute server provisioning steps if there is
+  a server in the hosts array.
 - Stop running `gem update bundler` during Travis runs. ([MODULES-6339](https://tickets.puppetlabs.com/browse/MODULES-6339))
 - The `sqlserver_tsql` resource now returns errors from sql queries properly. ([MODULES-6281](https://tickets.puppetlabs.com/browse/MODULES-6281))
 
@@ -234,7 +234,7 @@ attempts to reinstall an instance that already exists ([MODULES-6022](https://ti
 
 Initial release.
 
-[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..master
+[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..main
 [2.5.1]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.5.0..v2.5.1
 [2.5.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.4.0..2.5.0
 [2.4.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.3.0..2.4.0

LICENSE

@@ -1,3 +1,3 @@
-This Module is only available for use with (1) the Puppet Enterprise Free License for up to 10 Nodes or as part of a Puppet Enterprise paid license, both subject to the Master License Agreement located at https://puppet.com/legal or other existing valid license agreement between user and Puppet ("Agreement") governing the use of Puppet Enterprise or (2) Puppet Bolt for up to a ninety (90) day period from the date this Module is downloaded, subject to the open source license for Puppet Bolt.  With the exception of Puppet Bolt, this Module is not available for users of any other open source Puppet software.  Any terms not defined herein shall have the meaning set forth in the Agreement.
+This Module is only available for use with (1) the Puppet Enterprise Free License for up to 10 Nodes or as part of a Puppet Enterprise paid license, both subject to the Software License Agreement located at https://puppet.com/legal or other existing valid license agreement between user and Puppet ("Agreement") governing the use of Puppet Enterprise or (2) Puppet Bolt for up to a ninety (90) day period from the date this Module is downloaded, subject to the open source license for Puppet Bolt.  With the exception of Puppet Bolt, this Module is not available for users of any other open source Puppet software.  Any terms not defined herein shall have the meaning set forth in the Agreement.
 
 By downloading this Module, you represent that you have agreed to a valid Agreement for Puppet Enterprise or the applicable open source license for Puppet Bolt and you further agree that your use of the Module is governed by the terms of such Agreement and license, respectively.

README.md

@@ -268,7 +268,7 @@ sqlserver::role { 'sysadmin':
 
 ## Reference
 
-For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/REFERENCE.md)
+For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/REFERENCE.md)
 
 ## Limitations