Merge pull request #1907 from evgenyz/maint-1.3

Build and docs: Change the name of the master branch to main

Author: matejak

.github/workflows/build.yml

@@ -3,12 +3,12 @@
 name: Gating
 
 # Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# events but only for the main branch
 on:
   push:
     branches: [ '*' ]
   pull_request:
-    branches: [ master, maint-1.3 ]
+    branches: [ main, maint-1.3 ]
 
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

appveyor.yml

@@ -1,7 +1,7 @@
-version: master-{build}
+version: main-{build}
 branches:
   only:
-  - master
+  - main
   - maint-1.3
 image: Visual Studio 2017
 configuration: Release

docs/Doxyfile.in

@@ -801,7 +801,7 @@ HHC_LOCATION           =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
 # controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# it should be included in the main .chm file (NO).
 
 GENERATE_CHI           = NO
 

docs/contribute/contribute.adoc

@@ -69,13 +69,13 @@ $ git checkout maint-1.2
 $ git checkout -b fix_455
 ----
 
-On the other hand, if you decided that the fix will go into the `master` branch
+On the other hand, if you decided that the fix will go into the `main` branch
 you have to switch to this branch first before creating a new one:
 [source,bash]
 ----
-# create a new local branch to track the remote master branch
-$ git checkout -b master remotes/origin/master
-# and now create a new branch from the master branch which will contain your fix
+# create a new local branch to track the remote main branch
+$ git checkout -b main remotes/origin/main
+# and now create a new branch from the main branch which will contain your fix
 $ git checkout -b fix_455
 ----
 

docs/contribute/versioning.adoc

@@ -2,10 +2,10 @@
 
 OpenSCAP release versions have the common *$major.$minor.$patch* format.
 
-Most of the bleeding edge unstable development happens in the *master* branch.
+Most of the bleeding edge unstable development happens in the *main* branch.
 This branch is likely to break API and ABI and is likely not suitable for anyone
 but the developers. Only release candidates or other test releases are tagged
-from the master branch.
+from the main branch.
 
 *$major.$minor* together (e.g.: `1.2`) are called *feature releases*. As the
 name suggests, once a feature release is made, no new features are added to it.
@@ -42,7 +42,7 @@ in the maintenance branch even if it is considered broken or wrong. Only changes
 that make the implementation more compliant to documentation can be considered
 - these changes are most commonly bugfixes.
 
-Incompatible improvements shall always be done in the development (`master`)
+Incompatible improvements shall always be done in the development (`main`)
 branch if they are done at all. The commits should be accompanied with
 appropriate changes in documentation.
 
@@ -67,7 +67,7 @@ surrounding this so please use your best judgement.
 
 Bugfixes applied to maintenance branches must be merged up. For example,
 a bugfix applied to `maint-1.2` shall be merged to `maint-1.x` (where `x > 2`)
-which then shall be merged to `master`.
+which then shall be merged to `main`.
 
 This rule makes sure we always carry bugfixes to new feature releases.
 

docs/developer/developer.adoc

@@ -397,7 +397,7 @@ cd vcpkg
 
 ----
 cd c:\devel
-git clone -b master https://github.com/OpenSCAP/openscap.git
+git clone -b main https://github.com/OpenSCAP/openscap.git
 ----
 
 3) Generate Visual Studio Solution
@@ -437,10 +437,10 @@ mingw32-curl mingw32-pcre \
 mingw32-filesystem mingw32-bzip2
 -------------------------------------------------------------
 
-2) Checkout the master branch of the OpenSCAP repository
+2) Checkout the main branch of the OpenSCAP repository
 
 ----------------------------------------------------------------------
-$ git clone -b master https://github.com/openscap/openscap.git
+$ git clone -b main https://github.com/openscap/openscap.git
 $ cd openscap
 ----------------------------------------------------------------------