NO-JIRA: update build status and instructions after default branch renamed to main
diff --git a/README.md b/README.md
index 3c4a495..443a652 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
|CI Process|Status|
|---|---|
-|Travis CI Build|[![https://travis-ci.com/apache/qpid-broker-j.svg?branch=master](https://travis-ci.com/apache/qpid-broker-j.png?branch=master)](https://travis-ci.com/apache/qpid-broker-j?branch=master)|
+|Travis CI Build|[![Build Status](https://travis-ci.com/apache/qpid-broker-j.svg?branch=main)](https://travis-ci.com/apache/qpid-broker-j?branch=main)|
|Apache Jenkins CI Build|[![Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Qpid%2FQpid-Broker-J-TestMatrix)](https://ci-builds.apache.org/job/Qpid/job/Qpid-Broker-J-TestMatrix/)|
---
diff --git a/doc/developer-guide/src/main/markdown/quick-start.md b/doc/developer-guide/src/main/markdown/quick-start.md
index a6beb6a..28cbe21 100644
--- a/doc/developer-guide/src/main/markdown/quick-start.md
+++ b/doc/developer-guide/src/main/markdown/quick-start.md
@@ -108,11 +108,11 @@
## How to contribute changes to Qpid Broker-J
Here is a set of simple instructions to follow in order to contribute changes.
-Please note, that changes need to be implemented on master branch first before they can be ported into specific version support branch.
+Please note, that changes need to be implemented on main branch first before they can be ported into specific version support branch.
* Raise JIRA ticket
* Fork github mirror of broker-j repository, if it is not forked yet
-* Create working branch from master in forked repo
+* Create working branch from main in forked repo
* Implement required changes and unit/integration tests
* Verify that implementation follows [Qpid code standard](code-guide.md) and [clean code practices](https://en.wikipedia.org/wiki/SOLID)
* Verify that all tests are passing locally on a developer machine
@@ -120,5 +120,5 @@
* Create pull request in github mirror of broker-j repository
* Verify that all tests executed for PR by project Continuous Integration tools are still passing
* Address comments submitted by pull request reviewers if any and applicable
-* The reviewed changes needs to be applied into the master branch by project committer
+* The reviewed changes needs to be applied into the main branch by project committer
* Close the JIRA ticket
diff --git a/doc/developer-guide/src/main/markdown/release-instructions.md b/doc/developer-guide/src/main/markdown/release-instructions.md
index fda2b8e..d57baa8 100644
--- a/doc/developer-guide/src/main/markdown/release-instructions.md
+++ b/doc/developer-guide/src/main/markdown/release-instructions.md
@@ -51,7 +51,7 @@
## Release Steps
1. Checkout Qpid Broker-J Sources
- * For new major/minor release; checkout sources master
+ * For new major/minor release; checkout sources main branch
git clone https://gitbox.apache.org/repos/asf/qpid-broker-j.git qpid-broker-j
* For bugfix release