Skip to content

Commit

Permalink
Update 'master' branch references to 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
solth committed Dec 16, 2024
1 parent 64c07cb commit 70d6f38
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Kitodo/src/main/resources/kitodo_config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kitodo.Production Developer Documentation

* Read the docs: <https://kitodo-production.readthedocs.io/en/latest/>
* GitHub: <https://github.com/kitodo/kitodo-production/tree/master/docs>
* GitHub: <https://github.com/kitodo/kitodo-production/tree/main/docs>

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.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kitodo.Production Developer Documentation

* Read the docs: <https://kitodo-production.readthedocs.io/en/latest/>
* GitHub: <https://github.com/kitodo/kitodo-production/tree/master/docs>
* GitHub: <https://github.com/kitodo/kitodo-production/tree/main/docs>

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.

0 comments on commit 70d6f38

Please sign in to comment.