From 70d6f385b77e5b0f18d813a6eccc1047f6e56989 Mon Sep 17 00:00:00 2001 From: Arved Solth Date: Mon, 16 Dec 2024 10:48:50 +0100 Subject: [PATCH] Update 'master' branch references to 'main' --- .github/workflows/codeql.yml | 2 +- .github/workflows/main.yml | 4 ++-- Kitodo/src/main/resources/kitodo_config.properties | 4 ++-- docs/README.md | 2 +- docs/index.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index be469dc888e..c03135b37bf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,7 +14,7 @@ name: "CodeQL" on: push: pull_request: - branches: [ master ] + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4b88c595b8..d3f54021dee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,10 @@ name: CI # Controls when the action will run. on: - # Triggers the workflow on push and pull request events but only for pull_requests on the master branch + # Triggers the workflow on push and pull request events but only for pull_requests on the main branch push: pull_request: - branches: [ master ] + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/Kitodo/src/main/resources/kitodo_config.properties b/Kitodo/src/main/resources/kitodo_config.properties index 9fe425ec510..eb22ba64d44 100644 --- a/Kitodo/src/main/resources/kitodo_config.properties +++ b/Kitodo/src/main/resources/kitodo_config.properties @@ -591,7 +591,7 @@ taskProcessPropertyColumns= # - the activeMQ.hostURL should use the ssl:// procotocol at least once # - you must provide the JKS keystore (file or URI) including the keystore password # - you must provide the JKS truststore (file or URI) including the truststore password -# See https://github.com/kitodo/kitodo-production/tree/master/docs/gettingstarted/use_secured_activemq.md for +# See https://github.com/kitodo/kitodo-production/tree/main/docs/gettingstarted/use_secured_activemq.md for # more information how to generate certificats and how to configure the ActiveMQ server side #activeMQ.useSSL = false #activeMQ.keyStore = /usr/local/kitodo/certs/activemq-client.ks @@ -600,7 +600,7 @@ taskProcessPropertyColumns= #activeMQ.trustStorePassword = # Define if an authentication and authorization should be used. If so a username and password must be provided -# See https://github.com/kitodo/kitodo-production/tree/master/docs/gettingstarted/use_secured_activemq.md for +# See https://github.com/kitodo/kitodo-production/tree/main/docs/gettingstarted/use_secured_activemq.md for # more information how to configure the authentification and authorization #activeMQ.useAuth = false #activeMQ.authUsername = diff --git a/docs/README.md b/docs/README.md index a13cb18f45b..32c27d47dfc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Kitodo.Production Developer Documentation * Read the docs: -* GitHub: +* GitHub: This documentation is work in progress. Please consult the [javadoc](javadoc/README.md) or [contact the developer team](https://maillist.slub-dresden.de/cgi-bin/mailman/listinfo/kitodo-developer) if you have specific questions that are not covered here yet. diff --git a/docs/index.md b/docs/index.md index bbedebe6de1..a3dad0ba7fd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # Kitodo.Production Developer Documentation * Read the docs: -* GitHub: +* GitHub: This documentation is work in progress. Please consult the [javadoc](developer/javadoc/README.md) or [contact the developer team](https://maillist.slub-dresden.de/cgi-bin/mailman/listinfo/kitodo-developer) if you have specific questions that are not covered here yet.