[MAINTENANCE] Rename "master" branch

.github/ISSUE_TEMPLATE/feature_request.md

@@ -23,7 +23,7 @@ If applicable, add mockups and/or provide examples to help explain your proposal
 
 ## Target Version
 
-In general new features are only implemented for the current master branch. If you need the proposed feature to be backported to an earlier version as well, please tell us what prevents you from updating to the latest release.
+In general new features are only implemented for the current main branch. If you need the proposed feature to be backported to an earlier version as well, please tell us what prevents you from updating to the latest release.
 
 ## Additional Context
 Add any other context about the feature request here.

.github/pull.yml

@@ -1,7 +1,7 @@
 version: "1"
 rules:
-  - base: master
-    upstream: kitodo:master
+  - base: main
+    upstream: kitodo:main
     mergeMethod: hardreset
   - base: 1.x
     upstream: kitodo:1.x
@@ -18,6 +18,9 @@ rules:
   - base: 4.x
     upstream: kitodo:4.x
     mergeMethod: hardreset
-  - base: 5.x
-    upstream: kitodo:5.x
+  - base: 5.0.x
+    upstream: kitodo:5.0.x
+    mergeMethod: hardreset
+  - base: 5.1.x
+    upstream: kitodo:5.1.x
     mergeMethod: hardreset

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: CodeQL
 
 on:
   push:
-    branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x", "5.x" ]
+    branches: [ "main", "1.x", "2.x", "3.2.x", "3.3.x", "4.x", "5.0.x", "5.1.x" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   analyze:

.github/workflows/documentation.yml

@@ -1,6 +1,6 @@
 name: Documentation
 # Build and test documentation on pull_request and push event
-# If the git reference is the master branch, additionally build the documentation artifact and deploy it to GitHub Pages
+# If the git reference is the main branch, additionally build the documentation artifact and deploy it to GitHub Pages
 
 on: [ push, pull_request ]
 
@@ -14,37 +14,37 @@ jobs:
             - name: Test if the documentation will render without warnings
               run: |
                   mkdir -p Documentation-GENERATED-temp \
-                  && docker run --rm --pull always -v $(pwd):/project ghcr.io/typo3-documentation/render-guides:latest configure --project-version="dev-master" ./Documentation \
+                  && docker run --rm --pull always -v $(pwd):/project ghcr.io/typo3-documentation/render-guides:latest configure --project-version="dev-main" ./Documentation \
                   && docker run -v $(pwd):/project ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log
-            
+
             - name: Rename root page
-              if: github.ref == 'refs/heads/master'  
+              if: github.ref == 'refs/heads/main'
               run: mv ./Documentation-GENERATED-temp/Index.html ./Documentation-GENERATED-temp/index.html
-                     
+
             - name: Upload artifact
-              if: github.ref == 'refs/heads/master'  
+              if: github.ref == 'refs/heads/main'
               uses: actions/upload-pages-artifact@v3
               with:
                   path: ./Documentation-GENERATED-temp/
-                     
+
     deploy:
       name: Deploy documentation to GitHub Pages
-    
+
       # Add a dependency to the build job
       needs: build
 
-      if: github.ref == 'refs/heads/master'
-  
+      if: github.ref == 'refs/heads/main'
+
       # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
       permissions:
         pages: write      # to deploy to Pages
         id-token: write   # to verify the deployment originates from an appropriate source
-  
+
       # Deploy to the github-pages environment
       environment:
         name: github-pages
         url: ${{ steps.deployment.outputs.page_url }}
-  
+
       # Specify runner + deployment step
       runs-on: ubuntu-latest
       steps:

.github/workflows/phpstan.yml

@@ -2,9 +2,9 @@ name: PHPStan
 
 on:
     push:
-      branches: [ "master" ]
+      branches: [ "main" ]
     pull_request:
-      branches: [ "master" ]
+      branches: [ "main" ]
 
 jobs:
   phpstan:

.github/workflows/tests.yml

@@ -2,9 +2,9 @@ name: Unit and Functional Testing
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   test:

Configuration/ApacheSolr/README.txt

@@ -7,4 +7,4 @@ Installation instructions
 -------------------------
 
 Please follow the Solr installation instruction in the official
-Kitodo.Presentation documentation at https://docs.typo3.org/p/kitodo/presentation/master/en-us/Configuration/Index.html#solr-installation.
+Kitodo.Presentation documentation at https://docs.typo3.org/p/kitodo/presentation/main/en-us/Configuration/Index.html#solr-installation.

Documentation/guides.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <guides xmlns="https://www.phpdoc.org/guides" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.phpdoc.org/guides ../vendor/phpdocumentor/guides-cli/resources/schema/guides.xsd" links-are-relative="true">
-  <extension class="\T3Docs\Typo3DocsTheme\DependencyInjection\Typo3DocsThemeExtension" project-home="https://kitodo.org" project-contact="mailto:[email protected]" project-repository="https://github.com/kitodo/kitodo-presentation" project-issues="https://github.com/kitodo/kitodo-presentation/issues" edit-on-github-branch="master" edit-on-github="kitodo/kitodo-presentation" typo3-core-preferred="stable"/>
+  <extension class="\T3Docs\Typo3DocsTheme\DependencyInjection\Typo3DocsThemeExtension" project-home="https://kitodo.org" project-contact="mailto:[email protected]" project-repository="https://github.com/kitodo/kitodo-presentation" project-issues="https://github.com/kitodo/kitodo-presentation/issues" edit-on-github-branch="main" edit-on-github="kitodo/kitodo-presentation" typo3-core-preferred="stable"/>
   <project title="Kitodo.Presentation" release="6.0" copyright="since 2017 by Kitodo Release Management Team"/>
   <inventory id="t3tsref" url="http://docs.typo3.org/typo3cms/TyposcriptReference/"/>
 </guides>