diff --git a/.bulldozer.yml b/.bulldozer.yml index d9f5274f..181c7ef3 100644 --- a/.bulldozer.yml +++ b/.bulldozer.yml @@ -4,7 +4,7 @@ merge: trigger: labels: ["merge when ready"] comment_substrings: ["==AUTOMERGE==", "==MERGE_WHEN_READY=="] - branches: ["master"] + branches: ["main"] branch_patterns: ["epic/.*"] ignore: labels: ["do not merge"] @@ -15,5 +15,5 @@ merge: update: trigger: labels: ["wip", "update me"] - branches: ["master"] + branches: ["main"] branch_patterns: ["epic/.*"] diff --git a/.travis.yml b/.travis.yml index 55916342..8e3c8b32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,4 @@ deploy: committer_from_gh: true target_branch: gh-pages on: - branch: master + branch: main diff --git a/src/pages/contributing.mdx b/src/pages/contributing.mdx index f83aacc6..5ded063b 100644 --- a/src/pages/contributing.mdx +++ b/src/pages/contributing.mdx @@ -7,7 +7,7 @@ This is a guide for contributing to the SPM DevOps runbook. | Branch | Status | |:-:|:-:| -| _Master_ | [![Build Status](https://travis-ci.com/IBM/spm-kubernetes.svg?branch=master)](https://app.travis-ci.com/IBM/spm-kubernetes) | +| _Main_ | [![Build Status](https://travis-ci.com/IBM/spm-kubernetes.svg?branch=main)](https://app.travis-ci.com/IBM/spm-kubernetes) | ## House Rules diff --git a/src/pages/monitoring/jmx-statistics-performance-monitoring.mdx b/src/pages/monitoring/jmx-statistics-performance-monitoring.mdx index 533726aa..80398674 100644 --- a/src/pages/monitoring/jmx-statistics-performance-monitoring.mdx +++ b/src/pages/monitoring/jmx-statistics-performance-monitoring.mdx @@ -6,7 +6,7 @@ description: Monitoring performance using JMX statistics Cúram JMX statistics provides operational data from a running IBM® Cúram Social Program Management (SPM) application. JMX statistics for use with a traditional application server are documented -in this [IBM Documentation](https://www.ibm.com/docs/en/spm/8.0.0?topic=application-configuring-jmx-statistics) page. +in this [IBM Documentation](https://www.ibm.com/docs/en/spm/8.0.0?topic=management-configuring-jmx-statistics) page. ### Cúram JMX Kubernetes Limitations